Mercurial > emacs

comparison src/xfns.c @ 67264:d50a6a8cfd1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* xfns.c (x_real_positions): int ign => unsigned int. (xg_set_icon_from_xpm_data): Remove unused variable err. (x_set_name_internal, Fx_create_frame, xg_set_icon): Add cast to remove compiler warning. (compute_tip_xy): Put tip above pointer if it doesn't fit below.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 02 Dec 2005 14:55:14 +0000
parents 1a573209abf9
children 87de4735ecc9
comparison
equal deleted inserted replaced
67263:b2d1b6e2f96a 67264:d50a6a8cfd1e
606 win = wm_window; 606 win = wm_window;
607 } 607 }
608 608
609 if (! had_errors) 609 if (! had_errors)
610 { 610 {
611 int ign; 611 unsigned int ign;
612 Window child, rootw; 612 Window child, rootw;
613 613
614 /* Get the real coordinates for the WM window upper left corner */ 614 /* Get the real coordinates for the WM window upper left corner */
615 XGetGeometry (FRAME_X_DISPLAY (f), win, 615 XGetGeometry (FRAME_X_DISPLAY (f), win,
616 &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign); 616 &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign);
792 792
793 if (! NILP (found)) 793 if (! NILP (found))
794 { 794 {
795 GdkPixbuf *pixbuf; 795 GdkPixbuf *pixbuf;
796 GError *err = NULL; 796 GError *err = NULL;
797 char *filename; 797 char *filename = (char *) SDATA (found);
798
799 filename = SDATA (found);
800 BLOCK_INPUT; 798 BLOCK_INPUT;
801 799
802 pixbuf = gdk_pixbuf_new_from_file (filename, &err); 800 pixbuf = gdk_pixbuf_new_from_file (filename, &err);
803 801
804 if (pixbuf) 802 if (pixbuf)
823 xg_set_icon_from_xpm_data (f, data) 821 xg_set_icon_from_xpm_data (f, data)
824 FRAME_PTR f; 822 FRAME_PTR f;
825 char **data; 823 char **data;
826 { 824 {
827 int result = 0; 825 int result = 0;
828 GError *err = NULL; 826 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) data);
829 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data (data);
830 827
831 if (!pixbuf) 828 if (!pixbuf)
832 { 829 return 0;
833 g_error_free (err); 830
834 return 0; 831 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), pixbuf);
835 }
836
837 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
838 pixbuf);
839 g_object_unref (pixbuf); 832 g_object_unref (pixbuf);
840 return 1; 833 return 1;
841 } 834 }
842 #endif /* USE_GTK */ 835 #endif /* USE_GTK */
843 836
1647 icon.nitems = bytes; 1640 icon.nitems = bytes;
1648 } 1641 }
1649 1642
1650 #ifdef USE_GTK 1643 #ifdef USE_GTK
1651 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)), 1644 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
1652 SDATA (ENCODE_UTF_8 (name))); 1645 (char *) SDATA (ENCODE_UTF_8 (name)));
1653 #else /* not USE_GTK */ 1646 #else /* not USE_GTK */
1654 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text); 1647 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
1655 #endif /* not USE_GTK */ 1648 #endif /* not USE_GTK */
1656 1649
1657 XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon); 1650 XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
3374 BLOCK_INPUT; 3367 BLOCK_INPUT;
3375 XChangeProperty (FRAME_X_DISPLAY (f), 3368 XChangeProperty (FRAME_X_DISPLAY (f),
3376 FRAME_OUTER_WINDOW (f), 3369 FRAME_OUTER_WINDOW (f),
3377 dpyinfo->Xatom_wm_client_leader, 3370 dpyinfo->Xatom_wm_client_leader,
3378 XA_WINDOW, 32, PropModeReplace, 3371 XA_WINDOW, 32, PropModeReplace,
3379 (char *) &dpyinfo->client_leader_window, 1); 3372 (unsigned char *) &dpyinfo->client_leader_window, 1);
3380 UNBLOCK_INPUT; 3373 UNBLOCK_INPUT;
3381 } 3374 }
3382 3375
3383 UNGCPRO; 3376 UNGCPRO;
3384 3377
4939 } 4932 }
4940 4933
4941 if (INTEGERP (top)) 4934 if (INTEGERP (top))
4942 *root_y = XINT (top); 4935 *root_y = XINT (top);
4943 else if (*root_y + XINT (dy) - height < 0) 4936 else if (*root_y + XINT (dy) - height < 0)
4937 *root_y -= XINT (dy);
4938 else if (*root_y + XINT (dy) >= FRAME_X_DISPLAY_INFO (f)->height)
4939 /* Put tip above the pointer. */
4944 *root_y -= XINT (dy); 4940 *root_y -= XINT (dy);
4945 else 4941 else
4946 { 4942 {
4947 *root_y -= height; 4943 *root_y -= height;
4948 *root_y += XINT (dy); 4944 *root_y += XINT (dy);