diff options
Diffstat (limited to 'xorg-server/hw/dmx/config')
27 files changed, 382 insertions, 382 deletions
diff --git a/xorg-server/hw/dmx/config/.gitignore b/xorg-server/hw/dmx/config/.gitignore index bf5e80873..086062204 100644 --- a/xorg-server/hw/dmx/config/.gitignore +++ b/xorg-server/hw/dmx/config/.gitignore @@ -1,7 +1,7 @@ -# Add & Override for this directory and it's subdirectories
-dmxtodmx
-parser.c
-parser.h
-scanner.c
-vdltodmx
-xdmxconfig
+# Add & Override for this directory and it's subdirectories +dmxtodmx +parser.c +parser.h +scanner.c +vdltodmx +xdmxconfig diff --git a/xorg-server/hw/dmx/config/TODO b/xorg-server/hw/dmx/config/TODO index 0e9255fd2..2998ff4a0 100644 --- a/xorg-server/hw/dmx/config/TODO +++ b/xorg-server/hw/dmx/config/TODO @@ -1,7 +1,7 @@ -Fri May 31 13:20:17 2002
-
-1) Sanitize values from input boxes.
-
-2) Add canvas colors to cavas widget resources or to command-line options.
-
-3) Add ability to edit option line(s) and wall.
+Fri May 31 13:20:17 2002 + +1) Sanitize values from input boxes. + +2) Add canvas colors to cavas widget resources or to command-line options. + +3) Add ability to edit option line(s) and wall. diff --git a/xorg-server/hw/dmx/config/dmxcompat.h b/xorg-server/hw/dmx/config/dmxcompat.h index b9b083ff6..718892040 100644 --- a/xorg-server/hw/dmx/config/dmxcompat.h +++ b/xorg-server/hw/dmx/config/dmxcompat.h @@ -1,44 +1,44 @@ -/*
- * Copyright 2002 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * Authors:
- * Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-/** \file
- * Interface to VDL compatibility support. \see dmxcompat.c
- *
- * This file is not used by the DMX server.
- */
-
-#ifndef _DMXCOMPAT_H_
-#define _DMXCOMPAT_H_
-
-extern DMXConfigEntryPtr dmxVDLRead(const char *filename);
-#endif
+/* + * Copyright 2002 Red Hat Inc., Durham, North Carolina. + * + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation on the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* + * Authors: + * Rickard E. (Rik) Faith <faith@redhat.com> + * + */ + +/** \file + * Interface to VDL compatibility support. \see dmxcompat.c + * + * This file is not used by the DMX server. + */ + +#ifndef _DMXCOMPAT_H_ +#define _DMXCOMPAT_H_ + +extern DMXConfigEntryPtr dmxVDLRead(const char *filename); +#endif diff --git a/xorg-server/hw/dmx/config/parser.y b/xorg-server/hw/dmx/config/parser.y index 9a45e624f..ac2441017 100644 --- a/xorg-server/hw/dmx/config/parser.y +++ b/xorg-server/hw/dmx/config/parser.y @@ -1,226 +1,226 @@ -/* $XFree86$ */
-/*
- * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
- *
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation on the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-/*
- * Authors:
- * Rickard E. (Rik) Faith <faith@redhat.com>
- *
- */
-
-%{
-#ifdef HAVE_DMX_CONFIG_H
-#include <dmx-config.h>
-#endif
-
-#include "dmxparse.h"
-#include <string.h>
-#include <stdlib.h>
-#define YYDEBUG 1
-#define YYERROR_VERBOSE
-#define YY_USE_PROTOS
-
-DMXConfigEntryPtr dmxConfigEntry = NULL;
-#define APPEND(type, h, t) \
-{ \
- type pt; \
- for (pt = h; pt->next; pt = pt->next); \
- pt->next = t; \
-}
-%}
-
-%union {
- DMXConfigTokenPtr token;
- DMXConfigStringPtr string;
- DMXConfigNumberPtr number;
- DMXConfigPairPtr pair;
- DMXConfigFullDimPtr fdim;
- DMXConfigPartDimPtr pdim;
- DMXConfigDisplayPtr display;
- DMXConfigWallPtr wall;
- DMXConfigOptionPtr option;
- DMXConfigParamPtr param;
- DMXConfigCommentPtr comment;
- DMXConfigSubPtr subentry;
- DMXConfigVirtualPtr virtual;
- DMXConfigEntryPtr entry;
-}
-
- /* Terminals */
-%token <token> '{' '}' ';' '/' T_VIRTUAL T_DISPLAY T_WALL T_OPTION T_PARAM
-%token <string> T_STRING
-%token <pair> T_DIMENSION T_OFFSET T_ORIGIN
-%token <comment> T_COMMENT T_LINE_COMMENT
-
- /* Non-termials */
-%type <token> Display Wall Terminal Open Close
-%type <string> NameList Name
-%type <pair> Dimension Offset Origin
-%type <pdim> PartialDim
-%type <fdim> FullDim
-%type <display> DisplayEntry
-%type <option> OptionEntry
-%type <param> ParamEntry ParamList Param
-%type <subentry> SubList Sub
-%type <wall> WallEntry
-%type <virtual> Virtual
-%type <entry> Program EntryList Entry
-
-%%
-
-Program : EntryList { dmxConfigEntry = $1; }
- ;
-
-EntryList : Entry
- | EntryList Entry { APPEND(DMXConfigEntryPtr,$1,$2); $$ = $1; }
- ;
-
-Entry : Virtual { $$ = dmxConfigEntryVirtual($1); }
- | T_LINE_COMMENT { $$ = dmxConfigEntryComment($1); }
- ;
-
-Virtual : T_VIRTUAL Open SubList Close
- { $$ = dmxConfigCreateVirtual($1, NULL, NULL, $2, $3, $4); }
- | T_VIRTUAL Dimension Open SubList Close
- { $$ = dmxConfigCreateVirtual($1, NULL, $2, $3, $4, $5); }
- | T_VIRTUAL Name Open SubList Close
- { $$ = dmxConfigCreateVirtual($1, $2, NULL, $3, $4, $5); }
- | T_VIRTUAL Name Dimension Open SubList Close
- { $$ = dmxConfigCreateVirtual($1, $2, $3, $4, $5, $6 ); }
- ;
-
-SubList : Sub
- | SubList Sub { APPEND(DMXConfigSubPtr,$1,$2); $$ = $1; }
- ;
-
-Sub : T_LINE_COMMENT { $$ = dmxConfigSubComment($1); }
- | DisplayEntry { $$ = dmxConfigSubDisplay($1); }
- | WallEntry { $$ = dmxConfigSubWall($1); }
- | OptionEntry { $$ = dmxConfigSubOption($1); }
- | ParamEntry { $$ = dmxConfigSubParam($1); }
- ;
-
-OptionEntry : T_OPTION NameList Terminal
- { $$ = dmxConfigCreateOption($1, $2, $3); }
- ;
-
-ParamEntry : T_PARAM NameList Terminal
- { $$ = dmxConfigCreateParam($1, NULL, $2, NULL, $3); }
- | T_PARAM Open ParamList Close
- { $$ = dmxConfigCreateParam($1, $2, NULL, $4, NULL);
- $$->next = $3;
- }
- ;
-
-ParamList : Param
- | ParamList Param { APPEND(DMXConfigParamPtr,$1,$2); $$ = $1; }
- ;
-
-Param : NameList Terminal
- { $$ = dmxConfigCreateParam(NULL, NULL, $1, NULL, $2); }
- ;
-
-PartialDim : Dimension Offset
- { $$ = dmxConfigCreatePartDim($1, $2); }
- | Dimension
- { $$ = dmxConfigCreatePartDim($1, NULL); }
- | Offset
- { $$ = dmxConfigCreatePartDim(NULL, $1); }
- ;
-
-FullDim : PartialDim '/' PartialDim
- { $$ = dmxConfigCreateFullDim($1, $3); }
- | '/' PartialDim
- { $$ = dmxConfigCreateFullDim(NULL, $2); }
- | PartialDim
- { $$ = dmxConfigCreateFullDim($1, NULL); }
- ;
-
-DisplayEntry : Display Name FullDim Origin Terminal
- { $$ = dmxConfigCreateDisplay($1, $2, $3, $4, $5); }
- | Display FullDim Origin Terminal
- { $$ = dmxConfigCreateDisplay($1, NULL, $2, $3, $4); }
- | Display Name Origin Terminal
- { $$ = dmxConfigCreateDisplay($1, $2, NULL, $3, $4); }
-
- | Display Name FullDim Terminal
- { $$ = dmxConfigCreateDisplay($1, $2, $3, NULL, $4); }
- | Display FullDim Terminal
- { $$ = dmxConfigCreateDisplay($1, NULL, $2, NULL, $3); }
- | Display Name Terminal
- { $$ = dmxConfigCreateDisplay($1, $2, NULL, NULL, $3); }
- | Display Terminal
- { $$ = dmxConfigCreateDisplay($1, NULL, NULL, NULL, $2); }
- ;
-
-WallEntry : Wall Dimension Dimension NameList Terminal
- { $$ = dmxConfigCreateWall($1, $2, $3, $4, $5); }
- | Wall Dimension NameList Terminal
- { $$ = dmxConfigCreateWall($1, $2, NULL, $3, $4); }
- | Wall NameList Terminal
- { $$ = dmxConfigCreateWall($1, NULL, NULL, $2, $3); }
- ;
-
-Display : T_DISPLAY
- | T_DISPLAY T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Name : T_STRING
- | T_STRING T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Dimension : T_DIMENSION
- | T_DIMENSION T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Offset : T_OFFSET
- | T_OFFSET T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Origin : T_ORIGIN
- | T_ORIGIN T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Terminal : ';'
- | ';' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Open : '{'
- | '{' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Close : '}'
- | '}' T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-Wall : T_WALL
- | T_WALL T_COMMENT { $$ = $1; $$->comment = $2->comment; }
- ;
-
-NameList : Name
- | NameList Name { APPEND(DMXConfigStringPtr, $1, $2); $$ = $1; }
- ;
+/* $XFree86$ */ +/* + * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina. + * + * All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation on the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NON-INFRINGEMENT. IN NO EVENT SHALL RED HAT AND/OR THEIR SUPPLIERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +/* + * Authors: + * Rickard E. (Rik) Faith <faith@redhat.com> + * + */ + +%{ +#ifdef HAVE_DMX_CONFIG_H +#include <dmx-config.h> +#endif + +#include "dmxparse.h" +#include <string.h> +#include <stdlib.h> +#define YYDEBUG 1 +#define YYERROR_VERBOSE +#define YY_USE_PROTOS + +DMXConfigEntryPtr dmxConfigEntry = NULL; +#define APPEND(type, h, t) \ +{ \ + type pt; \ + for (pt = h; pt->next; pt = pt->next); \ + pt->next = t; \ +} +%} + +%union { + DMXConfigTokenPtr token; + DMXConfigStringPtr string; + DMXConfigNumberPtr number; + DMXConfigPairPtr pair; + DMXConfigFullDimPtr fdim; + DMXConfigPartDimPtr pdim; + DMXConfigDisplayPtr display; + DMXConfigWallPtr wall; + DMXConfigOptionPtr option; + DMXConfigParamPtr param; + DMXConfigCommentPtr comment; + DMXConfigSubPtr subentry; + DMXConfigVirtualPtr virtual; + DMXConfigEntryPtr entry; +} + + /* Terminals */ +%token <token> '{' '}' ';' '/' T_VIRTUAL T_DISPLAY T_WALL T_OPTION T_PARAM +%token <string> T_STRING +%token <pair> T_DIMENSION T_OFFSET T_ORIGIN +%token <comment> T_COMMENT T_LINE_COMMENT + + /* Non-termials */ +%type <token> Display Wall Terminal Open Close +%type <string> NameList Name +%type <pair> Dimension Offset Origin +%type <pdim> PartialDim +%type <fdim> FullDim +%type <display> DisplayEntry +%type <option> OptionEntry +%type <param> ParamEntry ParamList Param +%type <subentry> SubList Sub +%type <wall> WallEntry +%type <virtual> Virtual +%type <entry> Program EntryList Entry + +%% + +Program : EntryList { dmxConfigEntry = $1; } + ; + +EntryList : Entry + | EntryList Entry { APPEND(DMXConfigEntryPtr,$1,$2); $$ = $1; } + ; + +Entry : Virtual { $$ = dmxConfigEntryVirtual($1); } + | T_LINE_COMMENT { $$ = dmxConfigEntryComment($1); } + ; + +Virtual : T_VIRTUAL Open SubList Close + { $$ = dmxConfigCreateVirtual($1, NULL, NULL, $2, $3, $4); } + | T_VIRTUAL Dimension Open SubList Close + { $$ = dmxConfigCreateVirtual($1, NULL, $2, $3, $4, $5); } + | T_VIRTUAL Name Open SubList Close + { $$ = dmxConfigCreateVirtual($1, $2, NULL, $3, $4, $5); } + | T_VIRTUAL Name Dimension Open SubList Close + { $$ = dmxConfigCreateVirtual($1, $2, $3, $4, $5, $6 ); } + ; + +SubList : Sub + | SubList Sub { APPEND(DMXConfigSubPtr,$1,$2); $$ = $1; } + ; + +Sub : T_LINE_COMMENT { $$ = dmxConfigSubComment($1); } + | DisplayEntry { $$ = dmxConfigSubDisplay($1); } + | WallEntry { $$ = dmxConfigSubWall($1); } + | OptionEntry { $$ = dmxConfigSubOption($1); } + | ParamEntry { $$ = dmxConfigSubParam($1); } + ; + +OptionEntry : T_OPTION NameList Terminal + { $$ = dmxConfigCreateOption($1, $2, $3); } + ; + +ParamEntry : T_PARAM NameList Terminal + { $$ = dmxConfigCreateParam($1, NULL, $2, NULL, $3); } + | T_PARAM Open ParamList Close + { $$ = dmxConfigCreateParam($1, $2, NULL, $4, NULL); + $$->next = $3; + } + ; + +ParamList : Param + | ParamList Param { APPEND(DMXConfigParamPtr,$1,$2); $$ = $1; } + ; + +Param : NameList Terminal + { $$ = dmxConfigCreateParam(NULL, NULL, $1, NULL, $2); } + ; + +PartialDim : Dimension Offset + { $$ = dmxConfigCreatePartDim($1, $2); } + | Dimension + { $$ = dmxConfigCreatePartDim($1, NULL); } + | Offset + { $$ = dmxConfigCreatePartDim(NULL, $1); } + ; + +FullDim : PartialDim '/' PartialDim + { $$ = dmxConfigCreateFullDim($1, $3); } + | '/' PartialDim + { $$ = dmxConfigCreateFullDim(NULL, $2); } + | PartialDim + { $$ = dmxConfigCreateFullDim($1, NULL); } + ; + +DisplayEntry : Display Name FullDim Origin Terminal + { $$ = dmxConfigCreateDisplay($1, $2, $3, $4, $5); } + | Display FullDim Origin Terminal + { $$ = dmxConfigCreateDisplay($1, NULL, $2, $3, $4); } + | Display Name Origin Terminal + { $$ = dmxConfigCreateDisplay($1, $2, NULL, $3, $4); } + + | Display Name FullDim Terminal + { $$ = dmxConfigCreateDisplay($1, $2, $3, NULL, $4); } + | Display FullDim Terminal + { $$ = dmxConfigCreateDisplay($1, NULL, $2, NULL, $3); } + | Display Name Terminal + { $$ = dmxConfigCreateDisplay($1, $2, NULL, NULL, $3); } + | Display Terminal + { $$ = dmxConfigCreateDisplay($1, NULL, NULL, NULL, $2); } + ; + +WallEntry : Wall Dimension Dimension NameList Terminal + { $$ = dmxConfigCreateWall($1, $2, $3, $4, $5); } + | Wall Dimension NameList Terminal + { $$ = dmxConfigCreateWall($1, $2, NULL, $3, $4); } + | Wall NameList Terminal + { $$ = dmxConfigCreateWall($1, NULL, NULL, $2, $3); } + ; + +Display : T_DISPLAY + | T_DISPLAY T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Name : T_STRING + | T_STRING T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Dimension : T_DIMENSION + | T_DIMENSION T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Offset : T_OFFSET + | T_OFFSET T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Origin : T_ORIGIN + | T_ORIGIN T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Terminal : ';' + | ';' T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Open : '{' + | '{' T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Close : '}' + | '}' T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +Wall : T_WALL + | T_WALL T_COMMENT { $$ = $1; $$->comment = $2->comment; } + ; + +NameList : Name + | NameList Name { APPEND(DMXConfigStringPtr, $1, $2); $$ = $1; } + ; diff --git a/xorg-server/hw/dmx/config/test-a.in b/xorg-server/hw/dmx/config/test-a.in index 9aeeab047..827675374 100644 --- a/xorg-server/hw/dmx/config/test-a.in +++ b/xorg-server/hw/dmx/config/test-a.in @@ -1 +1 @@ -error
+error diff --git a/xorg-server/hw/dmx/config/test-a.out b/xorg-server/hw/dmx/config/test-a.out index e8b7404e1..d35b29fc0 100644 --- a/xorg-server/hw/dmx/config/test-a.out +++ b/xorg-server/hw/dmx/config/test-a.out @@ -1,2 +1,2 @@ -parse error on line 1 at token "error"
-syntax error, unexpected string expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "error" +syntax error, unexpected string expecting "virtual" or comment (e.g., #...) diff --git a/xorg-server/hw/dmx/config/test-b.in b/xorg-server/hw/dmx/config/test-b.in index d4f30e004..308ec1db4 100644 --- a/xorg-server/hw/dmx/config/test-b.in +++ b/xorg-server/hw/dmx/config/test-b.in @@ -1 +1 @@ -# comment
+# comment diff --git a/xorg-server/hw/dmx/config/test-b.out b/xorg-server/hw/dmx/config/test-b.out index d4f30e004..308ec1db4 100644 --- a/xorg-server/hw/dmx/config/test-b.out +++ b/xorg-server/hw/dmx/config/test-b.out @@ -1 +1 @@ -# comment
+# comment diff --git a/xorg-server/hw/dmx/config/test-c.in b/xorg-server/hw/dmx/config/test-c.in index a3d66513f..e07ae5ba6 100644 --- a/xorg-server/hw/dmx/config/test-c.in +++ b/xorg-server/hw/dmx/config/test-c.in @@ -1 +1 @@ -virtual
+virtual diff --git a/xorg-server/hw/dmx/config/test-c.out b/xorg-server/hw/dmx/config/test-c.out index 87838938a..7390397a4 100644 --- a/xorg-server/hw/dmx/config/test-c.out +++ b/xorg-server/hw/dmx/config/test-c.out @@ -1,2 +1,2 @@ -parse error on line 2 at token " "
-syntax error, unexpected $end, expecting "{" or string or dimension (e.g., 2x2 or 1024x768)
+parse error on line 2 at token " " +syntax error, unexpected $end, expecting "{" or string or dimension (e.g., 2x2 or 1024x768) diff --git a/xorg-server/hw/dmx/config/test-d.in b/xorg-server/hw/dmx/config/test-d.in index af14b8c09..6827503b1 100644 --- a/xorg-server/hw/dmx/config/test-d.in +++ b/xorg-server/hw/dmx/config/test-d.in @@ -1 +1 @@ -display
+display diff --git a/xorg-server/hw/dmx/config/test-d.out b/xorg-server/hw/dmx/config/test-d.out index f6e3db0a7..f3219b301 100644 --- a/xorg-server/hw/dmx/config/test-d.out +++ b/xorg-server/hw/dmx/config/test-d.out @@ -1,2 +1,2 @@ -parse error on line 1 at token "display"
-syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "display" +syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...) diff --git a/xorg-server/hw/dmx/config/test-e.in b/xorg-server/hw/dmx/config/test-e.in index 4ebcf2406..21dbde95c 100644 --- a/xorg-server/hw/dmx/config/test-e.in +++ b/xorg-server/hw/dmx/config/test-e.in @@ -1 +1 @@ -display;
+display; diff --git a/xorg-server/hw/dmx/config/test-e.out b/xorg-server/hw/dmx/config/test-e.out index f6e3db0a7..f3219b301 100644 --- a/xorg-server/hw/dmx/config/test-e.out +++ b/xorg-server/hw/dmx/config/test-e.out @@ -1,2 +1,2 @@ -parse error on line 1 at token "display"
-syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...)
+parse error on line 1 at token "display" +syntax error, unexpected "display" expecting "virtual" or comment (e.g., #...) diff --git a/xorg-server/hw/dmx/config/test-f.in b/xorg-server/hw/dmx/config/test-f.in index 1fe26c507..17f6c6327 100644 --- a/xorg-server/hw/dmx/config/test-f.in +++ b/xorg-server/hw/dmx/config/test-f.in @@ -1,2 +1,2 @@ -virtual {
-}
+virtual { +} diff --git a/xorg-server/hw/dmx/config/test-g.in b/xorg-server/hw/dmx/config/test-g.in index c8741c58e..453d8121c 100644 --- a/xorg-server/hw/dmx/config/test-g.in +++ b/xorg-server/hw/dmx/config/test-g.in @@ -1,4 +1,4 @@ -virtual a {
- display d0:0 1280x1024;
- display d1:0 1280x1024;
-}
+virtual a { + display d0:0 1280x1024; + display d1:0 1280x1024; +} diff --git a/xorg-server/hw/dmx/config/test-g.out b/xorg-server/hw/dmx/config/test-g.out index c8741c58e..453d8121c 100644 --- a/xorg-server/hw/dmx/config/test-g.out +++ b/xorg-server/hw/dmx/config/test-g.out @@ -1,4 +1,4 @@ -virtual a {
- display d0:0 1280x1024;
- display d1:0 1280x1024;
-}
+virtual a { + display d0:0 1280x1024; + display d1:0 1280x1024; +} diff --git a/xorg-server/hw/dmx/config/test-h.in b/xorg-server/hw/dmx/config/test-h.in index 93cef324f..1193d309e 100644 --- a/xorg-server/hw/dmx/config/test-h.in +++ b/xorg-server/hw/dmx/config/test-h.in @@ -1,7 +1,7 @@ -# comment a
-# comment b
-## comment c
-# <-- tab
-# Next comment is empty
-#
-# Non empty
+# comment a +# comment b +## comment c +# <-- tab +# Next comment is empty +# +# Non empty diff --git a/xorg-server/hw/dmx/config/test-h.out b/xorg-server/hw/dmx/config/test-h.out index 93cef324f..1193d309e 100644 --- a/xorg-server/hw/dmx/config/test-h.out +++ b/xorg-server/hw/dmx/config/test-h.out @@ -1,7 +1,7 @@ -# comment a
-# comment b
-## comment c
-# <-- tab
-# Next comment is empty
-#
-# Non empty
+# comment a +# comment b +## comment c +# <-- tab +# Next comment is empty +# +# Non empty diff --git a/xorg-server/hw/dmx/config/test-i.in b/xorg-server/hw/dmx/config/test-i.in index bf5d345c3..b65967e62 100644 --- a/xorg-server/hw/dmx/config/test-i.in +++ b/xorg-server/hw/dmx/config/test-i.in @@ -1,3 +1,3 @@ -virtual a {
- param a b; # comment
-}
+virtual a { + param a b; # comment +} diff --git a/xorg-server/hw/dmx/config/test-i.out b/xorg-server/hw/dmx/config/test-i.out index bf5d345c3..b65967e62 100644 --- a/xorg-server/hw/dmx/config/test-i.out +++ b/xorg-server/hw/dmx/config/test-i.out @@ -1,3 +1,3 @@ -virtual a {
- param a b; # comment
-}
+virtual a { + param a b; # comment +} diff --git a/xorg-server/hw/dmx/config/test-j.in b/xorg-server/hw/dmx/config/test-j.in index 087da79a6..cc1cdd0ea 100644 --- a/xorg-server/hw/dmx/config/test-j.in +++ b/xorg-server/hw/dmx/config/test-j.in @@ -1,13 +1,13 @@ -virtual a {
- option aaa # bbb
- aa cc;
- param { # comment 1
- a b;
- c d;
- x y z; # comment 2
- }
- param e f g h; # comment 3
- param e f g hlskdjflskdfjsd #comment 4
- flksdjf sldkfjsldkfjsdlf
- "lsdkfjsldkfjlsdkjflskdjflsdkjfl" "lkjsdlfjsdlfkjsdlfj";
-}
+virtual a { + option aaa # bbb + aa cc; + param { # comment 1 + a b; + c d; + x y z; # comment 2 + } + param e f g h; # comment 3 + param e f g hlskdjflskdfjsd #comment 4 + flksdjf sldkfjsldkfjsdlf + "lsdkfjsldkfjlsdkjflskdjflsdkjfl" "lkjsdlfjsdlfkjsdlfj"; +} diff --git a/xorg-server/hw/dmx/config/test-j.out b/xorg-server/hw/dmx/config/test-j.out index d386e40b5..9acaa009b 100644 --- a/xorg-server/hw/dmx/config/test-j.out +++ b/xorg-server/hw/dmx/config/test-j.out @@ -1,11 +1,11 @@ -virtual a {
- option "aaa aa cc";
- param { # comment 1
- a b;
- c d;
- x y z; # comment 2
- }
- param e f g h; # comment 3
- param e f g hlskdjflskdfjsd #comment 4
- flksdjf sldkfjsldkfjsdlf lsdkfjsldkfjlsdkjflskdjflsdkjfl lkjsdlfjsdlfkjsdlfj;
-}
+virtual a { + option "aaa aa cc"; + param { # comment 1 + a b; + c d; + x y z; # comment 2 + } + param e f g h; # comment 3 + param e f g hlskdjflskdfjsd #comment 4 + flksdjf sldkfjsldkfjsdlf lsdkfjsldkfjlsdkjflskdjflsdkjfl lkjsdlfjsdlfkjsdlfj; +} diff --git a/xorg-server/hw/dmx/config/test-k.in b/xorg-server/hw/dmx/config/test-k.in index 937e8ee27..2218d26d9 100644 --- a/xorg-server/hw/dmx/config/test-k.in +++ b/xorg-server/hw/dmx/config/test-k.in @@ -1,3 +1,3 @@ -virtual a {
- option +xinerama -syncbatch 0;
-}
+virtual a { + option +xinerama -syncbatch 0; +} diff --git a/xorg-server/hw/dmx/config/test-k.out b/xorg-server/hw/dmx/config/test-k.out index cdfd70358..ebd743923 100644 --- a/xorg-server/hw/dmx/config/test-k.out +++ b/xorg-server/hw/dmx/config/test-k.out @@ -1,3 +1,3 @@ -virtual a {
- option "+xinerama -syncbatch 0";
-}
+virtual a { + option "+xinerama -syncbatch 0"; +} diff --git a/xorg-server/hw/dmx/config/test-l.in b/xorg-server/hw/dmx/config/test-l.in index d04c47b9a..7bf05139b 100644 --- a/xorg-server/hw/dmx/config/test-l.in +++ b/xorg-server/hw/dmx/config/test-l.in @@ -1,12 +1,12 @@ -virtual a {
- display d0:0 1x2;
- display d1:0 +3+4;
- display d2:0 100x200 @1x1;
- display d3:0 +3+4 @2x2;
- display d4:0 100x200+3+4 @3x3;
- display d5:0 / 1x2+3+4;
- display d6:0 / 1x2;
- display d7:0 / +3+4;
- display d8:0 / 1x2+3+4 @4x4;
- display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
-}
+virtual a { + display d0:0 1x2; + display d1:0 +3+4; + display d2:0 100x200 @1x1; + display d3:0 +3+4 @2x2; + display d4:0 100x200+3+4 @3x3; + display d5:0 / 1x2+3+4; + display d6:0 / 1x2; + display d7:0 / +3+4; + display d8:0 / 1x2+3+4 @4x4; + display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100; +} diff --git a/xorg-server/hw/dmx/config/test-l.out b/xorg-server/hw/dmx/config/test-l.out index d04c47b9a..7bf05139b 100644 --- a/xorg-server/hw/dmx/config/test-l.out +++ b/xorg-server/hw/dmx/config/test-l.out @@ -1,12 +1,12 @@ -virtual a {
- display d0:0 1x2;
- display d1:0 +3+4;
- display d2:0 100x200 @1x1;
- display d3:0 +3+4 @2x2;
- display d4:0 100x200+3+4 @3x3;
- display d5:0 / 1x2+3+4;
- display d6:0 / 1x2;
- display d7:0 / +3+4;
- display d8:0 / 1x2+3+4 @4x4;
- display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100;
-}
+virtual a { + display d0:0 1x2; + display d1:0 +3+4; + display d2:0 100x200 @1x1; + display d3:0 +3+4 @2x2; + display d4:0 100x200+3+4 @3x3; + display d5:0 / 1x2+3+4; + display d6:0 / 1x2; + display d7:0 / +3+4; + display d8:0 / 1x2+3+4 @4x4; + display d9:0 11x22+33+44 / 111x222+333+444 @1000x1100; +} |