[PATCH 3/5] kdrive: always advance kdOrigin if a screen size was specified

Peter Hutterer peter.hutterer at who-t.net
Sun Oct 6 23:11:13 PDT 2013


If a screen size was specified as WxH, the loop returned early and kdOrigin
was never advanced. Thus, screen->origin was always 0 (or whatever was given
at the -origin commandline flag).

If a screen size was given with a bit depth (WxH at D), kdOrigin would always
advance by the current screen, offsetting the next screen.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 hw/kdrive/src/kdrive.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/kdrive/src/kdrive.c b/hw/kdrive/src/kdrive.c
index f8949be..0e2cceb 100644
--- a/hw/kdrive/src/kdrive.c
+++ b/hw/kdrive/src/kdrive.c
@@ -323,6 +323,8 @@ KdParseScreen(KdScreenInfo * screen, const char *arg)
         if (i == 0) {
             screen->width = pixels;
             screen->width_mm = mm;
+            kdOrigin.x += screen->width;
+            kdOrigin.y = 0;
         }
         else {
             screen->height = pixels;
@@ -332,8 +334,6 @@ KdParseScreen(KdScreenInfo * screen, const char *arg)
             return;
     }
 
-    kdOrigin.x += screen->width;
-    kdOrigin.y = 0;
     kdDumbDriver = FALSE;
     kdSoftCursor = FALSE;
     kdSubpixelOrder = SubPixelUnknown;
-- 
1.8.3.1



More information about the xorg-devel mailing list