Attachment 41746 Details for Bug 32430 – xfree86: Use last Screen section found to prefer xorg.conf (#32430)

[patch] xfree86: Use last Screen section found to prefer xorg.conf (#32430)

last-conf-screen.patch (text/plain), 3.27 KB, created by Dan Nicholson on 2011-01-07 07:03:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Nicholson

Created: 2011-01-07 07:03:09 UTC

Size: 3.27 KB

patch

obsolete

>From 9f408dbfc6ea0090fdbe074b3eb5ef1663da24b5 Mon Sep 17 00:00:00 2001
>From: Dan Nicholson <dbn.lists@gmail.com>
>Date: Thu, 16 Dec 2010 06:01:06 -0800
>Subject: [PATCH] xfree86: Use last Screen section found to prefer xorg.conf (#32430)
>
>Allowing multiple .conf files with xorg.conf.d works well for
>InputClass where any section in xorg.conf would override settings from
>previous .conf files typically installed by the distro. This does not
>work well with Screen sections where the first section found has been
>used when there is no Layout or the Layout doesn't specify a Screen.
>Instead, use the last Screen section found to give preference to
>xorg.conf and match the InputScreen semantics.
>
>X.Org Bug 32430 <https://bugs.freedesktop.org/show_bug.cgi?id=32430>
>
>Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
>---
> hw/xfree86/common/xf86Config.c |   22 ++++++++++++++++------
> 1 files changed, 16 insertions(+), 6 deletions(-)
>
>diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
>index 49d8fa8..ff53386 100644
>--- a/hw/xfree86/common/xf86Config.c
>+++ b/hw/xfree86/common/xf86Config.c
>@@ -1588,14 +1588,18 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
>         adjp = (XF86ConfAdjacencyPtr)adjp->list.next;
>     }
> 
>-    /* No screen was specified in the layout. take the first one from the
>+    /* No screen was specified in the layout. take the last one from the
>      * config file, or - if it is NULL - configScreen autogenerates one for
>      * us */
>     if (!count)
>     {
>+	XF86ConfScreenPtr s = xf86configptr->conf_screen_lst;
>+
>+	while (s && s->list.next)
>+	    s = s->list.next;
>+
>         slp[0].screen = xnfcalloc(1, sizeof(confScreenRec));
>-	if (!configScreen(slp[0].screen, xf86configptr->conf_screen_lst,
>-                          0, X_CONFIG)) {
>+	if (!configScreen(slp[0].screen, s, 0, X_CONFIG)) {
> 	    free(slp[0].screen);
> 	    free(slp);
> 	    return FALSE;
>@@ -1676,7 +1680,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
> }
> 
> /*
>- * No layout section, so find the first Screen section and set that up as
>+ * No layout section, so find the last Screen section and set that up as
>  * the only active screen.
>  */
> static Bool
>@@ -1695,7 +1699,7 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
>     /*
>      * which screen section is the active one?
>      *
>-     * If there is a -screen option, use that one, otherwise use the first
>+     * If there is a -screen option, use that one, otherwise use the last
>      * one.
>      */
> 
>@@ -1708,6 +1712,12 @@ configImpliedLayout(serverLayoutPtr servlayoutp, XF86ConfScreenPtr conf_screen,
> 	}
> 	conf_screen = s;
> 	from = X_CMDLINE;
>+    } else if (conf_screen) {
>+	/* Use the last Screen in the list */
>+	s = conf_screen;
>+	while (s->list.next)
>+	    s = s->list.next;
>+	conf_screen = s;
>     }
> 
>     /* We have exactly one screen */
>@@ -2428,7 +2438,7 @@ xf86HandleConfigFile(Bool autoconfig)
>     if (xf86configptr->conf_layout_lst == NULL || xf86ScreenName != NULL) {
> 	if (xf86ScreenName == NULL) {
> 	    xf86Msg(X_DEFAULT,
>-		    "No Layout section.  Using the first Screen section.\n");
>+		    "No Layout section.  Using the last Screen section.\n");
> 	}
> 	if (!configImpliedLayout(&xf86ConfigLayout,
> 				 xf86configptr->conf_screen_lst,
>-- 
>1.7.3.4
>

Actions: View | Splinter Review

Attachments on bug 32430: 41159 | 41160 | 41161 | 41171 | 41746

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.