diff options
author | Vojtech Pavlik <vojtech@suse.cz> | 2005-07-15 02:50:08 -0400 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-15 02:50:08 -0400 |
commit | 7b4019d04895de7407c9989895c3664c24ed01f7 (patch) | |
tree | 0bb113f175c7c4d977612955ef606ebe9f5a2f81 | |
parent | bc5d04822bd9f34ea93a681f05f5e5683935d574 (diff) |
Input: psmouse - wheel mice (imps, exps) always have 3rd button
There are wheel mice that respond to Logitech probes and report
that they have only 2 buttons (such as e-Aser mouse) and this
stops the wheel from being used as a middle button. Change the
driver to always report BTN_MIDDLE capability if a wheel is
present.
Also, never reset BTN_RIGHT capability in logips2pp code - there
are no Logitech mice that have only one button and if some other
mice happen to respond to Logitech's query we could do the wrong
thing.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r-- | drivers/input/mouse/logips2pp.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/psmouse-base.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c index 5ab1bd7d529d..48d2b20d2642 100644 --- a/drivers/input/mouse/logips2pp.c +++ b/drivers/input/mouse/logips2pp.c | |||
@@ -385,8 +385,6 @@ int ps2pp_init(struct psmouse *psmouse, int set_properties) | |||
385 | 385 | ||
386 | if (buttons < 3) | 386 | if (buttons < 3) |
387 | clear_bit(BTN_MIDDLE, psmouse->dev.keybit); | 387 | clear_bit(BTN_MIDDLE, psmouse->dev.keybit); |
388 | if (buttons < 2) | ||
389 | clear_bit(BTN_RIGHT, psmouse->dev.keybit); | ||
390 | 388 | ||
391 | if (model_info) | 389 | if (model_info) |
392 | ps2pp_set_model_properties(psmouse, model_info, use_ps2pp); | 390 | ps2pp_set_model_properties(psmouse, model_info, use_ps2pp); |
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c index 19785a6c5abd..2bb2fe78bdca 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c | |||
@@ -344,6 +344,7 @@ static int intellimouse_detect(struct psmouse *psmouse, int set_properties) | |||
344 | return -1; | 344 | return -1; |
345 | 345 | ||
346 | if (set_properties) { | 346 | if (set_properties) { |
347 | set_bit(BTN_MIDDLE, psmouse->dev.keybit); | ||
347 | set_bit(REL_WHEEL, psmouse->dev.relbit); | 348 | set_bit(REL_WHEEL, psmouse->dev.relbit); |
348 | 349 | ||
349 | if (!psmouse->vendor) psmouse->vendor = "Generic"; | 350 | if (!psmouse->vendor) psmouse->vendor = "Generic"; |
@@ -376,6 +377,7 @@ static int im_explorer_detect(struct psmouse *psmouse, int set_properties) | |||
376 | return -1; | 377 | return -1; |
377 | 378 | ||
378 | if (set_properties) { | 379 | if (set_properties) { |
380 | set_bit(BTN_MIDDLE, psmouse->dev.keybit); | ||
379 | set_bit(REL_WHEEL, psmouse->dev.relbit); | 381 | set_bit(REL_WHEEL, psmouse->dev.relbit); |
380 | set_bit(BTN_SIDE, psmouse->dev.keybit); | 382 | set_bit(BTN_SIDE, psmouse->dev.keybit); |
381 | set_bit(BTN_EXTRA, psmouse->dev.keybit); | 383 | set_bit(BTN_EXTRA, psmouse->dev.keybit); |