[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xterm.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xterm.c |
Date: |
Mon, 24 Oct 2005 10:59:42 -0400 |
Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.887 emacs/src/xterm.c:1.888
*** emacs/src/xterm.c:1.887 Mon Oct 24 08:05:36 2005
--- emacs/src/xterm.c Mon Oct 24 14:59:42 2005
***************
*** 249,254 ****
--- 249,255 ----
/* Where the mouse was last time we reported a mouse event. */
static XRectangle last_mouse_glyph;
+ static FRAME_PTR last_mouse_glyph_frame;
static Lisp_Object last_mouse_press_frame;
/* The scroll bar in which the last X motion event occurred.
***************
*** 3596,3616 ****
frame->mouse_moved = 1;
last_mouse_scroll_bar = Qnil;
note_mouse_highlight (frame, -1, -1);
return 1;
}
- note_mouse_highlight (frame, event->x, event->y);
/* Has the mouse moved off the glyph it was on at the last sighting? */
! if (event->x < last_mouse_glyph.x
|| event->x >= last_mouse_glyph.x + last_mouse_glyph.width
|| event->y < last_mouse_glyph.y
|| event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
{
frame->mouse_moved = 1;
last_mouse_scroll_bar = Qnil;
/* Remember which glyph we're now on. */
remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
return 1;
}
--- 3597,3620 ----
frame->mouse_moved = 1;
last_mouse_scroll_bar = Qnil;
note_mouse_highlight (frame, -1, -1);
+ last_mouse_glyph_frame = 0;
return 1;
}
/* Has the mouse moved off the glyph it was on at the last sighting? */
! if (frame != last_mouse_glyph_frame
! || event->x < last_mouse_glyph.x
|| event->x >= last_mouse_glyph.x + last_mouse_glyph.width
|| event->y < last_mouse_glyph.y
|| event->y >= last_mouse_glyph.y + last_mouse_glyph.height)
{
frame->mouse_moved = 1;
last_mouse_scroll_bar = Qnil;
+ note_mouse_highlight (frame, event->x, event->y);
/* Remember which glyph we're now on. */
remember_mouse_glyph (frame, event->x, event->y, &last_mouse_glyph);
+ last_mouse_glyph_frame = frame;
return 1;
}
***************
*** 3821,3826 ****
--- 3825,3831 ----
the frame are divided into. */
remember_mouse_glyph (f1, win_x, win_y, &last_mouse_glyph);
+ last_mouse_glyph_frame = f1;
*bar_window = Qnil;
*part = 0;
***************
*** 6658,6664 ****
int tool_bar_p = 0;
bzero (&compose_status, sizeof (compose_status));
! bzero (&last_mouse_glyph, sizeof (last_mouse_glyph));
if (dpyinfo->grabbed
&& last_mouse_frame
--- 6663,6669 ----
int tool_bar_p = 0;
bzero (&compose_status, sizeof (compose_status));
! last_mouse_glyph_frame = 0;
if (dpyinfo->grabbed
&& last_mouse_frame
- [Emacs-diffs] Changes to emacs/src/xterm.c, (continued)
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jason Rumney, 2005/10/10
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F . Storm, 2005/10/10
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F . Storm, 2005/10/11
- [Emacs-diffs] Changes to emacs/src/xterm.c, YAMAMOTO Mitsuharu, 2005/10/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F . Storm, 2005/10/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, YAMAMOTO Mitsuharu, 2005/10/12
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F . Storm, 2005/10/13
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kim F . Storm, 2005/10/20
- [Emacs-diffs] Changes to emacs/src/xterm.c, Jan Djärv, 2005/10/23
- [Emacs-diffs] Changes to emacs/src/xterm.c, Kenichi Handa, 2005/10/24
- [Emacs-diffs] Changes to emacs/src/xterm.c,
Kim F . Storm <=