emacs: src/w32menu.c comparison

comparison src/w32menu.c @ 46815:52f36f4b0e4f

(local_heap, local_alloc, local_free): New macros. (malloc_widget_value, free_widget_value) (w32_free_submenu_strings): Use them. (push_submenu_start, push_submenu_end, push_left_right_boundary) (push_menu_pane, push_menu_item, single_keymap_panes) (single_menu_item, Fx_popup_menu, menubar_selection_callback) (single_submenu, set_frame_menubar) (w32_menu_show, w32_dialog_show): Use AREF, ASET, ASIZE. (Fx_popup_menu): Don't show pop up menu until preceding one is actually cleaned up. Moved UNGCPRO outside #ifdef HAVE_MENUS block. Changes adapted from xmenu.c (set_frame_menubar): First parse all submenus, then make widget_value trees from them. Don't allocate any widget_value objects until we are done with the parsing. (parse_single_submenu): New function. (digest_single_submenu): New function. (single_submenu): Function deleted, replaced by those two.

author	Richard M. Stallman <rms@gnu.org>
date	Mon, 05 Aug 2002 16:33:44 +0000
parents	40db0673e6f0
children	4d7b83cc03aa

comparison

equal deleted inserted replaced

-:f7dd9a44324f
+:52f36f4b0e4f
 */
 struct _widget_value *free_list;
 #endif
 } widget_value;
-/* LocalAlloc/Free is a reasonably good allocator.  */
+/* Local memory management */
-#define malloc_widget_value() (void*)LocalAlloc (LMEM_ZEROINIT, sizeof (widget_value))
+#define local_heap (GetProcessHeap ())
-#define free_widget_value(wv) LocalFree (wv)
+#define local_alloc(n) (HeapAlloc (local_heap, HEAP_ZERO_MEMORY, (n)))
+#define local_free(p) (HeapFree (local_heap, 0, ((LPVOID) (p))))
+#define malloc_widget_value() ((widget_value *) local_alloc (sizeof (widget_value)))
+#define free_widget_value(wv) (local_free ((wv)))
 /******************************************************************/
 #ifndef TRUE
 #define TRUE 1
 push_submenu_start ()
 {
 if (menu_items_used + 1 > menu_items_allocated)
 grow_menu_items ();
-XVECTOR (menu_items)->contents[menu_items_used++] = Qnil;
+ASET (menu_items, menu_items_used++, Qnil);
 menu_items_submenu_depth++;
 }
 /* End a submenu.  */
 push_submenu_end ()
 {
 if (menu_items_used + 1 > menu_items_allocated)
 grow_menu_items ();
-XVECTOR (menu_items)->contents[menu_items_used++] = Qlambda;
+ASET (menu_items, menu_items_used++, Qlambda);
 menu_items_submenu_depth--;
 }
 /* Indicate boundary between left and right.  */
 push_left_right_boundary ()
 {
 if (menu_items_used + 1 > menu_items_allocated)
 grow_menu_items ();
-XVECTOR (menu_items)->contents[menu_items_used++] = Qquote;
+ASET (menu_items, menu_items_used++, Qquote);
 }
 /* Start a new menu pane in menu_items.
 NAME is the pane name.  PREFIX_VEC is a prefix key for this pane.  */
 if (menu_items_used + MENU_ITEMS_PANE_LENGTH > menu_items_allocated)
 grow_menu_items ();
 if (menu_items_submenu_depth == 0)
 menu_items_n_panes++;
-XVECTOR (menu_items)->contents[menu_items_used++] = Qt;
+ASET (menu_items, menu_items_used++, Qt);
-XVECTOR (menu_items)->contents[menu_items_used++] = name;
+ASET (menu_items, menu_items_used++, name);
-XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec;
+ASET (menu_items, menu_items_used++, prefix_vec);
 }
 /* Push one menu item into the current pane.  NAME is the string to
 display.  ENABLE if non-nil means this item can be selected.  KEY
 is the key generated by choosing this item, or nil if this item
 Lisp_Object name, enable, key, def, equiv, type, selected, help;
 {
 if (menu_items_used + MENU_ITEMS_ITEM_LENGTH > menu_items_allocated)
 grow_menu_items ();
-XVECTOR (menu_items)->contents[menu_items_used++] = name;
+ASET (menu_items, menu_items_used++, name);
-XVECTOR (menu_items)->contents[menu_items_used++] = enable;
+ASET (menu_items, menu_items_used++, enable);
-XVECTOR (menu_items)->contents[menu_items_used++] = key;
+ASET (menu_items, menu_items_used++, key);
-XVECTOR (menu_items)->contents[menu_items_used++] = equiv;
+ASET (menu_items, menu_items_used++, equiv);
-XVECTOR (menu_items)->contents[menu_items_used++] = def;
+ASET (menu_items, menu_items_used++, def);
-XVECTOR (menu_items)->contents[menu_items_used++] = type;
+ASET (menu_items, menu_items_used++, type);
-XVECTOR (menu_items)->contents[menu_items_used++] = selected;
+ASET (menu_items, menu_items_used++, selected);
-XVECTOR (menu_items)->contents[menu_items_used++] = help;
+ASET (menu_items, menu_items_used++, help);
 }
 /* Look through KEYMAPS, a vector of keymaps that is NMAPS long,
 and generate menu panes for them in menu_items.
 If NOTREAL is nonzero,
 	single_menu_item (XCAR (item), XCDR (item),
 			  &pending_maps, notreal, maxdepth);
 else if (VECTORP (item))
 	{
 	  /* Loop over the char values represented in the vector.  */
-	  int len = XVECTOR (item)->size;
+	  int len = ASIZE (item);
 	  int c;
 	  for (c = 0; c < len; c++)
 	    {
 	      Lisp_Object character;
 	      XSETFASTINT (character, c);
-	      single_menu_item (character, XVECTOR (item)->contents[c],
+	      single_menu_item (character, AREF (item, c),
 				&pending_maps, notreal, maxdepth);
 	    }
 	}
 UNGCPRO;
 }
 res = parse_menu_item (item, notreal, 0);
 UNGCPRO;
 if (!res)
 return;			/* Not a menu item.  */
-map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP];
+map = AREF (item_properties, ITEM_PROPERTY_MAP);
 if (notreal)
 {
 /* We don't want to make a menu, just traverse the keymaps to
 	 precompute equivalent key bindings.  */
 if (!NILP (map))
 	single_keymap_panes (map, Qnil, key, 1, maxdepth - 1);
 return;
 }
-enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE];
+enabled = AREF (item_properties, ITEM_PROPERTY_ENABLE);
-item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME];
+item_string = AREF (item_properties, ITEM_PROPERTY_NAME);
 if (!NILP (map) && SREF (item_string, 0) == '@')
 {
 if (!NILP (enabled))
 	/* An enabled separate pane. Remember this to handle it later.  */
 				   *pending_maps_ptr);
 return;
 }
 push_menu_item (item_string, enabled, key,
-		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF],
+		  AREF (item_properties, ITEM_PROPERTY_DEF),
-		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ],
+		  AREF (item_properties, ITEM_PROPERTY_KEYEQ),
-		  XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE],
+		  AREF (item_properties, ITEM_PROPERTY_TYPE),
-XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED],
+AREF (item_properties, ITEM_PROPERTY_SELECTED),
-XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]);
+AREF (item_properties, ITEM_PROPERTY_HELP));
 /* Display a submenu using the toolkit.  */
 if (! (NILP (map) || NILP (enabled)))
 {
 push_submenu_start ();
 if (NILP (title) && !NILP (prompt))
 	title = prompt;
 /* Make that be the pane title of the first pane.  */
 if (!NILP (prompt) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = prompt;
+	ASET (menu_items, MENU_ITEMS_PANE_NAME, prompt);
 keymaps = 1;
 }
 else if (CONSP (menu) && KEYMAPP (XCAR (menu)))
 {
 /* Extract the detailed info to make one pane.  */
 keymap_panes (maps, nmaps, NILP (position));
 /* Make the title be the pane title of the first pane.  */
 if (!NILP (title) && menu_items_n_panes >= 0)
-	XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME] = title;
+	ASET (menu_items, MENU_ITEMS_PANE_NAME, title);
 keymaps = 1;
 }
 else
 {
 UNGCPRO;
 return Qnil;
 }
 #ifdef HAVE_MENUS
+/* If resources from a previous popup menu exist yet, does nothing
+until the `menu_free_timer' has freed them (see w32fns.c).
+*/
+if (current_popup_menu)
+{
+discard_menu_items ();
+UNGCPRO;
+return Qnil;
+}
 /* Display them in a menu.  */
 BLOCK_INPUT;
 selection = w32_menu_show (f, xpos, ypos, for_click,
 			     keymaps, title, &error_name);
 UNBLOCK_INPUT;
 discard_menu_items ();
+#endif /* HAVE_MENUS */
 UNGCPRO;
-#endif /* HAVE_MENUS */
 if (error_name) error (error_name);
 return selection;
 }
 vector = f->menu_bar_vector;
 prefix = Qnil;
 i = 0;
 while (i < f->menu_bar_items_used)
 {
-if (EQ (XVECTOR (vector)->contents[i], Qnil))
+if (EQ (AREF (vector, i), Qnil))
 	{
 	  subprefix_stack[submenu_depth++] = prefix;
 	  prefix = entry;
 	  i++;
 	}
-else if (EQ (XVECTOR (vector)->contents[i], Qlambda))
+else if (EQ (AREF (vector, i), Qlambda))
 	{
 	  prefix = subprefix_stack[--submenu_depth];
 	  i++;
 	}
-else if (EQ (XVECTOR (vector)->contents[i], Qt))
+else if (EQ (AREF (vector, i), Qt))
 	{
-	  prefix = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX];
+	  prefix = AREF (vector, i + MENU_ITEMS_PANE_PREFIX);
 	  i += MENU_ITEMS_PANE_LENGTH;
 	}
 else
 	{
-	  entry = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE];
+	  entry = AREF (vector, i + MENU_ITEMS_ITEM_VALUE);
 	  /* The EMACS_INT cast avoids a warning.  There's no problem
 	     as long as pointers have enough bits to hold small integers.  */
 	  if ((int) (EMACS_INT) client_data == i)
 	    {
 	      int j;
 void
 free_menubar_widget_value_tree (wv)
 widget_value *wv;
 {
 if (! wv) return;
 wv->name = wv->value = wv->key = (char *) 0xDEADBEEF;
 if (wv->contents && (wv->contents != (widget_value*)1))
 {
 free_menubar_widget_value_tree (wv->contents);
 BLOCK_INPUT;
 free_widget_value (wv);
 UNBLOCK_INPUT;
 }
-/* Return a tree of widget_value structures for a menu bar item
+/* Set up data i menu_items for a menu bar item
 whose event type is ITEM_KEY (with string ITEM_NAME)
 and whose contents come from the list of keymaps MAPS.  */
-static widget_value *
+static int
-single_submenu (item_key, item_name, maps)
+parse_single_submenu (item_key, item_name, maps)
 Lisp_Object item_key, item_name, maps;
 {
-widget_value *wv, *prev_wv, *save_wv, *first_wv;
-int i;
-int submenu_depth = 0;
 Lisp_Object length;
 int len;
 Lisp_Object *mapvec;
-widget_value **submenu_stack;
+int i;
-int previous_items = menu_items_used;
 int top_level_items = 0;
 length = Flength (maps);
 len = XINT (length);
 for (i = 0; i < len; i++)
 {
 mapvec[i] = Fcar (maps);
 maps = Fcdr (maps);
 }
-menu_items_n_panes = 0;
 /* Loop over the given keymaps, making a pane for each map.
 But don't make a pane that is empty--ignore that map instead.  */
 for (i = 0; i < len; i++)
 {
 Qnil, Qnil, Qnil, Qnil);
 	}
 else
 	single_keymap_panes (mapvec[i], item_name, item_key, 0, 10);
 }
-/* Create a tree of widget_value objects
+return top_level_items;
-representing the panes and their items.  */
+}
+/* Create a tree of widget_value objects
+representing the panes and items
+in menu_items starting at index START, up to index END.  */
+static widget_value *
+digest_single_submenu (start, end, top_level_items)
+int start, end;
+{
+widget_value *wv, *prev_wv, *save_wv, *first_wv;
+int i;
+int submenu_depth = 0;
+widget_value **submenu_stack;
 submenu_stack
 = (widget_value **) alloca (menu_items_used * sizeof (widget_value *));
 wv = xmalloc_widget_value ();
 wv->name = "menu";
 /* Loop over all panes and items made during this call
 and construct a tree of widget_value objects.
 Ignore the panes and items made by previous calls to
 single_submenu, even though those are also in menu_items.  */
-i = previous_items;
+i = start;
-while (i < menu_items_used)
+while (i < end)
 {
-if (EQ (XVECTOR (menu_items)->contents[i], Qnil))
+if (EQ (AREF (menu_items, i), Qnil))
 	{
 	  submenu_stack[submenu_depth++] = save_wv;
 	  save_wv = prev_wv;
 	  prev_wv = 0;
 	  i++;
 	}
-else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))
+else if (EQ (AREF (menu_items, i), Qlambda))
 	{
 	  prev_wv = save_wv;
 	  save_wv = submenu_stack[--submenu_depth];
 	  i++;
 	}
-else if (EQ (XVECTOR (menu_items)->contents[i], Qt)
+else if (EQ (AREF (menu_items, i), Qt)
 	       && submenu_depth != 0)
 	i += MENU_ITEMS_PANE_LENGTH;
 /* Ignore a nil in the item list.
 	 It's meaningful only for dialog boxes.  */
-else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))
+else if (EQ (AREF (menu_items, i), Qquote))
 	i += 1;
-else if (EQ (XVECTOR (menu_items)->contents[i], Qt))
+else if (EQ (AREF (menu_items, i), Qt))
 	{
 	  /* Create a new pane.  */
 	  Lisp_Object pane_name, prefix;
 	  char *pane_string;
-	  pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME];
+	  pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
-	  prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
+	  prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
 #ifndef HAVE_MULTILINGUAL_MENU
 	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
 	    {
 	      pane_name = ENCODE_SYSTEM (pane_name);
-	      AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+	      ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
 	    }
 #endif
 	  pane_string = (NILP (pane_name)
 			 ? "" : (char *) SDATA (pane_name));
 	  /* If there is just one top-level pane, put all its items directly
 #ifndef HAVE_MULTILINGUAL_MENU
 	  if (STRING_MULTIBYTE (item_name))
 	    {
 	      item_name = ENCODE_SYSTEM (item_name);
-	      AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+	      ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
 	    }
 	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
 	    {
 	      descrip = ENCODE_SYSTEM (descrip);
-	      AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+	      ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
 	    }
 #endif /* not HAVE_MULTILINGUAL_MENU */
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv)
 int deep_p;
 {
 HMENU menubar_widget = f->output_data.w32->menubar_widget;
 Lisp_Object items;
 widget_value *wv, *first_wv, *prev_wv = 0;
-int i;
+int i, last_i;
+int *submenu_start, *submenu_end;
+int *submenu_top_level_items;
 /* We must not change the menubar when actually in use.  */
 if (f->output_data.w32->menubar_active)
 return;
 if (! menubar_widget)
 deep_p = 1;
 else if (pending_menu_activation && !deep_p)
 deep_p = 1;
-wv = xmalloc_widget_value ();
-wv->name = "menubar";
-wv->value = 0;
-wv->enabled = 1;
-wv->button_type = BUTTON_TYPE_NONE;
-wv->help = Qnil;
-first_wv = wv;
 if (deep_p)
 {
 /* Make a widget-value tree representing the entire menu trees.  */
 safe_run_hooks (Qmenu_bar_update_hook);
 FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
 items = FRAME_MENU_BAR_ITEMS (f);
-inhibit_garbage_collection ();
 /* Save the frame's previous menu bar contents data.  */
 if (previous_menu_items_used)
 	bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
 	       previous_menu_items_used * sizeof (Lisp_Object));
-/* Fill in the current menu bar contents.  */
+/* Fill in menu_items with the current menu bar contents.
+	 This can evaluate Lisp code.  */
 menu_items = f->menu_bar_vector;
 menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
+submenu_start = (int *) alloca (XVECTOR (items)->size * sizeof (int *));
+submenu_end = (int *) alloca (XVECTOR (items)->size * sizeof (int *));
+submenu_top_level_items
+	= (int *) alloca (XVECTOR (items)->size * sizeof (int *));
 init_menu_items ();
-for (i = 0; i < XVECTOR (items)->size; i += 4)
+for (i = 0; i < ASIZE (items); i += 4)
 	{
 	  Lisp_Object key, string, maps;
-	  key = XVECTOR (items)->contents[i];
+	  last_i = i;
-	  string = XVECTOR (items)->contents[i + 1];
-	  maps = XVECTOR (items)->contents[i + 2];
+	  key = AREF (items, i);
+	  string = AREF (items, i + 1);
+	  maps = AREF (items, i + 2);
 	  if (NILP (string))
 	    break;
-	  wv = single_submenu (key, string, maps);
+	  submenu_start[i] = menu_items_used;
+	  menu_items_n_panes = 0;
+	  submenu_top_level_items[i]
+	    = parse_single_submenu (key, string, maps);
+	  submenu_end[i] = menu_items_used;
+	}
+finish_menu_items ();
+/* Convert menu_items into widget_value trees
+	 to display the menu.  This cannot evaluate Lisp code.  */
+wv = xmalloc_widget_value ();
+wv->name = "menubar";
+wv->value = 0;
+wv->enabled = 1;
+wv->button_type = BUTTON_TYPE_NONE;
+wv->help = Qnil;
+first_wv = wv;
+for (i = 0; i < last_i; i += 4)
+	{
+	  wv = digest_single_submenu (submenu_start[i], submenu_end[i],
+				      submenu_top_level_items[i]);
 	  if (prev_wv)
 	    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 ();
 set_buffer_internal_1 (prev);
 unbind_to (specpdl_count, Qnil);
 /* If there has been no change in the Lisp-level contents
 	 of the menu bar, skip redisplaying it.  Just exit.  */
 for (i = 0; i < previous_menu_items_used; i++)
 	if (menu_items_used == i
-	    || (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i])))
+	    || (!EQ (previous_items[i], AREF (menu_items, i))))
 	  break;
 if (i == menu_items_used && i == previous_menu_items_used && i != 0)
 	{
 	  free_menubar_widget_value_tree (first_wv);
 	  menu_items = Qnil;
 	 so it's safe to store data from a Lisp_String, as long as
 	 local copies are made when the actual menu is created.
 	 Windows takes care of this for normal string items, but
 	 not for owner-drawn items or additional item-info.  */
 wv = first_wv->contents;
-for (i = 0; i < XVECTOR (items)->size; i += 4)
+for (i = 0; i < ASIZE (items); i += 4)
 	{
 	  Lisp_Object string;
-	  string = XVECTOR (items)->contents[i + 1];
+	  string = AREF (items, i + 1);
 	  if (NILP (string))
 	    break;
 	  wv->name = (char *) SDATA (string);
 	  wv = wv->next;
 	}
 else
 {
 /* Make a widget-value tree containing
 	 just the top level menu bar strings.  */
+wv = xmalloc_widget_value ();
+wv->name = "menubar";
+wv->value = 0;
+wv->enabled = 1;
+wv->button_type = BUTTON_TYPE_NONE;
+wv->help = Qnil;
+first_wv = wv;
 items = FRAME_MENU_BAR_ITEMS (f);
-for (i = 0; i < XVECTOR (items)->size; i += 4)
+for (i = 0; i < ASIZE (items); i += 4)
 	{
 	  Lisp_Object string;
-	  string = XVECTOR (items)->contents[i + 1];
+	  string = AREF (items, i + 1);
 	  if (NILP (string))
 	    break;
 	  wv = xmalloc_widget_value ();
 	  wv->name = (char *) SDATA (string);
 /* Loop over all panes and items, filling in the tree.  */
 i = 0;
 while (i < menu_items_used)
 {
-if (EQ (XVECTOR (menu_items)->contents[i], Qnil))
+if (EQ (AREF (menu_items, i), Qnil))
 	{
 	  submenu_stack[submenu_depth++] = save_wv;
 	  save_wv = prev_wv;
 	  prev_wv = 0;
 	  first_pane = 1;
 	  i++;
 	}
-else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))
+else if (EQ (AREF (menu_items, i), Qlambda))
 	{
 	  prev_wv = save_wv;
 	  save_wv = submenu_stack[--submenu_depth];
 	  first_pane = 0;
 	  i++;
 	}
-else if (EQ (XVECTOR (menu_items)->contents[i], Qt)
+else if (EQ (AREF (menu_items, i), Qt)
 	       && submenu_depth != 0)
 	i += MENU_ITEMS_PANE_LENGTH;
 /* Ignore a nil in the item list.
 	 It's meaningful only for dialog boxes.  */
-else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))
+else if (EQ (AREF (menu_items, i), Qquote))
 	i += 1;
-else if (EQ (XVECTOR (menu_items)->contents[i], Qt))
+else if (EQ (AREF (menu_items, i), Qt))
 	{
 	  /* Create a new pane.  */
 	  Lisp_Object pane_name, prefix;
 	  char *pane_string;
 	  pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
 	  prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
 #ifndef HAVE_MULTILINGUAL_MENU
 	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
 	    {
 	      pane_name = ENCODE_SYSTEM (pane_name);
-	      AREF (menu_items, i + MENU_ITEMS_PANE_NAME) = pane_name;
+	      ASET (menu_items, i + MENU_ITEMS_PANE_NAME, pane_name);
 	    }
 #endif
 	  pane_string = (NILP (pane_name)
 			 ? "" : (char *) SDATA (pane_name));
 	  /* If there is just one top-level pane, put all its items directly
 #ifndef HAVE_MULTILINGUAL_MENU
 if (STRINGP (item_name) && STRING_MULTIBYTE (item_name))
 	    {
 	      item_name = ENCODE_SYSTEM (item_name);
-	      AREF (menu_items, i + MENU_ITEMS_ITEM_NAME) = item_name;
+	      ASET (menu_items, i + MENU_ITEMS_ITEM_NAME, item_name);
 	    }
 if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
 {
 	      descrip = ENCODE_SYSTEM (descrip);
-	      AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY) = descrip;
+	      ASET (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY, descrip);
 	    }
 #endif /* not HAVE_MULTILINGUAL_MENU */
 	  wv = xmalloc_widget_value ();
 	  if (prev_wv)
 prefix = entry = Qnil;
 i = 0;
 while (i < menu_items_used)
 	{
-	  if (EQ (XVECTOR (menu_items)->contents[i], Qnil))
+	  if (EQ (AREF (menu_items, i), Qnil))
 	    {
 	      subprefix_stack[submenu_depth++] = prefix;
 	      prefix = entry;
 	      i++;
 	    }
-	  else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda))
+	  else if (EQ (AREF (menu_items, i), Qlambda))
 	    {
 	      prefix = subprefix_stack[--submenu_depth];
 	      i++;
 	    }
-	  else if (EQ (XVECTOR (menu_items)->contents[i], Qt))
+	  else if (EQ (AREF (menu_items, i), Qt))
 	    {
-	      prefix
+	      prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
-		= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
 	      i += MENU_ITEMS_PANE_LENGTH;
 	    }
 	  /* Ignore a nil in the item list.
 	     It's meaningful only for dialog boxes.  */
-	  else if (EQ (XVECTOR (menu_items)->contents[i], Qquote))
+	  else if (EQ (AREF (menu_items, i), Qquote))
 	    i += 1;
 	  else
 	    {
-	      entry
+	      entry	= AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
-		= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
 	      if (menu_item_selection == i)
 		{
 		  if (keymaps != 0)
 		    {
 		      int j;
 /* Create a tree of widget_value objects
 representing the text label and buttons.  */
 {
 Lisp_Object pane_name, prefix;
 char *pane_string;
-pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME];
+pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME);
-prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX];
+prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX);
 pane_string = (NILP (pane_name)
 		   ? "" : (char *) SDATA (pane_name));
 prev_wv = xmalloc_widget_value ();
 prev_wv->value = pane_string;
 if (keymaps && !NILP (prefix))
 {
 	/* Create a new item within current pane.  */
 	Lisp_Object item_name, enable, descrip, help;
-	item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME];
+	item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
-	enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE];
+	enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
-	descrip
+	descrip = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
-	  = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY];
+help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
-help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP];
 	if (NILP (item_name))
 	  {
 	    free_menubar_widget_value_tree (first_wv);
 	    *error = "Submenu in dialog items";
 	prev_wv->next = wv;
 	wv->name = (char *) button_names[nb_buttons];
 	if (!NILP (descrip))
 	  wv->key = (char *) SDATA (descrip);
 	wv->value = (char *) SDATA (item_name);
-	wv->call_data = (void *) &XVECTOR (menu_items)->contents[i];
+	wv->call_data = (void *) &AREF (menu_items, i);
 	wv->enabled = !NILP (enable);
 	wv->help = Qnil;
 	prev_wv = wv;
 	if (! boundary_seen)
 i = 0;
 while (i < menu_items_used)
 	{
 	  Lisp_Object entry;
-	  if (EQ (XVECTOR (menu_items)->contents[i], Qt))
+	  if (EQ (AREF (menu_items, i), Qt))
 	    {
-	      prefix
+	      prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
-		= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX];
 	      i += MENU_ITEMS_PANE_LENGTH;
 	    }
 	  else
 	    {
-	      entry
+	      entry	= AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
-		= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE];
 	      if (menu_item_selection == i)
 		{
 		  if (keymaps != 0)
 		    {
 		      entry = Fcons (entry, Qnil);
 	{
 	  /* Only use MF_OWNERDRAW if GetMenuItemInfo is usable, since
 	     we can't deallocate the memory otherwise.  */
 	  if (get_menu_item_info)
 	    {
-	      out_string = (char *) LocalAlloc (LPTR, strlen (wv->name) + 1);
+out_string = (char *) local_alloc (strlen (wv->name) + 1);
+strcpy (out_string, wv->name);
 #ifdef MENU_DEBUG
-	      DebPrint ("Menu: allocing %ld for owner-draw", info.dwItemData);
+	      DebPrint ("Menu: allocing %ld for owner-draw", out_string);
 #endif
-	      strcpy (out_string, wv->name);
 	      fuFlags = MF_OWNERDRAW | MF_DISABLED;
 	    }
 	  else
 	    fuFlags = MF_DISABLED;
 	}
 if ((info.fType & MF_OWNERDRAW) && info.dwItemData)
 	{
 #ifdef MENU_DEBUG
 	  DebPrint ("Menu: freeing %ld for owner-draw", info.dwItemData);
 #endif
-	  LocalFree (info.dwItemData);
+	  local_free (info.dwItemData);
 	}
 /* Recurse down submenus.  */
 if (info.hSubMenu)
 	w32_free_submenu_strings (info.hSubMenu);

Mercurial > emacs

comparison src/w32menu.c @ 46815:52f36f4b0e4f