Quartz: Move PseudoramiX initialisation to DDX
As PseudoramiX is a DDX-specific extension, move its loading and initialisation to hw/xquartz. This creates a QuartzExtensionInit() similar in spirit to xf86ExtensionInit. Signed-off-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
parent
79d14d9fc3
commit
27a624bee6
|
@ -42,6 +42,7 @@
|
|||
#include "darwin.h"
|
||||
#include "darwinEvents.h"
|
||||
#include "pseudoramiX.h"
|
||||
#include "extension.h"
|
||||
#define _APPLEWM_SERVER_
|
||||
#include "applewmExt.h"
|
||||
|
||||
|
@ -143,6 +144,22 @@ QuartzSetupScreen(int index,
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static const ExtensionModule quartzExtensions[] = {
|
||||
{ PseudoramiXExtensionInit, "PseudoramiX", &noPseudoramiXExtension, NULL },
|
||||
};
|
||||
|
||||
/*
|
||||
* QuartzExtensionInit
|
||||
* Initialises XQuartz-specific extensions.
|
||||
*/
|
||||
void QuartzExtensionInit(void)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(quartzExtensions); i++)
|
||||
LoadExtension(&quartzExtensions[i], TRUE);
|
||||
}
|
||||
|
||||
/*
|
||||
* QuartzInitOutput
|
||||
* Quartz display initialization.
|
||||
|
@ -182,6 +199,8 @@ QuartzInitOutput(int argc,
|
|||
|
||||
// Do display mode specific initialization
|
||||
quartzProcs->DisplayInit();
|
||||
|
||||
QuartzExtensionInit();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -284,11 +284,6 @@ InitExtensions(int argc, char *argv[])
|
|||
PanoramiXExtensionInit();
|
||||
#endif
|
||||
|
||||
#ifdef INXQUARTZ
|
||||
if (!noPseudoramiXExtension)
|
||||
PseudoramiXExtensionInit();
|
||||
#endif
|
||||
|
||||
#ifdef XFIXES
|
||||
/* must be before Render to layer DisplayCursor correctly */
|
||||
if (!noXFixesExtension)
|
||||
|
|
Loading…
Reference in New Issue
Block a user