File xf86-input-synaptics-fix-clickpad-capabilities.... of Package xf86-input-synaptics

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-synaptics-fix-clickpad-capabilities.diff of Package xf86-input-synaptics (Revision 9052c230f6fa7b83a00b8d481f1fbb02)

Currently displaying revision 9052c230f6fa7b83a00b8d481f1fbb02 , Show latest

---
 src/eventcomm.c |   29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

Index: xf86-input-synaptics-1.5.99.903/src/eventcomm.c
===================================================================
--- xf86-input-synaptics-1.5.99.903.orig/src/eventcomm.c
+++ xf86-input-synaptics-1.5.99.903/src/eventcomm.c
@@ -380,6 +380,25 @@ event_get_abs(InputInfoPtr pInfo, int fd
 }
 
 static void
+event_query_clickpad(InputInfoPtr pInfo)
+{
+    SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
+
+    /* clickpad device reports only the single left button mask */
+    if (priv->has_left && !priv->has_right && !priv->has_middle &&
+        /*!priv->has_double &&*/
+        priv->model == MODEL_SYNAPTICS) {
+        priv->is_clickpad = TRUE;
+        /* enable right/middle button caps; otherwise gnome-settings-daemon
+         * will ignore this device for left/right-hand setup because of a
+         * single-button
+         */
+        priv->has_right = priv->has_middle = TRUE;
+        xf86IDrvMsg(pInfo, X_INFO, "is Clickpad device\n");
+    }
+}
+
+static void
 event_query_led(InputInfoPtr pInfo)
 {
     SynapticsPrivate *priv = (SynapticsPrivate *)pInfo->private;
@@ -514,12 +533,6 @@ event_query_axis_ranges(InputInfoPtr pIn
         strcat(buf, " scroll-buttons");
 
     xf86IDrvMsg(pInfo, X_PROBED, "buttons:%s\n", buf);
-
-    /* clickpad device reports only the single left button mask */
-    if (priv->has_left && !priv->has_right && !priv->has_middle && !priv->has_double) {
-        priv->is_clickpad = TRUE;
-        xf86IDrvMsg(pInfo, X_PROBED, "is Clickpad device\n");
-    }
 }
 
 static Bool
@@ -961,12 +974,14 @@ EventReadDevDimensions(InputInfoPtr pInf
 #endif
         event_query_axis_ranges(pInfo);
     }
-    event_query_led(pInfo);
     event_query_model(pInfo->fd, &priv->model, &priv->id_vendor,
                       &priv->id_product);
 
     xf86IDrvMsg(pInfo, X_PROBED, "Vendor %#hx Product %#hx\n",
                 priv->id_vendor, priv->id_product);
+
+    event_query_clickpad(pInfo);
+    event_query_led(pInfo);
 }
 
 static Bool

Places

File xf86-input-synaptics-fix-clickpad-capabilities.diff of Package xf86-input-synaptics (Revision 9052c230f6fa7b83a00b8d481f1fbb02)

Places