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

Xext: rename shape's EventType to ShapeEventType to avoid name clashing. 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-01-27 15:40:31 +10:00
parent cfd3443fe8
commit faeb18eb7e
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Xext/shape.c
View File

@ -95,7 +95,7 @@ static DISPATCH_PROC(SProcShapeSelectInput);
#endif #endif
static int ShapeEventBase = 0; static int ShapeEventBase = 0;
static RESTYPE ClientType, EventType; /* resource types for event masks */ static RESTYPE ClientType, ShapeEventType; /* resource types for event masks */
/* /*
* each window has a list of clients requesting * each window has a list of clients requesting
@ -128,8 +128,8 @@ ShapeExtensionInit(void)
ExtensionEntry *extEntry; ExtensionEntry *extEntry;
ClientType = CreateNewResourceType(ShapeFreeClient); ClientType = CreateNewResourceType(ShapeFreeClient);
EventType = CreateNewResourceType(ShapeFreeEvents); ShapeEventType = CreateNewResourceType(ShapeFreeEvents);
if (ClientType && EventType && if (ClientType && ShapeEventType &&
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0, (extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
ProcShapeDispatch, SProcShapeDispatch, ProcShapeDispatch, SProcShapeDispatch,
NULL, StandardMinorOpcode))) NULL, StandardMinorOpcode)))
@ -741,7 +741,7 @@ ShapeFreeClient (pointer data, XID id)
pShapeEvent = (ShapeEventPtr) data; pShapeEvent = (ShapeEventPtr) data;
pWin = pShapeEvent->window; pWin = pShapeEvent->window;
pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, EventType); pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, ShapeEventType);
if (pHead) { if (pHead) {
pPrev = 0; pPrev = 0;
for (pCur = *pHead; pCur && pCur != pShapeEvent; pCur=pCur->next) for (pCur = *pHead; pCur && pCur != pShapeEvent; pCur=pCur->next)
@ -788,7 +788,7 @@ ProcShapeSelectInput (ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
pHead = (ShapeEventPtr *)SecurityLookupIDByType(client, pHead = (ShapeEventPtr *)SecurityLookupIDByType(client,
pWin->drawable.id, EventType, DixWriteAccess); pWin->drawable.id, ShapeEventType, DixWriteAccess);
switch (stuff->enable) { switch (stuff->enable) {
case xTrue: case xTrue:
if (pHead) { if (pHead) {
@ -828,7 +828,7 @@ ProcShapeSelectInput (ClientPtr client)
{ {
pHead = xalloc (sizeof (ShapeEventPtr)); pHead = xalloc (sizeof (ShapeEventPtr));
if (!pHead || if (!pHead ||
!AddResource (pWin->drawable.id, EventType, (pointer)pHead)) !AddResource (pWin->drawable.id, ShapeEventType, (pointer)pHead))
{ {
FreeResource (clientResource, RT_NONE); FreeResource (clientResource, RT_NONE);
return BadAlloc; return BadAlloc;
@ -878,7 +878,7 @@ SendShapeNotify (WindowPtr pWin, int which)
RegionPtr region; RegionPtr region;
BYTE shaped; BYTE shaped;
pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, EventType); pHead = (ShapeEventPtr *) LookupIDByType(pWin->drawable.id, ShapeEventType);
if (!pHead) if (!pHead)
return; return;
switch (which) { switch (which) {
@ -957,7 +957,7 @@ ProcShapeInputSelected (ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
pHead = (ShapeEventPtr *) SecurityLookupIDByType(client, pHead = (ShapeEventPtr *) SecurityLookupIDByType(client,
pWin->drawable.id, EventType, DixReadAccess); pWin->drawable.id, ShapeEventType, DixReadAccess);
enabled = xFalse; enabled = xFalse;
if (pHead) { if (pHead) {
for (pShapeEvent = *pHead; for (pShapeEvent = *pHead;