Revert "Add another third state to TouchpadOff for disabling all but button clicks"

This third state is not needed, the behaviour of the touchpad driver is now
good enough to not need an external syndaemon instance to toggle this third
state.

This reverts commit eea73358760c7ff9c9dac061f265753637c6f25c.

Conflicts:
	man/synaptics.man
	src/synaptics.c

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

7 files changed, 15 insertions, 46 deletions

diff --git a/man/synaptics.man b/man/synaptics.man
index 499fbe8..97f0114 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -263,7 +263,6 @@ l l.
 0	Touchpad is enabled
 1	Touchpad is switched off
 2	Only tapping and scrolling is switched off
-3	Only physical clicks are possible
 .TE
 Property: "Synaptics Off"
 .TP
diff --git a/man/syndaemon.man b/man/syndaemon.man
index 30ea20b..87691d8 100644
--- a/man/syndaemon.man
+++ b/man/syndaemon.man
@@ -45,11 +45,9 @@ A pid file will only be created if the program is started in daemon
 mode.
 .LP
 .TP
-\fB\-t\fP [off|tapping|click-only]
- Disable state. "off" for disabling the touchpad entirely, "tapping" for
- disabling tapping and scrolling only, "click-only" for disabling
- everything but physical clicks. The default if this option is missing is
- "off". If this option is given without a mode it defaults to "tapping".
+\fB\-t\fP
+Only disable tapping and scrolling, not mouse movements, in response
+to keyboard activity.
 .LP
 .TP
 \fB\-k\fP
diff --git a/src/properties.c b/src/properties.c
index 525649c..4c75797 100644
--- a/src/properties.c
+++ b/src/properties.c
@@ -600,7 +600,7 @@ SetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
 
         off = *(CARD8 *) prop->data;
 
-        if (off > 3)
+        if (off > 2)
             return BadValue;
 
         para->touchpad_off = off;
diff --git a/src/synaptics.c b/src/synaptics.c
index 640fa6f..aeb1c57 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -1810,8 +1810,7 @@ SelectTapButton(SynapticsPrivate * priv, enum EdgeType edge)
 {
     enum TapEvent tap;
 
-    if (priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF ||
-        priv->synpara.touchpad_off == TOUCHPAD_CLICK_ONLY) {
+    if (priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) {
         priv->tap_button = 0;
         return;
     }
@@ -2350,9 +2349,7 @@ HandleScrolling(SynapticsPrivate * priv, struct SynapticsHwState *hw,
     SynapticsParameters *para = &priv->synpara;
     int delay = 1000000000;
 
-    if ((priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) ||
-        (priv->synpara.touchpad_off == TOUCHPAD_CLICK_ONLY) ||
-        (priv->finger_state == FS_BLOCKED)) {
+    if ((priv->synpara.touchpad_off == TOUCHPAD_TAP_OFF) || (priv->finger_state == FS_BLOCKED)) {
         stop_coasting(priv);
         priv->circ_scroll_on = FALSE;
         priv->vert_scroll_edge_on = FALSE;
@@ -2964,9 +2961,6 @@ HandleTouches(InputInfoPtr pInfo, struct SynapticsHwState *hw)
     Bool restart_touches = FALSE;
     int i;
 
-    if (para->touchpad_off == TOUCHPAD_CLICK_ONLY)
-        goto out;
-
     if (para->click_action[F3_CLICK1] || para->tap_action[F3_TAP])
         min_touches = 4;
     else if (para->click_action[F2_CLICK1] || para->tap_action[F2_TAP] ||
@@ -3213,8 +3207,7 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now,
     }
 
     /* Post events */
-    if (finger >= FS_TOUCHED && (dx || dy) && !ignore_motion &&
-            (para->touchpad_off != TOUCHPAD_CLICK_ONLY))
+    if (finger >= FS_TOUCHED && (dx || dy) && !ignore_motion)
         xf86PostMotionEvent(pInfo->dev, 0, 0, 2, dx, dy);
 
     if (priv->mid_emu_state == MBE_LEFT_CLICK) {
diff --git a/src/synapticsstr.h b/src/synapticsstr.h
index bf77e57..b8a3492 100644
--- a/src/synapticsstr.h
+++ b/src/synapticsstr.h
@@ -63,7 +63,6 @@ enum OffState {
     TOUCHPAD_ON = 0,
     TOUCHPAD_OFF = 1,
     TOUCHPAD_TAP_OFF = 2,
-    TOUCHPAD_CLICK_ONLY = 3
 };
 
 enum TapEvent {
@@ -201,7 +200,6 @@ typedef struct _SynapticsParameters {
                                  * 0 : Not off
                                  * 1 : Off
                                  * 2 : Only tapping and scrolling off
-                                 * 3 : All but physical clicks off
                                  */
     Bool locked_drags;          /* Enable locked drags */
     int locked_drag_time;       /* timeout for locked drags */
diff --git a/tools/synclient.c b/tools/synclient.c
index 98285ac..ac31a66 100644
--- a/tools/synclient.c
+++ b/tools/synclient.c
@@ -105,7 +105,7 @@ static struct Parameter params[] = {
     {"UpDownScrollRepeat",    PT_BOOL,   0, 1,     SYNAPTICS_PROP_BUTTONSCROLLING_REPEAT,   8,	0},
     {"LeftRightScrollRepeat", PT_BOOL,   0, 1,     SYNAPTICS_PROP_BUTTONSCROLLING_REPEAT,   8,	1},
     {"ScrollButtonRepeat",    PT_INT,    SBR_MIN , SBR_MAX, SYNAPTICS_PROP_BUTTONSCROLLING_TIME, 32,	0},
-    {"TouchpadOff",           PT_INT,    0, 3,     SYNAPTICS_PROP_OFF,		8,	0},
+    {"TouchpadOff",           PT_INT,    0, 2,     SYNAPTICS_PROP_OFF,		8,	0},
     {"LockedDrags",           PT_BOOL,   0, 1,     SYNAPTICS_PROP_LOCKED_DRAGS,	8,	0},
     {"LockedDragTimeout",     PT_INT,    0, 30000, SYNAPTICS_PROP_LOCKED_DRAGS_TIMEOUT,	32,	0},
     {"RTCornerButton",        PT_INT,    0, SYN_MAX_BUTTONS, SYNAPTICS_PROP_TAP_ACTION,	8,	0},
diff --git a/tools/syndaemon.c b/tools/syndaemon.c
index b181d16..29e75f5 100644
--- a/tools/syndaemon.c
+++ b/tools/syndaemon.c
@@ -50,8 +50,7 @@
 enum TouchpadState {
     TouchpadOn = 0,
     TouchpadOff = 1,
-    TappingOff = 2,
-    ClickOnly = 3
+    TappingOff = 2
 };
 
 static Bool pad_disabled
@@ -74,7 +73,7 @@ static void
 usage(void)
 {
     fprintf(stderr,
-            "Usage: syndaemon [-i idle-time] [-m poll-delay] [-d] [-t [off|tapping|click-only]] [-k]\n");
+            "Usage: syndaemon [-i idle-time] [-m poll-delay] [-d] [-t] [-k]\n");
     fprintf(stderr,
             "  -i How many seconds to wait after the last key press before\n");
     fprintf(stderr, "     enabling the touchpad. (default is 2.0s)\n");
@@ -83,10 +82,7 @@ usage(void)
     fprintf(stderr, "  -d Start as a daemon, i.e. in the background.\n");
     fprintf(stderr, "  -p Create a pid file with the specified name.\n");
     fprintf(stderr,
-            "  -t Disable state.\n"
-            "     'off' for disabling the touchpad entirely, \n"
-            "     'tapping' for disabling tapping and scrolling only,\n"
-            "     'click-only' for disabling everything but physical clicks.\n");
+            "  -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");
@@ -551,7 +547,7 @@ main(int argc, char *argv[])
     int use_xrecord = 0;
 
     /* Parse command line parameters */
-    while ((c = getopt(argc, argv, ":i:m:dp:kKR?v")) != EOF) {
+    while ((c = getopt(argc, argv, "i:m:dtp:kKR?v")) != EOF) {
         switch (c) {
         case 'i':
             idle_time = atof(optarg);
@@ -562,6 +558,9 @@ main(int argc, char *argv[])
         case 'd':
             background = 1;
             break;
+        case 't':
+            disable_state = TappingOff;
+            break;
         case 'p':
             pid_file = optarg;
             break;
@@ -579,24 +578,6 @@ main(int argc, char *argv[])
             verbose = 1;
             break;
         case '?':
-            if (optopt != 't')
-                usage();
-            else {
-                if (optind < argc) {
-                    if (argv[optind][0] == '-')
-                        disable_state = TappingOff;
-                    else if (strcmp(argv[optind], "off") == 0)
-                        disable_state = TouchpadOff;
-                    else if (strcmp(argv[optind], "tapping") == 0)
-                        disable_state = TappingOff;
-                    else if (strcmp(argv[optind], "click-only") == 0)
-                        disable_state = ClickOnly;
-                    else
-                        usage();
-                } else
-                    disable_state = TappingOff;
-            }
-            break;
         default:
             usage();
             break;