https://bugs.freedesktop.org/show_bug.cgi?id=66532#c5

--- a/src/synaptics.c
+++ b/src/synaptics.c  "Taken from https://bugs.freedesktop.org/show_bug.cgi?id=66532#c5"
@@ -2796,6 +2796,7 @@
     int delay = 1000000000;
     int timeleft;
     Bool inside_active_area;
+    int i;

     /* If touchpad is switched off, we skip the whole thing and return delay */
     if (para->touchpad_off == TOUCHPAD_OFF) {
@@ -2830,6 +2831,34 @@

     inside_active_area = is_inside_active_area(priv, hw->x, hw->y);

+    if (para->clickpad) {
+        hw->numFingers = 0;
+        for (i = 0; i < hw->num_mt_mask; i++) {
+            ValuatorMask *f1;
+            Bool mt_inside;
+            double x1, y1;
+
+            if (hw->slot_state[i] == SLOTSTATE_EMPTY ||
+                    hw->slot_state[i] == SLOTSTATE_CLOSE)
+                continue;
+
+            f1 = hw->mt_mask[i];
+            x1 = valuator_mask_get_double(f1, 0);
+            y1 = valuator_mask_get_double(f1, 1);
+            mt_inside = is_inside_active_area(priv, x1, y1);
+            if (!mt_inside) {
+                hw->slot_state[i] = SLOTSTATE_EMPTY;
+                continue;
+            }
+            if (!inside_active_area) {
+                inside_active_area = TRUE;
+                hw->x = x1;
+                hw->y = y1;
+            }
+            hw->numFingers++;
+        }
+    }
+
     /* these two just update hw->left, right, etc. */
     update_hw_button_state(pInfo, hw, priv->old_hw_state, now, &delay);