[gpm][PATCH] 2 wheels support for imps2

[Pozsar Balazs]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---559023410-758783491-1024189867=:26665
Content-Type: TEXT/PLAIN; charset=US-ASCII


Hi!

This is a patch against 1.20.0, and unfortunately doesn't apply to current
cvs version because the m_imps2 function has changed.

A4Tech dual-wheel mice send these bytes in imps2 mode:
data[3]=
 0xff first wheel up
 0x01 first wheel down
 0xfe second wheel up
 0x02 second wheel down

Current code translates both wheels as if the first wheel was scrolled,
and doesn't even try to repeat them.

Using this patch, when is -Rimps2 mode, X receives button4 and button5
events for scrooling the first wheel, and button6 and button7 events for
the second, just as if you configured X to control the mice itself in
IMPS/2 mode.

Comments welcome :)

ps: I haven't tried the current cvs, only looked at the source, but I
think m_imps2/r_imps2 is messed up there... m_imps2 stores scrooling
information (from data[3]) in state->wdx and state->wdy, while r_imps2
checks bits of state->buttons. Am I missing something?

-- 
pozsy

---559023410-758783491-1024189867=:26665
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="gpm-1.20.0-2wheels"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.GSO.4.30.0206160311070.26665@balu>
Content-Description: 
Content-Disposition: attachment; filename="gpm-1.20.0-2wheels"

ZGlmZiAtTmF1ciBncG0tMS4yMC4wL3NyYy9oZWFkZXJzL2dwbS5oIGdwbS10
b3Jvay9zcmMvaGVhZGVycy9ncG0uaA0KLS0tIGdwbS0xLjIwLjAvc3JjL2hl
YWRlcnMvZ3BtLmgJU2F0IEZlYiAyMyAxNTo0MjoyMyAyMDAyDQorKysgZ3Bt
LXRvcm9rL3NyYy9oZWFkZXJzL2dwbS5oCVNhdCBKdW4gIDEgMjA6Mjg6MzQg
MjAwMg0KQEAgLTc2LDYgKzc2LDggQEANCiANCiAvKi4uLi4uLi4uLi4uLi4u
Li4uLi4uLi4uLi4uLi4uLi4uLi4uLi4uLiBDZmcgYnV0dG9ucyAqLw0KIA0K
KyNkZWZpbmUgR1BNX0JfRE9XTjIgICAgIDEyOA0KKyNkZWZpbmUgR1BNX0Jf
VVAyICAgICAgIDY0DQogI2RlZmluZSBHUE1fQl9ET1dOICAgICAgMzINCiAj
ZGVmaW5lIEdQTV9CX1VQICAgICAgICAxNg0KICNkZWZpbmUgR1BNX0JfRk9V
UlRIICAgIDgNCmRpZmYgLU5hdXIgZ3BtLTEuMjAuMC9zcmMvbWljZS5jIGdw
bS10b3Jvay9zcmMvbWljZS5jDQotLS0gZ3BtLTEuMjAuMC9zcmMvbWljZS5j
CVNhdCBGZWIgMjMgMTU6NDI6MjMgMjAwMg0KKysrIGdwbS10b3Jvay9zcmMv
bWljZS5jCVNhdCBKdW4gIDEgMjI6Mjg6MTggMjAwMg0KQEAgLTUxMiwxMiAr
NTEyLDEzIEBADQogICAgICAgKGR5ID4gMCA/IDB4MjAgOiAwKTsNCiAgICBi
dWZmZXJbMV0gPSBkeCAmIDB4RkY7DQogICAgYnVmZmVyWzJdID0gKC1keSkg
JiAweEZGOw0KLSAgIGJ1ZmZlclszXSA9IA0KLSAgICAgIChzdGF0ZS0+YnV0
dG9ucyAmIEdQTV9CX1VQID8gLTEgOiAwKSArIA0KLSAgICAgIChzdGF0ZS0+
YnV0dG9ucyAmIEdQTV9CX0RPV04gPyAxIDogMCk7DQorICAgYnVmZmVyWzNd
ID0NCisgICAgICAoc3RhdGUtPmJ1dHRvbnMgJiBHUE1fQl9VUDIgPyAtMiA6
IDApICsNCisgICAgICAoc3RhdGUtPmJ1dHRvbnMgJiBHUE1fQl9VUCA/IC0x
IDogMCkgKw0KKyAgICAgIChzdGF0ZS0+YnV0dG9ucyAmIEdQTV9CX0RPV04g
PyAxIDogMCkgKw0KKyAgICAgIChzdGF0ZS0+YnV0dG9ucyAmIEdQTV9CX0RP
V04yID8gMiA6IDApOw0KICAgDQogICAgcmV0dXJuIHdyaXRlKGZkLGJ1ZmZl
ciw0KTsNCi0NCiB9DQogDQogc3RhdGljIGludCBNX2xvZ2ltc2MoR3BtX0V2
ZW50ICpzdGF0ZSwgIHVuc2lnbmVkIGNoYXIgKmRhdGEpIC8qIHNhbWUgYXMg
bXNjICovDQpAQCAtNTkyLDggKzYwOSwyMyBAQA0KIHN0YXRpYyBpbnQgTV9p
bXBzMihHcG1fRXZlbnQgKnN0YXRlLCAgc2lnbmVkIGNoYXIgKmRhdGEpDQog
ew0KICAgIGludCByZXQgPSBNX3BzMihzdGF0ZSwgZGF0YSk7DQotICAgc3Rh
dGUtPmJ1dHRvbnMgfD0gKGRhdGFbM108MCkgKiBHUE1fQl9VUCArIChkYXRh
WzNdPjApICogR1BNX0JfRE9XTjsgDQotICAgIA0KKyAgIGlmIChkYXRhWzNd
ID09IC0yKQ0KKyAgICAgIHN0YXRlLT5idXR0b25zIHw9IEdQTV9CX1VQMjsN
CisgICBlbHNlDQorICAgICAgc3RhdGUtPmJ1dHRvbnMgJj0gfkdQTV9CX1VQ
MjsNCisgICBpZiAoZGF0YVszXSA9PSAtMSkNCisgICAgICBzdGF0ZS0+YnV0
dG9ucyB8PSBHUE1fQl9VUDsNCisgICBlbHNlDQorICAgICAgc3RhdGUtPmJ1
dHRvbnMgJj0gfkdQTV9CX1VQOw0KKyAgIGlmIChkYXRhWzNdID09IDB4MDEp
DQorICAgICAgc3RhdGUtPmJ1dHRvbnMgfD0gR1BNX0JfRE9XTjsNCisgICBl
bHNlDQorICAgICAgc3RhdGUtPmJ1dHRvbnMgJj0gfkdQTV9CX0RPV047DQor
ICAgaWYgKGRhdGFbM10gPT0gMHgwMikNCisgICAgICBzdGF0ZS0+YnV0dG9u
cyB8PSBHUE1fQl9ET1dOMjsNCisgICBlbHNlDQorICAgICAgc3RhdGUtPmJ1
dHRvbnMgJj0gfkdQTV9CX0RPV04yOw0KKw0KICAgIHJldHVybiByZXQ7DQog
fQ0KIA0K
---559023410-758783491-1024189867=:26665--