changeset 30182:73181a26fc85

(x_handle_tool_bar_click): Store the frame in the frame_or_window slot of TOOL_BAR_EVENT input events instead of consing. For prefix events, store the frame in the `arg' slot of the event, otherwise store the key there. (XTread_socket): Instead of consing, use the frame_or_window slot of HELP_EVENTs for the frame, and the `arg' slot for the help string.
author Gerd Moellmann <gerd@gnu.org>
date Thu, 13 Jul 2000 14:09:13 +0000
parents 770a280db6ee
children b6c7d5bcf786
files src/xterm.c
diffstat 1 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/xterm.c	Thu Jul 13 14:08:48 2000 +0000
+++ b/src/xterm.c	Thu Jul 13 14:09:13 2000 +0000
@@ -6780,11 +6780,13 @@
 
       XSETFRAME (frame, f);
       event.kind = TOOL_BAR_EVENT;
-      event.frame_or_window = Fcons (frame, Fcons (Qtool_bar, Qnil));
+      event.frame_or_window = frame;
+      event.arg = frame;
       kbd_buffer_store_event (&event);
 
       event.kind = TOOL_BAR_EVENT;
-      event.frame_or_window = Fcons (frame, key);
+      event.frame_or_window = frame;
+      event.arg = key;
       event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
 						button_event->state);
       kbd_buffer_store_event (&event);
@@ -9785,7 +9787,8 @@
 		    {
 		      XSETFRAME (frame, f);
 		      bufp->kind = HELP_EVENT;
-		      bufp->frame_or_window = Fcons (frame, Qnil);
+		      bufp->frame_or_window = frame;
+		      bufp->arg = Qnil;
 		      ++bufp, ++count, --numchars;
 		    }
 
@@ -9872,7 +9875,8 @@
 
 		    any_help_event_p = 1;
 		    bufp->kind = HELP_EVENT;
-		    bufp->frame_or_window = Fcons (frame, help_echo);
+		    bufp->frame_or_window = frame;
+		    bufp->arg = help_echo;
 		    ++bufp, ++count, --numchars;
 		  }