XQuartz: Move use of static dispatch procs after declaration
This fixes fallout from cbd4d5dbb7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
parent
c36ca7b186
commit
f492670948
|
@ -103,33 +103,6 @@ make_box (int x, int y, int w, int h)
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
AppleWMExtensionInit(
|
|
||||||
AppleWMProcsPtr procsPtr)
|
|
||||||
{
|
|
||||||
ExtensionEntry* extEntry;
|
|
||||||
|
|
||||||
ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
|
|
||||||
EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
|
|
||||||
eventResource = FakeClientID(0);
|
|
||||||
|
|
||||||
if (ClientType && EventType &&
|
|
||||||
(extEntry = AddExtension(APPLEWMNAME,
|
|
||||||
AppleWMNumberEvents,
|
|
||||||
AppleWMNumberErrors,
|
|
||||||
ProcAppleWMDispatch,
|
|
||||||
SProcAppleWMDispatch,
|
|
||||||
NULL,
|
|
||||||
StandardMinorOpcode)))
|
|
||||||
{
|
|
||||||
WMReqCode = (unsigned char)extEntry->base;
|
|
||||||
WMErrorBase = extEntry->errorBase;
|
|
||||||
WMEventBase = extEntry->eventBase;
|
|
||||||
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
|
||||||
appleWMProcs = procsPtr;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
|
/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
|
||||||
void
|
void
|
||||||
AppleWMSetScreenOrigin(
|
AppleWMSetScreenOrigin(
|
||||||
|
@ -734,3 +707,30 @@ SProcAppleWMDispatch (
|
||||||
return BadRequest;
|
return BadRequest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
AppleWMExtensionInit(
|
||||||
|
AppleWMProcsPtr procsPtr)
|
||||||
|
{
|
||||||
|
ExtensionEntry* extEntry;
|
||||||
|
|
||||||
|
ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
|
||||||
|
EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
|
||||||
|
eventResource = FakeClientID(0);
|
||||||
|
|
||||||
|
if (ClientType && EventType &&
|
||||||
|
(extEntry = AddExtension(APPLEWMNAME,
|
||||||
|
AppleWMNumberEvents,
|
||||||
|
AppleWMNumberErrors,
|
||||||
|
ProcAppleWMDispatch,
|
||||||
|
SProcAppleWMDispatch,
|
||||||
|
NULL,
|
||||||
|
StandardMinorOpcode)))
|
||||||
|
{
|
||||||
|
WMReqCode = (unsigned char)extEntry->base;
|
||||||
|
WMErrorBase = extEntry->errorBase;
|
||||||
|
WMEventBase = extEntry->eventBase;
|
||||||
|
EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
|
||||||
|
appleWMProcs = procsPtr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -76,27 +76,6 @@ typedef struct _DRIEvent {
|
||||||
unsigned int mask;
|
unsigned int mask;
|
||||||
} DRIEventRec;
|
} DRIEventRec;
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
AppleDRIExtensionInit(void)
|
|
||||||
{
|
|
||||||
ExtensionEntry* extEntry;
|
|
||||||
|
|
||||||
if (DRIExtensionInit() &&
|
|
||||||
(extEntry = AddExtension(APPLEDRINAME,
|
|
||||||
AppleDRINumberEvents,
|
|
||||||
AppleDRINumberErrors,
|
|
||||||
ProcAppleDRIDispatch,
|
|
||||||
SProcAppleDRIDispatch,
|
|
||||||
AppleDRIResetProc,
|
|
||||||
StandardMinorOpcode))) {
|
|
||||||
DRIReqCode = (unsigned char)extEntry->base;
|
|
||||||
DRIErrorBase = extEntry->errorBase;
|
|
||||||
DRIEventBase = extEntry->eventBase;
|
|
||||||
EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
static void
|
static void
|
||||||
AppleDRIResetProc (
|
AppleDRIResetProc (
|
||||||
|
@ -419,3 +398,23 @@ SProcAppleDRIDispatch (
|
||||||
return BadRequest;
|
return BadRequest;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
AppleDRIExtensionInit(void)
|
||||||
|
{
|
||||||
|
ExtensionEntry* extEntry;
|
||||||
|
|
||||||
|
if (DRIExtensionInit() &&
|
||||||
|
(extEntry = AddExtension(APPLEDRINAME,
|
||||||
|
AppleDRINumberEvents,
|
||||||
|
AppleDRINumberErrors,
|
||||||
|
ProcAppleDRIDispatch,
|
||||||
|
SProcAppleDRIDispatch,
|
||||||
|
AppleDRIResetProc,
|
||||||
|
StandardMinorOpcode))) {
|
||||||
|
DRIReqCode = (unsigned char)extEntry->base;
|
||||||
|
DRIErrorBase = extEntry->errorBase;
|
||||||
|
DRIEventBase = extEntry->eventBase;
|
||||||
|
EventSwapVector[DRIEventBase] = (EventSwapPtr) SNotifyEvent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user