From 83bb366e71ef41165998eed2934208f84714a37e Mon Sep 17 00:00:00 2001 From: Strake Date: Thu, 17 Oct 2013 23:20:20 -0500 Subject: [PATCH 1/4] unbreak KdEnableInput pi = ki = 0 here, so not follow them. Signed-off-by: Strake Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- hw/kdrive/src/kinput.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index 527c7a2ef..d845830cc 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(); } From 4292a39c8014f9f4920bed3001802e4a3e523c5e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 28 Oct 2013 12:10:10 +1000 Subject: [PATCH 2/4] 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 Signed-off-by: Peter Hutterer Reviewed-by: Alan Coopersmith --- Xi/exevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Xi/exevents.c b/Xi/exevents.c index fd4b80c48..5dc902054 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; From e16dea72d6f45dd6d7788362bb7dbe76263719b1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 23 Oct 2013 15:16:25 +1000 Subject: [PATCH 3/4] 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 Reviewed-by: Keith Packard --- hw/dmx/input/dmxevents.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c index 28756203b..bcb5c2ed8 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: From 9f4afe7e835cf9c513387ae01eaf8b7a6ba4aac9 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Mon, 28 Oct 2013 18:32:36 -0400 Subject: [PATCH 4/4] 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 Reviewed-by: Peter Hutterer Signed-off-by: Peter Hutterer --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 67ef3c24a..e7385f89c 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