emacs: src/xmenu.c comparison

comparison src/xmenu.c @ 24993:825f11b1c34d

Ditto. (xmenu_show) [LESSTIF_VERSION]: Add workaround for remaining button grab under LessTif (HAVE_BOXES): Define if USE_X_TOOLKIT. (HAVE_BOXES): Define if using Lucid menus. (single_submenu): Set button_type of menu to BUTTON_TYPE_NONE. (single_submenu): Likewise for panes and menu items. (set_frame_menubar): Set button_type of menu bar to none. (xmenu_show): Likewise. (single_submenu): Set widget values selected slot. (xmenu_show): Likewise. (push_menu_item): Add parameters `type' and `selected'. Store it in menu_items. (MENU_ITEMS_ITEM_TYPE): New. (MENU_ITEMS_ITEM_SELECTED): New. (MENU_ITEMS_ITEM_LENGTH): Increase by two. (popup_get_selection): Use xmalloc/xfree instead of malloc/free.

author	Gerd Moellmann <gerd@gnu.org>
date	Wed, 21 Jul 1999 21:43:52 +0000
parents	dcff2a4b6cb4
children	824b89fca192

comparison

equal deleted inserted replaced

-:f1632be03391
+:825f11b1c34d
 #else /* not USE_X_TOOLKIT */
 #include "../oldXMenu/XMenu.h"
 #endif /* not USE_X_TOOLKIT */
 #endif /* HAVE_X_WINDOWS */
+#ifdef USE_MOTIF
+#include <Xm/Xm.h>		/* for LESSTIF_VERSION */
+#endif
 #define min(x,y) (((x) < (y)) ? (x) : (y))
 #define max(x,y) (((x) > (y)) ? (x) : (y))
 #ifndef TRUE
 #define TRUE 1
 static Lisp_Object xdialog_show ();
 void popup_get_selection ();
 #endif
+#ifdef USE_X_TOOLKIT
+/* Define HAVE_BOXES if meus can handle radio and toggle buttons.  */
+#define HAVE_BOXES 1
+#endif
+static void push_menu_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object,
+				Lisp_Object, Lisp_Object, Lisp_Object,
+				Lisp_Object));
 static Lisp_Object xmenu_show ();
 static void keymap_panes ();
 static void single_keymap_panes ();
 static void single_menu_item ();
 static void list_of_panes ();
 #define MENU_ITEMS_ITEM_NAME 0
 #define MENU_ITEMS_ITEM_ENABLE 1
 #define MENU_ITEMS_ITEM_VALUE 2
 #define MENU_ITEMS_ITEM_EQUIV_KEY 3
 #define MENU_ITEMS_ITEM_DEFINITION 4
-#define MENU_ITEMS_ITEM_LENGTH 5
+#define MENU_ITEMS_ITEM_TYPE 5
+#define MENU_ITEMS_ITEM_SELECTED 6
+#define MENU_ITEMS_ITEM_LENGTH 7
 static Lisp_Object menu_items;
 /* Number of slots currently allocated in menu_items.  */
 static int menu_items_allocated;
 XVECTOR (menu_items)->contents[menu_items_used++] = Qt;
 XVECTOR (menu_items)->contents[menu_items_used++] = name;
 XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec;
 }
-/* Push one menu item into the current pane.
+/* Push one menu item into the current pane.  NAME is the string to
-NAME is the string to display.  ENABLE if non-nil means
+display.  ENABLE if non-nil means this item can be selected.  KEY
-this item can be selected.  KEY is the key generated by
+is the key generated by choosing this item, or nil if this item
-choosing this item, or nil if this item doesn't really have a definition.
+doesn't really have a definition.  DEF is the definition of this
-DEF is the definition of this item.
+item.  EQUIV is the textual description of the keyboard equivalent
-EQUIV is the textual description of the keyboard equivalent for
+for this item (or nil if none).  TYPE is the type of this menu
-this item (or nil if none).  */
+item, one of nil, `toggle' or `radio'. */
 static void
-push_menu_item (name, enable, key, def, equiv)
+push_menu_item (name, enable, key, def, equiv, type, selected)
-Lisp_Object name, enable, key, def, equiv;
+Lisp_Object name, enable, key, def, equiv, type, selected;
 {
 if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)
 grow_menu_items ();
 XVECTOR (menu_items)->contents[menu_items_used++] = name;
 XVECTOR (menu_items)->contents[menu_items_used++] = enable;
 XVECTOR (menu_items)->contents[menu_items_used++] = key;
 XVECTOR (menu_items)->contents[menu_items_used++] = equiv;
 XVECTOR (menu_items)->contents[menu_items_used++] = def;
+XVECTOR (menu_items)->contents[menu_items_used++] = type;
+XVECTOR (menu_items)->contents[menu_items_used++] = selected;
 }
 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long,
 and generate menu panes for them in menu_items.
 If NOTREAL is nonzero,
 item_string = concat2 (item_string, build_string (" >"));
 #endif
 push_menu_item (item_string, enabled, key,
 		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF],
-		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ]);
+		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ],
+		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE],
+		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]);
 #ifdef USE_X_TOOLKIT
 /* Display a submenu using the toolkit.  */
 if (! (NILP (map) || NILP (enabled)))
 {
 for (tail = pane; !NILP (tail); tail = Fcdr (tail))
 {
 item = Fcar (tail);
 if (STRINGP (item))
-	push_menu_item (item, Qnil, Qnil, Qt, Qnil);
+	push_menu_item (item, Qnil, Qnil, Qt, Qnil, Qnil, Qnil);
 else if (NILP (item))
 	push_left_right_boundary ();
 else
 	{
 	  CHECK_CONS (item, 0);
 	  item1 = Fcar (item);
 	  CHECK_STRING (item1, 1);
-	  push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil);
+	  push_menu_item (item1, Qt, Fcdr (item), Qt, Qnil, Qnil, Qnil);
 	}
 }
 }
 DEFUN ("x-popup-menu", Fx_popup_menu, Sx_popup_menu, 2, 2, 0,
 	{
 	  /* Here we have a command at top level in the menu bar
 	     as opposed to a submenu.  */
 	  top_level_items = 1;
 	  push_menu_pane (Qnil, Qnil);
-	  push_menu_item (item_name, Qt, item_key, mapvec[i], Qnil);
+	  push_menu_item (item_name, Qt, item_key, mapvec[i], Qnil, Qnil, Qnil);
 	}
 else
 	single_keymap_panes (mapvec[i], item_name, item_key, 0, 10);
 }
 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));
 wv = xmalloc_widget_value ();
 wv->name = "menu";
 wv->value = 0;
 wv->enabled = 1;
+wv->button_type = BUTTON_TYPE_NONE;
 first_wv = wv;
 save_wv = 0;
 prev_wv = 0;
 /* Loop over all panes and items made during this call
 		 This is a kludge, but this isn't worth more time.  */
 	      if (!NILP (prefix) && wv->name[0] == '@')
 		wv->name++;
 	      wv->value = 0;
 	      wv->enabled = 1;
+	      wv->button_type = BUTTON_TYPE_NONE;
 	    }
 	  save_wv = wv;
 	  prev_wv = 0;
 	  i += MENU_ITEMS_PANE_LENGTH;
 	}
 else
 	{
 	  /* Create a new item within current pane.  */
-	  Lisp_Object item_name, enable, descrip, def;
+	  Lisp_Object item_name, enable, descrip, def, type, selected;
 	  item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
 	  enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];
 	  descrip
 	    = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
 	  def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION];
+	  type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE];
+	  selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED];
 #ifndef HAVE_MULTILINGUAL_MENU
-	  if (STRING_MULTIBYTE (item_name))
+if (STRING_MULTIBYTE (item_name))
-	    item_name = string_make_unibyte (item_name);
+item_name = string_make_unibyte (item_name);
-	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
+if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
-	    descrip = string_make_unibyte (descrip);
+descrip = string_make_unibyte (descrip);
 #endif
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv)
 	    prev_wv->next = wv;
 	  else
 	    save_wv->contents = wv;
 	  wv->value = 0;
 	  /* The EMACS_INT cast avoids a warning.  There's no problem
 	     as long as pointers have enough bits to hold small integers.  */
 	  wv->call_data = (!NILP (def) ? (void *) (EMACS_INT) i : 0);
 	  wv->enabled = !NILP (enable);
+	  if (NILP (type))
+	    wv->button_type = BUTTON_TYPE_NONE;
+	  else if (EQ (type, QCradio))
+	    wv->button_type = BUTTON_TYPE_RADIO;
+	  else if (EQ (type, QCtoggle))
+	    wv->button_type = BUTTON_TYPE_TOGGLE;
+	  else
+	    abort ();
+	  wv->selected = !NILP (selected);
 	  prev_wv = wv;
 	  i += MENU_ITEMS_ITEM_LENGTH;
 	}
 }
 wv = xmalloc_widget_value ();
 wv->name = "menubar";
 wv->value = 0;
 wv->enabled = 1;
+wv->button_type = BUTTON_TYPE_NONE;
 first_wv = wv;
 if (deep_p)
 {
 /* Make a widget-value tree representing the entire menu trees.  */
 	    prev_wv->next = wv;
 	  else
 	    first_wv->contents = wv;
 	  /* Don't set wv->name here; GC during the loop might relocate it.  */
 	  wv->enabled = 1;
+	  wv->button_type = BUTTON_TYPE_NONE;
 	  prev_wv = wv;
 	}
 finish_menu_items ();
 	  wv = xmalloc_widget_value ();
 	  wv->name = (char *) XSTRING (string)->data;
 	  wv->value = 0;
 	  wv->enabled = 1;
+	  wv->button_type = BUTTON_TYPE_NONE;
 	  /* This prevents lwlib from assuming this
 	     menu item is really supposed to be empty.  */
 	  /* The EMACS_INT cast avoids a warning.
 	     This value just has to be different from small integers.  */
 	  wv->call_data = (void *) (EMACS_INT) (-1);
 representing the panes and their items.  */
 wv = xmalloc_widget_value ();
 wv->name = "menu";
 wv->value = 0;
 wv->enabled = 1;
+wv->button_type = BUTTON_TYPE_NONE;
 first_wv = wv;
 first_pane = 1;
 /* Loop over all panes and items, filling in the tree.  */
 i = 0;
 	      wv->name = pane_string;
 	      if (keymaps && !NILP (prefix))
 		wv->name++;
 	      wv->value = 0;
 	      wv->enabled = 1;
+	      wv->button_type = BUTTON_TYPE_NONE;
 	      save_wv = wv;
 	      prev_wv = 0;
 	    }
 	  else if (first_pane)
 	    {
 	  i += MENU_ITEMS_PANE_LENGTH;
 	}
 else
 	{
 	  /* Create a new item within current pane.  */
-	  Lisp_Object item_name, enable, descrip, def;
+	  Lisp_Object item_name, enable, descrip, def, type, selected;
 	  item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
 	  enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];
 	  descrip
 	    = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
 	  def = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_DEFINITION];
+	  type = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_TYPE];
+	  selected = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_SELECTED];
 #ifndef HAVE_MULTILINGUAL_MENU
-	  if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
+if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
-	    item_name = string_make_unibyte (item_name);
+item_name = string_make_unibyte (item_name);
-	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
+if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
-	    item_name = string_make_unibyte (descrip);
+item_name = string_make_unibyte (descrip);
 #endif
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv)
 	    prev_wv->next = wv;
 	  else
 	    save_wv->contents = wv;
 	     make the call_data null so that it won't display a box
 	     when the mouse is on it.  */
 	  wv->call_data
 	    = (!NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0);
 	  wv->enabled = !NILP (enable);
+	  if (NILP (type))
+	    wv->button_type = BUTTON_TYPE_NONE;
+	  else if (EQ (type, QCtoggle))
+	    wv->button_type = BUTTON_TYPE_TOGGLE;
+	  else if (EQ (type, QCradio))
+	    wv->button_type = BUTTON_TYPE_RADIO;
+	  else
+	    abort ();
+	  wv->selected = !NILP (selected);
 	  prev_wv = wv;
 	  i += MENU_ITEMS_ITEM_LENGTH;
 	}
 }
 if (STRING_MULTIBYTE (title))
 	title = string_make_unibyte (title);
 #endif
 wv_title->name = (char *) XSTRING (title)->data;
 wv_title->enabled = True;
+wv_title->button_type = BUTTON_TYPE_NONE;
 wv_title->next = wv_sep1;
 first_wv->contents = wv_title;
 }
 /* Actually create the menu.  */
 lw_popup_menu (menu, &dummy);
 popup_activated_flag = 1;
 /* Process events that apply to the menu.  */
 popup_get_selection ((XEvent *) 0, FRAME_X_DISPLAY_INFO (f), menu_id);
+#ifdef LESSTIF_VERSION
+/* Nov 1998: For an unknown reason a button grab remains active
+after the popup menu has gone.  */
+XUngrabButton (XtDisplay (f->output_data.x->widget),
+		 AnyButton, AnyModifier,
+		 XtWindow (f->output_data.x->widget));
+XUngrabButton (XtDisplay (f->output_data.x->edit_widget),
+		 AnyButton, AnyModifier,
+		 XtWindow (f->output_data.x->edit_widget));
+#endif /* LESSTIF_VERSION */
 /* fp turned off the following statement and wrote a comment
 that it is unnecessary--that the menu has already disappeared.
 Nowadays the menu disappears ok, all right, but
 we need to delete the widgets or multiple ones will pile up.  */

Mercurial > emacs

comparison src/xmenu.c @ 24993:825f11b1c34d