185.19185.19185.18.04

5 files changed, 24 insertions, 13 deletions

diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index 253e3a6..59e5b65 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -29,7 +29,6 @@ EXTRA_DIST += \
 	Makefile.inc \
 	NV-CONTROL-API.txt \
 	FRAMELOCK.txt \
-	nvidia-settings-user-guide.txt \
 	nvidia-settings.1.m4
 
 AUTO_TEXT = ".\\\" WARNING: THIS FILE IS AUTO-GENERATED!  Edit $< instead."
diff --git a/doc/nvidia-settings-user-guide.txt b/doc/nvidia-settings-user-guide.txt
deleted file mode 100644
index 6737eb9..0000000
--- a/doc/nvidia-settings-user-guide.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The nvidia-settings user guide has been moved to the nvidia-settings(1) man
-page.
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index bd9fc42..3409bea 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -153,7 +153,8 @@ static const char * __layout_hidden_label_help =
 
 static const char * __layout_xinerama_button_help =
 "The Enable Xinerama checkbox enables the Xinerama X extension; changing "
-"this option will require restarting your X server.";
+"this option will require restarting your X server.  Note that when Xinerama "
+"is enabled, resolution changes will also require restarting your X server.";
 
 
 /* Display tooltips */
@@ -172,16 +173,19 @@ static const char * __dpy_refresh_mnu_help =
 
 static const char * __dpy_position_type_help =
 "The Position Type drop-down allows you to set how the selected display "
-"device is placed within the X screen.";
+"device is placed within the X screen. This is only available when "
+"multiple display devices are present.";
 
 static const char * __dpy_position_relative_help =
 "The Position Relative drop-down allows you to set which other display "
 "device (within the X screen) the selected display device should be "
-"relative to.";
+"relative to. This is only available when multiple display "
+"devices are present.";
 
 static const char * __dpy_position_offset_help =
 "The Position Offset identifies the top left of the display device "
-"as an offset from the top left of the X screen position.";
+"as an offset from the top left of the X screen position. This is only "
+"available when multiple display devices are present.";
 
 static const char * __dpy_panning_help =
 "The Panning Domain sets the total width/height that the display "
diff --git a/src/gtk+-2.x/ctkpowermizer.c b/src/gtk+-2.x/ctkpowermizer.c
index 294dba4..83f64b8 100644
--- a/src/gtk+-2.x/ctkpowermizer.c
+++ b/src/gtk+-2.x/ctkpowermizer.c
@@ -54,11 +54,11 @@ static const char *__performance_level_help =
 "This indicates the current Performance Level of the GPU.";
 
 static const char *__performance_mode_short_help =
-"This indicates the current Performance Mode of the GPU.\n";
+"This indicates the current Performance Mode of the GPU.";
 
 static const char *__performance_mode_help =
-"This indicates the current Performance Mode of the GPU.\n"
-"Performance Mode can be either \"Desktop\" or\n"
+"This indicates the current Performance Mode of the GPU. "
+"Performance Mode can be either \"Desktop\" or "
 "\"Maximum Performance\".";
 
 static const char *__gpu_clock_freq_help =
diff --git a/src/gtk+-2.x/ctkslimm.c b/src/gtk+-2.x/ctkslimm.c
index 9b1a265..4f3f331 100644
--- a/src/gtk+-2.x/ctkslimm.c
+++ b/src/gtk+-2.x/ctkslimm.c
@@ -154,6 +154,7 @@ static GridConfig *get_ith_valid_grid_config(int idx)
 static void add_slimm_options(XConfigPtr xconf, gchar *metamode_str)
 {
     XConfigAdjacencyPtr adj;
+    XConfigScreenPtr screen;
 
     /* Make sure there is only one screen specified in the main layout */
     adj = xconf->layouts->adjacencies;
@@ -166,7 +167,7 @@ static void add_slimm_options(XConfigPtr xconf, gchar *metamode_str)
      * Now fix up the screen in the Device section (to prevent failure with
      * seperate x screen config
      *
-    */
+     */
     xconf->layouts->adjacencies->screen->device->screen = -1;
 
     /* Write out SLI Mosaic Option */
@@ -176,6 +177,15 @@ static void add_slimm_options(XConfigPtr xconf, gchar *metamode_str)
     /* Write out MetaMode Option */
     xconfigAddNewOption(&(xconf->layouts->adjacencies->screen->options),
                         "MetaModes", metamode_str);
+
+    /* Remove Virtual size specification */
+    for (screen = xconf->layouts->adjacencies->screen; screen;
+         screen = screen->next) {
+        if ((screen->displays->virtualX) || (screen->displays->virtualY)) {
+            screen->displays->virtualX = 0;
+            screen->displays->virtualY = 0;
+        }
+    }
 }
 
 
@@ -984,7 +994,7 @@ static Bool parse_slimm_layout(CtkSLIMM *ctk_slimm,
                 }
             }
         }
-        if (*voverlap > 0) { *voverlap -= (*cur_modeline)->data.vdisplay; }
+        if (*voverlap > 0) { *voverlap = (*cur_modeline)->data.vdisplay - *voverlap; }
         if (*voverlap < 0) { *voverlap += (*cur_modeline)->data.vdisplay; }
 
 
@@ -1004,7 +1014,7 @@ static Bool parse_slimm_layout(CtkSLIMM *ctk_slimm,
                 }
             }
         }
-        if (*hoverlap > 0) { *hoverlap -= (*cur_modeline)->data.hdisplay; }
+        if (*hoverlap > 0) { *hoverlap = (*cur_modeline)->data.hdisplay - *hoverlap; }
         if (*hoverlap < 0) { *hoverlap += (*cur_modeline)->data.hdisplay; }
     }