[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114109: * xterm.c (x_last_mouse_movement_time): Rev
From: |
Dmitry Antipov |
Subject: |
[Emacs-diffs] trunk r114109: * xterm.c (x_last_mouse_movement_time): Revert last change. |
Date: |
Mon, 02 Sep 2013 15:49:20 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114109
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 19:48:59 +0400
message:
* xterm.c (x_last_mouse_movement_time): Revert last change.
This code should use XDisplayMotionBufferSize to check display's
motion history first, and there are few other issues as well.
(x_scroll_bar_note_movement): Pass XMotionEvent rather than XEvent.
(handle_one_xevent): Adjust user.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/xterm.c xterm.c-20091113204419-o5vbwnq5f7feedwu-244
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-09-02 12:22:21 +0000
+++ b/src/ChangeLog 2013-09-02 15:48:59 +0000
@@ -1,3 +1,11 @@
+2013-09-02 Dmitry Antipov <address@hidden>
+
+ * xterm.c (x_last_mouse_movement_time): Revert last change.
+ This code should use XDisplayMotionBufferSize to check display's
+ motion history first, and there are few other issues as well.
+ (x_scroll_bar_note_movement): Pass XMotionEvent rather than XEvent.
+ (handle_one_xevent): Adjust user.
+
2013-09-02 Martin Rudalics <address@hidden>
* frame.c (check_minibuf_window): Don't abort if no window was
=== modified file 'src/xterm.c'
--- a/src/xterm.c 2013-09-02 11:24:11 +0000
+++ b/src/xterm.c 2013-09-02 15:48:59 +0000
@@ -133,9 +133,6 @@
#include <X11/XKBlib.h>
#endif
-/* Default to using XGetMotionEvents. */
-#define X_MOTION_HISTORY 1
-
/* Default to using XIM if available. */
#ifdef USE_XIM
int use_xim = 1;
@@ -224,6 +221,15 @@
static Lisp_Object last_mouse_scroll_bar;
+/* This is a hack. We would really prefer that XTmouse_position would
+ return the time associated with the position it returns, but there
+ doesn't seem to be any way to wrest the time-stamp from the server
+ along with the position query. So, we just keep track of the time
+ of the last movement we received, and return that in hopes that
+ it's somewhat accurate. */
+
+static Time last_mouse_movement_time;
+
/* Time for last user interaction as returned in X events. */
static Time last_user_time;
@@ -3716,48 +3722,6 @@
return Qnil;
}
-#ifdef X_MOTION_HISTORY
-
-/* Here we assume that X server supports XGetMotionEvents. If you hit
- eassert in the function below, most probably your X server is too
- old and/or buggy. Undef X_MOTION_HISTORY to enable legacy code. */
-
-static Time
-x_last_mouse_movement_time (struct frame *f)
-{
- Time t;
- int nevents;
- XTimeCoord *xtc;
-
- block_input ();
- xtc = XGetMotionEvents (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
- 1, last_user_time, &nevents);
- eassert (xtc && nevents > 0);
- t = xtc[nevents - 1].time;
- XFree (xtc);
- unblock_input ();
- return t;
-}
-
-#else /* no X_MOTION_HISTORY */
-
-/* This is a hack. We would really prefer that XTmouse_position would
- return the time associated with the position it returns, but there
- doesn't seem to be any way to wrest the time-stamp from the server
- along with the position query. So, we just keep track of the time
- of the last movement we received, and return that in hopes that
- it's somewhat accurate. */
-
-static Time last_mouse_movement_time;
-
-static Time
-x_last_mouse_movement_time (struct frame *f)
-{
- return last_mouse_movement_time;
-}
-
-#endif /* X_MOTION_HISTORY */
-
/* Function to report a mouse movement to the mainstream Emacs code.
The input handler calls this.
@@ -3772,9 +3736,7 @@
static int
note_mouse_movement (struct frame *frame, XMotionEvent *event)
{
-#ifndef X_MOTION_HISTORY
last_mouse_movement_time = event->time;
-#endif /* legacy */
last_mouse_motion_event = *event;
XSETFRAME (last_mouse_motion_frame, frame);
@@ -4030,7 +3992,7 @@
*fp = f1;
XSETINT (*x, win_x);
XSETINT (*y, win_y);
- *timestamp = x_last_mouse_movement_time (f1);
+ *timestamp = last_mouse_movement_time;
}
}
}
@@ -5533,12 +5495,12 @@
mark bits. */
static void
-x_scroll_bar_note_movement (struct scroll_bar *bar, XEvent *event)
+x_scroll_bar_note_movement (struct scroll_bar *bar, XMotionEvent *event)
{
struct frame *f = XFRAME (XWINDOW (bar->window)->frame);
-#ifndef X_MOTION_HISTORY
- last_mouse_movement_time = event->xmotion.time;
-#endif /* legacy */
+
+ last_mouse_movement_time = event->time;
+
f->mouse_moved = 1;
XSETVECTOR (last_mouse_scroll_bar, bar);
@@ -5546,7 +5508,7 @@
if (! NILP (bar->dragging))
{
/* Where should the handle be now? */
- int new_start = event->xmotion.y - XINT (bar->dragging);
+ int new_start = event->y - XINT (bar->dragging);
if (new_start != bar->start)
{
@@ -5623,9 +5585,10 @@
f->mouse_moved = 0;
last_mouse_scroll_bar = Qnil;
- *timestamp = x_last_mouse_movement_time (f);
}
+ *timestamp = last_mouse_movement_time;
+
unblock_input ();
}
@@ -6722,7 +6685,7 @@
event.xmotion.window);
if (bar)
- x_scroll_bar_note_movement (bar, &event);
+ x_scroll_bar_note_movement (bar, &event.xmotion);
#endif /* USE_TOOLKIT_SCROLL_BARS */
/* If we move outside the frame, then we're
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114109: * xterm.c (x_last_mouse_movement_time): Revert last change.,
Dmitry Antipov <=