aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/pseudoramiX
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/pseudoramiX')
-rw-r--r--xorg-server/pseudoramiX/makefile9
-rw-r--r--xorg-server/pseudoramiX/pseudoramiX.c6
-rw-r--r--xorg-server/pseudoramiX/pseudoramiX.h2
3 files changed, 14 insertions, 3 deletions
diff --git a/xorg-server/pseudoramiX/makefile b/xorg-server/pseudoramiX/makefile
new file mode 100644
index 000000000..3ea88ba35
--- /dev/null
+++ b/xorg-server/pseudoramiX/makefile
@@ -0,0 +1,9 @@
+# Fake Xinerama extension
+
+LIBRARY=libPseudoramiX
+
+libPseudoramiX_la_SOURCES = pseudoramiX.c pseudoramiX.h
+
+CSRCS = $(filter %.c,$(libPseudoramiX_la_SOURCES))
+
+
diff --git a/xorg-server/pseudoramiX/pseudoramiX.c b/xorg-server/pseudoramiX/pseudoramiX.c
index f47c7836d..e59ca1312 100644
--- a/xorg-server/pseudoramiX/pseudoramiX.c
+++ b/xorg-server/pseudoramiX/pseudoramiX.c
@@ -39,7 +39,7 @@
#include "pseudoramiX.h"
#include "extnsionst.h"
-#include "extinit.h"
+#include "nonsdk_extinit.h"
#include "dixstruct.h"
#include "window.h"
#include <X11/extensions/panoramiXproto.h>
@@ -49,6 +49,7 @@
#define DEBUG_LOG PseudoramiXDebug
Bool noPseudoramiXExtension = FALSE;
+extern Bool noRRXineramaExtension;
extern int
ProcPanoramiXQueryVersion(ClientPtr client);
@@ -190,6 +191,9 @@ PseudoramiXExtensionInit(void)
}
}
+ /* Do not allow RRXinerama to initialize if we did */
+ noRRXineramaExtension = success;
+
if (!success) {
ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
PANORAMIX_PROTOCOL_NAME);
diff --git a/xorg-server/pseudoramiX/pseudoramiX.h b/xorg-server/pseudoramiX/pseudoramiX.h
index f063919dd..5393062ee 100644
--- a/xorg-server/pseudoramiX/pseudoramiX.h
+++ b/xorg-server/pseudoramiX/pseudoramiX.h
@@ -2,8 +2,6 @@
* Minimal implementation of PanoramiX/Xinerama
*/
-extern int noPseudoramiXExtension;
-
void
PseudoramiXAddScreen(int x, int y, int w, int h);
void