Add type name argument to CreateNewResourceType
Convert all calls of CreateNewResourceType to pass name argument Breaks DIX ABI. ABI versions bumped: Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> Reviewed-by: Keith Packard <keithp@keithp.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
a11c58fa0c
commit
895f40792a
18
Xext/mbuf.c
18
Xext/mbuf.c
|
@ -42,8 +42,6 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
#include "sleepuntil.h"
|
#include "sleepuntil.h"
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
#include <X11/extensions/multibufconst.h>
|
#include <X11/extensions/multibufconst.h>
|
||||||
#include <X11/extensions/multibufproto.h>
|
#include <X11/extensions/multibufproto.h>
|
||||||
|
|
||||||
|
@ -469,12 +467,15 @@ MultibufferExtensionInit()
|
||||||
* create the resource types
|
* create the resource types
|
||||||
*/
|
*/
|
||||||
MultibufferDrawableResType =
|
MultibufferDrawableResType =
|
||||||
CreateNewResourceType(MultibufferDrawableDelete);
|
CreateNewResourceType(MultibufferDrawableDelete, "MultibufferDrawable");
|
||||||
if (MultiBufferDrawableResType)
|
if (MultiBufferDrawableResType)
|
||||||
MultibufferDrawableResType |= RC_DRAWABLE;
|
MultibufferDrawableResType |= RC_DRAWABLE;
|
||||||
MultibufferResType = CreateNewResourceType(MultibufferDelete);
|
MultibufferResType = CreateNewResourceType(MultibufferDelete,
|
||||||
MultibuffersResType = CreateNewResourceType(MultibuffersDelete);
|
"MultibufferBuffer");
|
||||||
OtherClientResType = CreateNewResourceType(OtherClientDelete);
|
MultibuffersResType = CreateNewResourceType(MultibuffersDelete,
|
||||||
|
"MultibufferWindow");
|
||||||
|
OtherClientResType = CreateNewResourceType(OtherClientDelete,
|
||||||
|
"MultibufferOtherClient");
|
||||||
if (MultibufferDrawableResType && MultibufferResType &&
|
if (MultibufferDrawableResType && MultibufferResType &&
|
||||||
MultibuffersResType && OtherClientResType &&
|
MultibuffersResType && OtherClientResType &&
|
||||||
(extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME,
|
(extEntry = AddExtension(MULTIBUFFER_PROTOCOL_NAME,
|
||||||
|
@ -483,11 +484,6 @@ MultibufferExtensionInit()
|
||||||
ProcMultibufferDispatch, SProcMultibufferDispatch,
|
ProcMultibufferDispatch, SProcMultibufferDispatch,
|
||||||
MultibufferResetProc, StandardMinorOpcode)))
|
MultibufferResetProc, StandardMinorOpcode)))
|
||||||
{
|
{
|
||||||
RegisterResourceName(MultibufferDrawableResType,
|
|
||||||
"MultibufferDrawable");
|
|
||||||
RegisterResourceName(MultibufferResType, "MultibufferBuffer");
|
|
||||||
RegisterResourceName(MultibuffersResType, "MultibufferWindow");
|
|
||||||
RegisterResourceName(OtherClientResType, "MultibufferOtherClient");
|
|
||||||
MultibufferEventBase = extEntry->eventBase;
|
MultibufferEventBase = extEntry->eventBase;
|
||||||
MultibufferErrorBase = extEntry->errorBase;
|
MultibufferErrorBase = extEntry->errorBase;
|
||||||
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;
|
EventSwapVector[MultibufferEventBase + MultibufferClobberNotify] = (EventSwapPtr) SClobberNotifyEvent;
|
||||||
|
|
|
@ -52,7 +52,6 @@ Equipment Corporation.
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#ifdef RENDER
|
#ifdef RENDER
|
||||||
#include "picturestr.h"
|
#include "picturestr.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -504,21 +503,20 @@ void PanoramiXExtensionInit(int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
XRC_DRAWABLE = CreateNewResourceClass();
|
XRC_DRAWABLE = CreateNewResourceClass();
|
||||||
XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource);
|
XRT_WINDOW = CreateNewResourceType(XineramaDeleteResource,
|
||||||
|
"XineramaWindow");
|
||||||
if (XRT_WINDOW)
|
if (XRT_WINDOW)
|
||||||
XRT_WINDOW |= XRC_DRAWABLE;
|
XRT_WINDOW |= XRC_DRAWABLE;
|
||||||
XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource);
|
XRT_PIXMAP = CreateNewResourceType(XineramaDeleteResource,
|
||||||
|
"XineramaPixmap");
|
||||||
if (XRT_PIXMAP)
|
if (XRT_PIXMAP)
|
||||||
XRT_PIXMAP |= XRC_DRAWABLE;
|
XRT_PIXMAP |= XRC_DRAWABLE;
|
||||||
XRT_GC = CreateNewResourceType(XineramaDeleteResource);
|
XRT_GC = CreateNewResourceType(XineramaDeleteResource,
|
||||||
XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource);
|
"XineramaGC");
|
||||||
|
XRT_COLORMAP = CreateNewResourceType(XineramaDeleteResource,
|
||||||
|
"XineramaColormap");
|
||||||
|
|
||||||
if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) {
|
if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) {
|
||||||
RegisterResourceName(XRT_WINDOW, "XineramaWindow");
|
|
||||||
RegisterResourceName(XRT_PIXMAP, "XineramaPixmap");
|
|
||||||
RegisterResourceName(XRT_GC, "XineramaGC");
|
|
||||||
RegisterResourceName(XRT_COLORMAP, "XineramaColormap");
|
|
||||||
|
|
||||||
panoramiXGeneration = serverGeneration;
|
panoramiXGeneration = serverGeneration;
|
||||||
success = TRUE;
|
success = TRUE;
|
||||||
}
|
}
|
||||||
|
|
12
Xext/saver.c
12
Xext/saver.c
|
@ -47,7 +47,6 @@ in this Software without prior written authorization from the X Consortium.
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
#ifdef PANORAMIX
|
#ifdef PANORAMIX
|
||||||
#include "panoramiX.h"
|
#include "panoramiX.h"
|
||||||
#include "panoramiXsrv.h"
|
#include "panoramiXsrv.h"
|
||||||
|
@ -253,9 +252,11 @@ ScreenSaverExtensionInit(INITARGS)
|
||||||
int i;
|
int i;
|
||||||
ScreenPtr pScreen;
|
ScreenPtr pScreen;
|
||||||
|
|
||||||
AttrType = CreateNewResourceType(ScreenSaverFreeAttr);
|
AttrType = CreateNewResourceType(ScreenSaverFreeAttr, "SaverAttr");
|
||||||
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents);
|
SaverEventType = CreateNewResourceType(ScreenSaverFreeEvents,
|
||||||
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend);
|
"SaverEvent");
|
||||||
|
SuspendType = CreateNewResourceType(ScreenSaverFreeSuspend,
|
||||||
|
"SaverSuspend");
|
||||||
|
|
||||||
for (i = 0; i < screenInfo.numScreens; i++)
|
for (i = 0; i < screenInfo.numScreens; i++)
|
||||||
{
|
{
|
||||||
|
@ -267,9 +268,6 @@ ScreenSaverExtensionInit(INITARGS)
|
||||||
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
|
ProcScreenSaverDispatch, SProcScreenSaverDispatch,
|
||||||
NULL, StandardMinorOpcode)))
|
NULL, StandardMinorOpcode)))
|
||||||
{
|
{
|
||||||
RegisterResourceName(AttrType, "SaverAttr");
|
|
||||||
RegisterResourceName(SaverEventType, "SaverEvent");
|
|
||||||
RegisterResourceName(SuspendType, "SaverSuspend");
|
|
||||||
ScreenSaverEventBase = extEntry->eventBase;
|
ScreenSaverEventBase = extEntry->eventBase;
|
||||||
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
|
EventSwapVector[ScreenSaverEventBase] = (EventSwapPtr) SScreenSaverNotifyEvent;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1105,17 +1105,17 @@ SecurityExtensionInit(INITARGS)
|
||||||
int ret = TRUE;
|
int ret = TRUE;
|
||||||
|
|
||||||
SecurityAuthorizationResType =
|
SecurityAuthorizationResType =
|
||||||
CreateNewResourceType(SecurityDeleteAuthorization);
|
CreateNewResourceType(SecurityDeleteAuthorization,
|
||||||
|
"SecurityAuthorization");
|
||||||
|
|
||||||
RTEventClient = CreateNewResourceType(
|
RTEventClient =
|
||||||
SecurityDeleteAuthorizationEventClient);
|
CreateNewResourceType(SecurityDeleteAuthorizationEventClient,
|
||||||
|
"SecurityEventClient");
|
||||||
|
|
||||||
if (!SecurityAuthorizationResType || !RTEventClient)
|
if (!SecurityAuthorizationResType || !RTEventClient)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
RTEventClient |= RC_NEVERRETAIN;
|
RTEventClient |= RC_NEVERRETAIN;
|
||||||
RegisterResourceName(SecurityAuthorizationResType, "SecurityAuthorization");
|
|
||||||
RegisterResourceName(RTEventClient, "SecurityEventClient");
|
|
||||||
|
|
||||||
/* Allocate the private storage */
|
/* Allocate the private storage */
|
||||||
if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))
|
if (!dixRequestPrivate(stateKey, sizeof(SecurityStateRec)))
|
||||||
|
|
|
@ -40,7 +40,6 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
#include <X11/extensions/shapeproto.h>
|
#include <X11/extensions/shapeproto.h>
|
||||||
#include "regionstr.h"
|
#include "regionstr.h"
|
||||||
|
@ -128,15 +127,13 @@ ShapeExtensionInit(void)
|
||||||
{
|
{
|
||||||
ExtensionEntry *extEntry;
|
ExtensionEntry *extEntry;
|
||||||
|
|
||||||
ClientType = CreateNewResourceType(ShapeFreeClient);
|
ClientType = CreateNewResourceType(ShapeFreeClient, "ShapeClient");
|
||||||
ShapeEventType = CreateNewResourceType(ShapeFreeEvents);
|
ShapeEventType = CreateNewResourceType(ShapeFreeEvents, "ShapeEvent");
|
||||||
if (ClientType && ShapeEventType &&
|
if (ClientType && ShapeEventType &&
|
||||||
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
|
(extEntry = AddExtension(SHAPENAME, ShapeNumberEvents, 0,
|
||||||
ProcShapeDispatch, SProcShapeDispatch,
|
ProcShapeDispatch, SProcShapeDispatch,
|
||||||
NULL, StandardMinorOpcode)))
|
NULL, StandardMinorOpcode)))
|
||||||
{
|
{
|
||||||
RegisterResourceName(ClientType, "ShapeClient");
|
|
||||||
RegisterResourceName(ShapeEventType, "ShapeEvent");
|
|
||||||
ShapeEventBase = extEntry->eventBase;
|
ShapeEventBase = extEntry->eventBase;
|
||||||
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
|
EventSwapVector[ShapeEventBase] = (EventSwapPtr) SShapeNotifyEvent;
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,7 +52,6 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
#include "shmint.h"
|
#include "shmint.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
#include <X11/extensions/shmproto.h>
|
#include <X11/extensions/shmproto.h>
|
||||||
#include <X11/Xfuncproto.h>
|
#include <X11/Xfuncproto.h>
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
@ -278,13 +277,12 @@ ShmExtensionInit(INITARGS)
|
||||||
screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
|
screenInfo.screens[i]->DestroyPixmap = ShmDestroyPixmap;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ShmSegType = CreateNewResourceType(ShmDetachSegment);
|
ShmSegType = CreateNewResourceType(ShmDetachSegment, "ShmSeg");
|
||||||
if (ShmSegType &&
|
if (ShmSegType &&
|
||||||
(extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors,
|
(extEntry = AddExtension(SHMNAME, ShmNumberEvents, ShmNumberErrors,
|
||||||
ProcShmDispatch, SProcShmDispatch,
|
ProcShmDispatch, SProcShmDispatch,
|
||||||
ShmResetProc, StandardMinorOpcode)))
|
ShmResetProc, StandardMinorOpcode)))
|
||||||
{
|
{
|
||||||
RegisterResourceName(ShmSegType, "ShmSeg");
|
|
||||||
ShmReqCode = (unsigned char)extEntry->base;
|
ShmReqCode = (unsigned char)extEntry->base;
|
||||||
ShmCompletionCode = extEntry->eventBase;
|
ShmCompletionCode = extEntry->eventBase;
|
||||||
BadShmSegCode = extEntry->errorBase;
|
BadShmSegCode = extEntry->errorBase;
|
||||||
|
|
|
@ -39,7 +39,6 @@ in this Software without prior written authorization from The Open Group.
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "pixmapstr.h"
|
#include "pixmapstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
typedef struct _Sertafied {
|
typedef struct _Sertafied {
|
||||||
struct _Sertafied *next;
|
struct _Sertafied *next;
|
||||||
|
@ -88,10 +87,10 @@ ClientSleepUntil (ClientPtr client,
|
||||||
|
|
||||||
if (SertafiedGeneration != serverGeneration)
|
if (SertafiedGeneration != serverGeneration)
|
||||||
{
|
{
|
||||||
SertafiedResType = CreateNewResourceType (SertafiedDelete);
|
SertafiedResType = CreateNewResourceType (SertafiedDelete,
|
||||||
|
"ClientSleep");
|
||||||
if (!SertafiedResType)
|
if (!SertafiedResType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
RegisterResourceName(SertafiedResType, "ClientSleep");
|
|
||||||
SertafiedGeneration = serverGeneration;
|
SertafiedGeneration = serverGeneration;
|
||||||
BlockHandlerRegistered = FALSE;
|
BlockHandlerRegistered = FALSE;
|
||||||
}
|
}
|
||||||
|
|
16
Xext/sync.c
16
Xext/sync.c
|
@ -64,7 +64,6 @@ PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
#include <X11/extensions/syncproto.h>
|
#include <X11/extensions/syncproto.h>
|
||||||
#include "syncsrv.h"
|
#include "syncsrv.h"
|
||||||
|
@ -874,12 +873,11 @@ SyncCreateSystemCounter(
|
||||||
*/
|
*/
|
||||||
if (RTCounter == 0)
|
if (RTCounter == 0)
|
||||||
{
|
{
|
||||||
RTCounter = CreateNewResourceType(FreeCounter);
|
RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
|
||||||
if (RTCounter == 0)
|
if (RTCounter == 0)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
RegisterResourceName(RTCounter, "SyncCounter");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);
|
pCounter = SyncCreateCounter(NULL, FakeClientID(0), initial);
|
||||||
|
@ -2112,13 +2110,13 @@ SyncExtensionInit(void)
|
||||||
|
|
||||||
if (RTCounter == 0)
|
if (RTCounter == 0)
|
||||||
{
|
{
|
||||||
RTCounter = CreateNewResourceType(FreeCounter);
|
RTCounter = CreateNewResourceType(FreeCounter, "SyncCounter");
|
||||||
}
|
}
|
||||||
RTAlarm = CreateNewResourceType(FreeAlarm);
|
RTAlarm = CreateNewResourceType(FreeAlarm, "SyncAlarm");
|
||||||
RTAwait = CreateNewResourceType(FreeAwait);
|
RTAwait = CreateNewResourceType(FreeAwait, "SyncAwait");
|
||||||
if (RTAwait)
|
if (RTAwait)
|
||||||
RTAwait |= RC_NEVERRETAIN;
|
RTAwait |= RC_NEVERRETAIN;
|
||||||
RTAlarmClient = CreateNewResourceType(FreeAlarmClient);
|
RTAlarmClient = CreateNewResourceType(FreeAlarmClient, "SyncAlarmClient");
|
||||||
if (RTAlarmClient)
|
if (RTAlarmClient)
|
||||||
RTAlarmClient |= RC_NEVERRETAIN;
|
RTAlarmClient |= RC_NEVERRETAIN;
|
||||||
|
|
||||||
|
@ -2135,10 +2133,6 @@ SyncExtensionInit(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
RegisterResourceName(RTCounter, "SyncCounter");
|
|
||||||
RegisterResourceName(RTAlarm, "SyncAlarm");
|
|
||||||
RegisterResourceName(RTAwait, "SyncAwait");
|
|
||||||
RegisterResourceName(RTAlarmClient, "SyncAlarmClient");
|
|
||||||
SyncEventBase = extEntry->eventBase;
|
SyncEventBase = extEntry->eventBase;
|
||||||
SyncErrorBase = extEntry->errorBase;
|
SyncErrorBase = extEntry->errorBase;
|
||||||
EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;
|
EventSwapVector[SyncEventBase + XSyncCounterNotify] = (EventSwapPtr) SCounterNotifyEvent;
|
||||||
|
|
|
@ -36,7 +36,6 @@ SOFTWARE.
|
||||||
#include "gcstruct.h"
|
#include "gcstruct.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
|
|
||||||
#include <X11/extensions/Xv.h>
|
#include <X11/extensions/Xv.h>
|
||||||
|
@ -1864,12 +1863,10 @@ void XineramifyXv(void)
|
||||||
XvAdaptorPtr MatchingAdaptors[MAXSCREENS];
|
XvAdaptorPtr MatchingAdaptors[MAXSCREENS];
|
||||||
int i, j, k, l;
|
int i, j, k, l;
|
||||||
|
|
||||||
XvXRTPort = CreateNewResourceType(XineramaDeleteResource);
|
XvXRTPort = CreateNewResourceType(XineramaDeleteResource, "XvXRTPort");
|
||||||
|
|
||||||
if (!xvsp0 || !XvXRTPort) return;
|
if (!xvsp0 || !XvXRTPort) return;
|
||||||
|
|
||||||
RegisterResourceName(XvXRTPort, "XvXRTPort");
|
|
||||||
|
|
||||||
for(i = 0; i < xvsp0->nAdaptors; i++) {
|
for(i = 0; i < xvsp0->nAdaptors; i++) {
|
||||||
refAdapt = xvsp0->pAdaptors + i;
|
refAdapt = xvsp0->pAdaptors + i;
|
||||||
|
|
||||||
|
|
|
@ -90,7 +90,6 @@ SOFTWARE.
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "opaque.h"
|
#include "opaque.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
|
@ -209,47 +208,45 @@ CreateResourceTypes(void)
|
||||||
|
|
||||||
XvResourceGeneration = serverGeneration;
|
XvResourceGeneration = serverGeneration;
|
||||||
|
|
||||||
if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort)))
|
if (!(XvRTPort = CreateNewResourceType(XvdiDestroyPort, "XvRTPort")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate port resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate port resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTPort, "XvRTPort");
|
|
||||||
|
|
||||||
if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab)))
|
if (!(XvRTGrab = CreateNewResourceType(XvdiDestroyGrab, "XvRTGrab")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate grab resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate grab resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTGrab, "XvRTGrab");
|
|
||||||
|
|
||||||
if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding)))
|
if (!(XvRTEncoding = CreateNewResourceType(XvdiDestroyEncoding,
|
||||||
|
"XvRTEncoding")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate encoding resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTEncoding, "XvRTEncoding");
|
|
||||||
|
|
||||||
if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify)))
|
if (!(XvRTVideoNotify = CreateNewResourceType(XvdiDestroyVideoNotify,
|
||||||
|
"XvRTVideoNotify")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate video notify resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTVideoNotify, "XvRTVideoNotify");
|
|
||||||
|
|
||||||
if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList)))
|
if (!(XvRTVideoNotifyList = CreateNewResourceType(XvdiDestroyVideoNotifyList,
|
||||||
|
"XvRTVideoNotifyList")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate video notify list resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTVideoNotifyList, "XvRTVideoNotifyList");
|
|
||||||
|
|
||||||
if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify)))
|
if (!(XvRTPortNotify = CreateNewResourceType(XvdiDestroyPortNotify,
|
||||||
|
"XvRTPortNotify")))
|
||||||
{
|
{
|
||||||
ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n");
|
ErrorF("CreateResourceTypes: failed to allocate port notify resource.\n");
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
RegisterResourceName(XvRTPortNotify, "XvRTPortNotify");
|
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
|
13
Xext/xvmc.c
13
Xext/xvmc.c
|
@ -11,7 +11,6 @@
|
||||||
#include "os.h"
|
#include "os.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
|
@ -675,17 +674,17 @@ XvMCExtensionInit(void)
|
||||||
if(XvMCScreenKey == NULL) /* nobody supports it */
|
if(XvMCScreenKey == NULL) /* nobody supports it */
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes)))
|
if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,
|
||||||
|
"XvMCRTContext")))
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(XvMCRTContext, "XvMCRTContext");
|
|
||||||
|
|
||||||
if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes)))
|
if(!(XvMCRTSurface = CreateNewResourceType(XvMCDestroySurfaceRes,
|
||||||
|
"XvMCRTSurface")))
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(XvMCRTSurface, "XvMCRTSurface");
|
|
||||||
|
|
||||||
if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes)))
|
if(!(XvMCRTSubpicture = CreateNewResourceType(XvMCDestroySubpictureRes,
|
||||||
|
"XvMCRTSubpicture")))
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(XvMCRTSubpicture, "XvMCRTSubpicture");
|
|
||||||
|
|
||||||
extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors,
|
extEntry = AddExtension(XvMCName, XvMCNumEvents, XvMCNumErrors,
|
||||||
ProcXvMCDispatch, SProcXvMCDispatch,
|
ProcXvMCDispatch, SProcXvMCDispatch,
|
||||||
|
|
|
@ -70,7 +70,6 @@ SOFTWARE.
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
#include "exglobals.h"
|
#include "exglobals.h"
|
||||||
#include "swaprep.h"
|
#include "swaprep.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "privates.h"
|
#include "privates.h"
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
|
||||||
|
@ -1269,10 +1268,10 @@ XInputExtensionInit(void)
|
||||||
IEventBase = extEntry->eventBase;
|
IEventBase = extEntry->eventBase;
|
||||||
XIVersion = thisversion;
|
XIVersion = thisversion;
|
||||||
MakeDeviceTypeAtoms();
|
MakeDeviceTypeAtoms();
|
||||||
RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone);
|
RT_INPUTCLIENT = CreateNewResourceType((DeleteType) InputClientGone,
|
||||||
|
"INPUTCLIENT");
|
||||||
if (!RT_INPUTCLIENT)
|
if (!RT_INPUTCLIENT)
|
||||||
FatalError("Failed to add resource type for XI.\n");
|
FatalError("Failed to add resource type for XI.\n");
|
||||||
RegisterResourceName(RT_INPUTCLIENT, "INPUTCLIENT");
|
|
||||||
FixExtensionEvents(extEntry);
|
FixExtensionEvents(extEntry);
|
||||||
ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;
|
ReplySwapVector[IReqCode] = (ReplySwapPtr) SReplyIDispatch;
|
||||||
EventSwapVector[DeviceValuator] = SEventIDispatch;
|
EventSwapVector[DeviceValuator] = SEventIDispatch;
|
||||||
|
|
|
@ -47,7 +47,6 @@
|
||||||
|
|
||||||
#include "compint.h"
|
#include "compint.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
|
||||||
static CARD8 CompositeReqCode;
|
static CARD8 CompositeReqCode;
|
||||||
|
@ -547,22 +546,20 @@ CompositeExtensionInit (void)
|
||||||
return;
|
return;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CompositeClientWindowType = CreateNewResourceType (FreeCompositeClientWindow);
|
CompositeClientWindowType = CreateNewResourceType
|
||||||
|
(FreeCompositeClientWindow, "CompositeClientWindow");
|
||||||
if (!CompositeClientWindowType)
|
if (!CompositeClientWindowType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(CompositeClientWindowType, "CompositeClientWindow");
|
|
||||||
|
|
||||||
CompositeClientSubwindowsType = CreateNewResourceType (FreeCompositeClientSubwindows);
|
CompositeClientSubwindowsType = CreateNewResourceType
|
||||||
|
(FreeCompositeClientSubwindows, "CompositeClientSubwindows");
|
||||||
if (!CompositeClientSubwindowsType)
|
if (!CompositeClientSubwindowsType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(CompositeClientSubwindowsType,
|
|
||||||
"CompositeClientSubwindows");
|
|
||||||
|
|
||||||
CompositeClientOverlayType = CreateNewResourceType (FreeCompositeClientOverlay);
|
CompositeClientOverlayType = CreateNewResourceType
|
||||||
|
(FreeCompositeClientOverlay, "CompositeClientOverlay");
|
||||||
if (!CompositeClientOverlayType)
|
if (!CompositeClientOverlayType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(CompositeClientOverlayType,
|
|
||||||
"CompositeClientOverlay");
|
|
||||||
|
|
||||||
if (!dixRequestPrivate(CompositeClientPrivateKey,
|
if (!dixRequestPrivate(CompositeClientPrivateKey,
|
||||||
sizeof(CompositeClientRec)))
|
sizeof(CompositeClientRec)))
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "registry.h"
|
|
||||||
#include "damageextint.h"
|
#include "damageextint.h"
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
|
|
||||||
|
@ -498,15 +497,13 @@ DamageExtensionInit(void)
|
||||||
for (s = 0; s < screenInfo.numScreens; s++)
|
for (s = 0; s < screenInfo.numScreens; s++)
|
||||||
DamageSetup (screenInfo.screens[s]);
|
DamageSetup (screenInfo.screens[s]);
|
||||||
|
|
||||||
DamageExtType = CreateNewResourceType (FreeDamageExt);
|
DamageExtType = CreateNewResourceType (FreeDamageExt, "DamageExt");
|
||||||
if (!DamageExtType)
|
if (!DamageExtType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(DamageExtType, "DamageExt");
|
|
||||||
|
|
||||||
DamageExtWinType = CreateNewResourceType (FreeDamageExtWin);
|
DamageExtWinType = CreateNewResourceType (FreeDamageExtWin, "DamageExtWin");
|
||||||
if (!DamageExtWinType)
|
if (!DamageExtWinType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(DamageExtWinType, "DamageExtWin");
|
|
||||||
|
|
||||||
if (!dixRequestPrivate(DamageClientPrivateKey, sizeof (DamageClientRec)))
|
if (!dixRequestPrivate(DamageClientPrivateKey, sizeof (DamageClientRec)))
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -54,7 +54,6 @@
|
||||||
#include "dbestruct.h"
|
#include "dbestruct.h"
|
||||||
#include "midbe.h"
|
#include "midbe.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
/* GLOBALS */
|
/* GLOBALS */
|
||||||
|
|
||||||
|
@ -1574,17 +1573,15 @@ DbeExtensionInit(void)
|
||||||
|
|
||||||
/* Create the resource types. */
|
/* Create the resource types. */
|
||||||
dbeDrawableResType =
|
dbeDrawableResType =
|
||||||
CreateNewResourceType(DbeDrawableDelete);
|
CreateNewResourceType(DbeDrawableDelete, "dbeDrawable");
|
||||||
if (!dbeDrawableResType)
|
if (!dbeDrawableResType)
|
||||||
return;
|
return;
|
||||||
dbeDrawableResType |= RC_DRAWABLE;
|
dbeDrawableResType |= RC_DRAWABLE;
|
||||||
RegisterResourceName(dbeDrawableResType, "dbeDrawable");
|
|
||||||
|
|
||||||
dbeWindowPrivResType =
|
dbeWindowPrivResType =
|
||||||
CreateNewResourceType(DbeWindowPrivDelete);
|
CreateNewResourceType(DbeWindowPrivDelete, "dbeWindow");
|
||||||
if (!dbeWindowPrivResType)
|
if (!dbeWindowPrivResType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(dbeWindowPrivResType, "dbeWindow");
|
|
||||||
|
|
||||||
if (!dixRegisterPrivateOffset(dbeDrawableResType,
|
if (!dixRegisterPrivateOffset(dbeDrawableResType,
|
||||||
offsetof(PixmapRec, devPrivates)))
|
offsetof(PixmapRec, devPrivates)))
|
||||||
|
|
|
@ -141,10 +141,10 @@ Equipment Corporation.
|
||||||
#endif
|
#endif
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include "registry.h"
|
||||||
|
|
||||||
#ifdef XSERVER_DTRACE
|
#ifdef XSERVER_DTRACE
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include "registry.h"
|
|
||||||
typedef const char *string;
|
typedef const char *string;
|
||||||
#include "Xserver-dtrace.h"
|
#include "Xserver-dtrace.h"
|
||||||
|
|
||||||
|
@ -197,7 +197,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
|
||||||
}
|
}
|
||||||
|
|
||||||
RESTYPE
|
RESTYPE
|
||||||
CreateNewResourceType(DeleteType deleteFunc)
|
CreateNewResourceType(DeleteType deleteFunc, char *name)
|
||||||
{
|
{
|
||||||
RESTYPE next = lastResourceType + 1;
|
RESTYPE next = lastResourceType + 1;
|
||||||
DeleteType *funcs;
|
DeleteType *funcs;
|
||||||
|
@ -214,6 +214,10 @@ CreateNewResourceType(DeleteType deleteFunc)
|
||||||
lastResourceType = next;
|
lastResourceType = next;
|
||||||
DeleteFuncs = funcs;
|
DeleteFuncs = funcs;
|
||||||
DeleteFuncs[next] = deleteFunc;
|
DeleteFuncs[next] = deleteFunc;
|
||||||
|
|
||||||
|
/* Called even if name is NULL, to remove any previous entry */
|
||||||
|
RegisterResourceName(next, name);
|
||||||
|
|
||||||
return next;
|
return next;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
14
glx/glxext.c
14
glx/glxext.c
|
@ -343,17 +343,15 @@ void GlxExtensionInit(void)
|
||||||
__GLXprovider *p;
|
__GLXprovider *p;
|
||||||
Bool glx_provided = False;
|
Bool glx_provided = False;
|
||||||
|
|
||||||
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
|
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
|
||||||
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
|
"GLXContext");
|
||||||
__glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone);
|
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone,
|
||||||
|
"GLXDrawable");
|
||||||
|
__glXSwapBarrierRes = CreateNewResourceType((DeleteType)SwapBarrierGone,
|
||||||
|
"GLXSwapBarrier");
|
||||||
if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)
|
if (!__glXContextRes || !__glXDrawableRes || !__glXSwapBarrierRes)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
RegisterResourceName(__glXContextRes, "GLXContext");
|
|
||||||
RegisterResourceName(__glXDrawableRes, "GLXDrawable");
|
|
||||||
RegisterResourceName(__glXSwapBarrierRes, "GLXSwapBarrier");
|
|
||||||
|
|
||||||
if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
|
if (!dixRequestPrivate(glxClientPrivateKey, sizeof (__GLXclientState)))
|
||||||
return;
|
return;
|
||||||
if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))
|
if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))
|
||||||
|
|
|
@ -44,7 +44,6 @@
|
||||||
#include "glxvisuals.h"
|
#include "glxvisuals.h"
|
||||||
#include "micmap.h"
|
#include "micmap.h"
|
||||||
#include "glxswap.h"
|
#include "glxswap.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Stubs to satisfy miinitext.c references.
|
** Stubs to satisfy miinitext.c references.
|
||||||
|
@ -294,22 +293,21 @@ void GlxExtensionInit(void)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
|
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone,
|
||||||
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone);
|
"GLXContext");
|
||||||
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone);
|
__glXClientRes = CreateNewResourceType((DeleteType)ClientGone,
|
||||||
__glXWindowRes = CreateNewResourceType((DeleteType)WindowGone);
|
"GLXClient");
|
||||||
__glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone);
|
__glXPixmapRes = CreateNewResourceType((DeleteType)PixmapGone,
|
||||||
|
"GLXPixmap");
|
||||||
|
__glXWindowRes = CreateNewResourceType((DeleteType)WindowGone,
|
||||||
|
"GLXWindow");
|
||||||
|
__glXPbufferRes = CreateNewResourceType((DeleteType)PbufferGone,
|
||||||
|
"GLXPbuffer");
|
||||||
|
|
||||||
if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
|
if (!__glXContextRes || !__glXClientRes || !__glXPixmapRes ||
|
||||||
!__glXWindowRes || !__glXPbufferRes)
|
!__glXWindowRes || !__glXPbufferRes)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
RegisterResourceName(__glXContextRes, "GLXContext");
|
|
||||||
RegisterResourceName(__glXClientRes, "GLXClient");
|
|
||||||
RegisterResourceName(__glXPixmapRes, "GLXPixmap");
|
|
||||||
RegisterResourceName(__glXWindowRes, "GLXWindow");
|
|
||||||
RegisterResourceName(__glXPbufferRes, "GLXPbuffer");
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
** Add extension to server extensions.
|
** Add extension to server extensions.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include "privates.h"
|
#include "privates.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -141,12 +140,11 @@ ephyrDRIExtensionInit (ScreenPtr a_screen)
|
||||||
EPHYR_LOG ("host X does have XShape extension\n") ;
|
EPHYR_LOG ("host X does have XShape extension\n") ;
|
||||||
|
|
||||||
#ifdef XF86DRI_EVENTS
|
#ifdef XF86DRI_EVENTS
|
||||||
EventType = CreateNewResourceType (XF86DRIFreeEvents);
|
EventType = CreateNewResourceType (XF86DRIFreeEvents, "DRIEvents");
|
||||||
if (!EventType) {
|
if (!EventType) {
|
||||||
EPHYR_LOG_ERROR ("failed to register DRI event resource type\n") ;
|
EPHYR_LOG_ERROR ("failed to register DRI event resource type\n") ;
|
||||||
goto out ;
|
goto out ;
|
||||||
}
|
}
|
||||||
RegisterResourceName(EventType, "DRIEvents");
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if ((extEntry = AddExtension(XF86DRINAME,
|
if ((extEntry = AddExtension(XF86DRINAME,
|
||||||
|
|
|
@ -82,9 +82,9 @@ typedef enum {
|
||||||
* mask is 0xFFFF0000.
|
* mask is 0xFFFF0000.
|
||||||
*/
|
*/
|
||||||
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
|
#define ABI_ANSIC_VERSION SET_ABI_VERSION(0, 4)
|
||||||
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(6, 0)
|
#define ABI_VIDEODRV_VERSION SET_ABI_VERSION(7, 0)
|
||||||
#define ABI_XINPUT_VERSION SET_ABI_VERSION(7, 0)
|
#define ABI_XINPUT_VERSION SET_ABI_VERSION(8, 0)
|
||||||
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(2, 0)
|
#define ABI_EXTENSION_VERSION SET_ABI_VERSION(3, 0)
|
||||||
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
|
#define ABI_FONT_VERSION SET_ABI_VERSION(0, 6)
|
||||||
|
|
||||||
#define MODINFOSTRING1 0xef23fdc5
|
#define MODINFOSTRING1 0xef23fdc5
|
||||||
|
|
|
@ -39,7 +39,6 @@ from Kaleb S. KEITHLEY
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
#include <X11/extensions/xf86vmproto.h>
|
#include <X11/extensions/xf86vmproto.h>
|
||||||
|
@ -171,7 +170,7 @@ XFree86VidModeExtensionInit(void)
|
||||||
DEBUG_P("XFree86VidModeExtensionInit");
|
DEBUG_P("XFree86VidModeExtensionInit");
|
||||||
|
|
||||||
#ifdef XF86VIDMODE_EVENTS
|
#ifdef XF86VIDMODE_EVENTS
|
||||||
EventType = CreateNewResourceType(XF86VidModeFreeEvents);
|
EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
for(i = 0; i < screenInfo.numScreens; i++) {
|
for(i = 0; i < screenInfo.numScreens; i++) {
|
||||||
|
@ -202,7 +201,6 @@ XFree86VidModeExtensionInit(void)
|
||||||
#endif
|
#endif
|
||||||
VidModeErrorBase = extEntry->errorBase;
|
VidModeErrorBase = extEntry->errorBase;
|
||||||
#ifdef XF86VIDMODE_EVENTS
|
#ifdef XF86VIDMODE_EVENTS
|
||||||
RegisterResourceName(EventType, "VidModeEvent");
|
|
||||||
XF86VidModeEventBase = extEntry->eventBase;
|
XF86VidModeEventBase = extEntry->eventBase;
|
||||||
EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;
|
EventSwapVector[XF86VidModeEventBase] = (EventSwapPtr)SXF86VidModeNotifyEvent;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -51,7 +51,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -790,13 +789,13 @@ DRIExtensionInit(void)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
|
DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
|
||||||
DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete);
|
"DRIDrawable");
|
||||||
|
DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete,
|
||||||
|
"DRIContext");
|
||||||
|
|
||||||
if (!DRIDrawablePrivResType || !DRIContextPrivResType)
|
if (!DRIDrawablePrivResType || !DRIContextPrivResType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
RegisterResourceName(DRIDrawablePrivResType, "DRIDrawable");
|
|
||||||
RegisterResourceName(DRIContextPrivResType, "DRIContext");
|
|
||||||
|
|
||||||
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
|
RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -95,7 +94,7 @@ XFree86DRIExtensionInit(void)
|
||||||
ExtensionEntry* extEntry;
|
ExtensionEntry* extEntry;
|
||||||
|
|
||||||
#ifdef XF86DRI_EVENTS
|
#ifdef XF86DRI_EVENTS
|
||||||
EventType = CreateNewResourceType(XF86DRIFreeEvents);
|
EventType = CreateNewResourceType(XF86DRIFreeEvents, "DRIEvent");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (
|
if (
|
||||||
|
@ -112,9 +111,6 @@ XFree86DRIExtensionInit(void)
|
||||||
StandardMinorOpcode))) {
|
StandardMinorOpcode))) {
|
||||||
DRIReqCode = (unsigned char)extEntry->base;
|
DRIReqCode = (unsigned char)extEntry->base;
|
||||||
DRIErrorBase = extEntry->errorBase;
|
DRIErrorBase = extEntry->errorBase;
|
||||||
#ifdef XF86DRI_EVENTS
|
|
||||||
RegisterResourceName(EventType, "DRIEvent");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,6 @@
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
#include "pixmapstr.h"
|
#include "pixmapstr.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "xf86drm.h"
|
#include "xf86drm.h"
|
||||||
#include "xfixes.h"
|
#include "xfixes.h"
|
||||||
#include "dri2.h"
|
#include "dri2.h"
|
||||||
|
@ -417,13 +416,11 @@ static int DRI2DrawableGone(pointer p, XID id)
|
||||||
static void
|
static void
|
||||||
DRI2ExtensionInit(void)
|
DRI2ExtensionInit(void)
|
||||||
{
|
{
|
||||||
dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone);
|
dri2DrawableRes = CreateNewResourceType(DRI2DrawableGone, "DRI2Drawable");
|
||||||
|
|
||||||
if (!dri2DrawableRes)
|
if (!dri2DrawableRes)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
RegisterResourceName(dri2DrawableRes, "DRI2Drawable");
|
|
||||||
|
|
||||||
dri2Extension = AddExtension(DRI2_NAME,
|
dri2Extension = AddExtension(DRI2_NAME,
|
||||||
DRI2NumberEvents,
|
DRI2NumberEvents,
|
||||||
DRI2NumberErrors,
|
DRI2NumberErrors,
|
||||||
|
|
|
@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -112,8 +111,8 @@ AppleWMExtensionInit(
|
||||||
{
|
{
|
||||||
ExtensionEntry* extEntry;
|
ExtensionEntry* extEntry;
|
||||||
|
|
||||||
ClientType = CreateNewResourceType(WMFreeClient);
|
ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
|
||||||
EventType = CreateNewResourceType(WMFreeEvents);
|
EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
|
||||||
eventResource = FakeClientID(0);
|
eventResource = FakeClientID(0);
|
||||||
|
|
||||||
if (ClientType && EventType &&
|
if (ClientType && EventType &&
|
||||||
|
@ -130,8 +129,6 @@ AppleWMExtensionInit(
|
||||||
WMEventBase = extEntry->eventBase;
|
WMEventBase = extEntry->eventBase;
|
||||||
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
||||||
appleWMProcs = procsPtr;
|
appleWMProcs = procsPtr;
|
||||||
RegisterResourceName(ClientType, "WMClient");
|
|
||||||
RegisterResourceName(EventType, "WMEvent");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -278,10 +277,8 @@ DRICloseScreen(ScreenPtr pScreen)
|
||||||
Bool
|
Bool
|
||||||
DRIExtensionInit(void)
|
DRIExtensionInit(void)
|
||||||
{
|
{
|
||||||
DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
|
DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
|
||||||
|
"DRIDrawable");
|
||||||
if (DRIDrawablePrivResType != 0)
|
|
||||||
RegisterResourceName(DRIDrawablePrivResType, "DRIDrawable");
|
|
||||||
|
|
||||||
return (DRIDrawablePrivResType != 0);
|
return (DRIDrawablePrivResType != 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#include "misc.h"
|
#include "misc.h"
|
||||||
#include "dixstruct.h"
|
#include "dixstruct.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "registry.h"
|
|
||||||
#include "colormapst.h"
|
#include "colormapst.h"
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "scrnintstr.h"
|
#include "scrnintstr.h"
|
||||||
|
@ -86,8 +85,8 @@ winWindowsWMExtensionInit ()
|
||||||
{
|
{
|
||||||
ExtensionEntry* extEntry;
|
ExtensionEntry* extEntry;
|
||||||
|
|
||||||
ClientType = CreateNewResourceType(WMFreeClient);
|
ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
|
||||||
eventResourceType = CreateNewResourceType(WMFreeEvents);
|
eventResourceType = CreateNewResourceType(WMFreeEvents, "WMEvent");
|
||||||
eventResource = FakeClientID(0);
|
eventResource = FakeClientID(0);
|
||||||
|
|
||||||
if (ClientType && eventResourceType &&
|
if (ClientType && eventResourceType &&
|
||||||
|
@ -103,8 +102,6 @@ winWindowsWMExtensionInit ()
|
||||||
WMErrorBase = extEntry->errorBase;
|
WMErrorBase = extEntry->errorBase;
|
||||||
WMEventBase = extEntry->eventBase;
|
WMEventBase = extEntry->eventBase;
|
||||||
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
||||||
RegisterResourceName(ClientType, "WMClient");
|
|
||||||
RegisterResourceName(eventResourceType, "WMEvent");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -155,7 +155,7 @@ typedef Bool (*FindComplexResType)(
|
||||||
pointer /*cdata*/);
|
pointer /*cdata*/);
|
||||||
|
|
||||||
extern _X_EXPORT RESTYPE CreateNewResourceType(
|
extern _X_EXPORT RESTYPE CreateNewResourceType(
|
||||||
DeleteType /*deleteFunc*/);
|
DeleteType /*deleteFunc*/, char * /*name*/);
|
||||||
|
|
||||||
extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
|
extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,6 @@ SOFTWARE.
|
||||||
#include "mifpoly.h"
|
#include "mifpoly.h"
|
||||||
#include "mi.h"
|
#include "mi.h"
|
||||||
#include "mifillarc.h"
|
#include "mifillarc.h"
|
||||||
#include "registry.h"
|
|
||||||
#include <X11/Xfuncproto.h>
|
#include <X11/Xfuncproto.h>
|
||||||
|
|
||||||
static double miDsin(double a);
|
static double miDsin(double a);
|
||||||
|
@ -867,8 +866,7 @@ miComputeWideEllipse(
|
||||||
}
|
}
|
||||||
if (!cacheType)
|
if (!cacheType)
|
||||||
{
|
{
|
||||||
cacheType = CreateNewResourceType(miFreeArcCache);
|
cacheType = CreateNewResourceType(miFreeArcCache, "miArcCache");
|
||||||
RegisterResourceName(cacheType, "miArcCache");
|
|
||||||
(void) AddResource(FakeClientID(0), cacheType, NULL);
|
(void) AddResource(FakeClientID(0), cacheType, NULL);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -29,8 +29,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
#include "randrstr.h"
|
#include "randrstr.h"
|
||||||
|
|
||||||
/* From render.h */
|
/* From render.h */
|
||||||
|
@ -338,14 +336,12 @@ RRExtensionInit (void)
|
||||||
if (!AddCallback (&ClientStateCallback, RRClientCallback, 0))
|
if (!AddCallback (&ClientStateCallback, RRClientCallback, 0))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
RRClientType = CreateNewResourceType(RRFreeClient);
|
RRClientType = CreateNewResourceType(RRFreeClient, "RandRClient");
|
||||||
if (!RRClientType)
|
if (!RRClientType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(RRClientType, "RandRClient");
|
RREventType = CreateNewResourceType(RRFreeEvents, "RandREvent");
|
||||||
RREventType = CreateNewResourceType(RRFreeEvents);
|
|
||||||
if (!RREventType)
|
if (!RREventType)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(RREventType, "RandREvent");
|
|
||||||
extEntry = AddExtension (RANDR_NAME, RRNumberEvents, RRNumberErrors,
|
extEntry = AddExtension (RANDR_NAME, RRNumberEvents, RRNumberErrors,
|
||||||
ProcRRDispatch, SProcRRDispatch,
|
ProcRRDispatch, SProcRRDispatch,
|
||||||
NULL, StandardMinorOpcode);
|
NULL, StandardMinorOpcode);
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
#include "randrstr.h"
|
#include "randrstr.h"
|
||||||
#include "swaprep.h"
|
#include "swaprep.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
RESTYPE RRCrtcType;
|
RESTYPE RRCrtcType;
|
||||||
|
|
||||||
|
@ -633,10 +632,9 @@ RRCrtcTransformSet (RRCrtcPtr crtc,
|
||||||
Bool
|
Bool
|
||||||
RRCrtcInit (void)
|
RRCrtcInit (void)
|
||||||
{
|
{
|
||||||
RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource);
|
RRCrtcType = CreateNewResourceType (RRCrtcDestroyResource, "CRTC");
|
||||||
if (!RRCrtcType)
|
if (!RRCrtcType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
RegisterResourceName (RRCrtcType, "CRTC");
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "randrstr.h"
|
#include "randrstr.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
RESTYPE RRModeType;
|
RESTYPE RRModeType;
|
||||||
|
|
||||||
|
@ -266,10 +265,9 @@ RRModeInit (void)
|
||||||
{
|
{
|
||||||
assert (num_modes == 0);
|
assert (num_modes == 0);
|
||||||
assert (modes == NULL);
|
assert (modes == NULL);
|
||||||
RRModeType = CreateNewResourceType (RRModeDestroyResource);
|
RRModeType = CreateNewResourceType (RRModeDestroyResource, "MODE");
|
||||||
if (!RRModeType)
|
if (!RRModeType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
RegisterResourceName (RRModeType, "MODE");
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "randrstr.h"
|
#include "randrstr.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
RESTYPE RROutputType;
|
RESTYPE RROutputType;
|
||||||
|
|
||||||
|
@ -422,10 +421,9 @@ RROutputDestroyResource (pointer value, XID pid)
|
||||||
Bool
|
Bool
|
||||||
RROutputInit (void)
|
RROutputInit (void)
|
||||||
{
|
{
|
||||||
RROutputType = CreateNewResourceType (RROutputDestroyResource);
|
RROutputType = CreateNewResourceType (RROutputDestroyResource, "OUTPUT");
|
||||||
if (!RROutputType)
|
if (!RROutputType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
RegisterResourceName (RROutputType, "OUTPUT");
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,7 +42,6 @@ and Jim Haggerty of Metheus.
|
||||||
#include "set.h"
|
#include "set.h"
|
||||||
#include "swaprep.h"
|
#include "swaprep.h"
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
@ -2876,10 +2875,9 @@ RecordExtensionInit(void)
|
||||||
#if 0
|
#if 0
|
||||||
ExtensionEntry *extentry;
|
ExtensionEntry *extentry;
|
||||||
|
|
||||||
RTContext = CreateNewResourceType(RecordDeleteContext);
|
RTContext = CreateNewResourceType(RecordDeleteContext, "RecordContext");
|
||||||
if (!RTContext)
|
if (!RTContext)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(RTContext, "RecordContext");
|
|
||||||
|
|
||||||
ppAllContexts = NULL;
|
ppAllContexts = NULL;
|
||||||
numContexts = numEnabledContexts = numEnabledRCAPs = 0;
|
numContexts = numEnabledContexts = numEnabledRCAPs = 0;
|
||||||
|
|
|
@ -41,7 +41,6 @@
|
||||||
#include "servermd.h"
|
#include "servermd.h"
|
||||||
#include "picturestr.h"
|
#include "picturestr.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
static int PictureScreenPrivateKeyIndex;
|
static int PictureScreenPrivateKeyIndex;
|
||||||
DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex;
|
DevPrivateKey PictureScreenPrivateKey = &PictureScreenPrivateKeyIndex;
|
||||||
|
@ -618,19 +617,16 @@ PictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
|
||||||
|
|
||||||
if (PictureGeneration != serverGeneration)
|
if (PictureGeneration != serverGeneration)
|
||||||
{
|
{
|
||||||
PictureType = CreateNewResourceType (FreePicture);
|
PictureType = CreateNewResourceType (FreePicture, "PICTURE");
|
||||||
if (!PictureType)
|
if (!PictureType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
PictFormatType = CreateNewResourceType (FreePictFormat);
|
PictFormatType = CreateNewResourceType (FreePictFormat, "PICTFORMAT");
|
||||||
if (!PictFormatType)
|
if (!PictFormatType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
GlyphSetType = CreateNewResourceType (FreeGlyphSet);
|
GlyphSetType = CreateNewResourceType (FreeGlyphSet, "GLYPHSET");
|
||||||
if (!GlyphSetType)
|
if (!GlyphSetType)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
PictureGeneration = serverGeneration;
|
PictureGeneration = serverGeneration;
|
||||||
RegisterResourceName (PictureType, "PICTURE");
|
|
||||||
RegisterResourceName (PictFormatType, "PICTFORMAT");
|
|
||||||
RegisterResourceName (GlyphSetType, "GLYPHSET");
|
|
||||||
}
|
}
|
||||||
if (!formats)
|
if (!formats)
|
||||||
{
|
{
|
||||||
|
|
|
@ -46,7 +46,6 @@
|
||||||
#include "cursorstr.h"
|
#include "cursorstr.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
#if HAVE_STDINT_H
|
#if HAVE_STDINT_H
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
@ -3241,10 +3240,8 @@ PanoramiXRenderInit (void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
XRT_PICTURE = CreateNewResourceType (XineramaDeleteResource);
|
XRT_PICTURE = CreateNewResourceType (XineramaDeleteResource,
|
||||||
if (XRT_PICTURE)
|
"XineramaPicture");
|
||||||
RegisterResourceName(XRT_PICTURE, "XineramaPicture");
|
|
||||||
|
|
||||||
for (i = 0; i < RenderNumberRequests; i++)
|
for (i = 0; i < RenderNumberRequests; i++)
|
||||||
PanoramiXSaveRenderVector[i] = ProcRenderVector[i];
|
PanoramiXSaveRenderVector[i] = ProcRenderVector[i];
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
#include "inputstr.h"
|
#include "inputstr.h"
|
||||||
#include "windowstr.h"
|
#include "windowstr.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
static RESTYPE CursorClientType;
|
static RESTYPE CursorClientType;
|
||||||
static RESTYPE CursorHideCountType;
|
static RESTYPE CursorHideCountType;
|
||||||
|
@ -1085,15 +1084,12 @@ XFixesCursorInit (void)
|
||||||
cs->pCursorHideCounts = NULL;
|
cs->pCursorHideCounts = NULL;
|
||||||
SetCursorScreen (pScreen, cs);
|
SetCursorScreen (pScreen, cs);
|
||||||
}
|
}
|
||||||
CursorClientType = CreateNewResourceType(CursorFreeClient);
|
CursorClientType = CreateNewResourceType(CursorFreeClient,
|
||||||
if (CursorClientType)
|
"XFixesCursorClient");
|
||||||
RegisterResourceName(CursorClientType, "XFixesCursorClient");
|
CursorHideCountType = CreateNewResourceType(CursorFreeHideCount,
|
||||||
CursorHideCountType = CreateNewResourceType(CursorFreeHideCount);
|
"XFixesCursorHideCount");
|
||||||
if (CursorHideCountType)
|
CursorWindowType = CreateNewResourceType(CursorFreeWindow,
|
||||||
RegisterResourceName(CursorClientType, "XFixesCursorClient");
|
"XFixesCursorWindow");
|
||||||
CursorWindowType = CreateNewResourceType(CursorFreeWindow);
|
|
||||||
if (CursorWindowType)
|
|
||||||
RegisterResourceName(CursorWindowType, "XFixesCursorWindow");
|
|
||||||
|
|
||||||
if (pInvisibleCursor == NULL) {
|
if (pInvisibleCursor == NULL) {
|
||||||
pInvisibleCursor = createInvisibleCursor();
|
pInvisibleCursor = createInvisibleCursor();
|
||||||
|
|
|
@ -33,7 +33,6 @@ extern int RenderErrBase;
|
||||||
#include <regionstr.h>
|
#include <regionstr.h>
|
||||||
#include <gcstruct.h>
|
#include <gcstruct.h>
|
||||||
#include <window.h>
|
#include <window.h>
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
RESTYPE RegionResType;
|
RESTYPE RegionResType;
|
||||||
|
|
||||||
|
@ -64,10 +63,7 @@ XFixesRegionCopy (RegionPtr pRegion)
|
||||||
Bool
|
Bool
|
||||||
XFixesRegionInit (void)
|
XFixesRegionInit (void)
|
||||||
{
|
{
|
||||||
RegionResType = CreateNewResourceType(RegionResFree);
|
RegionResType = CreateNewResourceType(RegionResFree, "XFixesRegion");
|
||||||
|
|
||||||
if (RegionResType)
|
|
||||||
RegisterResourceName(RegionResType, "XFixesRegion");
|
|
||||||
|
|
||||||
return (RegionResType != 0);
|
return (RegionResType != 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
#include "xfixesint.h"
|
#include "xfixesint.h"
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
static RESTYPE SelectionClientType, SelectionWindowType;
|
static RESTYPE SelectionClientType, SelectionWindowType;
|
||||||
static Bool SelectionCallbackRegistered = FALSE;
|
static Bool SelectionCallbackRegistered = FALSE;
|
||||||
|
@ -285,12 +284,9 @@ SelectionFreeWindow (pointer data, XID id)
|
||||||
Bool
|
Bool
|
||||||
XFixesSelectionInit (void)
|
XFixesSelectionInit (void)
|
||||||
{
|
{
|
||||||
SelectionClientType = CreateNewResourceType(SelectionFreeClient);
|
SelectionClientType = CreateNewResourceType(SelectionFreeClient,
|
||||||
if (SelectionClientType)
|
"XFixesSelectionClient");
|
||||||
RegisterResourceName(SelectionClientType, "XFixesSelectionClient");
|
SelectionWindowType = CreateNewResourceType(SelectionFreeWindow,
|
||||||
SelectionWindowType = CreateNewResourceType(SelectionFreeWindow);
|
"XFixesSelectionWindow");
|
||||||
if (SelectionWindowType)
|
|
||||||
RegisterResourceName(SelectionWindowType, "XFixesSelectionWindow");
|
|
||||||
|
|
||||||
return SelectionClientType && SelectionWindowType;
|
return SelectionClientType && SelectionWindowType;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
#include "xace.h"
|
#include "xace.h"
|
||||||
#include "xkb.h"
|
#include "xkb.h"
|
||||||
#include "protocol-versions.h"
|
#include "protocol-versions.h"
|
||||||
#include "registry.h"
|
|
||||||
|
|
||||||
#include <X11/extensions/XI.h>
|
#include <X11/extensions/XI.h>
|
||||||
#include <X11/extensions/XKMformat.h>
|
#include <X11/extensions/XKMformat.h>
|
||||||
|
@ -6705,10 +6704,9 @@ XkbExtensionInit(void)
|
||||||
{
|
{
|
||||||
ExtensionEntry *extEntry;
|
ExtensionEntry *extEntry;
|
||||||
|
|
||||||
RT_XKBCLIENT = CreateNewResourceType(XkbClientGone);
|
RT_XKBCLIENT = CreateNewResourceType(XkbClientGone, "XkbClient");
|
||||||
if (!RT_XKBCLIENT)
|
if (!RT_XKBCLIENT)
|
||||||
return;
|
return;
|
||||||
RegisterResourceName(RT_XKBCLIENT, "XkbClient");
|
|
||||||
|
|
||||||
if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors,
|
if ((extEntry = AddExtension(XkbName, XkbNumberEvents, XkbNumberErrors,
|
||||||
ProcXkbDispatch, SProcXkbDispatch,
|
ProcXkbDispatch, SProcXkbDispatch,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user