emacs: src/gtkutil.c comparison

comparison src/gtkutil.c @ 91041:bdb3fe0ba9fa

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257

author	Miles Bader <miles@gnu.org>
date	Thu, 11 Oct 2007 16:22:07 +0000
parents	b83d0dadb2a7 5d074ea0e4a2
children	880960b70474

comparison

equal deleted inserted replaced

-:14c4a6aac623
+:bdb3fe0ba9fa
 Display handling functions
 ***********************************************************************/
 #ifdef HAVE_GTK_MULTIDISPLAY
+/* Gtk does not work well without any display open.  Emacs may close
+all its displays.  In that case, keep a display around just for
+the purpose of having one.  */
+static GdkDisplay *gdpy_def;
 /* Return the GdkDisplay that corresponds to the X display DPY.  */
 static GdkDisplay *
 xg_get_gdk_display (dpy)
 Display *dpy;
 {
 new_dpy = dpyinfo->display;
 break;
 }
-if (! new_dpy) return; /* Emacs will exit anyway.  */
+if (new_dpy)
+gdpy_new = gdk_x11_lookup_xdisplay (new_dpy);
-gdpy_new = gdk_x11_lookup_xdisplay (new_dpy);
+else
+{
+if (!gdpy_def)
+gdpy_def = gdk_display_open (gdk_display_get_name (gdpy));
+gdpy_new = gdpy_def;
+}
 gdk_display_manager_set_default_display (gdk_display_manager_get (),
 gdpy_new);
 }
 /* GTK 2.2-2.8 has a bug that makes gdk_display_close crash (bug
 GtkImage *old_widget;
 {
 GdkPixmap *gpix;
 GdkPixmap *gmask;
 GdkDisplay *gdpy;
+GdkColormap *cmap;
+GdkPixbuf *icon_buf;
 /* If we have a file, let GTK do all the image handling.
 This seems to be the only way to make insensitive and activated icons
 look good in all cases.  */
 Lisp_Object specified_file = file_for_image (img->spec);
 gdpy = gdk_x11_lookup_xdisplay (FRAME_X_DISPLAY (f));
 gpix = gdk_pixmap_foreign_new_for_display (gdpy, img->pixmap);
 gmask = img->mask ? gdk_pixmap_foreign_new_for_display (gdpy, img->mask) : 0;
-if (x_screen_planes (f) > 8 || x_screen_planes (f) == 1)
+/* This is a workaround to make icons look good on pseudo color
-{
+displays.  Apparently GTK expects the images to have an alpha
-if (! old_widget)
+channel.  If they don't, insensitive and activated icons will
-old_widget = GTK_IMAGE (gtk_image_new_from_pixmap (gpix, gmask));
+look bad.  This workaround does not work on monochrome displays,
-else
+and is strictly not needed on true color/static color displays (i.e.
-gtk_image_set_from_pixmap (old_widget, gpix, gmask);
+16 bits and higher).  But we do it anyway so we get a pixbuf that is
-}
+not associated with the img->pixmap.  The img->pixmap may be removed
+by clearing the image cache and then the tool bar redraw fails, since
+Gtk+ assumes the pixmap is always there.  */
+cmap = gtk_widget_get_colormap (widget);
+icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap);
+if (! old_widget)
+old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf));
 else
-{
+gtk_image_set_from_pixbuf (old_widget, icon_buf);
-/* This is a workaround to make icons look good on pseudo color
+g_object_unref (G_OBJECT (icon_buf));
-displays.  Apparently GTK expects the images to have an alpha
-channel.  If they don't, insensitive and activated icons will
-look bad.  This workaround does not work on monochrome displays,
-and is not needed on true color/static color displays (i.e.
-16 bits and higher).  */
-GdkColormap *cmap = gtk_widget_get_colormap (widget);
-GdkPixbuf *icon_buf = xg_get_pixbuf_from_pix_and_mask (gpix, gmask, cmap);
-if (! old_widget)
-old_widget = GTK_IMAGE (gtk_image_new_from_pixbuf (icon_buf));
-else
-gtk_image_set_from_pixbuf (old_widget, icon_buf);
-g_object_unref (G_OBJECT (icon_buf));
-}
 g_object_unref (G_OBJECT (gpix));
 if (gmask) g_object_unref (G_OBJECT (gmask));
 return GTK_WIDGET (old_widget);
 gtk_widget_realize (wfixed);
 FRAME_X_WINDOW (f) = GTK_WIDGET_TO_X_WIN (wfixed);
 /* Since GTK clears its window by filling with the background color,
 we must keep X and GTK background in sync.  */
-xg_pix_to_gcolor (wfixed, f->output_data.x->background_pixel, &bg);
+xg_pix_to_gcolor (wfixed, FRAME_BACKGROUND_PIXEL (f), &bg);
 gtk_widget_modify_bg (wfixed, GTK_STATE_NORMAL, &bg);
 /* Also, do not let any background pixmap to be set, this looks very
 bad as Emacs overwrites the background pixmap with its own idea
 of background color.  */
 if (default_filename)
 {
 Lisp_Object file;
 struct gcpro gcpro1;
+char *utf8_filename;
 GCPRO1 (file);
-char *utf8_filename;
 file = build_string (default_filename);
 /* File chooser does not understand ~/... in the file name.  It must be
 an absolute name starting with /.  */
 popping down a menu is seen by Emacs (see xg_process_timeouts above).
 W is the widget that does the grab (not used).
 UNGRAB_P is TRUE if this is an ungrab, FALSE if it is a grab.
 CLIENT_DATA is NULL (not used).  */
+/* Keep track of total number of grabs.  */
+static int menu_grab_callback_cnt;
 static void
 menu_grab_callback (GtkWidget *widget,
 gboolean ungrab_p,
 gpointer client_data)
 {
-/* Keep track of total number of grabs.  */
+if (ungrab_p) menu_grab_callback_cnt--;
-static int cnt;
+else menu_grab_callback_cnt++;
-if (ungrab_p) cnt--;
+if (menu_grab_callback_cnt > 0 && ! xg_timer) xg_start_timer ();
-else cnt++;
+else if (menu_grab_callback_cnt == 0 && xg_timer) xg_stop_timer ();
-if (cnt > 0 && ! xg_timer) xg_start_timer ();
-else if (cnt == 0 && xg_timer) xg_stop_timer ();
 }
 /* Make a GTK widget that contains both UTF8_LABEL and UTF8_KEY (both
 must be non-NULL) and can be inserted into a menu item.
 }
 /* Return non-zero if LABEL specifies a separator (GTK only has one
 separator type)  */
+static char* separator_names[] = {
+"space",
+"no-line",
+"single-line",
+"double-line",
+"single-dashed-line",
+"double-dashed-line",
+"shadow-etched-in",
+"shadow-etched-out",
+"shadow-etched-in-dash",
+"shadow-etched-out-dash",
+"shadow-double-etched-in",
+"shadow-double-etched-out",
+"shadow-double-etched-in-dash",
+"shadow-double-etched-out-dash",
+0,
+};
 static int
 xg_separator_p (char *label)
 {
 if (! label) return 0;
 else if (strlen (label) > 3
 	   && strncmp (label, "--", 2) == 0
 	   && label[2] != '-')
 {
-static char* separator_names[] = {
-"space",
-	"no-line",
-	"single-line",
-	"double-line",
-	"single-dashed-line",
-	"double-dashed-line",
-	"shadow-etched-in",
-	"shadow-etched-out",
-	"shadow-etched-in-dash",
-	"shadow-etched-out-dash",
-	"shadow-double-etched-in",
-	"shadow-double-etched-out",
-	"shadow-double-etched-in-dash",
-	"shadow-double-etched-out-dash",
-0,
-};
 int i;
 label += 2;
 for (i = 0; separator_names[i]; ++i)
 	if (strcmp (label, separator_names[i]) == 0)
 }
 return w;
 }
-/* Callback called when keyboard traversal (started by menu-bar-open) ends.
+/* Callback called when keyboard traversal (started by x-menu-bar-open) ends.
 WMENU is the menu for which traversal has been done.  DATA points to the
 frame for WMENU.  We must release grabs, some bad interaction between GTK
 and Emacs makes the menus keep the grabs.  */
 static void
 /* The key for the data we put in the GtkImage widgets.  The data is
 the stock name used by Emacs.  We use this to see if we need to update
 the GtkImage with a new image.  */
 #define XG_TOOL_BAR_STOCK_NAME "emacs-tool-bar-stock-name"
+/* As above, but this is used for named theme widgets, as opposed to
+stock items.  */
+#define XG_TOOL_BAR_ICON_NAME "emacs-tool-bar-icon-name"
 /* Callback function invoked when a tool bar item is pressed.
 W is the button widget in the tool bar that got pressed,
 CLIENT_DATA is an integer that is the index of the button in the
 tool bar.  0 is the first button.  */
 return FALSE;
 }
 #define PROP(IDX) AREF (f->tool_bar_items, i * TOOL_BAR_ITEM_NSLOTS + (IDX))
-/* This callback is called when a tool bar shall be redrawn.
-We need to update the images in case the image cache
-has deleted the pixmaps used in the tool bar.
-W is the GtkToolbar to be redrawn.
-EVENT is the expose event for W.
-CLIENT_DATA is pointing to the frame for this tool bar.
-Returns FALSE to tell GTK to keep processing this event.  */
-static gboolean
-xg_tool_bar_expose_callback (w, event, client_data)
-GtkWidget *w;
-GdkEventExpose *event;
-gpointer client_data;
-{
-FRAME_PTR f = (FRAME_PTR) client_data;
-SET_FRAME_GARBAGED (f);
-return FALSE;
-}
 /* Create a tool bar for frame F.  */
 static void
 xg_create_tool_bar (f)
 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-detached",
 G_CALLBACK (xg_tool_bar_detach_callback), f);
 g_signal_connect (G_OBJECT (x->handlebox_widget), "child-attached",
 G_CALLBACK (xg_tool_bar_attach_callback), f);
-g_signal_connect (G_OBJECT (x->toolbar_widget),
-"expose-event",
-G_CALLBACK (xg_tool_bar_expose_callback),
-f);
 gtk_widget_show_all (x->handlebox_widget);
 gtk_widget_size_request (x->toolbar_widget, &req);
 FRAME_TOOLBAR_HEIGHT (f) = req.height;
 struct image *img = NULL;
 Lisp_Object image;
 Lisp_Object stock;
 GtkStockItem stock_item;
 char *stock_name = NULL;
+char *icon_name = NULL;
 Lisp_Object rtl;
-GtkWidget *wbutton;
+GtkWidget *wbutton = NULL;
 GtkWidget *weventbox;
 Lisp_Object func = intern ("x-gtk-map-stock");
 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (x->toolbar_widget), i);
 }
 if (EQ (Qt, Ffboundp (func)))
 stock = call1 (func, file_for_image (image));
-if (! NILP (stock) && STRINGP (stock)
+if (! NILP (stock) && STRINGP (stock))
-&& gtk_stock_lookup (SSDATA (stock), &stock_item))
 {
 stock_name = SSDATA (stock);
-icon_size = gtk_toolbar_get_icon_size (wtoolbar);
+if (stock_name[0] == 'n' && stock_name[1] == ':')
+{
+GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (wtoolbar));
+GtkIconTheme *icon_theme = gtk_icon_theme_get_for_screen (screen);
+icon_name = stock_name + 2;
+stock_name = NULL;
+stock = Qnil;
+if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
+icon_name = NULL;
+else
+icon_size = gtk_toolbar_get_icon_size (wtoolbar);
+}
+else if (gtk_stock_lookup (SSDATA (stock), &stock_item))
+icon_size = gtk_toolbar_get_icon_size (wtoolbar);
+else
+{
+stock = Qnil;
+stock_name = NULL;
+}
 }
-else
+if (stock_name == NULL && icon_name == NULL)
 {
 /* No stock image, or stock item not known.  Try regular image.  */
 /* If image is a vector, choose the image according to the
 button state.  */
 w = gtk_image_new_from_stock (stock_name, icon_size);
 g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_STOCK_NAME,
 (gpointer) xstrdup (stock_name),
 (GDestroyNotify) xfree);
 }
+else if (icon_name)
+{
+w = gtk_image_new_from_icon_name (icon_name, icon_size);
+g_object_set_data_full (G_OBJECT (w), XG_TOOL_BAR_ICON_NAME,
+(gpointer) xstrdup (icon_name),
+(GDestroyNotify) xfree);
+}
 else
 {
 w = xg_get_image_for_pixmap (f, img, x->widget, NULL);
 /* Save the image so we can see if an update is needed when
 this function is called again.  */
 GtkWidget *wimage = gtk_bin_get_child (GTK_BIN (wbutton));
 Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
 XG_TOOL_BAR_IMAGE_DATA);
 gpointer old_stock_name = g_object_get_data (G_OBJECT (wimage),
 XG_TOOL_BAR_STOCK_NAME);
+gpointer old_icon_name = g_object_get_data (G_OBJECT (wimage),
+XG_TOOL_BAR_ICON_NAME);
 if (stock_name &&
 (! old_stock_name || strcmp (old_stock_name, stock_name) != 0))
 {
 gtk_image_set_from_stock (GTK_IMAGE (wimage),
 stock_name, icon_size);
 g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
 (gpointer) xstrdup (stock_name),
 (GDestroyNotify) xfree);
 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
 NULL);
+g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL);
+}
+else if (icon_name &&
+(! old_icon_name || strcmp (old_icon_name, icon_name) != 0))
+{
+gtk_image_set_from_icon_name (GTK_IMAGE (wimage),
+icon_name, icon_size);
+g_object_set_data_full (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME,
+(gpointer) xstrdup (icon_name),
+(GDestroyNotify) xfree);
+g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
+NULL);
+g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
+NULL);
 }
 else if (img && old_img != img->pixmap)
 {
 (void) xg_get_image_for_pixmap (f, img, x->widget, wimage);
 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA,
 (gpointer)img->pixmap);
 g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME,
 NULL);
+g_object_set_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME, NULL);
 }
 gtk_misc_set_padding (GTK_MISC (wimage), hmargin, vmargin);
 gtk_widget_set_sensitive (wbutton, enabled_p);
 #if HAVE_XFT
 /* Work around a bug with corrupted data if libXft gets unloaded.  This way
 we keep it permanently linked in.  */
 XftInit (0);
 #endif
+gdpy_def = NULL;
 xg_ignore_gtk_scrollbar = 0;
 xg_detached_menus = 0;
 xg_menu_cb_list.prev = xg_menu_cb_list.next =
 xg_menu_item_cb_list.prev = xg_menu_item_cb_list.next = 0;

Mercurial > emacs

comparison src/gtkutil.c @ 91041:bdb3fe0ba9fa