diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/synaptics.c | 42 | ||||
| -rw-r--r-- | src/synapticsstr.h | 2 |
2 files changed, 0 insertions, 44 deletions
diff --git a/src/synaptics.c b/src/synaptics.c index 07b012f..955b042 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -703,12 +703,6 @@ set_default_parameters(InputInfoPtr pInfo) pars->touchpad_off = xf86SetIntOption(opts, "TouchpadOff", TOUCHPAD_ON); if (priv->has_scrollbuttons) { - priv->has_trackpoint_buttons = xf86SetBoolOption(opts, "HasTrackpointButtons", FALSE); - if (priv->has_trackpoint_buttons) - priv->has_scrollbuttons = FALSE; - } - - if (priv->has_scrollbuttons) { pars->updown_button_scrolling = xf86SetBoolOption(opts, "UpDownScrolling", TRUE); pars->leftright_button_scrolling = @@ -1087,7 +1081,6 @@ SynapticsReset(SynapticsPrivate * priv) priv->mid_emu_state = MBE_OFF; priv->nextRepeat = 0; priv->lastButtons = 0; - priv->lastTrackpointButtons = 0; priv->prev_z = 0; priv->prevFingers = 0; priv->num_active_touches = 0; @@ -2786,34 +2779,6 @@ handle_clickfinger(SynapticsPrivate * priv, struct SynapticsHwState *hw) } } -static void -handle_trackpoint_buttons(const InputInfoPtr pInfo, - struct SynapticsHwState *hw) -{ - SynapticsPrivate *priv = (SynapticsPrivate *) (pInfo->private); - unsigned int buttons, change; - int id; - - buttons = (hw->multi[0] ? 0x1 : 0) | - (hw->multi[1] ? 0x4 : 0) | - (hw->multi[2] ? 0x2 : 0); - - change = buttons ^ priv->lastTrackpointButtons; - while (change) { - id = ffs(change); /* number of first set bit 1..32 is returned */ - change &= ~(1 << (id - 1)); - xf86PostButtonEvent(pInfo->dev, FALSE, id, - (buttons & (1 << (id - 1))), - 0, 0); - } - - hw->multi[0] = FALSE; - hw->multi[1] = FALSE; - hw->multi[2] = FALSE; - - priv->lastTrackpointButtons = buttons; -} - /* Adjust the hardware state according to the extra buttons (if the touchpad * has any and not many touchpads do these days). These buttons are up/down * tilt buttons and/or left/right buttons that then map into a specific @@ -3169,13 +3134,6 @@ HandleState(InputInfoPtr pInfo, struct SynapticsHwState *hw, CARD32 now, Bool using_cumulative_coords = FALSE; Bool ignore_motion; - /* if we have phys. trackpoint buttons wired up to the touchpad, process - * them first. They belong to a different device so we don't care about - * sending out motion events before the trackpoint buttons. This makes - * the code a lot easier to slot in */ - if (priv->has_trackpoint_buttons) - handle_trackpoint_buttons(pInfo, hw); - /* We need both and x/y, the driver can't handle just one of the two * yet. But since it's possible to hit a phys button on non-clickpads * without ever getting motion data first, we must continue with 0/0 for diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 91c41fc..f8ab14e 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -289,7 +289,6 @@ struct _SynapticsPrivateRec { int repeatButtons; /* buttons for repeat */ int nextRepeat; /* Time when to trigger next auto repeat event */ int lastButtons; /* last state of the buttons */ - int lastTrackpointButtons; /* last state of the trackpoint buttons */ int prev_z; /* previous z value, for palm detection */ int prevFingers; /* previous numFingers, for transition detection */ int avg_width; /* weighted average of previous fingerWidth values */ @@ -309,7 +308,6 @@ struct _SynapticsPrivateRec { Bool has_pressure; /* device reports pressure */ Bool has_width; /* device reports finger width */ Bool has_scrollbuttons; /* device has physical scrollbuttons */ - Bool has_trackpoint_buttons;/* device has trackpoint buttons wired to touchpad */ Bool has_semi_mt; /* device is only semi-multitouch capable */ Bool has_mt_palm_detect; /* device reports per finger width and pressure */ |