xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 11
debian/patches/104_syndaemon_xinput_props.patch | 338 ++++++++++++++++++++++++
debian/patches/105_no_bcm5974_shmconfig.patch | 12
debian/patches/series | 2
src/properties.c | 2
5 files changed, 364 insertions(+), 1 deletion(-)
New commits:
commit 8143472ebd6926b798b30a6b8717aab1b4b3cbb4
Author: William Grant <wgrant@ubuntu.com>
Date: Mon Oct 13 21:50:02 2008 +1100
Add a reference in the changelog to bug #282004.
diff --git a/debian/changelog b/debian/changelog
index 1d6aae9..31e39cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,9 +5,9 @@ xfree86-driver-synaptics (0.15.2-0ubuntu5) intrepid; urgency=low
* debian/patches/104_syndaemon_xinput_props.patch: Add support for XInput
device properties to syndaemon.
* debian/patches/105_no_bcm5974_shmconfig.patch: Remove the SHMConfig
- enabling line from the bcm5974 section of the fdi file.
+ enabling line from the bcm5974 section of the fdi file. (LP: #282004)
- -- William Grant <wgrant@ubuntu.com> Mon, 13 Oct 2008 21:22:58 +1100
+ -- William Grant <wgrant@ubuntu.com> Mon, 13 Oct 2008 21:48:05 +1100
xfree86-driver-synaptics (0.15.2-0ubuntu4) intrepid; urgency=low
commit c7685db1da0977f5d6b1ad9f33e8cd1c4914603f
Author: William Grant <wgrant@ubuntu.com>
Date: Mon Oct 13 21:26:34 2008 +1100
Update the changelog for 0.15.2-0ubuntu5
diff --git a/debian/changelog b/debian/changelog
index ba641a4..1d6aae9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+xfree86-driver-synaptics (0.15.2-0ubuntu5) intrepid; urgency=low
+
+ * Cherry-picked commit db6e63, "Return correctly on successful property
+ setting"
+ * debian/patches/104_syndaemon_xinput_props.patch: Add support for XInput
+ device properties to syndaemon.
+ * debian/patches/105_no_bcm5974_shmconfig.patch: Remove the SHMConfig
+ enabling line from the bcm5974 section of the fdi file.
+
+ -- William Grant <wgrant@ubuntu.com> Mon, 13 Oct 2008 21:22:58 +1100
+
xfree86-driver-synaptics (0.15.2-0ubuntu4) intrepid; urgency=low
* Cherry-picked commit 355e845, "Adjust to new property API".
commit c0fafdeb6ad2ecaaee5358b327321d8383bde83e
Author: William Grant <wgrant@ubuntu.com>
Date: Mon Oct 13 21:16:44 2008 +1100
Don't enable SHMConfig by default for bcm5974
All of those settings were reverted upstream after the edge
autodetection was implemented, but only SHMConfig was actually
dangerous.
diff --git a/debian/patches/105_no_bcm5974_shmconfig.patch b/debian/patches/105_no_bcm5974_shmconfig.patch
new file mode 100644
index 0000000..85ae592
--- /dev/null
+++ b/debian/patches/105_no_bcm5974_shmconfig.patch
@@ -0,0 +1,12 @@
+Index: xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi
+===================================================================
+--- xserver-xorg-input-synaptics.orig/fdi/11-x11-synaptics.fdi 2008-10-13 21:15:54.000000000 +1100
++++ xserver-xorg-input-synaptics/fdi/11-x11-synaptics.fdi 2008-10-13 21:16:00.000000000 +1100
+@@ -18,7 +18,6 @@
+ </match>
+ <match key="info.product" contains="bcm5974">
+ <merge key="input.x11_driver" type="string">synaptics</merge>
+- <merge key="input.x11_options.SHMConfig" type="string">true</merge>
+ <merge key="input.x11_options.LeftEdge" type="string">0</merge>
+ <merge key="input.x11_options.RightEdge" type="string">1280</merge>
+ <merge key="input.x11_options.TopEdge" type="string">0</merge>
diff --git a/debian/patches/series b/debian/patches/series
index 3ccc7d4..a27c73a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
102_dont_check_abi.diff
103_enable_cornertapping.patch
104_syndaemon_xinput_props.patch
+105_no_bcm5974_shmconfig.patch
commit d475a219ccdc9033cbaf9bfaba0d8f2e97eb1140
Author: William Grant <wgrant@ubuntu.com>
Date: Mon Oct 13 21:11:24 2008 +1100
Add XInput property support to syndaemon.
diff --git a/debian/patches/104_syndaemon_xinput_props.patch b/debian/patches/104_syndaemon_xinput_props.patch
new file mode 100644
index 0000000..9a5e682
--- /dev/null
+++ b/debian/patches/104_syndaemon_xinput_props.patch
@@ -0,0 +1,338 @@
+Index: xfree86-driver-synaptics-0.15.2/tools/syndaemon.c
+===================================================================
+--- xfree86-driver-synaptics-0.15.2.orig/tools/syndaemon.c 2008-10-09 15:03:49.000000000 +1100
++++ xfree86-driver-synaptics-0.15.2/tools/syndaemon.c 2008-10-09 15:13:29.000000000 +1100
+@@ -1,5 +1,6 @@
+ /*
+ * Copyright © 2003-2004 Peter Osterlund
++ * Copyright © 2008 William Grant
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+@@ -22,6 +23,7 @@
+ *
+ * Authors:
+ * Peter Osterlund (petero2@telia.com)
++ * William Grant (wgrant@ubuntu.com)
+ */
+
+ #ifdef HAVE_CONFIG_H
+@@ -39,9 +41,13 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+
++#include <X11/Xatom.h>
++#include <X11/extensions/XInput.h>
++
+ #include "synaptics.h"
+
+ static SynapticsSHM *synshm;
++static int using_synshm;
+ static int pad_disabled;
+ static int disable_taps_only;
+ static int ignore_modifier_combos;
+@@ -64,15 +70,114 @@
+ fprintf(stderr, " -t Only disable tapping and scrolling, not mouse movements.\n");
+ fprintf(stderr, " -k Ignore modifier keys when monitoring keyboard activity.\n");
+ fprintf(stderr, " -K Like -k but also ignore Modifier+Key combos.\n");
++ fprintf(stderr, " -S Use SHMConfig even if input device properties are available.\n");
+ exit(1);
+ }
+
++static XDevice
++*device_is_touchpad(Display *display, XDeviceInfo deviceinfo)
++{
++ XDevice *device;
++ Atom *props;
++ int nprops;
++ char *name;
++
++ device = XOpenDevice(display, deviceinfo.id);
++ if (!device)
++ return NULL;
++
++ props = XListDeviceProperties(display, device, &nprops);
++ while (nprops--) {
++ name = XGetAtomName(display, props[nprops]);
++ if (!strcmp(name, "Synaptics Off")) {
++ free(name);
++ XFree(props);
++ return device;
++ }
++ free(name);
++ }
++
++ XFree(props);
++ XCloseDevice(display, device);
++ return NULL;
++}
++
+ static int
+-enable_touchpad()
++get_touchpad_off(Display *display)
++{
++ int numdevices, i;
++ XDeviceInfo *devicelist;
++ XDevice *device;
++ Atom realtype, prop;
++ int realformat;
++ unsigned long nitems, bytes_after;
++ unsigned char *data;
++ int result;
++
++ if (using_synshm)
++ return synshm->touchpad_off;
++
++ devicelist = XListInputDevices (display, &numdevices);
++
++ prop = XInternAtom(display, "Synaptics Off", False);
++
++ for (i = 0; i < numdevices; i++) {
++ if ((devicelist[i].use >= IsXExtensionDevice) &&
++ (device = device_is_touchpad(display, devicelist[i]))) {
++ XGetDeviceProperty(display, device, prop, 0, 1, False,
++ XA_INTEGER, &realtype, &realformat, &nitems,
++ &bytes_after, &data);
++
++ if (nitems < 1) {
++ fprintf(stderr, "Touchpad didn't return status information.\n");
++ exit(2);
++ }
++
++ result = data[0];
++ XFree(devicelist);
++ XFree(data);
++ XCloseDevice(display, device);
++ return result;
++ }
++ }
++ XFree(devicelist);
++ return 1;
++}
++
++static void
++set_touchpad_off(Display *display, int value)
++{
++ int numdevices, i;
++ XDeviceInfo *devicelist;
++ XDevice *device;
++ Atom realtype, prop;
++
++ if (using_synshm) {
++ synshm->touchpad_off = value;
++ return;
++ }
++
++ devicelist = XListInputDevices (display, &numdevices);
++
++ prop = XInternAtom(display, "Synaptics Off", False);
++
++ for (i = 0; i < numdevices; i++) {
++ if ((devicelist[i].use >= IsXExtensionDevice) &&
++ (device = device_is_touchpad(display, devicelist[i]))) {
++ XChangeDeviceProperty(display, device, prop, XA_INTEGER, 8, PropModeReplace,
++ (unsigned char *)&value, 1);
++ XCloseDevice(display, device);
++ }
++ }
++ XFree(devicelist);
++}
++
++static int
++enable_touchpad(Display *display)
+ {
+ int ret = 0;
+ if (pad_disabled) {
+- synshm->touchpad_off = 0;
++ set_touchpad_off(display, 0);
+ pad_disabled = 0;
+ ret = 1;
+ }
+@@ -82,7 +187,10 @@
+ static void
+ signal_handler(int signum)
+ {
+- enable_touchpad();
++ Display *display = XOpenDisplay(NULL);
++ enable_touchpad(display);
++ XCloseDisplay(display);
++
+ if (pid_file)
+ unlink(pid_file);
+ kill(getpid(), signum);
+@@ -156,18 +264,53 @@
+ * Return non-zero if any physical touchpad button is currently pressed.
+ */
+ static int
+-touchpad_buttons_active()
++touchpad_buttons_active(Display *display)
+ {
+ int i;
+-
+- if (synshm->left || synshm->right || synshm->up || synshm->down)
++ if (using_synshm) {
++ if (synshm->left || synshm->right || synshm->up || synshm->down)
++ return 1;
++ for (i = 0; i < 8; i++)
++ if (synshm->multi[i])
+ return 1;
+- for (i = 0; i < 8; i++)
+- if (synshm->multi[i])
++ if (synshm->guest_left || synshm->guest_mid || synshm->guest_right)
+ return 1;
+- if (synshm->guest_left || synshm->guest_mid || synshm->guest_right)
+- return 1;
+- return 0;
++ return 0;
++ }
++ else {
++ XDevice *device;
++ XDeviceInfo *devicelist;
++ XDeviceState *state;
++ XButtonState *buttonstate;
++ XInputClass *class;
++ int numdevices, classno, buttonno;
++ int pressed = 0;
++
++ devicelist = XListInputDevices (display, &numdevices);
++ for (i = 0; i < numdevices; i++)
++ if ((devicelist[i].use >= IsXExtensionDevice) &&
++ (device = device_is_touchpad(display, devicelist[i]))) {
++ state = XQueryDeviceState(display, device);
++ class = state->data;
++
++ for (classno = 0; classno < state->num_classes; classno++)
++ {
++ if (class->class == ButtonClass)
++ {
++ buttonstate = (XButtonState *)class;
++ for (buttonno = 1; buttonno <= buttonstate->num_buttons; buttonno++)
++ if (buttonstate->buttons[buttonno / 8] & (1 << (buttonno % 8)))
++ pressed = 1;
++ }
++ class = (XInputClass *)((char *) class + class->length);
++ }
++ XFree(state);
++ XCloseDevice(display, device);
++ break;
++ }
++ XFree(devicelist);
++ return pressed;
++ }
+ }
+
+ static double
+@@ -191,23 +334,20 @@
+ current_time = get_time();
+ if (keyboard_activity(display))
+ last_activity = current_time;
+- if (touchpad_buttons_active())
++ if (touchpad_buttons_active(display))
+ last_activity = 0.0;
+
+ if (current_time > last_activity + idle_time) { /* Enable touchpad */
+- if (enable_touchpad()) {
++ if (enable_touchpad(display)) {
+ if (!background)
+ printf("Enable\n");
+ }
+ } else { /* Disable touchpad */
+- if (!pad_disabled && !synshm->touchpad_off) {
++ if (!pad_disabled && !get_touchpad_off(display)) {
+ if (!background)
+ printf("Disable\n");
+ pad_disabled = 1;
+- if (disable_taps_only)
+- synshm->touchpad_off = 2;
+- else
+- synshm->touchpad_off = 1;
++ set_touchpad_off(display, disable_taps_only ? 2 : 1);
+ }
+ }
+
+@@ -254,7 +394,7 @@
+ int ignore_modifier_keys = 0;
+
+ /* Parse command line parameters */
+- while ((c = getopt(argc, argv, "i:m:dtp:kK?")) != EOF) {
++ while ((c = getopt(argc, argv, "i:m:dtp:kKS?")) != EOF) {
+ switch(c) {
+ case 'i':
+ idle_time = atof(optarg);
+@@ -278,6 +418,9 @@
+ ignore_modifier_combos = 1;
+ ignore_modifier_keys = 1;
+ break;
++ case 'S':
++ using_synshm = 1;
++ break;
+ default:
+ usage();
+ break;
+@@ -293,20 +436,42 @@
+ exit(2);
+ }
+
+- /* Connect to the shared memory area */
+- if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) {
+- if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) {
+- fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n");
+- exit(2);
+- } else {
+- fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n");
++ if (!using_synshm) {
++ XDeviceInfo *devicelist;
++ XDevice *device;
++ int numdevices, i;
++
++ using_synshm = 1;
++
++ devicelist = XListInputDevices (display, &numdevices);
++ for (i =0; i < numdevices; i++)
++ if ((devicelist[i].use >= IsXExtensionDevice) &&
++ (device = device_is_touchpad(display, devicelist[i]))) {
++ XCloseDevice(display, device);
++ using_synshm = 0;
++ break;
++ }
++ XFree(devicelist);
++ }
++
++
++ if (using_synshm) {
++ /* Connect to the shared memory area */
++ if ((shmid = shmget(SHM_SYNAPTICS, sizeof(SynapticsSHM), 0)) == -1) {
++ if ((shmid = shmget(SHM_SYNAPTICS, 0, 0)) == -1) {
++ fprintf(stderr, "Can't access shared memory area. SHMConfig disabled?\n");
++ exit(2);
++ } else {
++ fprintf(stderr, "Incorrect size of shared memory area. Incompatible driver version?\n");
++ exit(2);
++ }
++ }
++
++ if ((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) {
++ perror("shmat");
+ exit(2);
+ }
+ }
+- if ((synshm = (SynapticsSHM*) shmat(shmid, NULL, 0)) == NULL) {
+- perror("shmat");
+- exit(2);
+- }
+
+ /* Install a signal handler to restore synaptics parameters on exit */
+ install_signal_handler();
+Index: xfree86-driver-synaptics-0.15.2/configure.ac
+===================================================================
+--- xfree86-driver-synaptics-0.15.2.orig/configure.ac 2008-10-09 15:13:56.000000000 +1100
++++ xfree86-driver-synaptics-0.15.2/configure.ac 2008-10-09 15:14:23.000000000 +1100
+@@ -109,7 +109,7 @@
+ AC_SUBST([CFLAGS])
+
+ # Checks for libraries.
+-PKG_CHECK_MODULES(XLIB, x11) # needed for syndaemon
++PKG_CHECK_MODULES(XLIB, x11 xi) # needed for syndaemon
+
+ # Checks for header files.
+ AC_HEADER_STDC
diff --git a/debian/patches/series b/debian/patches/series
index 5305ab2..3ccc7d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
101_no_horizscroll.patch
102_dont_check_abi.diff
103_enable_cornertapping.patch
+104_syndaemon_xinput_props.patch
commit baba9b0de65e414a73336699ff66483b3b43ff0b
Author: William Grant <wgrant@ubuntu.com>
Date: Sat Oct 11 10:22:11 2008 +1030
Return correctly on successful property setting
TRUE was not replaced with Success when all of the other property handler
return codes were. This meant that properties ended up set in the driver but
not the rest of the server.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
diff --git a/src/properties.c b/src/properties.c
index dc10888..aa197f2 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -505,7 +505,7 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop)
para->grab_event_device = *(BOOL*)prop->data;
}
- return TRUE;
+ return Success;
}
#endif
Reply to: