xserver: Branch 'master' - 6 commits
Keith Packard
keithp at kemper.freedesktop.org
Wed Oct 30 05:17:27 CET 2013
Xi/exevents.c | 2 +-
configure.ac | 3 ++-
hw/dmx/input/dmxevents.c | 3 +--
hw/kdrive/src/kinput.c | 11 ++++++-----
4 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f
Merge: 04ab07c 9f4afe7
Author: Keith Packard <keithp at keithp.com>
Date: Tue Oct 29 21:00:13 2013 -0700
Merge remote-tracking branch 'whot/for-keith'
commit 9f4afe7e835cf9c513387ae01eaf8b7a6ba4aac9
Author: Gaetan Nadon <memsize at videotron.ca>
Date: Mon Oct 28 18:32:36 2013 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Fix Automake warning: AC_OUTPUT should be used without arguments.
www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Files
Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/configure.ac b/configure.ac
index 67ef3c2..e7385f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2238,7 +2238,7 @@ if test "x$CONFIG_HAL" = xno && test "x$CONFIG_UDEV" = xno; then
***********************************************])
fi
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
glx/Makefile
include/Makefile
@@ -2339,3 +2339,4 @@ test/xi2/Makefile
xserver.ent
xorg-server.pc
])
+AC_OUTPUT
commit e16dea72d6f45dd6d7788362bb7dbe76263719b1
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Wed Oct 23 15:16:25 2013 +1000
dmx: queue button events with a flags of 0
Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0. Set
the flags to 0 so we don't generate any motion on a button event.
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Keith Packard <keithp at keithp.com>
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 2875620..bcb5c2e 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -726,8 +726,7 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
case ButtonRelease:
detail = dmxGetButtonMapping(dmxLocal, detail);
valuator_mask_zero(&mask);
- QueuePointerEvents(p, type, detail,
- POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
+ QueuePointerEvents(p, type, detail, 0, &mask);
return;
case MotionNotify:
commit 4292a39c8014f9f4920bed3001802e4a3e523c5e
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon Oct 28 12:10:10 2013 +1000
Xi: fix logic error when calculating emulated motion events
gcc -Wlogical-op
exevents.c: In function 'DeliverEmulatedMotionEvent':
exevents.c:1480:13: warning: logical 'or' of collectively exhaustive
tests is always true [-Wlogical-op]
The relevant snippet of exevents.c:
1479 if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
1480 ti->listeners[0].type != LISTENER_POINTER_GRAB)
1481 return;
This condition was always true, causing dropped motion events.
Reported-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
diff --git a/Xi/exevents.c b/Xi/exevents.c
index fd4b80c..5dc9020 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -1476,7 +1476,7 @@ DeliverEmulatedMotionEvent(DeviceIntPtr dev, TouchPointInfoPtr ti,
GrabPtr grab;
XI2Mask *mask;
- if (ti->listeners[0].type != LISTENER_POINTER_REGULAR ||
+ if (ti->listeners[0].type != LISTENER_POINTER_REGULAR &&
ti->listeners[0].type != LISTENER_POINTER_GRAB)
return;
commit 83bb366e71ef41165998eed2934208f84714a37e
Author: Strake <strake888 at gmail.com>
Date: Thu Oct 17 23:20:20 2013 -0500
unbreak KdEnableInput
pi = ki = 0 here, so not follow them.
Signed-off-by: Strake <strake888 at gmail.com>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 527c7a2..d845830 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -308,21 +308,22 @@ KdEnableInput(void)
kdInputEnabled = TRUE;
+ ev.any.time = GetTimeInMillis();
+
for (ki = kdKeyboards; ki; ki = ki->next) {
if (ki->driver && ki->driver->Enable)
(*ki->driver->Enable) (ki);
+ /* reset screen saver */
+ NoticeEventTime (&ev, ki->dixdev);
}
for (pi = kdPointers; pi; pi = pi->next) {
if (pi->driver && pi->driver->Enable)
(*pi->driver->Enable) (pi);
+ /* reset screen saver */
+ NoticeEventTime (&ev, pi->dixdev);
}
- /* reset screen saver */
- ev.any.time = GetTimeInMillis();
- NoticeEventTime(&ev, pi->dixdev);
- NoticeEventTime(&ev, ki->dixdev);
-
OsReleaseSIGIO();
}
commit f8662a133690773692dfa392ecfa3b8b56af8fa9
Merge: 7cf1b59 2523a44
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Oct 18 16:50:12 2013 +1000
Merge branch 'xsync-transition-bug-59644' into for-keith
More information about the xorg-commit
mailing list