Fix Xdmx cursor jumps (#1019821)

This commit is contained in:
Peter Hutterer 2013-10-23 15:28:53 +10:00
parent 75e761ff34
commit 1dc058478e
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
From c6c228e06f215091f13b74dd99e0ae9c99049771 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 23 Oct 2013 15:16:25 +1000
Subject: [PATCH] dmx: queue button events with valid valuators
Setting POINTER_SCREEN with a unset valuator mask causes a jump to 0/0.
Alternative implementation here would be to remove the POINTER_SCREEN flag,
but that's likely more confusing to the casual reader.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
hw/dmx/input/dmxevents.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 2875620..3fd6348 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -725,7 +725,9 @@ dmxEnqueue(DevicePtr pDev, int type, int detail, KeySym keySym,
case ButtonPress:
case ButtonRelease:
detail = dmxGetButtonMapping(dmxLocal, detail);
- valuator_mask_zero(&mask);
+ valuators[0] = e->xbutton.x;
+ valuators[1] = e->xbutton.y;
+ valuator_mask_set_range(&mask, 0, 2, valuators);
QueuePointerEvents(p, type, detail,
POINTER_ABSOLUTE | POINTER_SCREEN, &mask);
return;
--
1.8.3.1

View File

@ -42,7 +42,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.14.3
Release: 5%{?gitdate:.%{gitdate}}%{dist}
Release: 6%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@ -155,6 +155,9 @@ Patch9030: 0030-xwayland-Use-a-per-screen-private-key-for-cursor-pri.patch
Patch9031: 0001-xfree86-Only-look-at-wayland-capable-drivers-when-wa.patch
Patch9032: 0001-xwayland-Just-send-the-bounding-box-of-the-damage.patch
# Bug 1019821: Xdmx mouse after button-click goes to upper-left position
Patch9040: 0001-dmx-queue-button-events-with-valid-valuators.patch
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
%global sdkdir %{_includedir}/xorg
@ -633,6 +636,9 @@ rm -rf $RPM_BUILD_ROOT
%{xserver_source_dir}
%changelog
* Wed Oct 23 2013 Peter Hutterer <peter.hutterer@redhat.com> 1.14.3-6
- Fix Xdmx cursor jumps (#1019821)
* Tue Oct 08 2013 Adam Jackson <ajax@redhat.com> 1.14.3-5
- Snap wayland damage reports to the bounding box