comparison src/macterm.c @ 66181:dc3ff6945eb2

(note_mouse_movement): Use PtInRect. (XTread_socket): Also ignore mouse motion just before a button release event. Don't process button release event when mouse is not grabbed.

66180:c80a3a047c83

				      frame->output_data.mac->nontext_cursor);
	}
      return 1;
    }
  /* Has the mouse moved off the glyph it was on at the last sighting?  */
  if (pos->h < last_mouse_glyph.left
      || pos->h >= last_mouse_glyph.right
      || pos->v < last_mouse_glyph.top
      || pos->v >= last_mouse_glyph.bottom)
    {
      frame->mouse_moved = 1;
      last_mouse_scroll_bar = Qnil;
      note_mouse_highlight (frame, pos->h, pos->v);
      /* Remember which glyph we're now on.  */

		    HideWindow (tip_window);
		    part_code = FindWindow (er.where, &window_ptr);
		  }
	      }

	    if (er.what != mouseDown && part_code != inContent)
	      break;

	    switch (part_code)
	      {
	      case inMenuBar:

		    if (er.what == mouseDown)
		      {
			dpyinfo->grabbed |= (1 << inev.code);
			last_mouse_frame = f;
			/* Ignore any mouse motion that happened
			   before this event; any subsequent
			   mouse-movement Emacs events should reflect
			   only motion after the ButtonPress.  */
			if (f != 0)
			  f->mouse_moved = 0;

			if (!tool_bar_p)
			  last_tool_bar_item = -1;
		      }
		    else

			     of multi-button emulation.  */
			  dpyinfo->grabbed = 0;
			else
			  dpyinfo->grabbed &= ~(1 << inev.code);
		      }

#ifdef USE_TOOLKIT_SCROLL_BARS
		    if (inev.kind == MOUSE_CLICK_EVENT)
#endif
		      switch (er.what)

66181:dc3ff6945eb2

				      frame->output_data.mac->nontext_cursor);
	}
      return 1;
    }
  /* Has the mouse moved off the glyph it was on at the last sighting?  */
  if (!PtInRect (*pos, &last_mouse_glyph))
    {
      frame->mouse_moved = 1;
      last_mouse_scroll_bar = Qnil;
      note_mouse_highlight (frame, pos->h, pos->v);
      /* Remember which glyph we're now on.  */

		    HideWindow (tip_window);
		    part_code = FindWindow (er.where, &window_ptr);
		  }
	      }

	    if (er.what != mouseDown &&
		(part_code != inContent	|| dpyinfo->grabbed == 0))
	      break;

	    switch (part_code)
	      {
	      case inMenuBar:

		    if (er.what == mouseDown)
		      {
			dpyinfo->grabbed |= (1 << inev.code);
			last_mouse_frame = f;

			if (!tool_bar_p)
			  last_tool_bar_item = -1;
		      }
		    else

			     of multi-button emulation.  */
			  dpyinfo->grabbed = 0;
			else
			  dpyinfo->grabbed &= ~(1 << inev.code);
		      }

		    /* Ignore any mouse motion that happened before
		       this event; any subsequent mouse-movement Emacs
		       events should reflect only motion after the
		       ButtonPress.  */
		    if (f != 0)
		      f->mouse_moved = 0;

#ifdef USE_TOOLKIT_SCROLL_BARS
		    if (inev.kind == MOUSE_CLICK_EVENT)
#endif
		      switch (er.what)