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

Xext: rename saver's EventType to SaverEventType. 

Avoid namespace clashing with the internal events.

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

10
Xext/saver.c
View File

@ -142,7 +142,7 @@ static int ScreenSaverFreeSuspend(
* entry from the per-screen queue. * entry from the per-screen queue.
*/ */
static RESTYPE EventType; /* resource type for event masks */ static RESTYPE SaverEventType; /* resource type for event masks */
typedef struct _ScreenSaverEvent *ScreenSaverEventPtr; typedef struct _ScreenSaverEvent *ScreenSaverEventPtr;
@ -253,7 +253,7 @@ ScreenSaverExtensionInit(INITARGS)
ScreenPtr pScreen; ScreenPtr pScreen;
AttrType = CreateNewResourceType(ScreenSaverFreeAttr); AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
EventType = CreateNewResourceType(ScreenSaverFreeEvents); SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents);
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend); SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
for (i = 0; i < screenInfo.numScreens; i++) for (i = 0; i < screenInfo.numScreens; i++)
@ -261,7 +261,7 @@ ScreenSaverExtensionInit(INITARGS)
pScreen = screenInfo.screens[i]; pScreen = screenInfo.screens[i];
SetScreenPrivate (pScreen, NULL); SetScreenPrivate (pScreen, NULL);
} }
if (AttrType && EventType && SuspendType && if (AttrType && SaverEventType && SuspendType &&
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0, (extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
ProcScreenSaverDispatch, SProcScreenSaverDispatch, ProcScreenSaverDispatch, SProcScreenSaverDispatch,
NULL, StandardMinorOpcode))) NULL, StandardMinorOpcode)))
@ -339,7 +339,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
break; break;
if (mask == 0) if (mask == 0)
{ {
FreeResource (pEv->resource, EventType); FreeResource (pEv->resource, SaverEventType);
*pPrev = pEv->next; *pPrev = pEv->next;
xfree (pEv); xfree (pEv);
CheckScreenPrivate (pScreen); CheckScreenPrivate (pScreen);
@ -359,7 +359,7 @@ setEventMask (ScreenPtr pScreen, ClientPtr client, unsigned long mask)
pEv->client = client; pEv->client = client;
pEv->screen = pScreen; pEv->screen = pScreen;
pEv->resource = FakeClientID (client->index); pEv->resource = FakeClientID (client->index);
if (!AddResource (pEv->resource, EventType, (pointer) pEv)) if (!AddResource (pEv->resource, SaverEventType, (pointer) pEv))
return FALSE; return FALSE;
} }
pEv->mask = mask; pEv->mask = mask;