[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#612926: xserver-xorg-input-synaptics: after upgrade to 1.3.0-2 touchpad ALPS serioulsy broken



Norbert Preining <preining@logic.at> (12/02/2011):
> Without any xorg.conf I get a much better situation
[…]

OK, what I suspected.

> Anything else I can do?
> 
> (I still consider it a bug. AFAIS the values I have in my config file
> are fine and within the ranges, and they worked for ages)

Apply the first patch. That should let you use xorg.conf and have
something working as when you're running without xorg.conf.

Applying the second patch might help further.

It'd be nice to report what happens with only the first one applied,
and what happens when both are applied.

KiBi.
From 88e2ed7dcbba6644cf3f92bd187cc15de5904e70 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 11 Feb 2011 17:57:56 +0100
Subject: [PATCH 1/2] Don't run autodevprobe on configured device.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
 src/synaptics.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 53c3685..6d9d509 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -265,7 +265,7 @@ SetDeviceAndProtocol(LocalDevicePtr local)
 	    proto = SYN_PROTO_ALPS;
 	} else { /* default to auto-dev */
 #ifdef BUILD_EVENTCOMM
-	    if (event_proto_operations.AutoDevProbe(local))
+	    if (!device && event_proto_operations.AutoDevProbe(local))
 		proto = SYN_PROTO_EVENT;
 #endif
 	}
-- 
1.7.2.3

From 19fb2580e57b8712847ea3597b18c8cf77070c17 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Fri, 11 Feb 2011 17:58:55 +0100
Subject: [PATCH 2/2] Collect options.

Signed-off-by: Cyril Brulebois <kibi@debian.org>
---
 src/synaptics.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/synaptics.c b/src/synaptics.c
index 6d9d509..140b2d7 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -684,6 +684,8 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
     local->conf_idev               = dev;
     local->always_core_feedback    = 0;
 
+    xf86CollectInputOptions(pInfo, NULL, NULL);
+
     xf86Msg(X_INFO, "Synaptics touchpad driver version %s\n", PACKAGE_VERSION);
 
     xf86CollectInputOptions(local, NULL, NULL);
-- 
1.7.2.3

Attachment: signature.asc
Description: Digital signature


Reply to: