xfree86: add MatchLayout entry to OutputClass

It is patch 2/2 of a series that provides a convenient way to specify
module search paths on a per-driver basis.

This entry proved to be useful in InputClass, so added it to OutputClass
as well. This allows to configure graphic drivers separately depending
on server layout names.

Signed-off-by: Oleh Nykyforchyn <[email protected]>

Author: ONykyf

hw/xfree86/common/xf86platformBus.c

@@ -179,10 +179,23 @@ OutputClassMatches(const XF86ConfOutputClassPtr oclass,
                    struct xf86_platform_device *dev)
 {
     char *driver = dev->attribs->driver;
+    const char *layout;
 
     if (!MatchAttrToken(driver, &oclass->match_driver))
         return FALSE;
 
+    /* MatchLayout string
+     *
+     * If no Layout section is found, xf86ServerLayout.id becomes "(implicit)"
+     * It is convenient that "" in patterns means "no explicit layout"
+     */
+    if (strcmp(xf86ConfigLayout.id,"(implicit)"))
+        layout = xf86ConfigLayout.id;
+    else
+        layout = "";
+    if (!MatchAttrToken(layout, &oclass->match_layout))
+            return FALSE;
+
     return TRUE;
 }
 

hw/xfree86/man/xorg.conf.man

@@ -1290,20 +1290,38 @@ module from the first
 .B Driver
 entry will be enabled when using the loadable server.
 .PP
-When an output device is automatically added, its characteristics are
+When an output device is automatically added, its characteristics and the active layout are
 checked against all
 .B OutputClass
 sections.
 Each section can contain optional entries to narrow the match of the class.
+.RE
+.TP 7
+.BI "MatchDriver \*q" matchdriver \*q
+Check the case-sensitive string
+.RI \*q matchdriver \*q
+against the kernel driver of the device.
+.RE
+.TP 7
+.BI "MatchLayout \*q" matchlayout \*q
+Check the case-sensitive string
+.RI \*q matchlayout \*q
+against the currently active
+.B ServerLayout
+section or against
+.RI \*q\*q
+, if no named
+.B ScreenLayout
+sections are present.
+.PP
 If none of the optional entries appear, the
 .B OutputClass
 section is generic and will match any output device.
 If more than one of these entries appear, they all must match for the
 configuration to apply.
 .PP
-The following list of tokens can be matched against attributes of the device.
-An entry can be constructed to match attributes from different devices by
-separating arguments with a '|' character.
+An entry can be constructed to match attributes from different devices or
+different screen layouts by separating arguments with a '|' character.
 .PP
 For example:
 .PP
@@ -1313,15 +1331,12 @@ For example:
 .B  "    Identifier   \*qMy Class\*q"
 .B  "    # kernel driver must be either foo or bar"
 .B  "    MatchDriver \*qfoo\^|\^bar\*q"
+.B  "    # active layout must be either Seat1 or implicit"
+.B  "    MatchLayout \*qSeat1|\*q"
 .I  "    \&.\|.\|.\&"
 .B  EndSection
 .fi
 .RE
-.TP 7
-.BI "MatchDriver \*q" matchdriver \*q
-Check the case-sensitive string
-.RI \*q matchdriver \*q
-against the kernel driver of the device.
 .PP
 When an output device has been matched to the
 .B OutputClass

hw/xfree86/parser/OutputClass.c

@@ -42,6 +42,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = {
     {MODULEPATH, "modulepath"},
     {OPTION, "option"},
     {MATCH_DRIVER, "matchdriver"},
+    {MATCH_LAYOUT, "matchlayout"},
     {-1, ""},
 };
 
@@ -58,6 +59,8 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr)
         TestFree(ptr->modulepath);
 
         xf86freeMatchGroupList(&ptr->match_driver);
+        xf86freeMatchGroupList(&ptr->match_layout);
+
         xf86optionListFree(ptr->option_lst);
 
         prev = ptr;
@@ -77,8 +80,8 @@ xf86parseOutputClassSection(void)
 
     parsePrologue(XF86ConfOutputClassPtr, XF86ConfOutputClassRec)
 
-    /* Initialize MatchGroup lists */
-    xorg_list_init(&ptr->match_driver);
+    /* MatchGroup and MatchLayout lists are zeroed by parsePrologue(),
+     * which is equivalent to xorg_list_init() */
 
     while ((token = xf86getToken(OutputClassTab)) != ENDSECTION) {
         switch (token) {
@@ -140,6 +143,16 @@ xf86parseOutputClassSection(void)
                 free(xf86_lex_val.str);
             }
             break;
+        case MATCH_LAYOUT:
+            if (xf86getSubToken(&(ptr->comment)) != XF86_TOKEN_STRING)
+                Error(QUOTE_MSG, "MatchLayout");
+            else {
+                group = xf86createMatchGroup(xf86_lex_val.str, MATCH_EXACT, FALSE);
+                if (group)
+                    xorg_list_add(&group->entry, &ptr->match_layout);
+                free(xf86_lex_val.str);
+            }
+            break;
         case EOF_TOKEN:
             Error(UNEXPECTED_EOF_MSG);
             break;
@@ -189,6 +202,16 @@ xf86printOutputClassSection(FILE * cf, XF86ConfOutputClassPtr ptr)
             fprintf(cf, "\"\n");
         }
 
+        xorg_list_for_each_entry(group, &ptr->match_layout, entry) {
+            fprintf(cf, "\tMatchLayout     \"");
+            not_first = FALSE;
+            xorg_list_for_each_entry(pattern, &group->patterns, entry) {
+                xf86printMatchPattern(cf, pattern, not_first);
+                not_first = TRUE;
+            }
+            fprintf(cf, "\"\n");
+        }
+
         fprintf(cf, "EndSection\n\n");
         ptr = ptr->list.next;
     }

hw/xfree86/parser/xf86Parser.h

@@ -362,6 +362,7 @@ typedef struct {
     char *modules;
     char *modulepath;
     struct xorg_list match_driver;
+    struct xorg_list match_layout;
     XF86OptionPtr option_lst;
     char *comment;
 } XF86ConfOutputClassRec, *XF86ConfOutputClassPtr;