emacs: src/xterm.c comparison

comparison src/xterm.c @ 30214:793f5a4e610b

(help_echo_object, help_echo_pos): New variables. (note_mode_line_highlight): Store additional information about the help-echo in help_echo_object and help_echo_pos. Check both `local-map' and `keymap' properties for changing the cursor (note_mouse_highlight): Store additional information about the help-echo in help_echo_object and help_echo_pos. (note_tool_bar_highlight): Set help_echo_object to nil and help_echo_pos to -1. (XTread_socket): Use gen_help_event instead of filling input_events manually. (syms_of_xterm): Staticpro help_echo_object.

author	Gerd Moellmann <gerd@gnu.org>
date	Fri, 14 Jul 2000 13:56:09 +0000
parents	3237a5529020
children	9a5ccf8784f3

comparison

equal deleted inserted replaced

-:a6cb500e4bc6
+:793f5a4e610b
 /* If a string, XTread_socket generates an event to display that string.
 (The display is done in read_char.)  */
 static Lisp_Object help_echo;
+static Lisp_Object help_echo_object;
+static int help_echo_pos;
 /* Temporary variable for XTread_socket.  */
 static Lisp_Object previous_help_echo;
 	     arrange for the help to be displayed.  This is done by
 	     setting the global variable help_echo to the help string.  */
 	  help = Fget_text_property (make_number (glyph->charpos),
 				     Qhelp_echo, glyph->object);
 	  if (!NILP (help))
-	    help_echo = help;
+	    {
+	      help_echo = help;
+	      help_echo_object = glyph->object;
+	      help_echo_pos = glyph->charpos;
+	    }
 	  /* Change the mouse pointer according to what is under X/Y.  */
 	  map = Fget_text_property (make_number (glyph->charpos),
 				    Qlocal_map, glyph->object);
 	  if (!NILP (Fkeymapp (map)))
 	    cursor = f->output_data.x->nontext_cursor;
+	  else
+	    {
+	      map = Fget_text_property (make_number (glyph->charpos),
+					Qkeymap, glyph->object);
+	      if (!NILP (Fkeymapp (map)))
+		cursor = f->output_data.x->nontext_cursor;
+	    }
 	}
 }
 XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), cursor);
 }
 	      }
 	  }
 	/* Look for a `help-echo' property.  */
 	{
-	  Lisp_Object help;
+	  Lisp_Object help, object, position;
 	  /* Check overlays first.  */
 	  help = Qnil;
 	  for (i = 0; i < noverlays && NILP (help); ++i)
 	    help = Foverlay_get (overlay_vec[i], Qhelp_echo);
-	  /* Try text properties.  */
+	  if (!NILP (help))
-	  if (NILP (help)
+	    {
-	      && ((STRINGP (glyph->object)
+	      help_echo = help;
+	      help_echo_object = w->buffer;
+	      help_echo_pos = pos;
+	    }
+	  else
+	    {
+	      /* Try text properties.  */
+	      if ((STRINGP (glyph->object)
 		   && glyph->charpos >= 0
 		   && glyph->charpos < XSTRING (glyph->object)->size)
 		  || (BUFFERP (glyph->object)
 		      && glyph->charpos >= BEGV
-		      && glyph->charpos < ZV)))
+		      && glyph->charpos < ZV))
-	    help = Fget_text_property (make_number (glyph->charpos),
+		help = Fget_text_property (make_number (glyph->charpos),
-				       Qhelp_echo, glyph->object);
+					   Qhelp_echo, glyph->object);
-	  if (!NILP (help))
+	      if (!NILP (help))
-	    help_echo = help;
+		{
+		  help_echo = help;
+		  help_echo_object = glyph->object;
+		  help_echo_pos = glyph->charpos;
+		}
+	    }
 	}
 	BEGV = obegv;
 	ZV = ozv;
 	current_buffer = obuf;
 set_help_echo:
 /* Set help_echo to a help string.to display for this tool-bar item.
 XTread_socket does the rest.  */
+help_echo_object = Qnil;
+help_echo_pos = -1;
 help_echo = (XVECTOR (f->current_tool_bar_items)
 	       ->contents[prop_idx + TOOL_BAR_ITEM_HELP]);
 if (NILP (help_echo))
 help_echo = (XVECTOR (f->current_tool_bar_items)
 		 ->contents[prop_idx + TOOL_BAR_ITEM_CAPTION]);
 		     Do it only if there's something to cancel.
 		     Otherwise, the startup message is cleared when
 		     the mouse leaves the frame.  */
 		  if (any_help_event_p)
 		    {
+		      Lisp_Object frame;
+		      int n;
 		      XSETFRAME (frame, f);
-		      bufp->kind = HELP_EVENT;
+		      n = gen_help_event (bufp, Qnil, frame, Qnil, 0);
-		      bufp->frame_or_window = frame;
+		      bufp += n, count += n, numchars -= n;
-		      bufp->arg = Qnil;
-		      ++bufp, ++count, --numchars;
 		    }
 #ifdef LESSTIF_VERSION
 		  /* Please see the comment at the start of the
 EnterNotify case.  */
 	      goto OTHER;
 	    case MotionNotify:
 	      {
 		previous_help_echo = help_echo;
-		help_echo = Qnil;
+		help_echo = help_echo_object = Qnil;
+		help_echo_pos = -1;
 		if (dpyinfo->grabbed && last_mouse_frame
 		    && FRAME_LIVE_P (last_mouse_frame))
 		  f = last_mouse_frame;
 		else
 		   has changed, generate a HELP_EVENT.  */
 		if (!NILP (help_echo)
 		    || !NILP (previous_help_echo))
 		  {
 		    Lisp_Object frame;
+		    int n;
 		    if (f)
 		      XSETFRAME (frame, f);
 		    else
 		      frame = Qnil;
 		    any_help_event_p = 1;
-		    bufp->kind = HELP_EVENT;
+		    n = gen_help_event (bufp, help_echo, frame,
-		    bufp->frame_or_window = frame;
+					help_echo_object, help_echo_pos);
-		    bufp->arg = help_echo;
+		    bufp += n, count += n, numchars -= n;
-		    ++bufp, ++count, --numchars;
 		  }
 		goto OTHER;
 	      }
 Qvendor_specific_keysyms = intern ("vendor-specific-keysyms");
 staticpro (&last_mouse_press_frame);
 last_mouse_press_frame = Qnil;
+help_echo = Qnil;
 staticpro (&help_echo);
-help_echo = Qnil;
+help_echo_object = Qnil;
+staticpro (&help_echo_object);
+previous_help_echo = Qnil;
 staticpro (&previous_help_echo);
-previous_help_echo = Qnil;
+help_echo_pos = -1;
 DEFVAR_BOOL ("x-stretch-cursor", &x_stretch_cursor_p,
 "*Non-nil means draw block cursor as wide as the glyph under it.\n\
 For example, if a block cursor is over a tab, it will be drawn as\n\
 wide as that tab on the display.");

Mercurial > emacs

comparison src/xterm.c @ 30214:793f5a4e610b