comparison src/xterm.c @ 8430:356e5509efda

(construct_mouse_click, construct_menu_click): Don't update x_mouse_grabbed, Vmouse_depressed, last_mouse_frame here. (XTread_socket): Update them here, so we do it without fail. (XTmouse_position, XTread_socket case MotionNotify): Check last_mouse_frame is nonzero before using it.

8429:f4138f5dc0d3

  result->modifiers = (x_x_to_emacs_modifiers (event->state)
		       | (event->type == ButtonRelease
			  ? up_modifier 
			  : down_modifier));

  /* Notice if the mouse is still grabbed.  */
  if (event->type == ButtonPress)
    {
      if (! x_mouse_grabbed)
	Vmouse_depressed = Qt;
      x_mouse_grabbed |= (1 << event->button);
      last_mouse_frame = f;
    }
  else if (event->type == ButtonRelease)
    {
      x_mouse_grabbed &= ~(1 << event->button);
      if (!x_mouse_grabbed)
	Vmouse_depressed = Qnil;
    }

  {
    int row, column;

#if 0
    pixel_to_glyph_coords (f, event->x, event->y, &column, &row, NULL, 0);

			  : down_modifier));

  XSET (result->x, Lisp_Int, event->x);
  XSET (result->y, Lisp_Int, -1);
  XSET (result->frame_or_window, Lisp_Frame, f);

  /* Notice if the mouse is still grabbed.  */
  if (event->type == ButtonPress)
    {
      if (! x_mouse_grabbed)
	Vmouse_depressed = Qt;
      x_mouse_grabbed |= (1 << event->button);
      last_mouse_frame = f;
    }
}

/* Function to report a mouse movement to the mainstream Emacs code.
   The input handler calls this.

	int win_x, win_y;
	int parent_x, parent_y;

	win = root;

	if (x_mouse_grabbed && FRAME_LIVE_P (last_mouse_frame))
	  {
	    /* If mouse was grabbed on a frame, give coords for that frame
	       even if the mouse is now outside it.  */
	    XTranslateCoordinates (x_current_display,

#endif /* ! defined (HAVE_X11) */

#ifdef HAVE_X11
	case MotionNotify:
	  {
	    if (x_mouse_grabbed && FRAME_LIVE_P (last_mouse_frame))
	      f = last_mouse_frame;
	    else
	      f = x_window_to_frame (event.xmotion.window);
	    if (f)
	      note_mouse_movement (f, &event.xmotion);

		  {
 		    f = x_any_window_to_frame (event.xbutton.window);
		    if (f && event.type == ButtonPress)
		      construct_menu_click (&emacs_event,
					    &event, f);
		    else if (f)
		      {
			x_mouse_grabbed &= ~(1 << event.xbutton.button);
			if (!x_mouse_grabbed)
			  Vmouse_depressed = Qnil;
		      }
		  }
#endif /* USE_X_TOOLKIT */
	      }

	    if (numchars >= 1 && emacs_event.kind != no_event)
	      {
		bcopy (&emacs_event, bufp, sizeof (struct input_event));

8430:356e5509efda

  result->modifiers = (x_x_to_emacs_modifiers (event->state)
		       | (event->type == ButtonRelease
			  ? up_modifier 
			  : down_modifier));

  {
    int row, column;

#if 0
    pixel_to_glyph_coords (f, event->x, event->y, &column, &row, NULL, 0);

			  : down_modifier));

  XSET (result->x, Lisp_Int, event->x);
  XSET (result->y, Lisp_Int, -1);
  XSET (result->frame_or_window, Lisp_Frame, f);
}

/* Function to report a mouse movement to the mainstream Emacs code.
   The input handler calls this.

	int win_x, win_y;
	int parent_x, parent_y;

	win = root;

	if (x_mouse_grabbed && last_mouse_frame
	    && FRAME_LIVE_P (last_mouse_frame))
	  {
	    /* If mouse was grabbed on a frame, give coords for that frame
	       even if the mouse is now outside it.  */
	    XTranslateCoordinates (x_current_display,

#endif /* ! defined (HAVE_X11) */

#ifdef HAVE_X11
	case MotionNotify:
	  {
	    if (x_mouse_grabbed && last_mouse_frame
		&& FRAME_LIVE_P (last_mouse_frame))
	      f = last_mouse_frame;
	    else
	      f = x_window_to_frame (event.xmotion.window);
	    if (f)
	      note_mouse_movement (f, &event.xmotion);

		  {
 		    f = x_any_window_to_frame (event.xbutton.window);
		    if (f && event.type == ButtonPress)
		      construct_menu_click (&emacs_event,
					    &event, f);
		  }
#endif /* USE_X_TOOLKIT */
	      }

	    if (event.type == ButtonPress)
	      {
		x_mouse_grabbed |= (1 << event.xbutton.button);
		Vmouse_depressed = Qt;
		last_mouse_frame = f;
	      }
	    else
	      {
		x_mouse_grabbed &= ~(1 << event.xbutton.button);
		if (!x_mouse_grabbed)
		  Vmouse_depressed = Qnil;
	      }

	    if (numchars >= 1 && emacs_event.kind != no_event)
	      {
		bcopy (&emacs_event, bufp, sizeof (struct input_event));