inkletblot/plan9port
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmd/devdraw: avoid use of X button state field
Some checks failed
GitHub Actions Build / Build-on-Ubuntu (push) Has been cancelled
Details
GitHub Actions Build / Build-on-macOS (push) Has been cancelled
Details

Browse Source 
This bug is an intermittent annoyance and does not seem likely to be
fixed soon. It means that every so often my acme becomes unusable
because it behaves as if a mouse button is permanently set.

Avoid that issue by keeping track of mouse button state directly.

While we're about it, fix another annoying issue: under Linux the
FocusOut event reset the kstate field but not the kbuttons field,
meaning that the buttons state could inappropriately persist. This
happened occasionally by accident, but was easy to reproduce: with the
mouse button held down, drag outside the window and click Alt-Tab to
switch away from the window. We see a KeyDown event followed by FocusOut
but no KeyUp event.

Change-Id: I3708316478c80c41806d7157ae9929c6cd84b662
This commit is contained in:
Roger Peppe 2025-03-29 13:10:49 +00:00 committed by Dan Cross
parent 13582b1a89
commit 9da5b44513
1 changed files with 12 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/cmd/devdraw/x11-screen.c
View File

@ -502,6 +502,7 @@ runxevent(XEvent *xev)
* so clear out the keyboard state when we lose the focus. * so clear out the keyboard state when we lose the focus.
*/ */
_x.kstate = 0; _x.kstate = 0;
_x.kbuttons = 0;
_x.altdown = 0; _x.altdown = 0;
gfx_abortcompose(w->client); gfx_abortcompose(w->client);
break; break;
@ -1275,10 +1276,18 @@ _xtoplan9kbd(XEvent *e)
return k+0; return k+0;
} }
int
_xtoplan9buttons(unsigned int b)
{
if(b == 0){
return 0;
}
return 1<<(b-1);
}
static int static int
_xtoplan9mouse(Xwin *w, XEvent *e, Mouse *m) _xtoplan9mouse(Xwin *w, XEvent *e, Mouse *m)
{ {
int s;
XButtonEvent *be; XButtonEvent *be;
XMotionEvent *me; XMotionEvent *me;
@ -1307,54 +1316,18 @@ _xtoplan9mouse(Xwin *w, XEvent *e, Mouse *m)
/* BUG? on mac need to inherit these from elsewhere? */ /* BUG? on mac need to inherit these from elsewhere? */
m->xy.x = be->x; m->xy.x = be->x;
m->xy.y = be->y; m->xy.y = be->y;
s = be->state;
m->msec = be->time; m->msec = be->time;
switch(be->button){ m->buttons |= _xtoplan9buttons(be->button);
case 1:
s |= Button1Mask;
break;
case 2:
s |= Button2Mask;
break;
case 3:
s |= Button3Mask;
break;
case 4:
s |= Button4Mask;
break;
case 5:
s |= Button5Mask;
break;
}
break; break;
case ButtonRelease: case ButtonRelease:
be = (XButtonEvent*)e; be = (XButtonEvent*)e;
m->xy.x = be->x; m->xy.x = be->x;
m->xy.y = be->y; m->xy.y = be->y;
s = be->state;
m->msec = be->time; m->msec = be->time;
switch(be->button){ m->buttons &= ~_xtoplan9buttons(be->button);
case 1:
s &= ~Button1Mask;
break;
case 2:
s &= ~Button2Mask;
break;
case 3:
s &= ~Button3Mask;
break;
case 4:
s &= ~Button4Mask;
break;
case 5:
s &= ~Button5Mask;
break;
}
break;
case MotionNotify: case MotionNotify:
me = (XMotionEvent*)e; me = (XMotionEvent*)e;
s = me->state;
m->xy.x = me->x; m->xy.x = me->x;
m->xy.y = me->y; m->xy.y = me->y;
m->msec = me->time; m->msec = me->time;
@ -1363,18 +1336,6 @@ _xtoplan9mouse(Xwin *w, XEvent *e, Mouse *m)
default: default:
return -1; return -1;
} }
m->buttons = 0;
if(s & Button1Mask)
m->buttons |= 1;
if(s & Button2Mask)
m->buttons |= 2;
if(s & Button3Mask)
m->buttons |= 4;
if(s & Button4Mask)
m->buttons |= 8;
if(s & Button5Mask)
m->buttons |= 16;
return 0; return 0;
} }