dix: AllocGrab can copy if an argument is passed in
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
4980bcef99
commit
925e35122e
|
@ -2844,7 +2844,7 @@ CheckDeviceGrabAndHintWindow(WindowPtr pWin, int type,
|
|||
(deliveryMask & DeviceButtonGrabMask)) {
|
||||
GrabPtr tempGrab;
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
if (!tempGrab)
|
||||
return;
|
||||
|
||||
|
|
|
@ -127,7 +127,7 @@ ProcXUngrabDeviceButton(ClientPtr client)
|
|||
(stuff->modifiers & ~AllModifiersMask))
|
||||
return BadValue;
|
||||
|
||||
temporaryGrab = AllocGrab();
|
||||
temporaryGrab = AllocGrab(NULL);
|
||||
if (!temporaryGrab)
|
||||
return BadAlloc;
|
||||
|
||||
|
|
|
@ -134,7 +134,7 @@ ProcXUngrabDeviceKey(ClientPtr client)
|
|||
(stuff->modifiers & ~AllModifiersMask))
|
||||
return BadValue;
|
||||
|
||||
temporaryGrab = AllocGrab();
|
||||
temporaryGrab = AllocGrab(NULL);
|
||||
if (!temporaryGrab)
|
||||
return BadAlloc;
|
||||
|
||||
|
|
|
@ -307,7 +307,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
|
|||
|
||||
mod_dev = (IsFloating(dev)) ? dev : GetMaster(dev, MASTER_KEYBOARD);
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
if (!tempGrab)
|
||||
return BadAlloc;
|
||||
|
||||
|
|
16
dix/events.c
16
dix/events.c
|
@ -1492,8 +1492,7 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
|
|||
if (grab->cursor)
|
||||
grab->cursor->refcnt++;
|
||||
BUG_WARN(grabinfo->grab != NULL);
|
||||
grabinfo->grab = AllocGrab();
|
||||
CopyGrab(grabinfo->grab, grab);
|
||||
grabinfo->grab = AllocGrab(grab);
|
||||
grabinfo->fromPassiveGrab = isPassive;
|
||||
grabinfo->implicitGrab = autoGrab & ImplicitGrabMask;
|
||||
PostNewCursor(mouse);
|
||||
|
@ -1596,8 +1595,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
|
|||
else
|
||||
grabinfo->grabTime = time;
|
||||
BUG_WARN(grabinfo->grab != NULL);
|
||||
grabinfo->grab = AllocGrab();
|
||||
CopyGrab(grabinfo->grab, grab);
|
||||
grabinfo->grab = AllocGrab(grab);
|
||||
grabinfo->fromPassiveGrab = passive;
|
||||
grabinfo->implicitGrab = passive & ImplicitGrabMask;
|
||||
CheckGrabForSyncs(keybd, (Bool) grab->keyboardMode,
|
||||
|
@ -1991,7 +1989,7 @@ ActivateImplicitGrab(DeviceIntPtr dev, ClientPtr client, WindowPtr win,
|
|||
else
|
||||
return FALSE;
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
if (!tempGrab)
|
||||
return FALSE;
|
||||
tempGrab->next = NULL;
|
||||
|
@ -3898,7 +3896,7 @@ CheckPassiveGrabsOnWindow(WindowPtr pWin,
|
|||
if (!grab)
|
||||
return NULL;
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
|
||||
/* Fill out the grab details, but leave the type for later before
|
||||
* comparing */
|
||||
|
@ -5087,7 +5085,7 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
|
|||
else {
|
||||
GrabPtr tempGrab;
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
|
||||
tempGrab->next = NULL;
|
||||
tempGrab->window = pWin;
|
||||
|
@ -5443,7 +5441,7 @@ ProcUngrabKey(ClientPtr client)
|
|||
client->errorValue = stuff->modifiers;
|
||||
return BadValue;
|
||||
}
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
if (!tempGrab)
|
||||
return BadAlloc;
|
||||
tempGrab->resource = client->clientAsMask;
|
||||
|
@ -5637,7 +5635,7 @@ ProcUngrabButton(ClientPtr client)
|
|||
|
||||
ptr = PickPointer(client);
|
||||
|
||||
tempGrab = AllocGrab();
|
||||
tempGrab = AllocGrab(NULL);
|
||||
if (!tempGrab)
|
||||
return BadAlloc;
|
||||
tempGrab->resource = client->clientAsMask;
|
||||
|
|
10
dix/grabs.c
10
dix/grabs.c
|
@ -189,7 +189,7 @@ UngrabAllDevices(Bool kill_client)
|
|||
}
|
||||
|
||||
GrabPtr
|
||||
AllocGrab(void)
|
||||
AllocGrab(const GrabPtr src)
|
||||
{
|
||||
GrabPtr grab = calloc(1, sizeof(GrabRec));
|
||||
|
||||
|
@ -201,6 +201,12 @@ AllocGrab(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (src && !CopyGrab(grab, src)) {
|
||||
free(grab->xi2mask);
|
||||
free(grab);
|
||||
grab = NULL;
|
||||
}
|
||||
|
||||
return grab;
|
||||
}
|
||||
|
||||
|
@ -213,7 +219,7 @@ CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice,
|
|||
{
|
||||
GrabPtr grab;
|
||||
|
||||
grab = AllocGrab();
|
||||
grab = AllocGrab(NULL);
|
||||
if (!grab)
|
||||
return (GrabPtr) NULL;
|
||||
grab->resource = FakeClientID(client);
|
||||
|
|
|
@ -31,7 +31,7 @@ struct _GrabParameters;
|
|||
extern void PrintDeviceGrabInfo(DeviceIntPtr dev);
|
||||
extern void UngrabAllDevices(Bool kill_client);
|
||||
|
||||
extern GrabPtr AllocGrab(void);
|
||||
extern GrabPtr AllocGrab(const GrabPtr src);
|
||||
extern void FreeGrab(GrabPtr grab);
|
||||
extern Bool CopyGrab(GrabPtr dst, const GrabPtr src);
|
||||
|
||||
|
|
Loading…
Reference in New Issue