diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
| commit | c31ae1eed4d2a77e0962bee16279459cb5f7cd65 (patch) | |
| tree | 8b2a43fffc3d0c4498b804f32c8600baad629915 /nx-X11/programs/Xserver/os | |
| parent | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (diff) | |
| parent | 4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2 (diff) | |
| download | nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.gz nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.bz2 nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.zip | |
Merge branch 'sunweaver-pr/rrxinerama-vs-panoramix-with-disable-support' into 3.6.x
Attributes GH PR #135: https://github.com/ArcticaProject/nx-libs/pull/135
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Sat, 18 Jun 2016 05:25:08 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/os')
| -rw-r--r-- | nx-X11/programs/Xserver/os/utils.c | 17 |
1 files changed, 15 insertions, 2 deletions
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) |