xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nusb/kb: fix continuous scrollwheel delta not being reported (thanks sam-d)

Browse source
This commit is contained in:
cinap_lenrek 2019-03-21 01:27:28 +01:00
parent 678be83990
commit 58668339bc
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sys/src/cmd/nusb/kb/kb.c
View file

@ -761,7 +761,7 @@ readerproc(void* a)
continue; continue;
/* combine all the slots */ /* combine all the slots */
abs = x = y = b = 0; abs = x = y = z = b = 0;
for(i=0; i<p.ns; *l = *s, i++){ for(i=0; i<p.ns; *l = *s, i++){
s = &p.s[i]; s = &p.s[i];
@ -773,7 +773,7 @@ readerproc(void* a)
*l = *s; *l = *s;
/* convet absolute z to relative */ /* convet absolute z to relative */
z = s->z; z += s->z;
if(s->abs & 4) if(s->abs & 4)
z -= l->z; z -= l->z;
@ -783,10 +783,10 @@ readerproc(void* a)
i, s->id, s->b, s->m, i, s->id, s->b, s->m,
(uint)s->x / 2147483648.0, (uint)s->x / 2147483648.0,
(uint)s->y / 2147483648.0, (uint)s->y / 2147483648.0,
z); s->z);
else else
fprint(2, "ptr[%d]: id=%x b=%x m=%x x=%d y=%d z=%d\n", fprint(2, "ptr[%d]: id=%x b=%x m=%x x=%d y=%d z=%d\n",
i, s->id, s->b, s->m, s->x, s->y, z); i, s->id, s->b, s->m, s->x, s->y, s->z);
} }
/* map to mouse buttons */ /* map to mouse buttons */
@ -795,8 +795,6 @@ readerproc(void* a)
b |= 2; b |= 2;
if(s->b & 2) if(s->b & 2)
b |= 4; b |= 4;
if(z != 0)
b |= z > 0 ? 8 : 16;
/* X/Y are absolute? */ /* X/Y are absolute? */
if((s->abs & 3) == 3){ if((s->abs & 3) == 3){
@ -815,7 +813,10 @@ readerproc(void* a)
} }
} }
if(abs || x != 0 || y != 0 || b != lastb){ if(z != 0)
b |= z > 0 ? 8 : 16;
if(abs || x != 0 || y != 0 || z != 0 || b != lastb){
lastb = b; lastb = b;
if(f->minfd < 0){ if(f->minfd < 0){