andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: don't detach SDs during grabs.

Browse Source
This commit is contained in:
Peter Hutterer 2008-11-28 14:21:05 +10:00
parent 71f289f7d1
commit f245c46d29
1 changed files with 0 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dix/events.c
View File

@ -1466,51 +1466,6 @@ CheckGrabForSyncs(DeviceIntPtr thisDev, Bool thisMode, Bool otherMode)
ComputeFreezes(); ComputeFreezes();
} }
/* Only ever used if a grab is called on an attached slave device. */
static int GrabPrivateKeyIndex;
static DevPrivateKey GrabPrivateKey = &GrabPrivateKeyIndex;
typedef struct _GrabMemoryRec {
DeviceIntPtr oldmaster;
} GrabMemoryRec, *GrabMemoryPtr;
/**
* Save the device's master device in the devPrivates. This needs to be done
* if a client directly grabs a slave device that is attached to a master. For
* the duration of the grab, the device is detached, ungrabbing re-attaches it
* though.
*/
static void
SaveOldMaster(DeviceIntPtr dev)
{
GrabMemoryPtr gm;
if (!(gm = xalloc(sizeof(GrabMemoryRec))))
{
ErrorF("[dix] Cannot allocate grab private. Grab not "
"possible on device.\n");
return;
}
gm->oldmaster = dev->u.master;
dixSetPrivate(&dev->devPrivates, GrabPrivateKey, gm);
}
static void
RestoreOldMaster(DeviceIntPtr dev)
{
GrabMemoryPtr gm;
if (dev->isMaster)
return;
gm = (GrabMemoryPtr)dixLookupPrivate(&dev->devPrivates, GrabPrivateKey);
if (gm)
{
dev->u.master = gm->oldmaster;
xfree(gm);
dixSetPrivate(&dev->devPrivates, GrabPrivateKey, NULL);
}
}
/** /**
* Activate a pointer grab on the given device. A pointer grab will cause all * Activate a pointer grab on the given device. A pointer grab will cause all
* core pointer events of this device to be delivered to the grabbing client only. * core pointer events of this device to be delivered to the grabbing client only.
@ -1536,13 +1491,6 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
: mouse->spriteInfo->sprite->win; : mouse->spriteInfo->sprite->win;
Bool isPassive = autoGrab & ~ImplicitGrabMask; Bool isPassive = autoGrab & ~ImplicitGrabMask;
/* slave devices need to float for the duration of the grab. */
if (!isPassive && !mouse->isMaster)
{
SaveOldMaster(mouse);
AttachDevice(NULL, mouse, NULL);
}
if (grab->confineTo) if (grab->confineTo)
{ {
if (grab->confineTo->drawable.pScreen if (grab->confineTo->drawable.pScreen
@ -1577,7 +1525,6 @@ DeactivatePointerGrab(DeviceIntPtr mouse)
{ {
GrabPtr grab = mouse->deviceGrab.grab; GrabPtr grab = mouse->deviceGrab.grab;
DeviceIntPtr dev; DeviceIntPtr dev;
Bool wasPassive= mouse->deviceGrab.fromPassiveGrab;
mouse->valuator->motionHintWindow = NullWindow; mouse->valuator->motionHintWindow = NullWindow;
mouse->deviceGrab.grab = NullGrab; mouse->deviceGrab.grab = NullGrab;
@ -1604,9 +1551,6 @@ DeactivatePointerGrab(DeviceIntPtr mouse)
if (grab->cursor) if (grab->cursor)
FreeCursor(grab->cursor, (Cursor)0); FreeCursor(grab->cursor, (Cursor)0);
if (!wasPassive)
RestoreOldMaster(mouse);
ComputeFreezes(); ComputeFreezes();
} }
@ -1621,13 +1565,6 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
GrabInfoPtr grabinfo = &keybd->deviceGrab; GrabInfoPtr grabinfo = &keybd->deviceGrab;
WindowPtr oldWin; WindowPtr oldWin;
/* slave devices need to float for the duration of the grab. */
if (!passive && !keybd->isMaster)
{
SaveOldMaster(keybd);
AttachDevice(NULL, keybd, NULL);
}
if (grabinfo->grab) if (grabinfo->grab)
oldWin = grabinfo->grab->window; oldWin = grabinfo->grab->window;
else if (keybd->focus) else if (keybd->focus)
@ -1659,7 +1596,6 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
DeviceIntPtr dev; DeviceIntPtr dev;
WindowPtr focusWin = keybd->focus ? keybd->focus->win WindowPtr focusWin = keybd->focus ? keybd->focus->win
: keybd->spriteInfo->sprite->win; : keybd->spriteInfo->sprite->win;
Bool wasPassive = keybd->deviceGrab.fromPassiveGrab;
if (focusWin == FollowKeyboardWin) if (focusWin == FollowKeyboardWin)
focusWin = inputInfo.keyboard->focus->win; focusWin = inputInfo.keyboard->focus->win;
@ -1681,9 +1617,6 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
} }
DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab); DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
if (!wasPassive)
RestoreOldMaster(keybd);
ComputeFreezes(); ComputeFreezes();
} }