xserver-xorg-input-synaptics: Changes to 'ubuntu'
debian/changelog | 22 ++
debian/patches/101_resolution_detect_option.patch | 68 ++++----
debian/patches/103_enable_cornertapping.patch | 10 -
debian/patches/104_always_enable_tapping.patch | 12 -
debian/patches/106_always_enable_vert_edge_scroll.patch | 10 -
debian/patches/115_evdev_only.patch | 11 -
debian/patches/116_xi2_1.patch | 100 +++++++------
debian/patches/117_gestures.patch | 63 +++++---
debian/patches/118_quell_error_msg.patch | 18 +-
debian/patches/119_active_area_touches.patch | 20 +-
debian/patches/120_active_touches_num_fingers.patch | 27 +--
debian/patches/121_semi-mt_num_fingers.patch | 33 +---
debian/patches/122_revert_pressure_finger_default.patch | 13 -
debian/patches/123_order_ProcessTouch_for_numFingers.patch | 8 -
debian/patches/124_syndaemon_events.patch | 17 --
15 files changed, 238 insertions(+), 194 deletions(-)
New commits:
commit 48e2184ef20d528fd7030b1316e48a8026d8b01b
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Jul 5 11:57:16 2011 +0300
Refresh patches.
diff --git a/debian/patches/101_resolution_detect_option.patch b/debian/patches/101_resolution_detect_option.patch
index 4cce724..4257ea1 100644
--- a/debian/patches/101_resolution_detect_option.patch
+++ b/debian/patches/101_resolution_detect_option.patch
@@ -1,7 +1,7 @@
-diff --git a/include/synaptics-properties.h b/include/synaptics-properties.h
-index 9c6a2ee..150ba53 100644
---- a/include/synaptics-properties.h
-+++ b/include/synaptics-properties.h
+Index: xserver-xorg-input-synaptics/include/synaptics-properties.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/include/synaptics-properties.h 2011-07-05 11:49:41.241347626 +0300
++++ xserver-xorg-input-synaptics/include/synaptics-properties.h 2011-07-05 11:54:23.291347670 +0300
@@ -140,6 +140,9 @@
#define SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR "Synaptics Pressure Motion Factor"
@@ -12,11 +12,11 @@ index 9c6a2ee..150ba53 100644
#define SYNAPTICS_PROP_GRAB "Synaptics Grab Event Device"
/* 8 bit (BOOL), 1 value, tap-and-drag */
-diff --git a/man/synaptics.man b/man/synaptics.man
-index 3f1ca9d..1ab36ca 100644
---- a/man/synaptics.man
-+++ b/man/synaptics.man
-@@ -446,6 +446,18 @@ The gesture is enabled by default and can be disabled by setting the
+Index: xserver-xorg-input-synaptics/man/synaptics.man
+===================================================================
+--- xserver-xorg-input-synaptics.orig/man/synaptics.man 2011-07-05 11:49:41.231347626 +0300
++++ xserver-xorg-input-synaptics/man/synaptics.man 2011-07-05 11:54:23.291347670 +0300
+@@ -457,6 +457,18 @@
TapAndDragGesture option to false. Property: "Synaptics Gestures"
.
.TP
@@ -35,7 +35,7 @@ index 3f1ca9d..1ab36ca 100644
.BI "Option \*qVertResolution\*q \*q" integer \*q
Resolution of X coordinates in units/millimeter. The value is used
together with HorizResolution to compensate unequal vertical and
-@@ -871,6 +883,10 @@ FLOAT, 2 values, speed, friction.
+@@ -898,6 +910,10 @@
FLOAT, 2 values, min, max.
.TP 7
@@ -46,11 +46,11 @@ index 3f1ca9d..1ab36ca 100644
.BI "Synaptics Grab Event Device"
8 bit (BOOL).
-diff --git a/src/properties.c b/src/properties.c
-index 5400928..61fd6ea 100644
---- a/src/properties.c
-+++ b/src/properties.c
-@@ -77,6 +77,7 @@ Atom prop_palm_dim = 0;
+Index: xserver-xorg-input-synaptics/src/properties.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/properties.c 2011-07-05 11:49:41.271347626 +0300
++++ xserver-xorg-input-synaptics/src/properties.c 2011-07-05 11:54:23.291347670 +0300
+@@ -77,6 +77,7 @@
Atom prop_coastspeed = 0;
Atom prop_pressuremotion = 0;
Atom prop_pressuremotion_factor = 0;
@@ -58,7 +58,7 @@ index 5400928..61fd6ea 100644
Atom prop_grab = 0;
Atom prop_gestures = 0;
Atom prop_capabilities = 0;
-@@ -254,7 +255,7 @@ InitDeviceProperties(InputInfoPtr pInfo)
+@@ -255,7 +256,7 @@
fvalues[1] = para->press_motion_max_factor;
prop_pressuremotion_factor = InitFloatAtom(pInfo->dev, SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 2, fvalues);
@@ -67,7 +67,7 @@ index 5400928..61fd6ea 100644
prop_grab = InitAtom(pInfo->dev, SYNAPTICS_PROP_GRAB, 8, 1, ¶->grab_event_device);
values[0] = para->tap_and_drag_gesture;
-@@ -621,6 +622,12 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
+@@ -628,6 +629,12 @@
para->press_motion_min_z = press[0];
para->press_motion_max_z = press[1];
@@ -80,11 +80,11 @@ index 5400928..61fd6ea 100644
} else if (property == prop_grab)
{
if (prop->size != 1 || prop->format != 8 || prop->type != XA_INTEGER)
-diff --git a/src/synaptics.c b/src/synaptics.c
-index 88bd024..78f1023 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -570,6 +570,7 @@ static void set_default_parameters(InputInfoPtr pInfo)
+Index: xserver-xorg-input-synaptics/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:49:41.261347626 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:36.601347672 +0300
+@@ -579,6 +579,7 @@
pars->single_tap_timeout = xf86SetIntOption(opts, "SingleTapTimeout", 180);
pars->press_motion_min_z = xf86SetIntOption(opts, "PressureMotionMinZ", pressureMotionMinZ);
pars->press_motion_max_z = xf86SetIntOption(opts, "PressureMotionMaxZ", pressureMotionMaxZ);
@@ -92,7 +92,7 @@ index 88bd024..78f1023 100644
pars->min_speed = xf86SetRealOption(opts, "MinSpeed", 0.4);
pars->max_speed = xf86SetRealOption(opts, "MaxSpeed", 0.7);
-@@ -1028,7 +1029,7 @@ DeviceInit(DeviceIntPtr dev)
+@@ -1039,7 +1040,7 @@
#endif
/* X valuator */
@@ -101,7 +101,7 @@ index 88bd024..78f1023 100644
{
min = priv->minx;
max = priv->maxx;
-@@ -1050,7 +1051,7 @@ DeviceInit(DeviceIntPtr dev)
+@@ -1061,7 +1062,7 @@
xf86InitValuatorDefaults(dev, 0);
/* Y valuator */
@@ -110,11 +110,11 @@ index 88bd024..78f1023 100644
{
min = priv->miny;
max = priv->maxy;
-diff --git a/src/synapticsstr.h b/src/synapticsstr.h
-index 9ad8638..5e98dab 100644
---- a/src/synapticsstr.h
-+++ b/src/synapticsstr.h
-@@ -155,6 +155,7 @@ typedef struct _SynapticsParameters
+Index: xserver-xorg-input-synaptics/src/synapticsstr.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synapticsstr.h 2011-07-05 11:49:41.251347626 +0300
++++ xserver-xorg-input-synaptics/src/synapticsstr.h 2011-07-05 11:54:33.021347672 +0300
+@@ -155,6 +155,7 @@
int press_motion_max_z; /* finger pressure at which maximum pressure motion factor is applied */
double press_motion_min_factor; /* factor applied on speed when finger pressure is at minimum */
double press_motion_max_factor; /* factor applied on speed when finger pressure is at minimum */
@@ -122,11 +122,11 @@ index 9ad8638..5e98dab 100644
Bool grab_event_device; /* grab event device for exclusive use? */
Bool tap_and_drag_gesture; /* Switches the tap-and-drag gesture on/off */
unsigned int resolution_horiz; /* horizontal resolution of touchpad in units/mm */
-diff --git a/tools/synclient.c b/tools/synclient.c
-index 9776d23..3f0c0bc 100644
---- a/tools/synclient.c
-+++ b/tools/synclient.c
-@@ -137,6 +137,8 @@ static struct Parameter params[] = {
+Index: xserver-xorg-input-synaptics/tools/synclient.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/tools/synclient.c 2011-07-05 11:49:41.281347626 +0300
++++ xserver-xorg-input-synaptics/tools/synclient.c 2011-07-05 11:54:31.731347670 +0300
+@@ -137,6 +137,8 @@
{"PressureMotionMaxZ", PT_INT, 1, 255, SYNAPTICS_PROP_PRESSURE_MOTION, 32, 1},
{"PressureMotionMinFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 0 /*float*/, 0},
{"PressureMotionMaxFactor", PT_DOUBLE, 0, 10.0,SYNAPTICS_PROP_PRESSURE_MOTION_FACTOR, 0 /*float*/, 1},
diff --git a/debian/patches/103_enable_cornertapping.patch b/debian/patches/103_enable_cornertapping.patch
index 0a63ae9..c357d5a 100644
--- a/debian/patches/103_enable_cornertapping.patch
+++ b/debian/patches/103_enable_cornertapping.patch
@@ -1,9 +1,9 @@
-Index: xfree86-driver-synaptics-0.99.3/src/synaptics.c
+Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xfree86-driver-synaptics-0.99.3.orig/src/synaptics.c 2008-12-15 00:33:15.000000000 +0100
-+++ xfree86-driver-synaptics-0.99.3/src/synaptics.c 2009-01-24 15:48:29.000000000 +0100
-@@ -464,8 +464,8 @@
- pars->guestmouse_off = xf86SetBoolOption(opts, "GuestMouseOff", FALSE);
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:36.601347672 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:45.481347675 +0300
+@@ -560,8 +560,8 @@
+ pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", 0);
pars->locked_drags = xf86SetBoolOption(opts, "LockedDrags", FALSE);
pars->locked_drag_time = xf86SetIntOption(opts, "LockedDragTimeout", 5000);
- pars->tap_action[RT_TAP] = xf86SetIntOption(opts, "RTCornerButton", 0);
diff --git a/debian/patches/104_always_enable_tapping.patch b/debian/patches/104_always_enable_tapping.patch
index c2a1989..8a19527 100644
--- a/debian/patches/104_always_enable_tapping.patch
+++ b/debian/patches/104_always_enable_tapping.patch
@@ -1,10 +1,10 @@
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-01-26 09:52:14.000000000 +0200
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-01-26 09:52:27.000000000 +0200
-@@ -403,10 +403,10 @@
- palmMinWidth = 10;
- }
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:45.481347675 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:48.311347674 +0300
+@@ -488,10 +488,10 @@
+ palmMinWidth = priv->minw + range * (10.0/16);
+ emulateTwoFingerMinW = priv->minw + range * (7.0/16);
- /* Enable tap if we don't have a phys left button */
- tapButton1 = priv->has_left ? 0 : 1;
@@ -15,5 +15,5 @@ Index: xserver-xorg-input-synaptics/src/synaptics.c
+ tapButton2 = 2;
+ tapButton3 = 3;
- /* Enable multifinger-click if we don't have right/middle button,
+ /* Enable multifinger-click if only have one physical button,
otherwise clickFinger is always button 1. */
diff --git a/debian/patches/106_always_enable_vert_edge_scroll.patch b/debian/patches/106_always_enable_vert_edge_scroll.patch
index 5844a0d..47f192d 100644
--- a/debian/patches/106_always_enable_vert_edge_scroll.patch
+++ b/debian/patches/106_always_enable_vert_edge_scroll.patch
@@ -1,10 +1,10 @@
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-01-26 09:52:44.000000000 +0200
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-01-26 09:52:48.000000000 +0200
-@@ -413,8 +413,8 @@
- clickFinger2 = 2;
- clickFinger3 = 3;
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:48.311347674 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:51.321347674 +0300
+@@ -499,8 +499,8 @@
+ clickFinger2 = (priv->has_right || priv->has_middle) ? 1 : 3;
+ clickFinger3 = (priv->has_right || priv->has_middle) ? 1 : 2;
- /* Enable vert edge scroll if we can't detect doubletap */
- vertEdgeScroll = priv->has_double ? FALSE : TRUE;
diff --git a/debian/patches/115_evdev_only.patch b/debian/patches/115_evdev_only.patch
index 8e6fc29..ffcf01d 100644
--- a/debian/patches/115_evdev_only.patch
+++ b/debian/patches/115_evdev_only.patch
@@ -1,11 +1,10 @@
Prevent non-evdev devices from firing the eventcomm AutoDevProbe callback.
---- a/conf/50-synaptics.conf
-+++ b/conf/50-synaptics.conf
-@@ -2,8 +2,8 @@ Section "InputClass"
- Identifier "touchpad catchall"
- Driver "synaptics"
- MatchIsTouchpad "on"
+Index: xserver-xorg-input-synaptics/conf/50-synaptics.conf
+===================================================================
+--- xserver-xorg-input-synaptics.orig/conf/50-synaptics.conf 2011-07-05 11:54:33.911347672 +0300
++++ xserver-xorg-input-synaptics/conf/50-synaptics.conf 2011-07-05 11:54:53.411347674 +0300
+@@ -14,5 +14,5 @@
# This option is recommend on all Linux systems using evdev, but cannot be
# enabled by default. See the following link for details:
# http://who-t.blogspot.com/2010/11/how-to-ignore-configuration-errors.html
diff --git a/debian/patches/116_xi2_1.patch b/debian/patches/116_xi2_1.patch
index c1833f7..cbdeb12 100644
--- a/debian/patches/116_xi2_1.patch
+++ b/debian/patches/116_xi2_1.patch
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -101,6 +101,9 @@ case "${host}" in
+Index: xserver-xorg-input-synaptics/configure.ac
+===================================================================
+--- xserver-xorg-input-synaptics.orig/configure.ac 2011-07-05 11:54:32.981347672 +0300
++++ xserver-xorg-input-synaptics/configure.ac 2011-07-05 11:54:55.781347674 +0300
+@@ -101,6 +101,9 @@
AC_MSG_RESULT([eventcomm])
BUILD_EVENTCOMM="yes"
AC_DEFINE(BUILD_EVENTCOMM, 1, [Optional backend eventcomm enabled])
@@ -10,9 +12,11 @@
;;
*freebsd* | *openbsd* | *netbsd* | *dragonfly*)
AC_MSG_RESULT([psmcomm])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -40,6 +40,7 @@ AM_CFLAGS = $(XORG_CFLAGS)
+Index: xserver-xorg-input-synaptics/src/Makefile.am
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/Makefile.am 2011-07-05 11:54:33.041347672 +0300
++++ xserver-xorg-input-synaptics/src/Makefile.am 2011-07-05 11:54:55.781347674 +0300
+@@ -40,6 +40,7 @@
if BUILD_EVENTCOMM
@DRIVER_NAME@_drv_la_SOURCES += \
eventcomm.c eventcomm.h
@@ -20,9 +24,11 @@
endif
if BUILD_PSMCOMM
---- a/src/alpscomm.c
-+++ b/src/alpscomm.c
-@@ -230,6 +230,9 @@ ALPSAutoDevProbe(InputInfoPtr pInfo)
+Index: xserver-xorg-input-synaptics/src/alpscomm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/alpscomm.c 2011-07-05 11:54:33.001347672 +0300
++++ xserver-xorg-input-synaptics/src/alpscomm.c 2011-07-05 11:54:55.781347674 +0300
+@@ -230,6 +230,9 @@
struct SynapticsProtocolOperations alps_proto_operations = {
NULL,
NULL,
@@ -32,8 +38,10 @@
ALPSQueryHardware,
ALPSReadHwState,
ALPSAutoDevProbe,
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
+Index: xserver-xorg-input-synaptics/src/eventcomm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:54:33.051347672 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:54:55.781347674 +0300
@@ -41,6 +41,8 @@
#include "synaptics.h"
#include "synapticsstr.h"
@@ -165,7 +173,7 @@
if (para->grab_event_device) {
/* Try to grab the event device so that data don't leak to /dev/input/mice */
-@@ -76,7 +178,50 @@ EventDeviceOnHook(InputInfoPtr pInfo, Sy
+@@ -76,7 +178,50 @@
}
}
@@ -217,7 +225,7 @@
}
static Bool
-@@ -171,11 +316,14 @@ static void
+@@ -171,11 +316,14 @@
event_query_axis_ranges(InputInfoPtr pInfo)
{
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
@@ -234,7 +242,7 @@
SYSCALL(rc = ioctl(pInfo->fd, EVIOCGABS(ABS_X), &abs));
if (rc >= 0)
-@@ -207,11 +355,12 @@ event_query_axis_ranges(InputInfoPtr pIn
+@@ -215,11 +363,12 @@
priv->has_pressure = FALSE;
priv->has_width = FALSE;
@@ -250,7 +258,7 @@
}
else
xf86Msg(X_ERROR, "%s: failed to query ABS bits (%s)\n", pInfo->name,
-@@ -270,15 +419,34 @@ event_query_axis_ranges(InputInfoPtr pIn
+@@ -278,15 +427,34 @@
xf86Msg(X_PROBED, "%s: buttons:%s\n", pInfo->name, buf);
}
@@ -287,7 +295,7 @@
return FALSE;
xf86Msg(X_PROBED, "%s: touchpad found\n", pInfo->name);
-@@ -286,13 +454,49 @@ EventQueryHardware(InputInfoPtr pInfo)
+@@ -294,13 +462,49 @@
return TRUE;
}
@@ -338,7 +346,7 @@
if (len <= 0)
{
/* We use X_NONE here because it doesn't alloc */
-@@ -316,6 +520,7 @@ EventReadHwState(InputInfoPtr pInfo,
+@@ -324,6 +528,7 @@
struct SynapticsHwState *hw = &(comm->hwState);
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
SynapticsParameters *para = &priv->synpara;
@@ -346,15 +354,15 @@
while (SynapticsReadEvent(pInfo, &ev)) {
switch (ev.type) {
-@@ -331,6 +536,7 @@ EventReadHwState(InputInfoPtr pInfo,
+@@ -339,6 +544,7 @@
else
hw->numFingers = 0;
*hwRet = *hw;
+ ProcessTouch(pInfo, priv);
return TRUE;
}
- case EV_KEY:
-@@ -404,6 +610,55 @@ EventReadHwState(InputInfoPtr pInfo,
+ break;
+@@ -413,6 +619,55 @@
case ABS_TOOL_WIDTH:
hw->fingerWidth = ev.value;
break;
@@ -410,7 +418,7 @@
}
break;
}
-@@ -423,9 +678,9 @@ static void
+@@ -432,9 +687,9 @@
EventReadDevDimensions(InputInfoPtr pInfo)
{
SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
@@ -422,7 +430,7 @@
event_query_axis_ranges(pInfo);
event_query_info(pInfo);
}
-@@ -482,8 +737,11 @@ EventAutoDevProbe(InputInfoPtr pInfo)
+@@ -491,8 +746,11 @@
}
struct SynapticsProtocolOperations event_proto_operations = {
@@ -435,8 +443,10 @@
EventQueryHardware,
EventReadHwState,
EventAutoDevProbe,
---- a/src/eventcomm.h
-+++ b/src/eventcomm.h
+Index: xserver-xorg-input-synaptics/src/eventcomm.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.h 2011-07-05 11:54:32.991347672 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.h 2011-07-05 11:54:55.781347674 +0300
@@ -29,9 +29,31 @@
#include <linux/input.h>
@@ -469,9 +479,11 @@
+} EventcommPrivate;
+
#endif /* _EVENTCOMM_H_ */
---- a/src/ps2comm.c
-+++ b/src/ps2comm.c
-@@ -668,7 +668,10 @@ PS2AutoDevProbe(InputInfoPtr pInfo)
+Index: xserver-xorg-input-synaptics/src/ps2comm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/ps2comm.c 2011-07-05 11:54:33.011347672 +0300
++++ xserver-xorg-input-synaptics/src/ps2comm.c 2011-07-05 11:54:55.781347674 +0300
+@@ -668,7 +668,10 @@
struct SynapticsProtocolOperations psaux_proto_operations = {
NULL,
@@ -482,11 +494,13 @@
PS2QueryHardware,
PS2ReadHwState,
PS2AutoDevProbe,
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -730,6 +730,10 @@ SynapticsPreInit(InputDriverPtr drv, Inp
- priv->tap_button_state = TBS_BUTTON_UP;
- priv->touch_on.millis = 0;
+Index: xserver-xorg-input-synaptics/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:51.321347674 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:54:55.781347674 +0300
+@@ -735,6 +735,10 @@
+ priv->synpara.hyst_x = -1;
+ priv->synpara.hyst_y = -1;
+ if (priv->proto_ops->DevicePreInitHook)
+ if (priv->proto_ops->DevicePreInitHook(drv, pInfo, flags) != Success)
@@ -495,7 +509,7 @@
/* read hardware dimensions */
ReadDevDimensions(pInfo);
-@@ -906,6 +910,9 @@ DeviceClose(DeviceIntPtr dev)
+@@ -911,6 +915,9 @@
InputInfoPtr pInfo = dev->public.devicePrivate;
SynapticsPrivate *priv = (SynapticsPrivate *) pInfo->private;
@@ -505,7 +519,7 @@
RetValue = DeviceOff(dev);
TimerFree(priv->timer);
priv->timer = NULL;
-@@ -1084,6 +1091,9 @@ DeviceInit(DeviceIntPtr dev)
+@@ -1089,6 +1096,9 @@
InitDeviceProperties(pInfo);
XIRegisterPropertyHandler(pInfo->dev, SetProperty, NULL, NULL);
@@ -515,8 +529,10 @@
return Success;
}
---- a/src/synapticsstr.h
-+++ b/src/synapticsstr.h
+Index: xserver-xorg-input-synaptics/src/synapticsstr.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synapticsstr.h 2011-07-05 11:54:33.021347672 +0300
++++ xserver-xorg-input-synaptics/src/synapticsstr.h 2011-07-05 11:54:55.781347674 +0300
@@ -22,6 +22,8 @@
#ifndef _SYNAPTICSSTR_H_
#define _SYNAPTICSSTR_H_
@@ -526,7 +542,7 @@
#include "synproto.h"
#ifdef DBG
-@@ -238,6 +240,7 @@ typedef struct _SynapticsPrivateRec
+@@ -240,6 +242,7 @@
Bool has_pressure; /* device reports pressure */
Bool has_width; /* device reports finger width */
Bool has_scrollbuttons; /* device has physical scrollbuttons */
@@ -534,9 +550,11 @@
enum TouchpadModel model; /* The detected model */
} SynapticsPrivate;
---- a/src/synproto.h
-+++ b/src/synproto.h
-@@ -83,8 +83,11 @@ struct SynapticsHwInfo;
+Index: xserver-xorg-input-synaptics/src/synproto.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synproto.h 2011-07-05 11:54:33.071347672 +0300
++++ xserver-xorg-input-synaptics/src/synproto.h 2011-07-05 11:54:55.781347674 +0300
+@@ -83,8 +83,11 @@
struct CommData;
struct SynapticsProtocolOperations {
@@ -548,7 +566,7 @@
Bool (*QueryHardware)(InputInfoPtr pInfo);
Bool (*ReadHwState)(InputInfoPtr pInfo,
struct SynapticsProtocolOperations *proto_ops,
-@@ -102,5 +105,4 @@ extern struct SynapticsProtocolOperation
+@@ -102,5 +105,4 @@
#endif /* BUILD_PSMCOMM */
extern struct SynapticsProtocolOperations alps_proto_operations;
diff --git a/debian/patches/117_gestures.patch b/debian/patches/117_gestures.patch
index df61ecd..b5e6506 100644
--- a/debian/patches/117_gestures.patch
+++ b/debian/patches/117_gestures.patch
@@ -1,6 +1,8 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -104,6 +104,10 @@ case "${host}" in
+Index: xserver-xorg-input-synaptics/configure.ac
+===================================================================
+--- xserver-xorg-input-synaptics.orig/configure.ac 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/configure.ac 2011-07-05 11:55:02.771347676 +0300
+@@ -104,6 +104,10 @@
# Obtain compiler/linker options for mtdev
PKG_CHECK_MODULES(MTDEV, mtdev)
@@ -11,9 +13,11 @@
;;
*freebsd* | *openbsd* | *netbsd* | *dragonfly*)
AC_MSG_RESULT([psmcomm])
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -39,8 +39,8 @@ AM_CFLAGS = $(XORG_CFLAGS)
+Index: xserver-xorg-input-synaptics/src/Makefile.am
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/Makefile.am 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/src/Makefile.am 2011-07-05 11:55:02.771347676 +0300
+@@ -39,8 +39,8 @@
if BUILD_EVENTCOMM
@DRIVER_NAME@_drv_la_SOURCES += \
@@ -24,8 +28,10 @@
endif
if BUILD_PSMCOMM
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
+Index: xserver-xorg-input-synaptics/src/eventcomm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:55:02.771347676 +0300
@@ -43,6 +43,7 @@
#include <xf86.h>
#include <xorg/xserver-properties.h>
@@ -34,7 +40,7 @@
#define SYSCALL(call) while (((call) == -1) && (errno == EINTR))
-@@ -186,28 +187,13 @@ EventDeviceOnHook(InputInfoPtr pInfo, Sy
+@@ -186,28 +187,13 @@
ecpriv->cur_slot = abs.value;
}
@@ -65,7 +71,7 @@
}
static void
-@@ -491,9 +477,8 @@ SynapticsReadEvent(InputInfoPtr pInfo, s
+@@ -499,9 +485,8 @@
int rc = TRUE;
ssize_t len;
@@ -77,7 +83,7 @@
else
len = read(pInfo->fd, ev, sizeof(*ev));
-@@ -503,167 +488,182 @@ SynapticsReadEvent(InputInfoPtr pInfo, s
+@@ -511,167 +496,182 @@
if (errno != EAGAIN)
xf86MsgVerb(X_NONE, 0, "%s: Read error %s\n", pInfo->name, strerror(errno));
rc = FALSE;
@@ -403,8 +409,10 @@
return FALSE;
}
---- a/src/eventcomm.h
-+++ b/src/eventcomm.h
+Index: xserver-xorg-input-synaptics/src/eventcomm.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.h 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.h 2011-07-05 11:55:02.771347676 +0300
@@ -32,12 +32,15 @@
#include <X11/Xdefs.h>
#include <xorg/input.h>
@@ -421,7 +429,7 @@
typedef struct {
BOOL need_grab;
-@@ -54,6 +57,13 @@ typedef struct {
+@@ -54,6 +57,13 @@
int num_mt_axes;
int num_touches;
struct mtdev *mtdev;
@@ -435,8 +443,10 @@
+extern void GrailClose(InputInfoPtr pInfo);
+
#endif /* _EVENTCOMM_H_ */
---- /dev/null
-+++ b/src/grail.c
+Index: xserver-xorg-input-synaptics/src/grail.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ xserver-xorg-input-synaptics/src/grail.c 2011-07-05 11:55:02.771347676 +0300
@@ -0,0 +1,376 @@
+/*
+ * Copyright © 2010 Canonical, Ltd.
@@ -814,9 +824,11 @@
+ ecpriv->grail = NULL;
+ }
+}
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -119,7 +119,6 @@ static InputInfoPtr SynapticsPreInit(Inp
+Index: xserver-xorg-input-synaptics/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:55:02.771347676 +0300
+@@ -119,7 +119,6 @@
static void SynapticsUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
static Bool DeviceControl(DeviceIntPtr, int);
static void ReadInput(InputInfoPtr);
@@ -824,7 +836,7 @@
static int ControlProc(InputInfoPtr, xDeviceCtl*);
static int SwitchMode(ClientPtr, DeviceIntPtr, int);
static Bool DeviceInit(DeviceIntPtr);
-@@ -1214,7 +1213,7 @@ is_inside_active_area(SynapticsPrivate *
+@@ -1219,7 +1218,7 @@
return inside_area;
}
@@ -833,7 +845,7 @@
timerFunc(OsTimerPtr timer, CARD32 now, pointer arg)
{
InputInfoPtr pInfo = arg;
-@@ -2410,7 +2409,7 @@ repeat_scrollbuttons(const InputInfoPtr
+@@ -2422,7 +2421,7 @@
* milliseconds to wait before calling the function again if no state change
* occurs.
*/
@@ -842,9 +854,11 @@
HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw)
{
SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private);
---- a/src/synproto.h
-+++ b/src/synproto.h
-@@ -105,4 +105,7 @@ extern struct SynapticsProtocolOperation
+Index: xserver-xorg-input-synaptics/src/synproto.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synproto.h 2011-07-05 11:54:55.781347674 +0300
++++ xserver-xorg-input-synaptics/src/synproto.h 2011-07-05 11:55:02.771347676 +0300
+@@ -105,4 +105,7 @@
#endif /* BUILD_PSMCOMM */
extern struct SynapticsProtocolOperations alps_proto_operations;
diff --git a/debian/patches/118_quell_error_msg.patch b/debian/patches/118_quell_error_msg.patch
index b195c04..d6fac22 100644
--- a/debian/patches/118_quell_error_msg.patch
+++ b/debian/patches/118_quell_error_msg.patch
@@ -1,7 +1,8 @@
-diff -Nurp patched//tools/synclient.c working//tools/synclient.c
---- patched//tools/synclient.c 2011-03-02 11:52:26.000000000 -0800
-+++ working//tools/synclient.c 2011-03-02 11:54:13.000000000 -0800
-@@ -390,9 +390,7 @@ dp_get_device(Display *dpy)
+Index: xserver-xorg-input-synaptics/tools/synclient.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/tools/synclient.c 2011-07-05 11:54:31.731347670 +0300
++++ xserver-xorg-input-synaptics/tools/synclient.c 2011-07-05 11:55:06.211347676 +0300
+@@ -391,9 +391,7 @@
unwind:
XFree(properties);
XFreeDeviceList(info);
@@ -12,10 +13,11 @@ diff -Nurp patched//tools/synclient.c working//tools/synclient.c
{
XCloseDevice(dpy, dev);
dev = NULL;
-diff -Nurp patched//tools/syndaemon.c working//tools/syndaemon.c
---- patched//tools/syndaemon.c 2011-03-02 11:52:14.000000000 -0800
-+++ working//tools/syndaemon.c 2011-03-02 11:54:37.000000000 -0800
-@@ -500,9 +500,7 @@ dp_get_device(Display *dpy)
+Index: xserver-xorg-input-synaptics/tools/syndaemon.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/tools/syndaemon.c 2011-07-05 11:54:31.751347670 +0300
++++ xserver-xorg-input-synaptics/tools/syndaemon.c 2011-07-05 11:55:06.211347676 +0300
+@@ -512,9 +512,7 @@
unwind:
XFree(properties);
XFreeDeviceList(info);
diff --git a/debian/patches/119_active_area_touches.patch b/debian/patches/119_active_area_touches.patch
index d66527f..a85711b 100644
--- a/debian/patches/119_active_area_touches.patch
+++ b/debian/patches/119_active_area_touches.patch
@@ -12,9 +12,9 @@ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Index: xserver-xorg-input-synaptics/src/eventcomm.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-04-01 08:38:31.647029257 -0400
-+++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-04-01 08:39:46.215699655 -0400
-@@ -447,7 +447,11 @@
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:55:02.771347676 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:55:08.771347676 +0300
+@@ -455,7 +455,11 @@
if (!priv->has_touch || ecpriv->cur_slot < 0 ||
ecpriv->mt_slot_map[ecpriv->cur_slot] == (uint32_t)-1)
@@ -26,7 +26,7 @@ Index: xserver-xorg-input-synaptics/src/eventcomm.c
if (ecpriv->close_slot)
{
-@@ -459,10 +463,27 @@
+@@ -467,10 +471,27 @@
}
else
{
@@ -57,7 +57,7 @@ Index: xserver-xorg-input-synaptics/src/eventcomm.c
ecpriv->new_touch = FALSE;
}
-@@ -620,7 +641,7 @@
+@@ -628,7 +649,7 @@
ecpriv->cur_vals);
}
}
@@ -68,9 +68,9 @@ Index: xserver-xorg-input-synaptics/src/eventcomm.c
case ABS_MT_TOUCH_MAJOR:
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-04-01 08:38:31.651029289 -0400
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2011-04-01 08:39:09.047363887 -0400
-@@ -1195,7 +1195,7 @@
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:55:02.771347676 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:55:08.771347676 +0300
+@@ -1200,7 +1200,7 @@
* priv->synpara.area_{left|right|top|bottom}_edge are
* all set to zero), the function returns TRUE.
*/
@@ -81,8 +81,8 @@ Index: xserver-xorg-input-synaptics/src/synaptics.c
Bool inside_area = TRUE;
Index: xserver-xorg-input-synaptics/src/synproto.h
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synproto.h 2011-04-01 08:38:31.655029323 -0400
-+++ xserver-xorg-input-synaptics/src/synproto.h 2011-04-01 08:38:31.727029958 -0400
+--- xserver-xorg-input-synaptics.orig/src/synproto.h 2011-07-05 11:55:02.771347676 +0300
++++ xserver-xorg-input-synaptics/src/synproto.h 2011-07-05 11:55:08.771347676 +0300
@@ -81,6 +81,7 @@
struct _SynapticsParameters;
struct SynapticsHwInfo;
diff --git a/debian/patches/120_active_touches_num_fingers.patch b/debian/patches/120_active_touches_num_fingers.patch
index 163a27b..1863426 100644
--- a/debian/patches/120_active_touches_num_fingers.patch
+++ b/debian/patches/120_active_touches_num_fingers.patch
@@ -15,11 +15,11 @@ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
src/eventcomm.h | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
-diff --git a/src/eventcomm.c b/src/eventcomm.c
-index bb22f55..d3fc943 100644
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
-@@ -459,6 +459,7 @@ ProcessTouch(InputInfoPtr pInfo, SynapticsPrivate *priv)
+Index: xserver-xorg-input-synaptics/src/eventcomm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:55:08.771347676 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:55:10.801347676 +0300
+@@ -468,6 +468,7 @@
XI_TouchEnd, 0, ecpriv->touch_mask);
ecpriv->mt_slot_map[ecpriv->cur_slot] = -1;
ecpriv->close_slot = FALSE;
@@ -27,7 +27,7 @@ index bb22f55..d3fc943 100644
}
else
{
-@@ -470,9 +471,12 @@ ProcessTouch(InputInfoPtr pInfo, SynapticsPrivate *priv)
+@@ -479,9 +480,12 @@
int y = valuator_mask_get(ecpriv->touch_mask, y_axis);
if (is_inside_active_area(priv, x, y))
@@ -40,7 +40,7 @@ index bb22f55..d3fc943 100644
else
ecpriv->mt_slot_map[ecpriv->cur_slot] = -1;
}
-@@ -531,7 +535,9 @@ EventProcessEvent(InputInfoPtr pInfo, struct CommData *comm,
+@@ -540,7 +544,9 @@
case EV_SYN:
switch (ev->code) {
case SYN_REPORT:
@@ -51,11 +51,11 @@ index bb22f55..d3fc943 100644
hw->numFingers = 1;
else if (comm->twoFingers)
hw->numFingers = 2;
-diff --git a/src/eventcomm.h b/src/eventcomm.h
-index c6ef87c..d9c9ebb 100644
---- a/src/eventcomm.h
-+++ b/src/eventcomm.h
-@@ -58,6 +58,7 @@ typedef struct {
+Index: xserver-xorg-input-synaptics/src/eventcomm.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.h 2011-07-05 11:55:02.771347676 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.h 2011-07-05 11:55:10.801347676 +0300
+@@ -58,6 +58,7 @@
int num_touches;
struct mtdev *mtdev;
struct grail *grail;
@@ -63,6 +63,3 @@ index c6ef87c..d9c9ebb 100644
} EventcommPrivate;
extern Bool EventProcessEvent(InputInfoPtr pInfo, struct CommData *comm,
---
-1.7.4.1
-
diff --git a/debian/patches/121_semi-mt_num_fingers.patch b/debian/patches/121_semi-mt_num_fingers.patch
index 4ec14a4..7c2563f 100644
--- a/debian/patches/121_semi-mt_num_fingers.patch
+++ b/debian/patches/121_semi-mt_num_fingers.patch
@@ -26,11 +26,11 @@ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
src/eventcomm.h | 5 ++++
2 files changed, 49 insertions(+), 15 deletions(-)
-diff --git a/src/eventcomm.c b/src/eventcomm.c
-index d3fc943..b247934 100644
---- a/src/eventcomm.c
-+++ b/src/eventcomm.c
-@@ -406,11 +406,6 @@ event_query_axis_ranges(InputInfoPtr pInfo)
+Index: xserver-xorg-input-synaptics/src/eventcomm.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:55:10.801347676 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:55:12.731347678 +0300
+@@ -414,11 +414,6 @@
xf86Msg(X_PROBED, "%s: buttons:%s\n", pInfo->name, buf);
}
@@ -42,7 +42,7 @@ index d3fc943..b247934 100644
for (i = ABS_MT_TOUCH_MAJOR; i <= ABS_MT_PRESSURE; i++) {
if (!BitIsOn(ecpriv->absbits, i))
continue;
-@@ -424,6 +419,16 @@ event_query_axis_ranges(InputInfoPtr pInfo)
+@@ -432,6 +427,16 @@
ecpriv->mt_axis_map[i - ABS_MT_TOUCH_MAJOR] = ecpriv->num_mt_axes++;
priv->has_touch = TRUE;
}
@@ -59,7 +59,7 @@ index d3fc943..b247934 100644
}
static Bool
-@@ -453,10 +458,11 @@ ProcessTouch(InputInfoPtr pInfo, SynapticsPrivate *priv)
+@@ -462,10 +467,11 @@
}
if (ecpriv->close_slot)
@@ -75,7 +75,7 @@ index d3fc943..b247934 100644
ecpriv->mt_slot_map[ecpriv->cur_slot] = -1;
ecpriv->close_slot = FALSE;
ecpriv->active_touches--;
-@@ -470,17 +476,22 @@ ProcessTouch(InputInfoPtr pInfo, SynapticsPrivate *priv)
+@@ -479,17 +485,22 @@
int x = valuator_mask_get(ecpriv->touch_mask, x_axis);
int y = valuator_mask_get(ecpriv->touch_mask, y_axis);
@@ -103,7 +103,7 @@ index d3fc943..b247934 100644
{
xf86PostTouchEvent(pInfo->dev,
ecpriv->mt_slot_map[ecpriv->cur_slot],
-@@ -535,7 +546,7 @@ EventProcessEvent(InputInfoPtr pInfo, struct CommData *comm,
+@@ -544,7 +555,7 @@
case EV_SYN:
switch (ev->code) {
case SYN_REPORT:
@@ -112,7 +112,7 @@ index d3fc943..b247934 100644
hw->numFingers = ecpriv->active_touches;
else if (comm->oneFinger)
hw->numFingers = 1;
-@@ -667,6 +678,24 @@ EventProcessEvent(InputInfoPtr pInfo, struct CommData *comm,
+@@ -676,6 +687,24 @@
valuator_mask_set(ecpriv->cur_vals,
ecpriv->mt_axis_map[ev->code - ABS_MT_TOUCH_MAJOR],
ev->value);
@@ -137,11 +137,11 @@ index d3fc943..b247934 100644
}
break;
}
-diff --git a/src/eventcomm.h b/src/eventcomm.h
-index d9c9ebb..4ac36a8 100644
---- a/src/eventcomm.h
-+++ b/src/eventcomm.h
-@@ -59,6 +59,11 @@ typedef struct {
+Index: xserver-xorg-input-synaptics/src/eventcomm.h
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.h 2011-07-05 11:55:10.801347676 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.h 2011-07-05 11:55:12.731347678 +0300
+@@ -59,6 +59,11 @@
struct mtdev *mtdev;
struct grail *grail;
int active_touches;
@@ -153,6 +153,3 @@ index d9c9ebb..4ac36a8 100644
} EventcommPrivate;
extern Bool EventProcessEvent(InputInfoPtr pInfo, struct CommData *comm,
---
-1.7.4.1
-
diff --git a/debian/patches/122_revert_pressure_finger_default.patch b/debian/patches/122_revert_pressure_finger_default.patch
index 8894a50..3a40220 100644
--- a/debian/patches/122_revert_pressure_finger_default.patch
+++ b/debian/patches/122_revert_pressure_finger_default.patch
@@ -19,11 +19,11 @@ Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
src/synaptics.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
-diff --git a/src/synaptics.c b/src/synaptics.c
-index f4e440a..51d3ad0 100644
---- a/src/synaptics.c
-+++ b/src/synaptics.c
-@@ -463,18 +463,13 @@ static void set_default_parameters(InputInfoPtr pInfo)
+Index: xserver-xorg-input-synaptics/src/synaptics.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2011-07-05 11:55:08.771347676 +0300
++++ xserver-xorg-input-synaptics/src/synaptics.c 2011-07-05 11:55:14.761347678 +0300
+@@ -469,18 +469,13 @@
fingerLow = priv->minp + range * (25.0/256);
fingerHigh = priv->minp + range * (30.0/256);
fingerPress = priv->minp + range * 1.000;
@@ -43,6 +43,3 @@ index f4e440a..51d3ad0 100644
range = priv->maxw - priv->minw;
/* scaling based on defaults below and a tool width of 16 */
---
-1.7.4.1
-
diff --git a/debian/patches/123_order_ProcessTouch_for_numFingers.patch b/debian/patches/123_order_ProcessTouch_for_numFingers.patch
index 7ad1177..e482d85 100644
--- a/debian/patches/123_order_ProcessTouch_for_numFingers.patch
+++ b/debian/patches/123_order_ProcessTouch_for_numFingers.patch
@@ -1,8 +1,8 @@
Index: xserver-xorg-input-synaptics/src/eventcomm.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-04-05 11:02:20.297458106 -0400
-+++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-04-05 11:02:48.753536302 -0400
-@@ -547,6 +547,7 @@
+--- xserver-xorg-input-synaptics.orig/src/eventcomm.c 2011-07-05 11:55:12.731347678 +0300
++++ xserver-xorg-input-synaptics/src/eventcomm.c 2011-07-05 11:55:17.051347678 +0300
+@@ -555,6 +555,7 @@
case EV_SYN:
switch (ev->code) {
case SYN_REPORT:
@@ -10,7 +10,7 @@ Index: xserver-xorg-input-synaptics/src/eventcomm.c
if (priv->has_touch && ecpriv->active_touches < 2)
hw->numFingers = ecpriv->active_touches;
else if (comm->oneFinger)
-@@ -558,7 +559,6 @@
+@@ -566,7 +567,6 @@
else
hw->numFingers = 0;
*hwRet = *hw;
diff --git a/debian/patches/124_syndaemon_events.patch b/debian/patches/124_syndaemon_events.patch
index 31f0087..05f8a47 100644
--- a/debian/patches/124_syndaemon_events.patch
+++ b/debian/patches/124_syndaemon_events.patch
@@ -22,13 +22,13 @@ probably should not be committed upstream though.
tools/syndaemon.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
-diff --git a/tools/syndaemon.c b/tools/syndaemon.c
-index 0309fb5..1c799c6 100644
---- a/tools/syndaemon.c
-+++ b/tools/syndaemon.c
-@@ -415,6 +415,14 @@ void record_main_loop(Display* display, double idle_time) {
-
- XRecordProcessReplies(dpy_data);
+Index: xserver-xorg-input-synaptics/tools/syndaemon.c
+===================================================================
+--- xserver-xorg-input-synaptics.orig/tools/syndaemon.c 2011-07-05 11:55:06.211347676 +0300
++++ xserver-xorg-input-synaptics/tools/syndaemon.c 2011-07-05 11:55:19.281347678 +0300
+@@ -429,6 +429,14 @@
+ fprintf(stderr, "bad event received, major opcode %d\n", event.type);
+ }
+ /* If there are any events left over, they are in error. Drain them
+ * from the connection queue so we don't get stuck. */
@@ -41,6 +41,3 @@ index 0309fb5..1c799c6 100644
if (!ignore_modifier_keys && cbres.key_event) {
disable_event = 1;
}
---
Reply to: