[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c,v
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c,v |
Date: |
Fri, 15 Dec 2006 00:22:57 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kim F. Storm <kfstorm> 06/12/15 00:22:57
Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -b -r1.883 -r1.884
--- keyboard.c 14 Dec 2006 08:41:46 -0000 1.883
+++ keyboard.c 15 Dec 2006 00:22:57 -0000 1.884
@@ -1438,13 +1438,25 @@
}
/* If mouse has moved on some frame, return one of those frames.
- Return 0 otherwise. */
+
+ Return 0 otherwise.
+
+ If ignore_mouse_drag_p is non-zero, ignore (implicit) mouse movement
+ after resizing the tool-bar window. */
+
+int ignore_mouse_drag_p;
static FRAME_PTR
some_mouse_moved ()
{
Lisp_Object tail, frame;
+ if (ignore_mouse_drag_p)
+ {
+ //ignore_mouse_drag_p = 0;
+ return 0;
+ }
+
FOR_EACH_FRAME (tail, frame)
{
if (XFRAME (frame)->mouse_moved)
@@ -5592,6 +5604,7 @@
double_click_count = 1;
button_down_time = event->timestamp;
*start_pos_ptr = Fcopy_alist (position);
+ ignore_mouse_drag_p = 0;
}
/* Now we're releasing a button - check the co-ordinates to
@@ -5627,7 +5640,12 @@
ydiff = XINT (event->y) - XINT (XCDR (down));
}
- if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz
+ if (ignore_mouse_drag_p)
+ {
+ event->modifiers |= click_modifier;
+ ignore_mouse_drag_p = 0;
+ }
+ else if (xdiff < double_click_fuzz && xdiff > -
double_click_fuzz
&& ydiff < double_click_fuzz && ydiff > - double_click_fuzz
/* Maybe the mouse has moved a lot, caused scrolling, and
eventually ended up at the same screen position (but
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/04
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/04
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, YAMAMOTO Mitsuharu, 2006/12/14
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v,
Kim F. Storm <=
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Kim F. Storm, 2006/12/19
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Juanma Barranquero, 2006/12/19
- [Emacs-diffs] Changes to emacs/src/keyboard.c,v, Eli Zaretskii, 2006/12/22