aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/include/globals.h1
-rw-r--r--nx-X11/programs/Xserver/os/utils.c17
-rw-r--r--nx-X11/programs/Xserver/randr/rrxinerama.c2
3 files changed, 18 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/include/globals.h b/nx-X11/programs/Xserver/include/globals.h
index f37fb68ba..853b63e86 100644
--- a/nx-X11/programs/Xserver/include/globals.h
+++ b/nx-X11/programs/Xserver/include/globals.h
@@ -87,6 +87,7 @@ extern Bool noMITShmExtension;
#ifdef RANDR
extern Bool noRRExtension;
+extern Bool noRRXineramaExtension;
#endif
#ifdef RENDER
diff --git a/nx-X11/programs/Xserver/os/utils.c b/nx-X11/programs/Xserver/os/utils.c
index 13889ed9a..90cf55d1a 100644
--- a/nx-X11/programs/Xserver/os/utils.c
+++ b/nx-X11/programs/Xserver/os/utils.c
@@ -179,6 +179,7 @@ Bool noMITShmExtension = FALSE;
#endif
#ifdef RANDR
Bool noRRExtension = FALSE;
+Bool noRRXineramaExtension = FALSE;
#endif
#ifdef RENDER
Bool noRenderExtension = FALSE;
@@ -664,10 +665,14 @@ void UseMsg(void)
ErrorF("-x string loads named extension at init time \n");
ErrorF("-maxbigreqsize set maximal bigrequest size \n");
#ifdef PANORAMIX
- ErrorF("+xinerama Enable XINERAMA extension\n");
- ErrorF("-xinerama Disable XINERAMA extension\n");
+ ErrorF("+xinerama Enable XINERAMA (PanoramiX) extension\n");
+ ErrorF("-xinerama Disable XINERAMA (PanoramiX) extension (default)\n");
ErrorF("-disablexineramaextension Disable XINERAMA extension\n");
#endif
+#ifdef RANDR
+ ErrorF("+rrxinerama Enable XINERAMA (via RandR) extension (default)\n");
+ ErrorF("-rrxinerama Disable XINERAMA (via RandR) extension\n");
+#endif
#ifdef SMART_SCHEDULE
ErrorF("-dumbSched Disable smart scheduling, enable old behavior\n");
ErrorF("-schedInterval int Set scheduler interval in msec\n");
@@ -1037,6 +1042,14 @@ ProcessCommandLine(int argc, char *argv[])
PanoramiXExtensionDisabledHack = TRUE;
}
#endif
+#ifdef RANDR
+ else if ( strcmp( argv[i], "+rrxinerama") == 0){
+ noRRXineramaExtension = FALSE;
+ }
+ else if ( strcmp( argv[i], "-rrxinerama") == 0){
+ noRRXineramaExtension = TRUE;
+ }
+#endif
else if ( strcmp( argv[i], "-x") == 0)
{
if(++i >= argc)
diff --git a/nx-X11/programs/Xserver/randr/rrxinerama.c b/nx-X11/programs/Xserver/randr/rrxinerama.c
index 2bc17cf21..9ff1e051b 100644
--- a/nx-X11/programs/Xserver/randr/rrxinerama.c
+++ b/nx-X11/programs/Xserver/randr/rrxinerama.c
@@ -107,6 +107,8 @@ static int ProcRRXineramaIsActive(ClientPtr client);
static int ProcRRXineramaQueryScreens(ClientPtr client);
static int SProcRRXineramaDispatch(ClientPtr client);
+extern Bool noRRXineramaExtension;
+
/* Proc */
int