comparison src/xterm.c @ 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.

30181:770a280db6ee

      key = (XVECTOR (f->current_tool_bar_items)
	     ->contents[prop_idx + TOOL_BAR_ITEM_KEY]);

      XSETFRAME (frame, f);
      event.kind = TOOL_BAR_EVENT;
      event.frame_or_window = Fcons (frame, Fcons (Qtool_bar, Qnil));
      kbd_buffer_store_event (&event);

      event.kind = TOOL_BAR_EVENT;
      event.frame_or_window = Fcons (frame, key);
      event.modifiers = x_x_to_emacs_modifiers (FRAME_X_DISPLAY_INFO (f),
						button_event->state);
      kbd_buffer_store_event (&event);
      last_tool_bar_item = -1;
    }

		     the mouse leaves the frame.  */
		  if (any_help_event_p)
		    {
		      XSETFRAME (frame, f);
		      bufp->kind = HELP_EVENT;
		      bufp->frame_or_window = Fcons (frame, Qnil);
		      ++bufp, ++count, --numchars;
		    }

#ifdef LESSTIF_VERSION
		  /* Please see the comment at the start of the

		    else
		      frame = Qnil;

		    any_help_event_p = 1;
		    bufp->kind = HELP_EVENT;
		    bufp->frame_or_window = Fcons (frame, help_echo);
		    ++bufp, ++count, --numchars;
		  }
		
		goto OTHER;
	      }

30182:73181a26fc85

      key = (XVECTOR (f->current_tool_bar_items)
	     ->contents[prop_idx + TOOL_BAR_ITEM_KEY]);

      XSETFRAME (frame, f);
      event.kind = TOOL_BAR_EVENT;
      event.frame_or_window = frame;
      event.arg = frame;
      kbd_buffer_store_event (&event);

      event.kind = TOOL_BAR_EVENT;
      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);
      last_tool_bar_item = -1;
    }

		     the mouse leaves the frame.  */
		  if (any_help_event_p)
		    {
		      XSETFRAME (frame, f);
		      bufp->kind = HELP_EVENT;
		      bufp->frame_or_window = frame;
		      bufp->arg = Qnil;
		      ++bufp, ++count, --numchars;
		    }

#ifdef LESSTIF_VERSION
		  /* Please see the comment at the start of the

		    else
		      frame = Qnil;

		    any_help_event_p = 1;
		    bufp->kind = HELP_EVENT;
		    bufp->frame_or_window = frame;
		    bufp->arg = help_echo;
		    ++bufp, ++count, --numchars;
		  }
		
		goto OTHER;
	      }