Worth to note that -xinerama changed behaviour now, thus enabling such extension.
Signed-off-by: Tiago Vignatti <tiago.vigna...@nokia.com> --- hw/dmx/Xdmx.man | 18 +++++++++--------- hw/dmx/config/test-k.in | 2 +- hw/dmx/config/test-k.out | 2 +- os/utils.c | 10 +++------- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/hw/dmx/Xdmx.man b/hw/dmx/Xdmx.man index 9c8bdea..3364e31 100644 --- a/hw/dmx/Xdmx.man +++ b/hw/dmx/Xdmx.man @@ -41,7 +41,7 @@ back-end X servers. Clients connect to the .I Xdmx front-end, and everything appears as it would in a regular multi-head configuration. If Xinerama is enabled (e.g., with -.B +xinerama +.B -xinerama on the command line), the clients see a single large screen. .PP .I Xdmx @@ -544,7 +544,7 @@ command line option described above. .PP For example, if you specify a font path with the following command line: .RS -Xdmx :1 -display d0:0 -fontpath /usr/fonts/75dpi/ -fontpath /usr/fonts/Type1/ +xinerama +Xdmx :1 -display d0:0 -fontpath /usr/fonts/75dpi/ -fontpath /usr/fonts/Type1/ -xinerama .RE Then, /usr/fonts/75dpi/ and /usr/fonts/Type1/ must be valid font paths on the @@ -556,7 +556,7 @@ Font servers can also be specified with the option. For example, let's assume that a properly configured font server is running on host d0. Then, the following command line .RS -Xdmx :1 -display d0:0 -display d1:0 -fontpath tcp/d0:7100 +xinerama +Xdmx :1 -display d0:0 -display d1:0 -fontpath tcp/d0:7100 -xinerama .RE will initialize the front-end .I Xdmx @@ -595,23 +595,23 @@ option can also be added to the configuration file as described above. The back-end machines are d0 and d1, core input is from the pointer and keyboard attached to d0, clients will refer to :1 when opening windows: .RS -Xdmx :1 -display d0:0 -display d1:0 +xinerama +Xdmx :1 -display d0:0 -display d1:0 -xinerama .RE .PP As above, except with core input from d1: .RS -Xdmx :1 -display d0:0 -display d1:0 -input d1:0 +xinerama +Xdmx :1 -display d0:0 -display d1:0 -input d1:0 -xinerama .RE .PP As above, except with core input from a console window on the local display: .RS -Xdmx :1 -display d0:0 -display d1:0 -input :0 +xinerama +Xdmx :1 -display d0:0 -display d1:0 -input :0 -xinerama .RE .PP As above, except with core input from the local keyboard and mouse: .RS -Xdmx :1 -display d0:0 -display d1:0 -input local,kbd,ps2 +xinerama +Xdmx :1 -display d0:0 -display d1:0 -input local,kbd,ps2 -xinerama .RE Note that local input can be used under Linux while another X session is running on :0 (assuming the user can access the Linux console tty and @@ -623,11 +623,11 @@ Xdmx session and return to the original VC. .PP This example uses the configuration file shown in the previous section: .RS -Xdmx :1 -input :0 +xinerama -configfile filename -config example2 +Xdmx :1 -input :0 -xinerama -configfile filename -config example2 .RE With this configuration file line: .RS -option -input :0 +xinerama; +option -input :0 -xinerama; .RE the command line can be shortened to: .RS diff --git a/hw/dmx/config/test-k.in b/hw/dmx/config/test-k.in index 2218d26..823f2c5 100644 --- a/hw/dmx/config/test-k.in +++ b/hw/dmx/config/test-k.in @@ -1,3 +1,3 @@ virtual a { - option +xinerama -syncbatch 0; + option -xinerama -syncbatch 0; } diff --git a/hw/dmx/config/test-k.out b/hw/dmx/config/test-k.out index ebd7439..f6ed97b 100644 --- a/hw/dmx/config/test-k.out +++ b/hw/dmx/config/test-k.out @@ -1,3 +1,3 @@ virtual a { - option "+xinerama -syncbatch 0"; + option "-xinerama -syncbatch 0"; } diff --git a/os/utils.c b/os/utils.c index 98aabce..8ed0c7c 100644 --- a/os/utils.c +++ b/os/utils.c @@ -172,7 +172,7 @@ Bool noXFree86VidModeExtension = FALSE; Bool noXFixesExtension = FALSE; #endif #ifdef PANORAMIX -/* Xinerama is disabled by default unless enabled via +xinerama */ +/* Xinerama is disabled by default unless enabled via -xinerama option */ Bool noPanoramiXExtension = TRUE; #endif #ifdef XSELINUX @@ -520,8 +520,7 @@ void UseMsg(void) ErrorF("-wr create root window with white background\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 extension\n"); #endif ErrorF("-dumbSched Disable smart scheduling, enable old behavior\n"); ErrorF("-schedInterval int Set scheduler interval in msec\n"); @@ -856,11 +855,8 @@ ProcessCommandLine(int argc, char *argv[]) } } #ifdef PANORAMIX - else if ( strcmp( argv[i], "+xinerama") == 0){ - noPanoramiXExtension = FALSE; - } else if ( strcmp( argv[i], "-xinerama") == 0){ - noPanoramiXExtension = TRUE; + noPanoramiXExtension = FALSE; } else if ( strcmp( argv[i], "-disablexineramaextension") == 0){ PanoramiXExtensionDisabledHack = TRUE; -- 1.7.0.4 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel