diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-11 11:55:48 +0200 |
| commit | 6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch) | |
| tree | 21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/hw/xquartz/quartz.c | |
| parent | 75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff) | |
| parent | d137057fd13e83ec15ab416c7fe774741da06047 (diff) | |
| download | vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2 vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/Xext/shm.c
xorg-server/Xext/sync.c
xorg-server/Xext/xf86bigfont.c
xorg-server/Xi/opendev.c
xorg-server/dix/dispatch.c
xorg-server/include/globals.h
xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/hw/xquartz/quartz.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartz.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c index 62a2852b7..3de223bf4 100644 --- a/xorg-server/hw/xquartz/quartz.c +++ b/xorg-server/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(); } /* |