hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-08 23:12:27 +00:00
Code Issues Projects Releases Wiki Activity

Introduce a consistent coding style

Browse source 
This is strictly the application of the script 'x-indent-all.sh'
from util/modular. Compared to the patch that Daniel posted in
January, I've added a few indent flags:

	-bap
	-psl
	-T PrivatePtr
	-T pmWait
	-T _XFUNCPROTOBEGIN
	-T _XFUNCPROTOEND
	-T _X_EXPORT

The typedefs were needed to make the output of sdksyms.sh match the
previous output, otherwise, the code is formatted badly enough that
sdksyms.sh generates incorrect output.

The generated code was compared with the previous version and found to
be essentially identical -- "assert" line numbers and BUILD_TIME were
the only differences found.

The comparison was done with this script:

dir1=$1
dir2=$2

for dir in $dir1 $dir2; do
	(cd $dir && find . -name '*.o' | while read file; do
		dir=`dirname $file`
		base=`basename $file .o`
		dump=$dir/$base.dump
		objdump -d $file > $dump
	done)
done

find $dir1 -name '*.dump' | while read dump; do
	otherdump=`echo $dump | sed "s;$dir1;$dir2;"`
	diff -u $dump $otherdump
done

Signed-off-by: Keith Packard <keithp@keithp.com>
Acked-by: Daniel Stone <daniel@fooishbar.org>
Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Keith Packard 2012-03-21 12:55:09 -07:00
commit 9838b7032e
1258 changed files with 264655 additions and 259938 deletions
Download patch file Download diff file Expand all files Collapse all files

501
dix/grabs.c
View file

@ -24,7 +24,6 @@ not be used in advertising or otherwise to promote the sale, use or
other dealings in this Software without prior written authorization
from The Open Group.
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts,
All Rights Reserved
@ -84,24 +83,20 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
ErrorF("Active grab 0x%lx (%s) on device '%s' (%d):\n",
(unsigned long) grab->resource,
(grab->grabtype == XI2) ? "xi2" :
((grab->grabtype == CORE) ? "core" : "xi1"),
dev->name, dev->id);
((grab->grabtype == CORE) ? "core" : "xi1"), dev->name, dev->id);
client = clients[CLIENT_ID(grab->resource)];
if (client)
{
if (client) {
pid_t clientpid = GetClientPid(client);
const char *cmdname = GetClientCmdName(client);
const char *cmdargs = GetClientCmdArgs(client);
if ((clientpid > 0) && (cmdname != NULL))
{
if ((clientpid > 0) && (cmdname != NULL)) {
ErrorF(" client pid %ld %s %s\n",
(long) clientpid, cmdname, cmdargs ? cmdargs : "");
clientIdPrinted = TRUE;
}
else if (GetLocalClientCreds(client, &lcc) != -1)
{
else if (GetLocalClientCreds(client, &lcc) != -1) {
ErrorF(" client pid %ld uid %ld gid %ld\n",
(lcc->fieldsSet & LCC_PID_SET) ? (long) lcc->pid : 0,
(lcc->fieldsSet & LCC_UID_SET) ? (long) lcc->euid : 0,
@ -110,8 +105,7 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
clientIdPrinted = TRUE;
}
}
if (!clientIdPrinted)
{
if (!clientIdPrinted) {
ErrorF(" (no client information available for client %d)\n",
CLIENT_ID(grab->resource));
}
@ -125,32 +119,26 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
(unsigned long) devGrab->grabTime.milliseconds,
devGrab->fromPassiveGrab ? "passive" : "active",
devGrab->implicitGrab ? " (implicit)" : "",
devGrab->sync.frozen ? "frozen" : "thawed",
devGrab->sync.state);
devGrab->sync.frozen ? "frozen" : "thawed", devGrab->sync.state);
if (grab->grabtype == CORE)
{
if (grab->grabtype == CORE) {
ErrorF(" core event mask 0x%lx\n",
(unsigned long) grab->eventMask);
}
else if (grab->grabtype == XI)
{
else if (grab->grabtype == XI) {
ErrorF(" xi1 event mask 0x%lx\n",
devGrab->implicitGrab ? (unsigned long) grab->deviceMask :
(unsigned long) grab->eventMask);
(unsigned long) grab->eventMask);
}
else if (grab->grabtype == XI2)
{
for (i = 0; i < xi2mask_num_masks(grab->xi2mask); i++)
{
else if (grab->grabtype == XI2) {
for (i = 0; i < xi2mask_num_masks(grab->xi2mask); i++) {
const unsigned char *mask;
int print;
print = 0;
for (j = 0; j < XI2MASKSIZE; j++)
{
for (j = 0; j < XI2MASKSIZE; j++) {
mask = xi2mask_get_one_mask(grab->xi2mask, i);
if (mask[j])
{
if (mask[j]) {
print = 1;
break;
}
@ -164,8 +152,7 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
}
}
if (devGrab->fromPassiveGrab)
{
if (devGrab->fromPassiveGrab) {
ErrorF(" passive grab type %d, detail 0x%x, "
"activating key %d\n", grab->type, grab->detail.exact,
devGrab->activatingKey);
@ -187,8 +174,7 @@ UngrabAllDevices(Bool kill_client)
ErrorF("Ungrabbing all devices%s; grabs listed below:\n",
kill_client ? " and killing their owners" : "");
for (dev = inputInfo.devices; dev; dev = dev->next)
{
for (dev = inputInfo.devices; dev; dev = dev->next) {
if (!dev->deviceGrab.grab)
continue;
PrintDeviceGrabInfo(dev);
@ -219,28 +205,18 @@ AllocGrab(void)
}
GrabPtr
CreateGrab(
int client,
DeviceIntPtr device,
DeviceIntPtr modDevice,
WindowPtr window,
enum InputLevel grabtype,
GrabMask *mask,
GrabParameters *param,
int type,
KeyCode keybut, /* key or button */
WindowPtr confineTo,
CursorPtr cursor)
CreateGrab(int client, DeviceIntPtr device, DeviceIntPtr modDevice, WindowPtr window, enum InputLevel grabtype, GrabMask *mask, GrabParameters *param, int type, KeyCode keybut, /* key or button */
WindowPtr confineTo, CursorPtr cursor)
{
GrabPtr grab;
grab = AllocGrab();
if (!grab)
return (GrabPtr)NULL;
return (GrabPtr) NULL;
grab->resource = FakeClientID(client);
grab->device = device;
grab->window = window;
grab->eventMask = mask->core; /* same for XI */
grab->eventMask = mask->core; /* same for XI */
grab->deviceMask = 0;
grab->ownerEvents = param->ownerEvents;
grab->keyboardMode = param->this_device_mode;
@ -259,7 +235,7 @@ CreateGrab(
if (grabtype == XI2)
xi2mask_merge(grab->xi2mask, mask->xi2mask);
if (cursor)
cursor->refcnt++;
cursor->refcnt++;
return grab;
}
@ -274,7 +250,7 @@ FreeGrab(GrabPtr pGrab)
free(pGrab->detail.pMask);
if (pGrab->cursor)
FreeCursor(pGrab->cursor, (Cursor)0);
FreeCursor(pGrab->cursor, (Cursor) 0);
xi2mask_free(&pGrab->xi2mask);
free(pGrab);
@ -292,6 +268,7 @@ CopyGrab(GrabPtr dst, const GrabPtr src)
if (src->modifiersDetail.pMask) {
int len = MasksPerDetailMask * sizeof(Mask);
mdetails_mask = malloc(len);
if (!mdetails_mask)
return FALSE;
@ -300,6 +277,7 @@ CopyGrab(GrabPtr dst, const GrabPtr src)
if (src->detail.pMask) {
int len = MasksPerDetailMask * sizeof(Mask);
details_mask = malloc(len);
if (!details_mask) {
free(mdetails_mask);
@ -315,7 +293,8 @@ CopyGrab(GrabPtr dst, const GrabPtr src)
free(details_mask);
return FALSE;
}
} else {
}
else {
xi2mask = dst->xi2mask;
xi2mask_zero(xi2mask, -1);
}
@ -334,22 +313,19 @@ int
DeletePassiveGrab(pointer value, XID id)
{
GrabPtr g, prev;
GrabPtr pGrab = (GrabPtr)value;
GrabPtr pGrab = (GrabPtr) value;
/* it is OK if the grab isn't found */
prev = 0;
for (g = (wPassiveGrabs (pGrab->window)); g; g = g->next)
{
if (pGrab == g)
{
if (prev)
prev->next = g->next;
else
if (!(pGrab->window->optional->passiveGrabs = g->next))
CheckWindowOptionalNeed (pGrab->window);
break;
}
prev = g;
for (g = (wPassiveGrabs(pGrab->window)); g; g = g->next) {
if (pGrab == g) {
if (prev)
prev->next = g->next;
else if (!(pGrab->window->optional->passiveGrabs = g->next))
CheckWindowOptionalNeed(pGrab->window);
break;
}
prev = g;
}
FreeGrab(pGrab);
return Success;
@ -362,69 +338,60 @@ DeleteDetailFromMask(Mask *pDetailMask, unsigned int detail)
int i;
mask = malloc(sizeof(Mask) * MasksPerDetailMask);
if (mask)
{
if (pDetailMask)
for (i = 0; i < MasksPerDetailMask; i++)
mask[i]= pDetailMask[i];
else
for (i = 0; i < MasksPerDetailMask; i++)
mask[i]= ~0L;
BITCLEAR(mask, detail);
if (mask) {
if (pDetailMask)
for (i = 0; i < MasksPerDetailMask; i++)
mask[i] = pDetailMask[i];
else
for (i = 0; i < MasksPerDetailMask; i++)
mask[i] = ~0L;
BITCLEAR(mask, detail);
}
return mask;
return mask;
}
static Bool
IsInGrabMask(
DetailRec firstDetail,
DetailRec secondDetail,
unsigned int exception)
IsInGrabMask(DetailRec firstDetail,
DetailRec secondDetail, unsigned int exception)
{
if (firstDetail.exact == exception)
{
if (firstDetail.pMask == NULL)
return TRUE;
/* (at present) never called with two non-null pMasks */
if (secondDetail.exact == exception)
return FALSE;
if (firstDetail.exact == exception) {
if (firstDetail.pMask == NULL)
return TRUE;
if (GETBIT(firstDetail.pMask, secondDetail.exact))
return TRUE;
/* (at present) never called with two non-null pMasks */
if (secondDetail.exact == exception)
return FALSE;
if (GETBIT(firstDetail.pMask, secondDetail.exact))
return TRUE;
}
return FALSE;
}
static Bool
IdenticalExactDetails(
unsigned int firstExact,
unsigned int secondExact,
unsigned int exception)
static Bool
IdenticalExactDetails(unsigned int firstExact,
unsigned int secondExact, unsigned int exception)
{
if ((firstExact == exception) || (secondExact == exception))
return FALSE;
return FALSE;
if (firstExact == secondExact)
return TRUE;
return TRUE;
return FALSE;
}
static Bool
DetailSupersedesSecond(
DetailRec firstDetail,
DetailRec secondDetail,
unsigned int exception)
static Bool
DetailSupersedesSecond(DetailRec firstDetail,
DetailRec secondDetail, unsigned int exception)
{
if (IsInGrabMask(firstDetail, secondDetail, exception))
return TRUE;
return TRUE;
if (IdenticalExactDetails(firstDetail.exact, secondDetail.exact, exception))
return TRUE;
if (IdenticalExactDetails(firstDetail.exact, secondDetail.exact,
exception))
return TRUE;
return FALSE;
}
@ -432,17 +399,15 @@ static Bool
GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
{
unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
(unsigned int)XIAnyModifier :
(unsigned int)AnyModifier;
(unsigned int) XIAnyModifier : (unsigned int) AnyModifier;
if (!DetailSupersedesSecond(pFirstGrab->modifiersDetail,
pSecondGrab->modifiersDetail,
any_modifier))
return FALSE;
pSecondGrab->modifiersDetail, any_modifier))
return FALSE;
if (DetailSupersedesSecond(pFirstGrab->detail,
pSecondGrab->detail, (unsigned int)AnyKey))
return TRUE;
pSecondGrab->detail, (unsigned int) AnyKey))
return TRUE;
return FALSE;
}
@ -463,57 +428,54 @@ Bool
GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab, Bool ignoreDevice)
{
unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
(unsigned int)XIAnyModifier :
(unsigned int)AnyModifier;
(unsigned int) XIAnyModifier : (unsigned int) AnyModifier;
if (pFirstGrab->grabtype != pSecondGrab->grabtype)
return FALSE;
if (pFirstGrab->grabtype == XI2)
{
if (pFirstGrab->grabtype == XI2) {
if (pFirstGrab->device == inputInfo.all_devices ||
pSecondGrab->device == inputInfo.all_devices)
{
pSecondGrab->device == inputInfo.all_devices) {
/* do nothing */
} else if (pFirstGrab->device == inputInfo.all_master_devices)
{
}
else if (pFirstGrab->device == inputInfo.all_master_devices) {
if (pSecondGrab->device != inputInfo.all_master_devices &&
!IsMaster(pSecondGrab->device))
return FALSE;
} else if (pSecondGrab->device == inputInfo.all_master_devices)
{
}
else if (pSecondGrab->device == inputInfo.all_master_devices) {
if (pFirstGrab->device != inputInfo.all_master_devices &&
!IsMaster(pFirstGrab->device))
return FALSE;
} else if (pSecondGrab->device != pFirstGrab->device)
return FALSE;
} else if (!ignoreDevice &&
((pFirstGrab->device != pSecondGrab->device) ||
(pFirstGrab->modifierDevice != pSecondGrab->modifierDevice)))
}
else if (pSecondGrab->device != pFirstGrab->device)
return FALSE;
}
else if (!ignoreDevice &&
((pFirstGrab->device != pSecondGrab->device) ||
(pFirstGrab->modifierDevice != pSecondGrab->modifierDevice)))
return FALSE;
if (pFirstGrab->type != pSecondGrab->type)
return FALSE;
return FALSE;
if (GrabSupersedesSecond(pFirstGrab, pSecondGrab) ||
GrabSupersedesSecond(pSecondGrab, pFirstGrab))
return TRUE;
GrabSupersedesSecond(pSecondGrab, pFirstGrab))
return TRUE;
if (DetailSupersedesSecond(pSecondGrab->detail, pFirstGrab->detail,
(unsigned int)AnyKey)
&&
DetailSupersedesSecond(pFirstGrab->modifiersDetail,
pSecondGrab->modifiersDetail,
any_modifier))
return TRUE;
(unsigned int) AnyKey)
&&
DetailSupersedesSecond(pFirstGrab->modifiersDetail,
pSecondGrab->modifiersDetail, any_modifier))
return TRUE;
if (DetailSupersedesSecond(pFirstGrab->detail, pSecondGrab->detail,
(unsigned int)AnyKey)
&&
DetailSupersedesSecond(pSecondGrab->modifiersDetail,
pFirstGrab->modifiersDetail,
any_modifier))
return TRUE;
(unsigned int) AnyKey)
&&
DetailSupersedesSecond(pSecondGrab->modifiersDetail,
pFirstGrab->modifiersDetail, any_modifier))
return TRUE;
return FALSE;
}
@ -522,38 +484,33 @@ static Bool
GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
{
unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
(unsigned int)XIAnyModifier :
(unsigned int)AnyModifier;
(unsigned int) XIAnyModifier : (unsigned int) AnyModifier;
if (pFirstGrab->grabtype != pSecondGrab->grabtype)
return FALSE;
if (pFirstGrab->device != pSecondGrab->device ||
(pFirstGrab->modifierDevice != pSecondGrab->modifierDevice) ||
(pFirstGrab->type != pSecondGrab->type))
return FALSE;
if (!(DetailSupersedesSecond(pFirstGrab->detail,
pSecondGrab->detail,
(unsigned int)AnyKey) &&
DetailSupersedesSecond(pSecondGrab->detail,
pFirstGrab->detail,
(unsigned int)AnyKey)))
if (pFirstGrab->device != pSecondGrab->device ||
(pFirstGrab->modifierDevice != pSecondGrab->modifierDevice) ||
(pFirstGrab->type != pSecondGrab->type))
return FALSE;
if (!(DetailSupersedesSecond(pFirstGrab->detail,
pSecondGrab->detail,
(unsigned int) AnyKey) &&
DetailSupersedesSecond(pSecondGrab->detail,
pFirstGrab->detail, (unsigned int) AnyKey)))
return FALSE;
if (!(DetailSupersedesSecond(pFirstGrab->modifiersDetail,
pSecondGrab->modifiersDetail,
any_modifier) &&
DetailSupersedesSecond(pSecondGrab->modifiersDetail,
pFirstGrab->modifiersDetail,
any_modifier)))
if (!(DetailSupersedesSecond(pFirstGrab->modifiersDetail,
pSecondGrab->modifiersDetail,
any_modifier) &&
DetailSupersedesSecond(pSecondGrab->modifiersDetail,
pFirstGrab->modifiersDetail, any_modifier)))
return FALSE;
return TRUE;
}
/**
* Prepend the new grab to the list of passive grabs on the window.
* Any previously existing grab that matches the new grab will be removed.
@ -569,44 +526,39 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
Mask access_mode = DixGrabAccess;
int rc;
for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next)
{
if (GrabMatchesSecond(pGrab, grab, (pGrab->grabtype == CORE)))
{
if (CLIENT_BITS(pGrab->resource) != CLIENT_BITS(grab->resource))
{
FreeGrab(pGrab);
return BadAccess;
}
}
for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next) {
if (GrabMatchesSecond(pGrab, grab, (pGrab->grabtype == CORE))) {
if (CLIENT_BITS(pGrab->resource) != CLIENT_BITS(grab->resource)) {
FreeGrab(pGrab);
return BadAccess;
}
}
}
if (pGrab->keyboardMode == GrabModeSync||pGrab->pointerMode == GrabModeSync)
access_mode |= DixFreezeAccess;
if (pGrab->keyboardMode == GrabModeSync ||
pGrab->pointerMode == GrabModeSync)
access_mode |= DixFreezeAccess;
rc = XaceHook(XACE_DEVICE_ACCESS, client, pGrab->device, access_mode);
if (rc != Success)
return rc;
return rc;
/* Remove all grabs that match the new one exactly */
for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next)
{
if (GrabsAreIdentical(pGrab, grab))
{
for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next) {
if (GrabsAreIdentical(pGrab, grab)) {
DeletePassiveGrabFromList(grab);
break;
}
}
}
if (!pGrab->window->optional && !MakeWindowOptional (pGrab->window))
{
FreeGrab(pGrab);
return BadAlloc;
if (!pGrab->window->optional && !MakeWindowOptional(pGrab->window)) {
FreeGrab(pGrab);
return BadAlloc;
}
pGrab->next = pGrab->window->optional->passiveGrabs;
pGrab->window->optional->passiveGrabs = pGrab;
if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer)pGrab))
return Success;
if (AddResource(pGrab->resource, RT_PASSIVEGRAB, (pointer) pGrab))
return Success;
return BadAlloc;
}
@ -633,58 +585,50 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
i = 0;
for (grab = wPassiveGrabs(pMinuendGrab->window); grab; grab = grab->next)
i++;
i++;
if (!i)
return TRUE;
return TRUE;
deletes = malloc(i * sizeof(GrabPtr));
adds = malloc(i * sizeof(GrabPtr));
updates = malloc(i * sizeof(Mask **));
details = malloc(i * sizeof(Mask *));
if (!deletes || !adds || !updates || !details)
{
free(details);
free(updates);
free(adds);
free(deletes);
return FALSE;
if (!deletes || !adds || !updates || !details) {
free(details);
free(updates);
free(adds);
free(deletes);
return FALSE;
}
any_modifier = (pMinuendGrab->grabtype == XI2) ?
(unsigned int)XIAnyModifier : (unsigned int)AnyModifier;
(unsigned int) XIAnyModifier : (unsigned int) AnyModifier;
any_key = (pMinuendGrab->grabtype == XI2) ?
(unsigned int)XIAnyKeycode : (unsigned int)AnyKey;
(unsigned int) XIAnyKeycode : (unsigned int) AnyKey;
ndels = nadds = nups = 0;
ok = TRUE;
for (grab = wPassiveGrabs(pMinuendGrab->window);
grab && ok;
grab = grab->next)
{
if ((CLIENT_BITS(grab->resource) != CLIENT_BITS(pMinuendGrab->resource)) ||
!GrabMatchesSecond(grab, pMinuendGrab,
(grab->grabtype == CORE)))
continue;
if (GrabSupersedesSecond(pMinuendGrab, grab))
{
deletes[ndels++] = grab;
}
else if ((grab->detail.exact == any_key)
&& (grab->modifiersDetail.exact != any_modifier))
{
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
}
else if ((grab->modifiersDetail.exact == any_modifier)
&& (grab->detail.exact != any_key))
{
UPDATE(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.exact);
}
else if ((pMinuendGrab->detail.exact != any_key)
&& (pMinuendGrab->modifiersDetail.exact != any_modifier))
{
GrabPtr pNewGrab;
grab && ok; grab = grab->next) {
if ((CLIENT_BITS(grab->resource) != CLIENT_BITS(pMinuendGrab->resource))
|| !GrabMatchesSecond(grab, pMinuendGrab, (grab->grabtype == CORE)))
continue;
if (GrabSupersedesSecond(pMinuendGrab, grab)) {
deletes[ndels++] = grab;
}
else if ((grab->detail.exact == any_key)
&& (grab->modifiersDetail.exact != any_modifier)) {
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
}
else if ((grab->modifiersDetail.exact == any_modifier)
&& (grab->detail.exact != any_key)) {
UPDATE(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.exact);
}
else if ((pMinuendGrab->detail.exact != any_key)
&& (pMinuendGrab->modifiersDetail.exact != any_modifier)) {
GrabPtr pNewGrab;
GrabParameters param;
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
memset(&param, 0, sizeof(param));
param.ownerEvents = grab->ownerEvents;
@ -692,64 +636,57 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
param.other_devices_mode = grab->pointerMode;
param.modifiers = any_modifier;
pNewGrab = CreateGrab(CLIENT_ID(grab->resource), grab->device,
grab->modifierDevice, grab->window,
pNewGrab = CreateGrab(CLIENT_ID(grab->resource), grab->device,
grab->modifierDevice, grab->window,
grab->grabtype,
(GrabMask*)&grab->eventMask,
&param, (int)grab->type,
pMinuendGrab->detail.exact,
grab->confineTo, grab->cursor);
if (!pNewGrab)
ok = FALSE;
else if (!(pNewGrab->modifiersDetail.pMask =
DeleteDetailFromMask(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.exact))
||
(!pNewGrab->window->optional &&
!MakeWindowOptional(pNewGrab->window)))
{
FreeGrab(pNewGrab);
ok = FALSE;
}
else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB,
(pointer)pNewGrab))
ok = FALSE;
else
adds[nadds++] = pNewGrab;
}
else if (pMinuendGrab->detail.exact == any_key)
{
UPDATE(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.exact);
}
else
{
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
}
(GrabMask *) &grab->eventMask,
&param, (int) grab->type,
pMinuendGrab->detail.exact,
grab->confineTo, grab->cursor);
if (!pNewGrab)
ok = FALSE;
else if (!(pNewGrab->modifiersDetail.pMask =
DeleteDetailFromMask(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.
exact))
|| (!pNewGrab->window->optional &&
!MakeWindowOptional(pNewGrab->window))) {
FreeGrab(pNewGrab);
ok = FALSE;
}
else if (!AddResource(pNewGrab->resource, RT_PASSIVEGRAB,
(pointer) pNewGrab))
ok = FALSE;
else
adds[nadds++] = pNewGrab;
}
else if (pMinuendGrab->detail.exact == any_key) {
UPDATE(grab->modifiersDetail.pMask,
pMinuendGrab->modifiersDetail.exact);
}
else {
UPDATE(grab->detail.pMask, pMinuendGrab->detail.exact);
}
}
if (!ok)
{
for (i = 0; i < nadds; i++)
FreeResource(adds[i]->resource, RT_NONE);
for (i = 0; i < nups; i++)
free(details[i]);
if (!ok) {
for (i = 0; i < nadds; i++)
FreeResource(adds[i]->resource, RT_NONE);
for (i = 0; i < nups; i++)
free(details[i]);
}
else
{
for (i = 0; i < ndels; i++)
FreeResource(deletes[i]->resource, RT_NONE);
for (i = 0; i < nadds; i++)
{
grab = adds[i];
grab->next = grab->window->optional->passiveGrabs;
grab->window->optional->passiveGrabs = grab;
}
for (i = 0; i < nups; i++)
{
free(*updates[i]);
*updates[i] = details[i];
}
else {
for (i = 0; i < ndels; i++)
FreeResource(deletes[i]->resource, RT_NONE);
for (i = 0; i < nadds; i++) {
grab = adds[i];
grab->next = grab->window->optional->passiveGrabs;
grab->window->optional->passiveGrabs = grab;
}
for (i = 0; i < nups; i++) {
free(*updates[i]);
*updates[i] = details[i];
}
}
free(details);
free(updates);
@ -764,14 +701,12 @@ Bool
GrabIsPointerGrab(GrabPtr grab)
{
return (grab->type == ButtonPress ||
grab->type == DeviceButtonPress ||
grab->type == XI_ButtonPress);
grab->type == DeviceButtonPress || grab->type == XI_ButtonPress);
}
Bool
GrabIsKeyboardGrab(GrabPtr grab)
{
return (grab->type == KeyPress ||
grab->type == DeviceKeyPress ||
grab->type == XI_KeyPress);
return (grab->type == KeyPress ||
grab->type == DeviceKeyPress || grab->type == XI_KeyPress);
}