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

dix: Extract FreezeThisEventIfNeededForSyncGrab()

This commit is contained in:
Povilas Kanapickas 2020-10-10 02:51:39 +03:00 committed by Peter Hutterer
parent 36f8dacc06
commit f5220117e9
2 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dix/events.c
View File

@ -4256,7 +4256,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
GrabPtr grab; GrabPtr grab;
GrabInfoPtr grabinfo; GrabInfoPtr grabinfo;
int deliveries = 0; int deliveries = 0;
DeviceIntPtr dev;
SpritePtr pSprite = thisDev->spriteInfo->sprite; SpritePtr pSprite = thisDev->spriteInfo->sprite;
BOOL sendCore = FALSE; BOOL sendCore = FALSE;
@ -4304,6 +4303,19 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
event->any.type == ET_KeyRelease || event->any.type == ET_KeyRelease ||
event->any.type == ET_ButtonPress || event->any.type == ET_ButtonPress ||
event->any.type == ET_ButtonRelease)) { event->any.type == ET_ButtonRelease)) {
FreezeThisEventIfNeededForSyncGrab(thisDev, event);
}
return deliveries;
}
void
FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev, InternalEvent *event)
{
GrabInfoPtr grabinfo = &thisDev->deviceGrab;
GrabPtr grab = grabinfo->grab;
DeviceIntPtr dev;
switch (grabinfo->sync.state) { switch (grabinfo->sync.state) {
case FREEZE_BOTH_NEXT_EVENT: case FREEZE_BOTH_NEXT_EVENT:
dev = GetPairedDevice(thisDev); dev = GetPairedDevice(thisDev);
@ -4323,9 +4335,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
*grabinfo->sync.event = *event; *grabinfo->sync.event = *event;
break; break;
} }
}
return deliveries;
} }
/* This function is used to set the key pressed or key released state - /* This function is used to set the key pressed or key released state -

4
include/dix.h
View File

@ -449,6 +449,10 @@ DeliverGrabbedEvent(InternalEvent * /* event */ ,
DeviceIntPtr /* thisDev */ , DeviceIntPtr /* thisDev */ ,
Bool /* deactivateGrab */ ); Bool /* deactivateGrab */ );
extern void
FreezeThisEventIfNeededForSyncGrab(DeviceIntPtr thisDev,
InternalEvent *event);
extern void extern void
FixKeyState(DeviceEvent * /* event */ , FixKeyState(DeviceEvent * /* event */ ,
DeviceIntPtr /* keybd */ ); DeviceIntPtr /* keybd */ );