Fix pseudoramiX.c compilation without darwin.h
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
parent
067931ccce
commit
f193907f1b
|
@ -37,7 +37,6 @@
|
||||||
#include <dix-config.h>
|
#include <dix-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "darwin.h"
|
|
||||||
#include "pseudoramiX.h"
|
#include "pseudoramiX.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
#include "extinit.h"
|
#include "extinit.h"
|
||||||
|
@ -46,6 +45,9 @@
|
||||||
#include <X11/extensions/panoramiXproto.h>
|
#include <X11/extensions/panoramiXproto.h>
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
||||||
|
#define TRACE PseudoramiXTrace("TRACE " __FILE__ ":%s",__FUNCTION__)
|
||||||
|
#define DEBUG_LOG PseudoramiXDebug
|
||||||
|
|
||||||
Bool noPseudoramiXExtension = FALSE;
|
Bool noPseudoramiXExtension = FALSE;
|
||||||
|
|
||||||
extern int
|
extern int
|
||||||
|
@ -96,6 +98,26 @@ static int pseudoramiXScreensAllocated = 0;
|
||||||
static int pseudoramiXNumScreens = 0;
|
static int pseudoramiXNumScreens = 0;
|
||||||
static unsigned long pseudoramiXGeneration = 0;
|
static unsigned long pseudoramiXGeneration = 0;
|
||||||
|
|
||||||
|
static void
|
||||||
|
PseudoramiXTrace(const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, format);
|
||||||
|
LogVMessageVerb(X_NONE, 10, format, ap);
|
||||||
|
va_end(ap);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
PseudoramiXDebug(const char *format, ...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
|
||||||
|
va_start(ap, format);
|
||||||
|
LogVMessageVerb(X_NONE, 3, format, ap);
|
||||||
|
va_end(ap);
|
||||||
|
}
|
||||||
|
|
||||||
// Add a PseudoramiX screen.
|
// Add a PseudoramiX screen.
|
||||||
// The rest of the X server will know nothing about this screen.
|
// The rest of the X server will know nothing about this screen.
|
||||||
// Can be called before or after extension init.
|
// Can be called before or after extension init.
|
||||||
|
@ -133,7 +155,7 @@ PseudoramiXExtensionInit(void)
|
||||||
|
|
||||||
if (noPseudoramiXExtension) return;
|
if (noPseudoramiXExtension) return;
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
/* Even with only one screen we need to enable PseudoramiX to allow
|
/* Even with only one screen we need to enable PseudoramiX to allow
|
||||||
dynamic screen configuration changes. */
|
dynamic screen configuration changes. */
|
||||||
|
@ -170,7 +192,7 @@ PseudoramiXExtensionInit(void)
|
||||||
void
|
void
|
||||||
PseudoramiXResetScreens(void)
|
PseudoramiXResetScreens(void)
|
||||||
{
|
{
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
pseudoramiXNumScreens = 0;
|
pseudoramiXNumScreens = 0;
|
||||||
}
|
}
|
||||||
|
@ -178,7 +200,7 @@ PseudoramiXResetScreens(void)
|
||||||
static void
|
static void
|
||||||
PseudoramiXResetProc(ExtensionEntry *extEntry)
|
PseudoramiXResetProc(ExtensionEntry *extEntry)
|
||||||
{
|
{
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
PseudoramiXResetScreens();
|
PseudoramiXResetScreens();
|
||||||
}
|
}
|
||||||
|
@ -187,7 +209,7 @@ PseudoramiXResetProc(ExtensionEntry *extEntry)
|
||||||
static int
|
static int
|
||||||
ProcPseudoramiXQueryVersion(ClientPtr client)
|
ProcPseudoramiXQueryVersion(ClientPtr client)
|
||||||
{
|
{
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
return ProcPanoramiXQueryVersion(client);
|
return ProcPanoramiXQueryVersion(client);
|
||||||
}
|
}
|
||||||
|
@ -201,7 +223,7 @@ ProcPseudoramiXGetState(ClientPtr client)
|
||||||
xPanoramiXGetStateReply rep;
|
xPanoramiXGetStateReply rep;
|
||||||
register int rc;
|
register int rc;
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
||||||
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
||||||
|
@ -231,7 +253,7 @@ ProcPseudoramiXGetScreenCount(ClientPtr client)
|
||||||
xPanoramiXGetScreenCountReply rep;
|
xPanoramiXGetScreenCountReply rep;
|
||||||
register int rc;
|
register int rc;
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
||||||
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
|
||||||
|
@ -261,7 +283,7 @@ ProcPseudoramiXGetScreenSize(ClientPtr client)
|
||||||
xPanoramiXGetScreenSizeReply rep;
|
xPanoramiXGetScreenSizeReply rep;
|
||||||
register int rc;
|
register int rc;
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
if (stuff->screen >= pseudoramiXNumScreens)
|
if (stuff->screen >= pseudoramiXNumScreens)
|
||||||
return BadMatch;
|
return BadMatch;
|
||||||
|
@ -300,7 +322,7 @@ ProcPseudoramiXIsActive(ClientPtr client)
|
||||||
/* REQUEST(xXineramaIsActiveReq); */
|
/* REQUEST(xXineramaIsActiveReq); */
|
||||||
xXineramaIsActiveReply rep;
|
xXineramaIsActiveReply rep;
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
|
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
|
||||||
|
|
||||||
|
@ -369,7 +391,7 @@ static int
|
||||||
ProcPseudoramiXDispatch(ClientPtr client)
|
ProcPseudoramiXDispatch(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xReq);
|
REQUEST(xReq);
|
||||||
TRACE();
|
TRACE;
|
||||||
switch (stuff->data) {
|
switch (stuff->data) {
|
||||||
case X_PanoramiXQueryVersion:
|
case X_PanoramiXQueryVersion:
|
||||||
return ProcPseudoramiXQueryVersion(client);
|
return ProcPseudoramiXQueryVersion(client);
|
||||||
|
@ -397,7 +419,7 @@ SProcPseudoramiXQueryVersion(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xPanoramiXQueryVersionReq);
|
REQUEST(xPanoramiXQueryVersionReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
|
REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
|
||||||
|
@ -409,7 +431,7 @@ SProcPseudoramiXGetState(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xPanoramiXGetStateReq);
|
REQUEST(xPanoramiXGetStateReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
|
||||||
|
@ -421,7 +443,7 @@ SProcPseudoramiXGetScreenCount(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xPanoramiXGetScreenCountReq);
|
REQUEST(xPanoramiXGetScreenCountReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
|
||||||
|
@ -433,7 +455,7 @@ SProcPseudoramiXGetScreenSize(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xPanoramiXGetScreenSizeReq);
|
REQUEST(xPanoramiXGetScreenSizeReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
|
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
|
||||||
|
@ -445,7 +467,7 @@ SProcPseudoramiXIsActive(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xXineramaIsActiveReq);
|
REQUEST(xXineramaIsActiveReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
|
REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
|
||||||
|
@ -457,7 +479,7 @@ SProcPseudoramiXQueryScreens(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xXineramaQueryScreensReq);
|
REQUEST(xXineramaQueryScreensReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
swaps(&stuff->length);
|
swaps(&stuff->length);
|
||||||
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
|
REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
|
||||||
|
@ -469,7 +491,7 @@ SProcPseudoramiXDispatch(ClientPtr client)
|
||||||
{
|
{
|
||||||
REQUEST(xReq);
|
REQUEST(xReq);
|
||||||
|
|
||||||
TRACE();
|
TRACE;
|
||||||
|
|
||||||
switch (stuff->data) {
|
switch (stuff->data) {
|
||||||
case X_PanoramiXQueryVersion:
|
case X_PanoramiXQueryVersion:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user