frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(submit/xnest-cleanup-event-handler) Xnest: xnestCollectEvents(): scope local variables 

Make the code easier to read/understand by scoping variables to where
exactly they're needed. Also a preparation for subsequent reworks
(keep the diff smaller and thus easier to review)

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-08-21 10:31:12 +02:00
parent 40f17ebabf
commit e2fc6519b7
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/xnest/Events.c
View File

@ -112,39 +112,49 @@ void
xnestCollectEvents(void) xnestCollectEvents(void)
{ {
XEvent X; XEvent X;
int valuators[2];
ValuatorMask mask;
ScreenPtr pScreen;
while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) { while (XCheckIfEvent(xnestDisplay, &X, xnestNotExposurePredicate, NULL)) {
switch (X.type) { switch (X.type) {
case KeyPress: case KeyPress:
{
xnestUpdateModifierState(X.xkey.state); xnestUpdateModifierState(X.xkey.state);
xnestQueueKeyEvent(KeyPress, X.xkey.keycode); xnestQueueKeyEvent(KeyPress, X.xkey.keycode);
break; break;
}
case KeyRelease: case KeyRelease:
{
xnestUpdateModifierState(X.xkey.state); xnestUpdateModifierState(X.xkey.state);
xnestQueueKeyEvent(KeyRelease, X.xkey.keycode); xnestQueueKeyEvent(KeyRelease, X.xkey.keycode);
break; break;
}
case ButtonPress: case ButtonPress:
{
ValuatorMask mask;
valuator_mask_set_range(&mask, 0, 0, NULL); valuator_mask_set_range(&mask, 0, 0, NULL);
xnestUpdateModifierState(X.xkey.state); xnestUpdateModifierState(X.xkey.state);
lastEventTime = GetTimeInMillis(); lastEventTime = GetTimeInMillis();
QueuePointerEvents(xnestPointerDevice, ButtonPress, QueuePointerEvents(xnestPointerDevice, ButtonPress,
X.xbutton.button, POINTER_RELATIVE, &mask); X.xbutton.button, POINTER_RELATIVE, &mask);
break; break;
}
case ButtonRelease: case ButtonRelease:
{
ValuatorMask mask;
valuator_mask_set_range(&mask, 0, 0, NULL); valuator_mask_set_range(&mask, 0, 0, NULL);
xnestUpdateModifierState(X.xkey.state); xnestUpdateModifierState(X.xkey.state);
lastEventTime = GetTimeInMillis(); lastEventTime = GetTimeInMillis();
QueuePointerEvents(xnestPointerDevice, ButtonRelease, QueuePointerEvents(xnestPointerDevice, ButtonRelease,
X.xbutton.button, POINTER_RELATIVE, &mask); X.xbutton.button, POINTER_RELATIVE, &mask);
break; break;
}
case MotionNotify: case MotionNotify:
{
ValuatorMask mask;
int valuators[2];
valuators[0] = X.xmotion.x; valuators[0] = X.xmotion.x;
valuators[1] = X.xmotion.y; valuators[1] = X.xmotion.y;
valuator_mask_set_range(&mask, 0, 2, valuators); valuator_mask_set_range(&mask, 0, 2, valuators);
@ -152,30 +162,38 @@ xnestCollectEvents(void)
QueuePointerEvents(xnestPointerDevice, MotionNotify, QueuePointerEvents(xnestPointerDevice, MotionNotify,
0, POINTER_ABSOLUTE, &mask); 0, POINTER_ABSOLUTE, &mask);
break; break;
}
case FocusIn: case FocusIn:
{
if (X.xfocus.detail != NotifyInferior) { if (X.xfocus.detail != NotifyInferior) {
pScreen = xnestScreen(X.xfocus.window); ScreenPtr pScreen = xnestScreen(X.xfocus.window);
if (pScreen) if (pScreen)
xnestDirectInstallColormaps(pScreen); xnestDirectInstallColormaps(pScreen);
} }
break; break;
}
case FocusOut: case FocusOut:
{
if (X.xfocus.detail != NotifyInferior) { if (X.xfocus.detail != NotifyInferior) {
pScreen = xnestScreen(X.xfocus.window); ScreenPtr pScreen = xnestScreen(X.xfocus.window);
if (pScreen) if (pScreen)
xnestDirectUninstallColormaps(pScreen); xnestDirectUninstallColormaps(pScreen);
} }
break; break;
}
case KeymapNotify: case KeymapNotify:
break; break;
case EnterNotify: case EnterNotify:
{
if (X.xcrossing.detail != NotifyInferior) { if (X.xcrossing.detail != NotifyInferior) {
pScreen = xnestScreen(X.xcrossing.window); ScreenPtr pScreen = xnestScreen(X.xcrossing.window);
if (pScreen) { if (pScreen) {
ValuatorMask mask;
int valuators[2];
NewCurrentScreen(inputInfo.pointer, pScreen, X.xcrossing.x, NewCurrentScreen(inputInfo.pointer, pScreen, X.xcrossing.x,
X.xcrossing.y); X.xcrossing.y);
valuators[0] = X.xcrossing.x; valuators[0] = X.xcrossing.x;
@ -188,21 +206,26 @@ xnestCollectEvents(void)
} }
} }
break; break;
}
case LeaveNotify: case LeaveNotify:
{
if (X.xcrossing.detail != NotifyInferior) { if (X.xcrossing.detail != NotifyInferior) {
pScreen = xnestScreen(X.xcrossing.window); ScreenPtr pScreen = xnestScreen(X.xcrossing.window);
if (pScreen) { if (pScreen) {
xnestDirectUninstallColormaps(pScreen); xnestDirectUninstallColormaps(pScreen);
} }
} }
break; break;
}
case DestroyNotify: case DestroyNotify:
{
if (xnestParentWindow != (Window) 0 && if (xnestParentWindow != (Window) 0 &&
X.xdestroywindow.window == xnestParentWindow) X.xdestroywindow.window == xnestParentWindow)
exit(0); exit(0);
break; break;
}
case CirculateNotify: case CirculateNotify:
case ConfigureNotify: case ConfigureNotify: