From 9979315d68c82de6233ab815a92336b209b2646f Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Thu, 13 Jul 2000 14:08:48 +0000 Subject: [PATCH] (menu_highlight_callback): Store help string in the `arg' member of the input event; don't cons. (menubar_selection_callback): Use the `arg' slot of input events to queue additional information, instead of consing. --- src/xmenu.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/xmenu.c b/src/xmenu.c index a811d3b4d74..c84a6d7b332 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1222,7 +1222,8 @@ menu_highlight_callback (widget, id, call_data) /* Store the help event. */ help = wv && wv->help ? build_string (wv->help) : Qnil; buf.kind = HELP_EVENT; - buf.frame_or_window = Fcons (frame, help); + buf.frame_or_window = frame; + buf.arg = help; kbd_buffer_store_event (&buf); } @@ -1280,27 +1281,31 @@ menubar_selection_callback (widget, id, client_data) Lisp_Object frame; XSETFRAME (frame, f); - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, Fcons (Qmenu_bar, Qnil)); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = frame; kbd_buffer_store_event (&buf); for (j = 0; j < submenu_depth; j++) if (!NILP (subprefix_stack[j])) { - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, subprefix_stack[j]); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = subprefix_stack[j]; kbd_buffer_store_event (&buf); } if (!NILP (prefix)) { - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, prefix); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = prefix; kbd_buffer_store_event (&buf); } - buf.kind = menu_bar_event; - buf.frame_or_window = Fcons (frame, entry); + buf.kind = MENU_BAR_EVENT; + buf.frame_or_window = frame; + buf.arg = entry; kbd_buffer_store_event (&buf); return; -- 2.39.2