whot pushed to xorg-x11-server (f22). "Add the unaccelerated valuator masks, fixes nonmoving mouse in SDL (..more)"
by notificationsï¼ fedoraproject.org
From 5a1985ddb66f6461aa1c9bbe64fa892ba9a490f1 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Tue, 26 May 2015 10:09:48 +1000
Subject: Add the unaccelerated valuator masks, fixes nonmoving mouse in SDL
(#1208992)
diff --git a/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch b/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
new file mode 100644
index 0000000..86744f1
--- /dev/null
+++ b/0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
@@ -0,0 +1,210 @@
+From e1a7f4bb5333b0271d29f785eb55f1c3273e626a Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue, 5 May 2015 14:18:54 +1000
+Subject: [PATCH] dix: Add unaccelerated valuators to the ValuatorMask
+
+Allows a mask to carry both accelerated and unaccelerated motion at the same
+time.
+
+This is required for xf86-input-libinput where the pointer acceleration
+happens in libinput already, but parts of the server, specifically raw events
+and DGA rely on device-specific unaccelerated data.
+
+To ease integration add this as a second set to the ValuatorMask rather than
+extending all APIs to carry a second, possibly NULL set of valuators.
+
+Note that a valuator mask should only be used in either accel/unaccel or
+standard mode at any time. Switching requires either a valuator_mask_zero()
+call or unsetting all valuators one-by-one. Trying to mix the two will produce
+a warning.
+
+The server has a shortcut for changing a mask with the
+valuator_mask_drop_unaccelerated() call. This saves us from having to loop
+through all valuators on every event, we can just drop the bits we know we
+don't want.
+
+Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+Reviewed-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ dix/inpututils.c | 82 +++++++++++++++++++++++++++++++++++++++---
+ hw/xfree86/common/xf86Module.h | 2 +-
+ include/input.h | 15 ++++++++
+ include/inpututils.h | 2 ++
+ 4 files changed, 95 insertions(+), 6 deletions(-)
+
+diff --git a/dix/inpututils.c b/dix/inpututils.c
+index 5c2a32d..1363988 100644
+--- a/dix/inpututils.c
++++ b/dix/inpututils.c
+@@ -505,11 +505,8 @@ valuator_mask_isset(const ValuatorMask *mask, int valuator)
+ return mask->last_bit >= valuator && BitIsOn(mask->mask, valuator);
+ }
+
+-/**
+- * Set the valuator to the given floating-point data.
+- */
+-void
+-valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
++static inline void
++_valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
+ {
+ mask->last_bit = max(valuator, mask->last_bit);
+ SetBit(mask->mask, valuator);
+@@ -517,6 +514,17 @@ valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
+ }
+
+ /**
++ * Set the valuator to the given floating-point data.
++ */
++void
++valuator_mask_set_double(ValuatorMask *mask, int valuator, double data)
++{
++ BUG_WARN_MSG(mask->has_unaccelerated,
++ "Do not mix valuator types, zero mask first\n");
++ _valuator_mask_set_double(mask, valuator, data);
++}
++
++/**
+ * Set the valuator to the given integer data.
+ */
+ void
+@@ -594,11 +602,15 @@ valuator_mask_unset(ValuatorMask *mask, int valuator)
+
+ ClearBit(mask->mask, valuator);
+ mask->valuators[valuator] = 0.0;
++ mask->unaccelerated[valuator] = 0.0;
+
+ for (i = 0; i <= mask->last_bit; i++)
+ if (valuator_mask_isset(mask, i))
+ lastbit = max(lastbit, i);
+ mask->last_bit = lastbit;
++
++ if (mask->last_bit == -1)
++ mask->has_unaccelerated = FALSE;
+ }
+ }
+
+@@ -611,6 +623,66 @@ valuator_mask_copy(ValuatorMask *dest, const ValuatorMask *src)
+ valuator_mask_zero(dest);
+ }
+
++Bool
++valuator_mask_has_unaccelerated(const ValuatorMask *mask)
++{
++ return mask->has_unaccelerated;
++}
++
++void
++valuator_mask_drop_unaccelerated(ValuatorMask *mask)
++{
++ memset(mask->unaccelerated, 0, sizeof(mask->unaccelerated));
++ mask->has_unaccelerated = FALSE;
++}
++
++/**
++ * Set both accelerated and unaccelerated value for this mask.
++ */
++void
++valuator_mask_set_unaccelerated(ValuatorMask *mask,
++ int valuator,
++ double accel,
++ double unaccel)
++{
++ BUG_WARN_MSG(mask->last_bit != -1 && !mask->has_unaccelerated,
++ "Do not mix valuator types, zero mask first\n");
++ _valuator_mask_set_double(mask, valuator, accel);
++ mask->has_unaccelerated = TRUE;
++ mask->unaccelerated[valuator] = unaccel;
++}
++
++double
++valuator_mask_get_accelerated(const ValuatorMask *mask,
++ int valuator)
++{
++ return valuator_mask_get_double(mask, valuator);
++}
++
++double
++valuator_mask_get_unaccelerated(const ValuatorMask *mask,
++ int valuator)
++{
++ return mask->unaccelerated[valuator];
++}
++
++Bool
++valuator_mask_fetch_unaccelerated(const ValuatorMask *mask,
++ int valuator,
++ double *accel,
++ double *unaccel)
++{
++ if (valuator_mask_isset(mask, valuator)) {
++ if (accel)
++ *accel = valuator_mask_get_accelerated(mask, valuator);
++ if (unaccel)
++ *unaccel = valuator_mask_get_unaccelerated(mask, valuator);
++ return TRUE;
++ }
++ else
++ return FALSE;
++}
++
+ int
+ CountBits(const uint8_t * mask, int len)
+ {
+diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
+index e68fe9c..6133641 100644
+--- a/hw/xfree86/common/xf86Module.h
++++ b/hw/xfree86/common/xf86Module.h
+@@ -81,7 +81,7 @@ typedef enum {
+ */
+ #define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
+ #define ABI_VIDEODRV_VERSION SET_ABI_VERSION(19, 0)
+-#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 0)
++#define ABI_XINPUT_VERSION SET_ABI_VERSION(21, 1)
+ #define ABI_EXTENSION_VERSION SET_ABI_VERSION(9, 0)
+ #define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
+
+diff --git a/include/input.h b/include/input.h
+index bf22dc7..0a4c4f7 100644
+--- a/include/input.h
++++ b/include/input.h
+@@ -674,6 +674,21 @@ extern _X_EXPORT Bool valuator_mask_fetch(const ValuatorMask *mask,
+ extern _X_EXPORT Bool valuator_mask_fetch_double(const ValuatorMask *mask,
+ int valnum, double *val);
+
++extern _X_EXPORT Bool valuator_mask_has_unaccelerated(const ValuatorMask *mask);
++extern _X_EXPORT void valuator_mask_set_unaccelerated(ValuatorMask *mask,
++ int valuator,
++ double accel,
++ double unaccel);
++extern _X_EXPORT double valuator_mask_get_accelerated(const ValuatorMask *mask,
++ int valuator);
++extern _X_EXPORT double valuator_mask_get_unaccelerated(const ValuatorMask *mask,
++ int valuator);
++extern _X_EXPORT Bool valuator_mask_fetch_unaccelerated(const ValuatorMask *mask,
++ int valuator,
++ double *accel,
++ double *unaccel);
++extern _X_HIDDEN void valuator_mask_drop_unaccelerated(ValuatorMask *mask);
++
+ /* InputOption handling interface */
+ extern _X_EXPORT InputOption *input_option_new(InputOption *list,
+ const char *key,
+diff --git a/include/inpututils.h b/include/inpututils.h
+index 53c96ba..4e90815 100644
+--- a/include/inpututils.h
++++ b/include/inpututils.h
+@@ -36,8 +36,10 @@ extern Mask event_filters[MAXDEVICES][MAXEVENTS];
+
+ struct _ValuatorMask {
+ int8_t last_bit; /* highest bit set in mask */
++ int8_t has_unaccelerated;
+ uint8_t mask[(MAX_VALUATORS + 7) / 8];
+ double valuators[MAX_VALUATORS]; /* valuator data */
++ double unaccelerated[MAX_VALUATORS]; /* valuator data */
+ };
+
+ extern void verify_internal_event(const InternalEvent *ev);
+--
+2.4.1
+
diff --git a/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch b/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
new file mode 100644
index 0000000..6b8b1e5
--- /dev/null
+++ b/0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
@@ -0,0 +1,134 @@
+From 7504fbd2239257f1a00a1a15d02862eea81f167c Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Tue, 5 May 2015 14:48:41 +1000
+Subject: [PATCH] dix: hook up the unaccelerated valuator masks
+
+If present, access the unaccelerated valuator mask values for DGA and XI2 raw
+events.
+
+Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+Reviewed-by: Hans de Goede <hdegoede(a)redhat.com>
+---
+ dix/getevents.c | 31 ++++++++++++++++++++++---------
+ hw/xfree86/common/xf86Xinput.c | 4 ++++
+ 2 files changed, 26 insertions(+), 9 deletions(-)
+
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 6fb12c5..64bf76e 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -213,14 +213,25 @@ init_raw(DeviceIntPtr dev, RawDeviceEvent *event, Time ms, int type, int detail)
+ }
+
+ static void
+-set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask, double *data)
++set_raw_valuators(RawDeviceEvent *event, ValuatorMask *mask,
++ BOOL use_unaccel, double *data)
+ {
+ int i;
+
++ use_unaccel = use_unaccel && valuator_mask_has_unaccelerated(mask);
++
+ for (i = 0; i < valuator_mask_size(mask); i++) {
+ if (valuator_mask_isset(mask, i)) {
++ double v;
++
+ SetBit(event->valuators.mask, i);
+- data[i] = valuator_mask_get_double(mask, i);
++
++ if (use_unaccel)
++ v = valuator_mask_get_unaccelerated(mask, i);
++ else
++ v = valuator_mask_get_double(mask, i);
++
++ data[i] = v;
+ }
+ }
+ }
+@@ -1138,11 +1149,11 @@ GetKeyboardEvents(InternalEvent *events, DeviceIntPtr pDev, int type,
+ valuator_mask_copy(&mask, mask_in);
+
+ init_raw(pDev, raw, ms, type, key_code);
+- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
+
+ clipValuators(pDev, &mask);
+
+- set_raw_valuators(raw, &mask, raw->valuators.data);
++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
+
+ event = &events->device_event;
+ init_device_event(event, pDev, ms);
+@@ -1423,9 +1434,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
+ num_events++;
+
+ init_raw(pDev, raw, ms, type, buttons);
+- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
+ }
+
++ valuator_mask_drop_unaccelerated(&mask);
++
+ /* valuators are in driver-native format (rel or abs) */
+
+ if (flags & POINTER_ABSOLUTE) {
+@@ -1438,7 +1451,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
+ transformAbsolute(pDev, &mask);
+ clipAbsolute(pDev, &mask);
+ if ((flags & POINTER_NORAW) == 0 && raw)
+- set_raw_valuators(raw, &mask, raw->valuators.data);
++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
+ }
+ else {
+ transformRelative(pDev, &mask);
+@@ -1446,7 +1459,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
+ if (flags & POINTER_ACCELERATE)
+ accelPointer(pDev, &mask, ms);
+ if ((flags & POINTER_NORAW) == 0 && raw)
+- set_raw_valuators(raw, &mask, raw->valuators.data);
++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
+
+ moveRelative(pDev, flags, &mask);
+ }
+@@ -1951,7 +1964,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
+ events++;
+ num_events++;
+ init_raw(dev, raw, ms, type, client_id);
+- set_raw_valuators(raw, &mask, raw->valuators.data_raw);
++ set_raw_valuators(raw, &mask, TRUE, raw->valuators.data_raw);
+ }
+
+ event = &events->device_event;
+@@ -2013,7 +2026,7 @@ GetTouchEvents(InternalEvent *events, DeviceIntPtr dev, uint32_t ddx_touchid,
+ screeny = dev->spriteInfo->sprite->hotPhys.y;
+ }
+ if (need_rawevent)
+- set_raw_valuators(raw, &mask, raw->valuators.data);
++ set_raw_valuators(raw, &mask, FALSE, raw->valuators.data);
+
+ /* Indirect device touch coordinates are not used for cursor positioning.
+ * They are merely informational, and are provided in device coordinates.
+diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
+index 1fb5b16..5ce4c71 100644
+--- a/hw/xfree86/common/xf86Xinput.c
++++ b/hw/xfree86/common/xf86Xinput.c
+@@ -1137,12 +1137,16 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
+ dx = valuator_mask_get(mask, 0);
+ if (is_absolute)
+ dx -= device->last.valuators[0];
++ else if (valuator_mask_has_unaccelerated(mask))
++ dx = valuator_mask_get_unaccelerated(mask, 0);
+ }
+
+ if (valuator_mask_isset(mask, 1)) {
+ dy = valuator_mask_get(mask, 1);
+ if (is_absolute)
+ dy -= device->last.valuators[1];
++ else if (valuator_mask_has_unaccelerated(mask))
++ dy = valuator_mask_get_unaccelerated(mask, 1);
+ }
+
+ if (DGAStealMotionEvent(device, idx, dx, dy))
+--
+2.4.1
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 13fb20c..491a71a 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -22,7 +22,7 @@
%global videodrv_major 19
%global videodrv_minor 0
%global xinput_major 21
-%global xinput_minor 0
+%global xinput_minor 1
%global extension_major 9
%global extension_minor 0
%endif
@@ -45,7 +45,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.17.1
-Release: 13%{?gitdate:.%{gitdate}}%{dist}
+Release: 14%{?gitdate:.%{gitdate}}%{dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -120,6 +120,12 @@ Patch10005: 0001-linux-Add-linux_parse_vt_settings-and-linux_get_keep.patch
Patch10006: 0002-linux-Add-a-may_fail-paramter-to-linux_parse_vt_sett.patch
Patch10007: 0003-systemd-logind-Only-use-systemd-logind-integration-t.patch
+# rhbz1208992: Mouse cursor doesn't move when moving the physical mouse
+# slowly.
+# already upstream
+Patch10010: 0001-dix-Add-unaccelerated-valuators-to-the-ValuatorMask.patch
+Patch10011: 0002-dix-hook-up-the-unaccelerated-valuator-masks.patch
+
%global moduledir %{_libdir}/xorg/modules
%global drimoduledir %{_libdir}/dri
%global sdkdir %{_includedir}/xorg
@@ -657,6 +663,10 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
%changelog
+* Tue May 26 2015 Peter Hutterer <peter.hutterer(a)redhat.com> 1.17.1-14
+- Add the unaccelerated valuator masks, fixes nonmoving mouse in SDL
+ (#1208992)
+
* Wed May 20 2015 Kalev Lember <kalevlember(a)gmail.com> - 1.17.1-13
- Obsolete xorg-x11-drv-void
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/commit/?h=f22&id=5...
4Â years, 6Â months
- 1
- 0
whot pushed to xorg-x11-drv-wacom (master). "wacom 0.29.99.1"
by notificationsï¼ fedoraproject.org
From a687355fc0baca5523dffee69b9d0e3f9c7f4da4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Mon, 1 Jun 2015 11:27:39 +1000
Subject: wacom 0.29.99.1
diff --git a/.gitignore b/.gitignore
index e18e3f2..b857a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ xf86-input-wacom-20101119.tar.bz2
/xf86-input-wacom-0.28.0.tar.bz2
/xf86-input-wacom-0.28.99.1.tar.bz2
/xf86-input-wacom-0.29.0.tar.bz2
+/xf86-input-wacom-0.29.99.1.tar.bz2
diff --git a/0001-Allow-PAD-only-interfaces-without-EV_ABS-and-or-EV_X.patch b/0001-Allow-PAD-only-interfaces-without-EV_ABS-and-or-EV_X.patch
deleted file mode 100644
index b95782c..0000000
--- a/0001-Allow-PAD-only-interfaces-without-EV_ABS-and-or-EV_X.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8501c0433587a64ff5ef2f2f42d7a2d54330c3a7 Mon Sep 17 00:00:00 2001
-From: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
-Date: Fri, 13 Mar 2015 11:24:27 -0400
-Subject: [PATCH] Allow PAD only interfaces without EV_ABS and/or EV_X/Y to
- report events
-
-commit 0cfe113 (Allow PAD only interface without setting up EV_ABS
-and/or EV_X/Y) allows xf86-input-wacom to handle Pad only interface but
-such interface do not report any events.
-
-We need to call usbWcmInitPadState() to be able to forward events.
-
-Signed-off-by: Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
-Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
----
- src/wcmUSB.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/wcmUSB.c b/src/wcmUSB.c
-index b7c81c1..c15cd4a 100644
---- a/src/wcmUSB.c
-+++ b/src/wcmUSB.c
-@@ -553,7 +553,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
- /* may be an expresskey only interface */
- if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
- ISBITSET(common->wcmKeys, BTN_0))
-- return Success;
-+ goto pad_init;
-
- xf86Msg(X_ERROR, "%s: no abs bits.\n", pInfo->name);
- return !Success;
-@@ -572,7 +572,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
- /* may be a PAD only interface */
- if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
- ISBITSET(common->wcmKeys, BTN_0))
-- return Success;
-+ goto pad_init;
-
- xf86Msg(X_ERROR, "%s: unable to ioctl xmax value.\n", pInfo->name);
- return !Success;
-@@ -787,6 +787,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
- common->wcmHWTouchSwitchState = 1;
- }
-
-+pad_init:
- usbWcmInitPadState(pInfo);
-
- return Success;
---
-2.3.2
-
diff --git a/sources b/sources
index e2f41e5..5bab4da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50786440df6044a483cdab2008a7efe7 xf86-input-wacom-0.29.0.tar.bz2
+ef428fcd296c9ed06d73919b3a3a40b9 xf86-input-wacom-0.29.99.1.tar.bz2
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index 0b524ba..90af384 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -8,8 +8,8 @@
Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom
-Version: 0.29.0
-Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version: 0.29.99.1
+Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org
License: GPLv2+
Group: User Interface/X Hardware Support
@@ -22,8 +22,6 @@ Source2: commitid
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}...
%endif
-Patch01: 0001-Allow-PAD-only-interfaces-without-EV_ABS-and-or-EV_X.patch
-
ExcludeArch: s390 s390x
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
@@ -43,7 +41,6 @@ X.Org X11 wacom input driver for Wacom tablets.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%patch01 -p1
%build
autoreconf --force -v --install || exit 1
@@ -103,6 +100,9 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger
%changelog
+* Mon Jun 01 2015 Peter Hutterer <peter.hutterer(a)redhat.com> 0.29.99.1-1
+- wacom 0.29.99.1
+
* Fri Mar 20 2015 Peter Hutterer <peter.hutterer(a)redhat.com> 0.29.0-2
- Allow for PAD devices without x/y (HUION tablets)
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/xorg-x11-drv-wacom.git/commit/?h=maste...
4Â years, 6Â months
- 1
- 0
whot uploaded xf86-input-wacom-0.29.99.1.tar.bz2 for xorg-x11-drv-wacom
by notificationsï¼ fedoraproject.org
ef428fcd296c9ed06d73919b3a3a40b9 xf86-input-wacom-0.29.99.1.tar.bz2
http://pkgs.fedoraproject.org/lookaside/pkgs/xorg-x11-drv-wacom/xf86-inpu...
4Â years, 6Â months
- 1
- 0