diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-09 16:24:10 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:44:20 +0200 |
| commit | 3f8aa38feb327688ef62836613d160e80f868575 (patch) | |
| tree | 225b10a6d61f9eca2b5a3b4206ac78ae0aa849b5 | |
| parent | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (diff) | |
| download | nx-libs-3f8aa38feb327688ef62836613d160e80f868575.tar.gz nx-libs-3f8aa38feb327688ef62836613d160e80f868575.tar.bz2 nx-libs-3f8aa38feb327688ef62836613d160e80f868575.zip | |
noRRXineramaExtension: Make Boolean configurable via new cmdline switch (+|-rrxinerama).
| -rw-r--r-- | nx-X11/programs/Xserver/include/globals.h | 1 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 17 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrxinerama.c | 2 |
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 |