Skip to content

N
nx-libs
Commit ad90098f authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Xext: rename saver's EventType to SaverEventType.

Backport of this xorg-xserver commit: commit cfd3443fe81685e91a53063dee58e24a5684dc29 Author: Peter Hutterer <peter.hutterer@who-t.net> Date: Wed Jan 28 13:34:10 2009 +1000 Xext: rename saver's EventType to SaverEventType. Avoid namespace clashing with the internal events. Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 238a4b68
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
nx-X11/programs/Xserver/Xext/saver.c
View file @ ad90098f
...@@ -148,7 +148,7 @@ static int ScreenSaverFreeSuspend( ...@@ -148,7 +148,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;
...@@ -256,7 +256,7 @@ ScreenSaverExtensionInit(void) ...@@ -256,7 +256,7 @@ ScreenSaverExtensionInit(void)
ScreenPtr pScreen; ScreenPtr pScreen;
AttrType = CreateNewResourceType(ScreenSaverFreeAttr); AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
EventType = CreateNewResourceType(ScreenSaverFreeEvents); SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents);
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend); SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
ScreenPrivateIndex = AllocateScreenPrivateIndex (); ScreenPrivateIndex = AllocateScreenPrivateIndex ();
...@@ -265,7 +265,7 @@ ScreenSaverExtensionInit(void) ...@@ -265,7 +265,7 @@ ScreenSaverExtensionInit(void)
pScreen = screenInfo.screens[i]; pScreen = screenInfo.screens[i];
SetScreenPrivate (pScreen, NULL); SetScreenPrivate (pScreen, NULL);
} }
if (AttrType && EventType && SuspendType && ScreenPrivateIndex != -1 && if (AttrType && SaverEventType && SuspendType && ScreenPrivateIndex != -1 &&
(extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0, (extEntry = AddExtension(ScreenSaverName, ScreenSaverNumberEvents, 0,
ProcScreenSaverDispatch, SProcScreenSaverDispatch, ProcScreenSaverDispatch, SProcScreenSaverDispatch,
ScreenSaverResetProc, StandardMinorOpcode))) ScreenSaverResetProc, StandardMinorOpcode)))
...@@ -360,7 +360,7 @@ setEventMask (pScreen, client, mask) ...@@ -360,7 +360,7 @@ setEventMask (pScreen, client, mask)
break; break;
if (mask == 0) if (mask == 0)
{ {
FreeResource (pEv->resource, EventType); FreeResource (pEv->resource, SaverEventType);
*pPrev = pEv->next; *pPrev = pEv->next;
free (pEv); free (pEv);
CheckScreenPrivate (pScreen); CheckScreenPrivate (pScreen);
...@@ -380,7 +380,7 @@ setEventMask (pScreen, client, mask) ...@@ -380,7 +380,7 @@ setEventMask (pScreen, client, 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, (void *) pEv)) if (!AddResource (pEv->resource, SaverEventType, (void *) pEv))
return FALSE; return FALSE;
} }
pEv->mask = mask; pEv->mask = mask;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment