diff options
| -rw-r--r-- | hw/xquartz/quartz.c | 19 | ||||
| -rw-r--r-- | mi/miinitext.c | 5 |
2 files changed, 19 insertions, 5 deletions
diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c index 62a2852b7..3de223bf4 100644 --- a/hw/xquartz/quartz.c +++ b/hw/xquartz/quartz.c @@ -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(); } /* diff --git a/mi/miinitext.c b/mi/miinitext.c index e5acec4ad..69ed97bb9 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -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) |