Hello community,
here is the log from the commit of package xf86-input-evdev for
openSUSE:Factory checked in at 2016-05-26 23:53:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-evdev (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-evdev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-evdev"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-evdev/xf86-input-evdev.changes
2016-05-08 10:39:40.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-input-evdev.new/xf86-input-evdev.changes
2016-05-26 23:53:12.000000000 +0200
@@ -1,0 +2,7 @@
+Mon May 23 18:07:39 UTC 2016 - e...@suse.com
+
+- u_01-Add-a-kiosk-mode-for-touch-screens.patch
+ u_02-Add-delay-between-button-press-and-release-to-kiosk-mode.patch
+ (FATE#320263).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ u_01-Add-a-kiosk-mode-for-touch-screens.patch ++++++
--- /var/tmp/diff_new_pack.WQuMZI/_old 2016-05-26 23:53:13.000000000 +0200
+++ /var/tmp/diff_new_pack.WQuMZI/_new 2016-05-26 23:53:13.000000000 +0200
@@ -1,4 +1,4 @@
-From: Egbert Eich <e...@suse.com>
+From: Egbert Eich <e...@linux-0ems.fritz.box>
Date: Thu Apr 14 15:30:22 2016 +0200
Subject: [PATCH 1/2]Add a 'kiosk mode' for touch screens
Patch-mainline: to be upstreamed
@@ -16,8 +16,8 @@
src/Makefile.am | 1 +
src/evdev.c | 13 ++-
src/evdev.h | 17 ++++
- src/kioskTouch.c | 214 +++++++++++++++++++++++++++++++++++++++++++++
- 6 files changed, 264 insertions(+), 4 deletions(-)
+ src/kioskTouch.c | 215 +++++++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 265 insertions(+), 4 deletions(-)
diff --git a/include/evdev-properties.h b/include/evdev-properties.h
index 8ae5ba3..29f2bd9 100644
@@ -81,7 +81,7 @@
axis_labels.h
diff --git a/src/evdev.c b/src/evdev.c
-index 3176660..96d931f 100644
+index 3176660..a72a866 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -584,6 +584,9 @@ EvdevProcessButtonEvent(InputInfoPtr pInfo, struct
input_event *ev)
@@ -138,14 +138,14 @@
return Success;
}
-@@ -2640,6 +2644,7 @@ EvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
- Evdev3BEmuPreInit(pInfo);
+@@ -2641,6 +2645,7 @@ EvdevPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
EvdevWheelEmuPreInit(pInfo);
EvdevDragLockPreInit(pInfo);
-+ EvdevKioskTouchPreInit(pInfo);
}
++ EvdevKioskTouchPreInit(pInfo);
return Success;
+
diff --git a/src/evdev.h b/src/evdev.h
index 4d44d2b..27c1cb2 100644
--- a/src/evdev.h
@@ -188,10 +188,10 @@
#endif
diff --git a/src/kioskTouch.c b/src/kioskTouch.c
new file mode 100644
-index 0000000..56acd8c
+index 0000000..d32f386
--- /dev/null
+++ b/src/kioskTouch.c
-@@ -0,0 +1,214 @@
+@@ -0,0 +1,215 @@
+/*
+ * Copyright 2016 Egbert Eich
+ *
@@ -232,7 +232,7 @@
+#include <X11/Xatom.h>
+#include <evdev-properties.h>
+
-+#define DEBUG(x) /*x;*/
++#define DEBUG(x) x;
+
+static Atom prop_ktouch = 0; /* Kiosk touch emulation on/off property
*/
+static Atom prop_ktouch_button = 0; /* Kiosk touch emulation button property
*/
@@ -245,10 +245,11 @@
+ EvdevPtr pEvdev = (EvdevPtr)pInfo->private;
+ int val;
+
-+ if (!(pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) &&
-+ (pEvdev->flags & EVDEV_RELATIVE_EVENTS) &&
-+ (pEvdev->flags & EVDEV_TOUCHPAD) &&
-+ !libevdev_has_event_code(pEvdev->dev, EV_ABS, ABS_X) &&
++ if (!(pEvdev->flags & EVDEV_ABSOLUTE_EVENTS) ||
++ !(pEvdev->flags & EVDEV_BUTTON_EVENTS) ||
++ (pEvdev->flags & EVDEV_RELATIVE_EVENTS) ||
++ (pEvdev->flags & EVDEV_TOUCHPAD) ||
++ !libevdev_has_event_code(pEvdev->dev, EV_ABS, ABS_X) ||
+ !libevdev_has_event_code(pEvdev->dev, EV_ABS, ABS_Y)) {
+ pEvdev->kioskTouch.mode = -1;
+ return;
++++++ u_02-Add-delay-between-button-press-and-release-to-kiosk-mode.patch
++++++
--- /var/tmp/diff_new_pack.WQuMZI/_old 2016-05-26 23:53:13.000000000 +0200
+++ /var/tmp/diff_new_pack.WQuMZI/_new 2016-05-26 23:53:13.000000000 +0200
@@ -1,4 +1,4 @@
-From: Egbert Eich <e...@suse.de>
+From: Egbert Eich <e...@linux-0ems.fritz.box>
Date: Mon Apr 18 23:26:25 2016 +0200
Subject: [PATCH 2/2]Add delay between button press and release to kiosk mode.
Patch-mainline: to be upstreamed
@@ -61,7 +61,7 @@
.SH AUTHORS
Kristian Høgsberg, Peter Hutterer
diff --git a/src/evdev.c b/src/evdev.c
-index 96d931f..5eaa5ce 100644
+index a72a866..ab0ed31 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -482,6 +482,7 @@ EvdevProcessValuators(InputInfoPtr pInfo)
@@ -127,7 +127,7 @@
+void EvdevKioskTouchClose(InputInfoPtr pInfo);
#endif
diff --git a/src/kioskTouch.c b/src/kioskTouch.c
-index 56acd8c..0e6de3a 100644
+index d32f386..f0dd3cb 100644
--- a/src/kioskTouch.c
+++ b/src/kioskTouch.c
@@ -42,8 +42,11 @@
@@ -142,7 +142,7 @@
void
EvdevKioskTouchPreInit(InputInfoPtr pInfo)
-@@ -74,18 +77,21 @@ EvdevKioskTouchPreInit(InputInfoPtr pInfo)
+@@ -75,18 +78,21 @@ EvdevKioskTouchPreInit(InputInfoPtr pInfo)
val = 0;
}
pEvdev->kioskTouch.button = pEvdev->kioskTouch.button_queued = val;
@@ -167,7 +167,7 @@
if (pEvdev->kioskTouch.state & KTOUCH_STATE_ACTIVE)
return;
if (pEvdev->mt_mask) {
-@@ -97,6 +103,7 @@ EvdevKioskTouchSwitchQueued(EvdevPtr pEvdev)
+@@ -98,6 +104,7 @@ EvdevKioskTouchSwitchQueued(EvdevPtr pEvdev)
}
pEvdev->kioskTouch.mode = pEvdev->kioskTouch.mode_queued;
pEvdev->kioskTouch.button = pEvdev->kioskTouch.button_queued;
@@ -175,7 +175,7 @@
}
}
-@@ -107,6 +114,33 @@ EvdevKioskTouchFilterTouch(EvdevPtr pEvdev)
+@@ -108,6 +115,33 @@ EvdevKioskTouchFilterTouch(EvdevPtr pEvdev)
return (pEvdev->kioskTouch.mode > 0) ? TRUE : FALSE;
}
@@ -209,7 +209,7 @@
BOOL
EvdevKioskTouchFilterButton(InputInfoPtr pInfo, unsigned int button, int
value)
{
-@@ -117,28 +151,46 @@ EvdevKioskTouchFilterButton(InputInfoPtr pInfo, unsigned
int button, int value)
+@@ -118,28 +152,46 @@ EvdevKioskTouchFilterButton(InputInfoPtr pInfo, unsigned
int button, int value)
if (value == 1)
pEvdev->kioskTouch.state = KTOUCH_STATE_ACTIVE;
else
@@ -264,7 +264,7 @@
}
return FALSE;
default:
-@@ -149,6 +201,104 @@ EvdevKioskTouchFilterButton(InputInfoPtr pInfo, unsigned
int button, int value)
+@@ -150,6 +202,104 @@ EvdevKioskTouchFilterButton(InputInfoPtr pInfo, unsigned
int button, int value)
return FALSE;
}
@@ -369,7 +369,7 @@
static int
EvdevKioskTouchSetProperty(DeviceIntPtr dev, Atom atom, XIPropertyValuePtr
val,
BOOL checkonly)
-@@ -170,6 +320,13 @@ EvdevKioskTouchSetProperty(DeviceIntPtr dev, Atom atom,
XIPropertyValuePtr val,
+@@ -171,6 +321,13 @@ EvdevKioskTouchSetProperty(DeviceIntPtr dev, Atom atom,
XIPropertyValuePtr val,
if (!checkonly)
pEvdev->kioskTouch.button_queued = *((unsigned char*)val->data);
@@ -383,7 +383,7 @@
}
return Success;
-@@ -182,10 +339,14 @@ EvdevKioskTouchInitProperty(DeviceIntPtr dev)
+@@ -183,10 +340,14 @@ EvdevKioskTouchInitProperty(DeviceIntPtr dev)
EvdevPtr pEvdev = pInfo->private;
int rc;
@@ -398,7 +398,7 @@
}
if (pEvdev->kioskTouch.mode < 0)
-@@ -210,5 +371,23 @@ EvdevKioskTouchInitProperty(DeviceIntPtr dev)
+@@ -211,5 +372,23 @@ EvdevKioskTouchInitProperty(DeviceIntPtr dev)
return;
XISetDevicePropertyDeletable(dev, prop_ktouch_button, FALSE);
