emacs: src/gtkutil.c comparison

comparison src/gtkutil.c @ 111991:968255ee954a

Support for menu separators in the GTK tool-bar. * src/gtkutil.c (XG_BIN_CHILD): New macro. (xg_get_menu_item_label, xg_update_menubar) (xg_update_menu_item, xg_tool_bar_menu_proxy) (xg_show_toolbar_item, update_frame_tool_bar): Use it. (separator_names, xg_separator_p): Move to keyboard.c. (create_menus, xg_update_submenu, update_frame_tool_bar): Use menu_separator_name_p. * src/keyboard.c (parse_tool_bar_item): Allow menu separators in tool-bar maps. (menu_separator_name_p): New function, from gtkutil.c. (separator_names): Move from gtkutil.c. * src/keyboard.h (menu_separator_name_p): Add prototype. * src/nsmenu.m (name_is_separator): Function deleted. (addItemWithWidgetValue): Use menu_separator_name_p. * src/w32menu.c (name_is_separator): Function deleted. (add_menu_item): Use menu_separator_name_p.

author	Chong Yidong <cyd@stupidchicken.com>
date	Fri, 17 Dec 2010 12:04:06 +0800
parents	0bd93f14fcb6
children	dffe14ef6b65

comparison

equal deleted inserted replaced

-:fd7dd167d6e5
+:968255ee954a
 #if GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION > 11
 #define remove_submenu(w) gtk_menu_item_set_submenu ((w), NULL)
 #else
 #define remove_submenu(w) gtk_menu_item_remove_submenu ((w))
 #endif
+#define XG_BIN_CHILD(x) gtk_bin_get_child (GTK_BIN (x))
 /***********************************************************************
 Display handling functions
 ***********************************************************************/
 if (! item->enabled) gtk_widget_set_sensitive (w, FALSE);
 return w;
 }
-/* Return non-zero if LABEL specifies a separator (GTK only has one
-separator type)  */
-static const 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 (const char *label)
-{
-if (! label) return 0;
-else if (strlen (label) > 3
-	   && strncmp (label, "--", 2) == 0
-	   && label[2] != '-')
-{
-int i;
-label += 2;
-for (i = 0; separator_names[i]; ++i)
-	if (strcmp (label, separator_names[i]) == 0)
-return 1;
-}
-else
-{
-/* Old-style separator, maybe.  It's a separator if it contains
-	 only dashes.  */
-while (*label == '-')
-	++label;
-if (*label == 0) return 1;
-}
-return 0;
-}
 static int xg_detached_menus;
 /* Returns non-zero if there are detached menus.  */
 int
 for (item = data; item; item = item->next)
 {
 GtkWidget *w;
 if (pop_up_p && !item->contents && !item->call_data
-&& !xg_separator_p (item->name))
+&& !menu_separator_name_p (item->name))
 {
 char *utf8_label;
 /* A title for a popup.  We do the same as GTK does when
 creating titles, but it does not look good.  */
 group = NULL;
 gtk_menu_set_title (GTK_MENU (wmenu), utf8_label);
 w = gtk_menu_item_new_with_label (utf8_label);
 gtk_widget_set_sensitive (w, FALSE);
 if (utf8_label) g_free (utf8_label);
 }
-else if (xg_separator_p (item->name))
+else if (menu_separator_name_p (item->name))
 {
 group = NULL;
 /* GTK only have one separator type.  */
 w = gtk_separator_menu_item_new ();
 }
 /* Return the label for menu item WITEM.  */
 static const char *
 xg_get_menu_item_label (GtkMenuItem *witem)
 {
-GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
+GtkLabel *wlabel = GTK_LABEL (XG_BIN_CHILD (witem));
 return gtk_label_get_label (wlabel);
 }
 /* Return non-zero if the menu item WITEM has the text LABEL.  */
 back the C-mode menu.  Thus we do:
 Rename B to X (C-mode to minibuf menu)
 Rename X to B (minibuf to C-mode menu).
 If the X menu hasn't been invoked, the menu under B
 is up to date when leaving the minibuffer.  */
-GtkLabel *wlabel = GTK_LABEL (gtk_bin_get_child (GTK_BIN (witem)));
+GtkLabel *wlabel = GTK_LABEL (XG_BIN_CHILD (witem));
 char *utf8_label = get_utf8_string (val->name);
 GtkWidget *submenu = gtk_menu_item_get_submenu (witem);
 gtk_label_set_text (wlabel, utf8_label);
 char *utf8_key;
 const char *old_label = 0;
 const char *old_key = 0;
 xg_menu_item_cb_data *cb_data;
-wchild = gtk_bin_get_child (GTK_BIN (w));
+wchild = XG_BIN_CHILD (w);
 utf8_label = get_utf8_string (val->name);
 utf8_key = get_utf8_string (val->key);
 /* See if W is a menu item with a key.  See make_menu_item above.  */
 if (GTK_IS_HBOX (wchild))
 && ! GTK_IS_RADIO_MENU_ITEM (w))
 first_radio = 0;
 if (GTK_IS_SEPARATOR_MENU_ITEM (w))
 {
-if (! xg_separator_p (cur->name))
+if (! menu_separator_name_p (cur->name))
 break;
 }
 else if (GTK_IS_CHECK_MENU_ITEM (w))
 {
 if (cur->button_type != BUTTON_TYPE_TOGGLE)
 {
 GtkMenuItem *witem = GTK_MENU_ITEM (w);
 GtkWidget *sub;
 if (cur->button_type != BUTTON_TYPE_NONE ||
-xg_separator_p (cur->name))
+menu_separator_name_p (cur->name))
 break;
 xg_update_menu_item (cur, w, select_cb, highlight_cb, cl_data);
 sub = gtk_menu_item_get_submenu (witem);
 blank.  */
 static gboolean
 xg_tool_bar_menu_proxy (GtkToolItem *toolitem, gpointer user_data)
 {
-GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (toolitem));
+GtkButton *wbutton = GTK_BUTTON (XG_BIN_CHILD (XG_BIN_CHILD (toolitem)));
-GtkButton *wbutton = GTK_BUTTON (gtk_bin_get_child (GTK_BIN (weventbox)));
+GtkWidget *vb = XG_BIN_CHILD (wbutton);
-GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
 GtkWidget *c1;
 GtkLabel *wlbl = GTK_LABEL (xg_get_tool_bar_widgets (vb, &c1));
 GtkImage *wimage = GTK_IMAGE (c1);
 GtkWidget *wmenuitem = gtk_image_menu_item_new_with_label
 (gtk_label_get_text (wlbl));
 int horiz = both_horiz || text_image;
 int vert_only = ! gtk_tool_item_get_is_important (ti);
 int show_label = ! EQ (style, Qimage) && ! (vert_only && horiz);
 int show_image = ! EQ (style, Qtext);
-GtkWidget *weventbox = gtk_bin_get_child (GTK_BIN (ti));
+GtkWidget *weventbox = XG_BIN_CHILD (ti);
-GtkWidget *wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
+GtkWidget *wbutton = XG_BIN_CHILD (weventbox);
-GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
+GtkWidget *vb = XG_BIN_CHILD (wbutton);
 GtkWidget *wimage;
 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage);
 GtkWidget *new_box = NULL;
 if (GTK_IS_VBOX (vb) && horiz)
 GtkStockItem stock_item;
 char *stock_name = NULL;
 char *icon_name = NULL;
 Lisp_Object rtl;
 GtkWidget *wbutton = NULL;
-GtkWidget *weventbox;
 Lisp_Object specified_file;
 const char *label = (STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
 ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL)) : "");
 int vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
 ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), i);
+/* If this is a separator, use a gtk separator item.  */
+if (EQ (PROP (TOOL_BAR_ITEM_TYPE), Qt))
+	{
+	  if (ti == NULL || !GTK_IS_SEPARATOR_TOOL_ITEM (ti))
+	    {
+	      if (ti)
+		gtk_container_remove (GTK_CONTAINER (wtoolbar),
+				      GTK_WIDGET (ti));
+	      ti = gtk_separator_tool_item_new ();
+	      gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, i);
+	    }
+	  gtk_widget_show (GTK_WIDGET (ti));
+	  continue;
+	}
+/* Otherwise, the tool-bar item is an ordinary button.  */
+if (ti && GTK_IS_SEPARATOR_TOOL_ITEM (ti))
+	{
+	  gtk_container_remove (GTK_CONTAINER (wtoolbar), GTK_WIDGET (ti));
+	  ti = NULL;
+	}
 if (ti)
-{
+	wbutton = XG_BIN_CHILD (XG_BIN_CHILD (ti));
-weventbox = gtk_bin_get_child (GTK_BIN (ti));
-wbutton = gtk_bin_get_child (GTK_BIN (weventbox));
+/* Ignore invalid image specifications.  */
-}
 image = PROP (TOOL_BAR_ITEM_IMAGES);
-/* Ignore invalid image specifications.  */
 if (!valid_image_p (image))
 {
 if (wbutton) gtk_widget_hide (wbutton);
 continue;
 }
 gtk_widget_hide_all (GTK_WIDGET (ti));
 else
 {
 /* Insert an empty (non-image) button */
 ti = xg_make_tool_item (f, NULL, NULL, "", i, 0);
-gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
+gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, i);
 }
 continue;
 }
 }
 (gpointer)img->pixmap);
 }
 gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
 ti = xg_make_tool_item (f, w, &wbutton, label, i, vert_only);
-gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, -1);
+gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, i);
 gtk_widget_set_sensitive (wbutton, enabled_p);
 }
 else
 {
-GtkWidget *vb = gtk_bin_get_child (GTK_BIN (wbutton));
+GtkWidget *vb = XG_BIN_CHILD (wbutton);
 GtkWidget *wimage;
 GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage);
-Pixmap old_img = (Pixmap)g_object_get_data (G_OBJECT (wimage),
+Pixmap old_img = (Pixmap) g_object_get_data (G_OBJECT (wimage),
-XG_TOOL_BAR_IMAGE_DATA);
+						       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);
 gtk_label_set_text (GTK_LABEL (wlbl), label);

Mercurial > emacs

comparison src/gtkutil.c @ 111991:968255ee954a