Merge remote-tracking branch 'origin/released'

Conflicts:
	libX11/specs/libX11/CH08.xml
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/queryobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mkfontscale/list.h
	pixman/pixman/Makefile.win32
	xorg-server/dix/devices.c
	xorg-server/dix/events.c
	xorg-server/dix/inpututils.c
	xorg-server/fb/fbbltone.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/ephyrinit.c
	xorg-server/hw/xfree86/common/xf86Module.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xfree86/man/xorg.conf.man
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/include/input.h
	xorg-server/include/inputstr.h
	xorg-server/mi/mieq.c
	xorg-server/randr/rrscreen.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/base.xml.in

10 files changed, 1303 insertions, 1220 deletions

diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index 4519398a9..b08dc1e40 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -52,6 +52,7 @@ Bool ephyrNoDRI=FALSE ;
 Bool ephyrNoXV=FALSE ;

 

 static int mouseState = 0;

+static Rotation ephyrRandr = RR_Rotate_0;

 

 typedef struct _EphyrInputPrivate {

     Bool    enabled;

@@ -252,7 +253,11 @@ ephyrMapFramebuffer (KdScreenInfo *screen)
   EPHYR_LOG("screen->width: %d, screen->height: %d index=%d",

 	     screen->width, screen->height, screen->mynum);

   

-  KdComputePointerMatrix (&m, scrpriv->randr, screen->width, screen->height);

+  /*

+   * Use the rotation last applied to ourselves (in the Xephyr case the fb

+   * coordinate system moves independently of the pointer coordiante system).

+   */

+  KdComputePointerMatrix (&m, ephyrRandr, screen->width, screen->height);

   KdSetPointerMatrix (&m);

   

   priv->bytes_per_line = ((screen->width * screen->fb.bitsPerPixel + 31) >> 5) << 2;

@@ -533,7 +538,15 @@ ephyrRandRSetConfig (ScreenPtr		pScreen,
    * Set new configuration

    */

   

-  scrpriv->randr = KdAddRotation (screen->randr, randr);

+  /*

+   * We need to store the rotation value for pointer coords transformation;

+   * though initially the pointer and fb rotation are identical, when we map

+   * the fb, the screen will be reinitialized and return into an unrotated

+   * state (presumably the HW is taking care of the rotation of the fb), but the

+   * pointer still needs to be transformed.

+   */

+  ephyrRandr = KdAddRotation (screen->randr, randr);

+  scrpriv->randr = ephyrRandr;

   

   ephyrUnmapFramebuffer (screen); 

   

@@ -1069,6 +1082,14 @@ MouseInit (KdPointerInfo *pi)
     pi->nButtons = 32;

     free(pi->name);

     pi->name = strdup("Xephyr virtual mouse");

+

+    /*

+     * Must transform pointer coords since the pointer position

+     * relative to the Xephyr window is controlled by the host server and

+     * remains constant regardless of any rotation applied to the Xephyr screen.

+     */

+    pi->transformCoordinates = TRUE;

+

     ephyrMouse = pi;

     return Success;

 }

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index b90b92bac..9be68b08b 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -370,13 +370,18 @@ ephyrDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
   return TRUE;

 }

 

+static void

+ephyrDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)

+{

+}

+

 miPointerSpriteFuncRec EphyrPointerSpriteFuncs = {

 	ephyrRealizeCursor,

 	ephyrUnrealizeCursor,

 	ephyrSetCursor,

 	ephyrMoveCursor,

 	ephyrDeviceCursorInitialize,

-	NULL

+	ephyrDeviceCursorCleanup

 };

 

 

diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index 02fdab608..f5f182b25 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -83,7 +83,7 @@ typedef enum {
  */

 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)

 #define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(11, 0)

-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(12, 2)

+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(13, 0)

 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(5, 0)

 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)

 

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index b8d866429..afef0994d 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -470,6 +470,20 @@ match_path_pattern(const char *attr, const char *pattern)
 #endif

 

 /*

+ * If no Layout section is found, xf86ServerLayout.id becomes "(implicit)"

+ * It is convenient that "" in patterns means "no explicit layout"

+ */

+static int

+match_string_implicit(const char *attr, const char *pattern)

+{

+    if (strlen(pattern)) {

+        return strcmp(attr, pattern);

+    } else {

+        return strcmp(attr,"(implicit)");

+    }

+}

+

+/*

  * Match an attribute against a list of NULL terminated arrays of patterns.

  * If a pattern in each list entry is matched, return TRUE.

  */

@@ -564,6 +578,13 @@ InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
             return FALSE;

     }

 

+    /* MatchLayout string */

+    if (!list_is_empty(&iclass->match_layout)) {

+        if (!MatchAttrToken(xf86ConfigLayout.id,

+                            &iclass->match_layout, match_string_implicit))

+            return FALSE;

+    }

+

     /* MatchIs* booleans */

     if (iclass->is_keyboard.set &&

         iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))

diff --git a/xorg-server/hw/xfree86/man/xorg.conf.man b/xorg-server/hw/xfree86/man/xorg.conf.man
index ce0c177bc..5379fdc45 100644
--- a/xorg-server/hw/xfree86/man/xorg.conf.man
+++ b/xorg-server/hw/xfree86/man/xorg.conf.man
@@ -1140,6 +1140,16 @@ matches the
 pattern. A match is found if at least one of the tags given in

 .RI \*q matchtag \*q

 matches at least one of the tags assigned by the backend.

+.TP 7

+.BI "MatchLayout \*q" matchlayout \*q

+Check the case-sensitive string

+.RI \*q matchlayout \*q

+against the currently active

+.B ServerLayout

+section. The empty string "" matches an implicit layout which appears

+if no named

+.B ServerLayout

+sections have been found.

 .PP

 The second type of entry is used to match device types. These entries take a

 boolean argument similar to

diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index ddf344a0f..3f801700e 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -1,403 +1,424 @@
-/*

- * Copyright (c) 2009 Dan Nicholson

- *

- * 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 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 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

- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT

- * HOLDERS 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.

- */

-

-/* View/edit this file with tab stops set to 4 */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <string.h>

-#include "os.h"

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static

-xf86ConfigSymTabRec InputClassTab[] =

-{

-    {ENDSECTION, "endsection"},

-    {IDENTIFIER, "identifier"},

-    {OPTION, "option"},

-    {DRIVER, "driver"},

-    {MATCH_PRODUCT, "matchproduct"},

-    {MATCH_VENDOR, "matchvendor"},

-    {MATCH_DEVICE_PATH, "matchdevicepath"},

-    {MATCH_OS, "matchos"},

-    {MATCH_PNPID, "matchpnpid"},

-    {MATCH_USBID, "matchusbid"},

-    {MATCH_DRIVER, "matchdriver"},

-    {MATCH_TAG, "matchtag"},

-    {MATCH_IS_KEYBOARD, "matchiskeyboard"},

-    {MATCH_IS_POINTER, "matchispointer"},

-    {MATCH_IS_JOYSTICK, "matchisjoystick"},

-    {MATCH_IS_TABLET, "matchistablet"},

-    {MATCH_IS_TOUCHPAD, "matchistouchpad"},

-    {MATCH_IS_TOUCHSCREEN, "matchistouchscreen"},

-    {-1, ""},

-};

-

-#define CLEANUP xf86freeInputClassList

-

-#define TOKEN_SEP "|"

-

-static void

-add_group_entry(struct list *head, char **values)

-{

-    xf86MatchGroup *group;

-

-    group = malloc(sizeof(*group));

-    if (group) {

-        group->values = values;

-        list_add(&group->entry, head);

-    }

-}

-

-XF86ConfInputClassPtr

-xf86parseInputClassSection(void)

-{

-    int has_ident = FALSE;

-    int token;

-

-    parsePrologue(XF86ConfInputClassPtr, XF86ConfInputClassRec)

-

-    /* Initialize MatchGroup lists */

-    list_init(&ptr->match_product);

-    list_init(&ptr->match_vendor);

-    list_init(&ptr->match_device);

-    list_init(&ptr->match_os);

-    list_init(&ptr->match_pnpid);

-    list_init(&ptr->match_usbid);

-    list_init(&ptr->match_driver);

-    list_init(&ptr->match_tag);

-

-    while ((token = xf86getToken(InputClassTab)) != ENDSECTION) {

-        switch (token) {

-        case COMMENT:

-            ptr->comment = xf86addComment(ptr->comment, val.str);

-            break;

-        case IDENTIFIER:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "Identifier");

-            if (has_ident == TRUE)

-                Error(MULTIPLE_MSG, "Identifier");

-            ptr->identifier = val.str;

-            has_ident = TRUE;

-            break;

-        case DRIVER:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "Driver");

-            if (strcmp(val.str, "keyboard") == 0) {

-                ptr->driver = strdup("kbd");

-                free(val.str);

-            }

-            else

-                ptr->driver = val.str;

-            break;

-        case OPTION:

-            ptr->option_lst = xf86parseOption(ptr->option_lst);

-            break;

-        case MATCH_PRODUCT:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchProduct");

-            add_group_entry(&ptr->match_product,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_VENDOR:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchVendor");

-            add_group_entry(&ptr->match_vendor,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_DEVICE_PATH:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchDevicePath");

-            add_group_entry(&ptr->match_device,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_OS:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchOS");

-            add_group_entry(&ptr->match_os,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_PNPID:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchPnPID");

-            add_group_entry(&ptr->match_pnpid,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_USBID:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchUSBID");

-            add_group_entry(&ptr->match_usbid,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_DRIVER:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchDriver");

-            add_group_entry(&ptr->match_driver,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_TAG:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchTag");

-            add_group_entry(&ptr->match_tag,

-                            xstrtokenize(val.str, TOKEN_SEP));

-            break;

-        case MATCH_IS_KEYBOARD:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsKeyboard");

-            ptr->is_keyboard.set = xf86getBoolValue(&ptr->is_keyboard.val,

-                                                    val.str);

-            if (!ptr->is_keyboard.set)

-                Error(BOOL_MSG, "MatchIsKeyboard");

-            break;

-        case MATCH_IS_POINTER:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsPointer");

-            ptr->is_pointer.set = xf86getBoolValue(&ptr->is_pointer.val,

-                                                   val.str);

-            if (!ptr->is_pointer.set)

-                Error(BOOL_MSG, "MatchIsPointer");

-            break;

-        case MATCH_IS_JOYSTICK:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsJoystick");

-            ptr->is_joystick.set = xf86getBoolValue(&ptr->is_joystick.val,

-                                                    val.str);

-            if (!ptr->is_joystick.set)

-                Error(BOOL_MSG, "MatchIsJoystick");

-            break;

-        case MATCH_IS_TABLET:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsTablet");

-            ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val,

-                                                  val.str);

-            if (!ptr->is_tablet.set)

-                Error(BOOL_MSG, "MatchIsTablet");

-            break;

-        case MATCH_IS_TOUCHPAD:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsTouchpad");

-            ptr->is_touchpad.set = xf86getBoolValue(&ptr->is_touchpad.val,

-                                                    val.str);

-            if (!ptr->is_touchpad.set)

-                Error(BOOL_MSG, "MatchIsTouchpad");

-            break;

-        case MATCH_IS_TOUCHSCREEN:

-            if (xf86getSubToken(&(ptr->comment)) != STRING)

-                Error(QUOTE_MSG, "MatchIsTouchscreen");

-            ptr->is_touchscreen.set = xf86getBoolValue(&ptr->is_touchscreen.val,

-                                                       val.str);

-            if (!ptr->is_touchscreen.set)

-                Error(BOOL_MSG, "MatchIsTouchscreen");

-            break;

-        case EOF_TOKEN:

-            Error(UNEXPECTED_EOF_MSG, NULL);

-            break;

-        default:

-            Error(INVALID_KEYWORD_MSG, xf86tokenString ());

-            break;

-        }

-    }

-

-    if (!has_ident)

-        Error(NO_IDENT_MSG, NULL);

-

-#ifdef DEBUG

-    printf("InputClass section parsed\n");

-#endif

-

-    return ptr;

-}

-

-void

-xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)

-{

-    const xf86MatchGroup *group;

-    char * const *cur;

-

-    while (ptr) {

-        fprintf(cf, "Section \"InputClass\"\n");

-        if (ptr->comment)

-            fprintf(cf, "%s", ptr->comment);

-        if (ptr->identifier)

-            fprintf(cf, "\tIdentifier      \"%s\"\n", ptr->identifier);

-        if (ptr->driver)

-            fprintf(cf, "\tDriver          \"%s\"\n", ptr->driver);

-

-        list_for_each_entry(group, &ptr->match_product, entry) {

-            fprintf(cf, "\tMatchProduct    \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_vendor, entry) {

-            fprintf(cf, "\tMatchVendor     \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_device, entry) {

-            fprintf(cf, "\tMatchDevicePath \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_os, entry) {

-            fprintf(cf, "\tMatchOS         \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_pnpid, entry) {

-            fprintf(cf, "\tMatchPnPID      \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_usbid, entry) {

-            fprintf(cf, "\tMatchUSBID      \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_driver, entry) {

-            fprintf(cf, "\tMatchDriver     \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-        list_for_each_entry(group, &ptr->match_tag, entry) {

-            fprintf(cf, "\tMatchTag        \"");

-            for (cur = group->values; *cur; cur++)

-                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,

-                        *cur);

-            fprintf(cf, "\"\n");

-        }

-

-        if (ptr->is_keyboard.set)

-            fprintf(cf, "\tIsKeyboard      \"%s\"\n",

-                    ptr->is_keyboard.val ? "yes" : "no");

-        if (ptr->is_pointer.set)

-            fprintf(cf, "\tIsPointer       \"%s\"\n",

-                    ptr->is_pointer.val ? "yes" : "no");

-        if (ptr->is_joystick.set)

-            fprintf(cf, "\tIsJoystick      \"%s\"\n",

-                    ptr->is_joystick.val ? "yes" : "no");

-        if (ptr->is_tablet.set)

-            fprintf(cf, "\tIsTablet        \"%s\"\n",

-                    ptr->is_tablet.val ? "yes" : "no");

-        if (ptr->is_touchpad.set)

-            fprintf(cf, "\tIsTouchpad      \"%s\"\n",

-                    ptr->is_touchpad.val ? "yes" : "no");

-        if (ptr->is_touchscreen.set)

-            fprintf(cf, "\tIsTouchscreen   \"%s\"\n",

-                    ptr->is_touchscreen.val ? "yes" : "no");

-        xf86printOptionList(cf, ptr->option_lst, 1);

-        fprintf(cf, "EndSection\n\n");

-        ptr = ptr->list.next;

-    }

-}

-

-void

-xf86freeInputClassList (XF86ConfInputClassPtr ptr)

-{

-    XF86ConfInputClassPtr prev;

-

-    while (ptr) {

-        xf86MatchGroup *group, *next;

-        char **list;

-

-        TestFree(ptr->identifier);

-        TestFree(ptr->driver);

-

-        list_for_each_entry_safe(group, next, &ptr->match_product, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_vendor, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_device, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_os, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_driver, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-        list_for_each_entry_safe(group, next, &ptr->match_tag, entry) {

-            list_del(&group->entry);

-            for (list = group->values; *list; list++)

-                free(*list);

-            free(group);

-        }

-

-        TestFree(ptr->comment);

-        xf86optionListFree(ptr->option_lst);

-

-        prev = ptr;

-        ptr = ptr->list.next;

-        free(prev);

-    }

-}

+/*
+ * Copyright (c) 2009 Dan Nicholson
+ *
+ * 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 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 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
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS 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.
+ */
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <string.h>
+#include "os.h"
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static
+xf86ConfigSymTabRec InputClassTab[] =
+{
+    {ENDSECTION, "endsection"},
+    {IDENTIFIER, "identifier"},
+    {OPTION, "option"},
+    {DRIVER, "driver"},
+    {MATCH_PRODUCT, "matchproduct"},
+    {MATCH_VENDOR, "matchvendor"},
+    {MATCH_DEVICE_PATH, "matchdevicepath"},
+    {MATCH_OS, "matchos"},
+    {MATCH_PNPID, "matchpnpid"},
+    {MATCH_USBID, "matchusbid"},
+    {MATCH_DRIVER, "matchdriver"},
+    {MATCH_TAG, "matchtag"},
+    {MATCH_LAYOUT, "matchlayout"},
+    {MATCH_IS_KEYBOARD, "matchiskeyboard"},
+    {MATCH_IS_POINTER, "matchispointer"},
+    {MATCH_IS_JOYSTICK, "matchisjoystick"},
+    {MATCH_IS_TABLET, "matchistablet"},
+    {MATCH_IS_TOUCHPAD, "matchistouchpad"},
+    {MATCH_IS_TOUCHSCREEN, "matchistouchscreen"},
+    {-1, ""},
+};
+
+#define CLEANUP xf86freeInputClassList
+
+#define TOKEN_SEP "|"
+
+static void
+add_group_entry(struct list *head, char **values)
+{
+    xf86MatchGroup *group;
+
+    group = malloc(sizeof(*group));
+    if (group) {
+        group->values = values;
+        list_add(&group->entry, head);
+    }
+}
+
+XF86ConfInputClassPtr
+xf86parseInputClassSection(void)
+{
+    int has_ident = FALSE;
+    int token;
+
+    parsePrologue(XF86ConfInputClassPtr, XF86ConfInputClassRec)
+
+    /* Initialize MatchGroup lists */
+    list_init(&ptr->match_product);
+    list_init(&ptr->match_vendor);
+    list_init(&ptr->match_device);
+    list_init(&ptr->match_os);
+    list_init(&ptr->match_pnpid);
+    list_init(&ptr->match_usbid);
+    list_init(&ptr->match_driver);
+    list_init(&ptr->match_tag);
+    list_init(&ptr->match_layout);
+
+    while ((token = xf86getToken(InputClassTab)) != ENDSECTION) {
+        switch (token) {
+        case COMMENT:
+            ptr->comment = xf86addComment(ptr->comment, val.str);
+            break;
+        case IDENTIFIER:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "Identifier");
+            if (has_ident == TRUE)
+                Error(MULTIPLE_MSG, "Identifier");
+            ptr->identifier = val.str;
+            has_ident = TRUE;
+            break;
+        case DRIVER:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "Driver");
+            if (strcmp(val.str, "keyboard") == 0) {
+                ptr->driver = strdup("kbd");
+                free(val.str);
+            }
+            else
+                ptr->driver = val.str;
+            break;
+        case OPTION:
+            ptr->option_lst = xf86parseOption(ptr->option_lst);
+            break;
+        case MATCH_PRODUCT:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchProduct");
+            add_group_entry(&ptr->match_product,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_VENDOR:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchVendor");
+            add_group_entry(&ptr->match_vendor,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_DEVICE_PATH:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchDevicePath");
+            add_group_entry(&ptr->match_device,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_OS:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchOS");
+            add_group_entry(&ptr->match_os,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_PNPID:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchPnPID");
+            add_group_entry(&ptr->match_pnpid,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_USBID:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchUSBID");
+            add_group_entry(&ptr->match_usbid,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_DRIVER:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchDriver");
+            add_group_entry(&ptr->match_driver,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_TAG:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchTag");
+            add_group_entry(&ptr->match_tag,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_LAYOUT:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchLayout");
+            add_group_entry(&ptr->match_layout,
+                            xstrtokenize(val.str, TOKEN_SEP));
+            break;
+        case MATCH_IS_KEYBOARD:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsKeyboard");
+            ptr->is_keyboard.set = xf86getBoolValue(&ptr->is_keyboard.val,
+                                                    val.str);
+            if (!ptr->is_keyboard.set)
+                Error(BOOL_MSG, "MatchIsKeyboard");
+            break;
+        case MATCH_IS_POINTER:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsPointer");
+            ptr->is_pointer.set = xf86getBoolValue(&ptr->is_pointer.val,
+                                                   val.str);
+            if (!ptr->is_pointer.set)
+                Error(BOOL_MSG, "MatchIsPointer");
+            break;
+        case MATCH_IS_JOYSTICK:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsJoystick");
+            ptr->is_joystick.set = xf86getBoolValue(&ptr->is_joystick.val,
+                                                    val.str);
+            if (!ptr->is_joystick.set)
+                Error(BOOL_MSG, "MatchIsJoystick");
+            break;
+        case MATCH_IS_TABLET:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsTablet");
+            ptr->is_tablet.set = xf86getBoolValue(&ptr->is_tablet.val,
+                                                  val.str);
+            if (!ptr->is_tablet.set)
+                Error(BOOL_MSG, "MatchIsTablet");
+            break;
+        case MATCH_IS_TOUCHPAD:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsTouchpad");
+            ptr->is_touchpad.set = xf86getBoolValue(&ptr->is_touchpad.val,
+                                                    val.str);
+            if (!ptr->is_touchpad.set)
+                Error(BOOL_MSG, "MatchIsTouchpad");
+            break;
+        case MATCH_IS_TOUCHSCREEN:
+            if (xf86getSubToken(&(ptr->comment)) != STRING)
+                Error(QUOTE_MSG, "MatchIsTouchscreen");
+            ptr->is_touchscreen.set = xf86getBoolValue(&ptr->is_touchscreen.val,
+                                                       val.str);
+            if (!ptr->is_touchscreen.set)
+                Error(BOOL_MSG, "MatchIsTouchscreen");
+            break;
+        case EOF_TOKEN:
+            Error(UNEXPECTED_EOF_MSG, NULL);
+            break;
+        default:
+            Error(INVALID_KEYWORD_MSG, xf86tokenString ());
+            break;
+        }
+    }
+
+    if (!has_ident)
+        Error(NO_IDENT_MSG, NULL);
+
+#ifdef DEBUG
+    printf("InputClass section parsed\n");
+#endif
+
+    return ptr;
+}
+
+void
+xf86printInputClassSection (FILE * cf, XF86ConfInputClassPtr ptr)
+{
+    const xf86MatchGroup *group;
+    char * const *cur;
+
+    while (ptr) {
+        fprintf(cf, "Section \"InputClass\"\n");
+        if (ptr->comment)
+            fprintf(cf, "%s", ptr->comment);
+        if (ptr->identifier)
+            fprintf(cf, "\tIdentifier      \"%s\"\n", ptr->identifier);
+        if (ptr->driver)
+            fprintf(cf, "\tDriver          \"%s\"\n", ptr->driver);
+
+        list_for_each_entry(group, &ptr->match_product, entry) {
+            fprintf(cf, "\tMatchProduct    \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_vendor, entry) {
+            fprintf(cf, "\tMatchVendor     \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_device, entry) {
+            fprintf(cf, "\tMatchDevicePath \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_os, entry) {
+            fprintf(cf, "\tMatchOS         \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_pnpid, entry) {
+            fprintf(cf, "\tMatchPnPID      \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_usbid, entry) {
+            fprintf(cf, "\tMatchUSBID      \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_driver, entry) {
+            fprintf(cf, "\tMatchDriver     \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_tag, entry) {
+            fprintf(cf, "\tMatchTag        \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+        list_for_each_entry(group, &ptr->match_layout, entry) {
+            fprintf(cf, "\tMatchLayout     \"");
+            for (cur = group->values; *cur; cur++)
+                fprintf(cf, "%s%s", cur == group->values ? "" : TOKEN_SEP,
+                        *cur);
+            fprintf(cf, "\"\n");
+        }
+
+        if (ptr->is_keyboard.set)
+            fprintf(cf, "\tIsKeyboard      \"%s\"\n",
+                    ptr->is_keyboard.val ? "yes" : "no");
+        if (ptr->is_pointer.set)
+            fprintf(cf, "\tIsPointer       \"%s\"\n",
+                    ptr->is_pointer.val ? "yes" : "no");
+        if (ptr->is_joystick.set)
+            fprintf(cf, "\tIsJoystick      \"%s\"\n",
+                    ptr->is_joystick.val ? "yes" : "no");
+        if (ptr->is_tablet.set)
+            fprintf(cf, "\tIsTablet        \"%s\"\n",
+                    ptr->is_tablet.val ? "yes" : "no");
+        if (ptr->is_touchpad.set)
+            fprintf(cf, "\tIsTouchpad      \"%s\"\n",
+                    ptr->is_touchpad.val ? "yes" : "no");
+        if (ptr->is_touchscreen.set)
+            fprintf(cf, "\tIsTouchscreen   \"%s\"\n",
+                    ptr->is_touchscreen.val ? "yes" : "no");
+        xf86printOptionList(cf, ptr->option_lst, 1);
+        fprintf(cf, "EndSection\n\n");
+        ptr = ptr->list.next;
+    }
+}
+
+void
+xf86freeInputClassList (XF86ConfInputClassPtr ptr)
+{
+    XF86ConfInputClassPtr prev;
+
+    while (ptr) {
+        xf86MatchGroup *group, *next;
+        char **list;
+
+        TestFree(ptr->identifier);
+        TestFree(ptr->driver);
+
+        list_for_each_entry_safe(group, next, &ptr->match_product, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_vendor, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_device, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_os, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_pnpid, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_usbid, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_driver, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_tag, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+        list_for_each_entry_safe(group, next, &ptr->match_layout, entry) {
+            list_del(&group->entry);
+            for (list = group->values; *list; list++)
+                free(*list);
+            free(group);
+        }
+
+        TestFree(ptr->comment);
+        xf86optionListFree(ptr->option_lst);
+
+        prev = ptr;
+        ptr = ptr->list.next;
+        free(prev);
+    }
+}
diff --git a/xorg-server/hw/xfree86/parser/xf86Parser.h b/xorg-server/hw/xfree86/parser/xf86Parser.h
index bb7025dc4..a8785c5fa 100644
--- a/xorg-server/hw/xfree86/parser/xf86Parser.h
+++ b/xorg-server/hw/xfree86/parser/xf86Parser.h
@@ -1,518 +1,519 @@
-/* 

- * 

- * Copyright (c) 1997  Metro Link Incorporated

- * 

- * 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

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE X CONSORTIUM 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.

- * 

- * Except as contained in this notice, the name of the Metro Link shall not be

- * used in advertising or otherwise to promote the sale, use or other dealings

- * in this Software without prior written authorization from Metro Link.

- * 

- */

-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-/* 

- * This file contains the external interfaces for the XFree86 configuration

- * file parser.

- */

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#ifndef _xf86Parser_h_

-#define _xf86Parser_h_

-

-#include <X11/Xdefs.h>

-#include "xf86Optrec.h"

-#include "list.h"

-

-#define HAVE_PARSER_DECLS

-

-typedef struct

-{

-	char *file_logfile;

-	char *file_modulepath;

-	char *file_fontpath;

-	char *file_comment;

-	char *file_xkbdir;

-}

-XF86ConfFilesRec, *XF86ConfFilesPtr;

-

-/* Values for load_type */

-#define XF86_LOAD_MODULE	0

-#define XF86_LOAD_DRIVER	1

-#define XF86_DISABLE_MODULE	2

-

-typedef struct

-{

-	GenericListRec list;

-	int load_type;

-	char *load_name;

-	XF86OptionPtr load_opt;

-	char *load_comment;

-        int ignore;

-}

-XF86LoadRec, *XF86LoadPtr;

-

-typedef struct

-{

-	XF86LoadPtr mod_load_lst;

-    XF86LoadPtr mod_disable_lst;

-	char *mod_comment;

-}

-XF86ConfModuleRec, *XF86ConfModulePtr;

-

-#define CONF_IMPLICIT_KEYBOARD	"Implicit Core Keyboard"

-

-#define CONF_IMPLICIT_POINTER	"Implicit Core Pointer"

-

-#define XF86CONF_PHSYNC    0x0001

-#define XF86CONF_NHSYNC    0x0002

-#define XF86CONF_PVSYNC    0x0004

-#define XF86CONF_NVSYNC    0x0008

-#define XF86CONF_INTERLACE 0x0010

-#define XF86CONF_DBLSCAN   0x0020

-#define XF86CONF_CSYNC     0x0040

-#define XF86CONF_PCSYNC    0x0080

-#define XF86CONF_NCSYNC    0x0100

-#define XF86CONF_HSKEW     0x0200	/* hskew provided */

-#define XF86CONF_BCAST     0x0400

-#define XF86CONF_VSCAN     0x1000

-

-typedef struct

-{

-	GenericListRec list;

-	char *ml_identifier;

-	int ml_clock;

-	int ml_hdisplay;

-	int ml_hsyncstart;

-	int ml_hsyncend;

-	int ml_htotal;

-	int ml_vdisplay;

-	int ml_vsyncstart;

-	int ml_vsyncend;

-	int ml_vtotal;

-	int ml_vscan;

-	int ml_flags;

-	int ml_hskew;

-	char *ml_comment;

-}

-XF86ConfModeLineRec, *XF86ConfModeLinePtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *vp_identifier;

-	XF86OptionPtr vp_option_lst;

-	char *vp_comment;

-}

-XF86ConfVideoPortRec, *XF86ConfVideoPortPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *va_identifier;

-	char *va_vendor;

-	char *va_board;

-	char *va_busid;

-	char *va_driver;

-	XF86OptionPtr va_option_lst;

-	XF86ConfVideoPortPtr va_port_lst;

-	char *va_fwdref;

-	char *va_comment;

-}

-XF86ConfVideoAdaptorRec, *XF86ConfVideoAdaptorPtr;

-

-#define CONF_MAX_HSYNC 8

-#define CONF_MAX_VREFRESH 8

-

-typedef struct

-{

-	float hi, lo;

-}

-parser_range;

-

-typedef struct

-{

-	int red, green, blue;

-}

-parser_rgb;

-

-typedef struct

-{

-	GenericListRec list;

-	char *modes_identifier;

-	XF86ConfModeLinePtr mon_modeline_lst;

-	char *modes_comment;

-}

-XF86ConfModesRec, *XF86ConfModesPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *ml_modes_str;

-	XF86ConfModesPtr ml_modes;

-}

-XF86ConfModesLinkRec, *XF86ConfModesLinkPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *mon_identifier;

-	char *mon_vendor;

-	char *mon_modelname;

-	int mon_width;				/* in mm */

-	int mon_height;				/* in mm */

-	XF86ConfModeLinePtr mon_modeline_lst;

-	int mon_n_hsync;

-	parser_range mon_hsync[CONF_MAX_HSYNC];

-	int mon_n_vrefresh;

-	parser_range mon_vrefresh[CONF_MAX_VREFRESH];

-	float mon_gamma_red;

-	float mon_gamma_green;

-	float mon_gamma_blue;

-	XF86OptionPtr mon_option_lst;

-	XF86ConfModesLinkPtr mon_modes_sect_lst;

-	char *mon_comment;

-}

-XF86ConfMonitorRec, *XF86ConfMonitorPtr;

-

-#define CONF_MAXDACSPEEDS 4

-#define CONF_MAXCLOCKS    128

-

-typedef struct

-{

-	GenericListRec list;

-	char *dev_identifier;

-	char *dev_vendor;

-	char *dev_board;

-	char *dev_chipset;

-	char *dev_busid;

-	char *dev_card;

-	char *dev_driver;

-	char *dev_ramdac;

-	int dev_dacSpeeds[CONF_MAXDACSPEEDS];

-	int dev_videoram;

-	int dev_textclockfreq;

-	unsigned long dev_bios_base;

-	unsigned long dev_mem_base;

-	unsigned long dev_io_base;

-	char *dev_clockchip;

-	int dev_clocks;

-	int dev_clock[CONF_MAXCLOCKS];

-	int dev_chipid;

-	int dev_chiprev;

-	int dev_irq;

-	int dev_screen;

-	XF86OptionPtr dev_option_lst;

-	char *dev_comment;

-}

-XF86ConfDeviceRec, *XF86ConfDevicePtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *mode_name;

-}

-XF86ModeRec, *XF86ModePtr;

-

-typedef struct

-{

-	GenericListRec list;

-	int disp_frameX0;

-	int disp_frameY0;

-	int disp_virtualX;

-	int disp_virtualY;

-	int disp_depth;

-	int disp_bpp;

-	char *disp_visual;

-	parser_rgb disp_weight;

-	parser_rgb disp_black;

-	parser_rgb disp_white;

-	XF86ModePtr disp_mode_lst;

-	XF86OptionPtr disp_option_lst;

-	char *disp_comment;

-}

-XF86ConfDisplayRec, *XF86ConfDisplayPtr;

-

-typedef struct

-{

-	XF86OptionPtr flg_option_lst;

-	char *flg_comment;

-}

-XF86ConfFlagsRec, *XF86ConfFlagsPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *al_adaptor_str;

-	XF86ConfVideoAdaptorPtr al_adaptor;

-}

-XF86ConfAdaptorLinkRec, *XF86ConfAdaptorLinkPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *scrn_identifier;

-	char *scrn_obso_driver;

-	int scrn_defaultdepth;

-	int scrn_defaultbpp;

-	int scrn_defaultfbbpp;

-	char *scrn_monitor_str;

-	XF86ConfMonitorPtr scrn_monitor;

-	char *scrn_device_str;

-	XF86ConfDevicePtr scrn_device;

-	XF86ConfAdaptorLinkPtr scrn_adaptor_lst;

-	XF86ConfDisplayPtr scrn_display_lst;

-	XF86OptionPtr scrn_option_lst;

-	char *scrn_comment;

-	int scrn_virtualX, scrn_virtualY;

-}

-XF86ConfScreenRec, *XF86ConfScreenPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *inp_identifier;

-	char *inp_driver;

-	XF86OptionPtr inp_option_lst;

-	char *inp_comment;

-}

-XF86ConfInputRec, *XF86ConfInputPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	XF86ConfInputPtr iref_inputdev;

-	char *iref_inputdev_str;

-	XF86OptionPtr iref_option_lst;

-}

-XF86ConfInputrefRec, *XF86ConfInputrefPtr;

-

-typedef struct

-{

-	Bool set;

-	Bool val;

-}

-xf86TriState;

-

-typedef struct

-{

-	struct list entry;

-	char **values;

-}

-xf86MatchGroup;

-

-typedef struct

-{

-	GenericListRec list;

-	char *identifier;

-	char *driver;

-	struct list match_product;

-	struct list match_vendor;

-	struct list match_device;

-	struct list match_os;

-	struct list match_pnpid;

-	struct list match_usbid;

-	struct list match_driver;

-	struct list match_tag;

-	xf86TriState is_keyboard;

-	xf86TriState is_pointer;

-	xf86TriState is_joystick;

-	xf86TriState is_tablet;

-	xf86TriState is_touchpad;

-	xf86TriState is_touchscreen;

-	XF86OptionPtr option_lst;

-	char *comment;

-}

-XF86ConfInputClassRec, *XF86ConfInputClassPtr;

-

-/* Values for adj_where */

-#define CONF_ADJ_OBSOLETE	-1

-#define CONF_ADJ_ABSOLUTE	0

-#define CONF_ADJ_RIGHTOF	1

-#define CONF_ADJ_LEFTOF		2

-#define CONF_ADJ_ABOVE		3

-#define CONF_ADJ_BELOW		4

-#define CONF_ADJ_RELATIVE	5

-

-typedef struct

-{

-	GenericListRec list;

-	int adj_scrnum;

-	XF86ConfScreenPtr adj_screen;

-	char *adj_screen_str;

-	XF86ConfScreenPtr adj_top;

-	char *adj_top_str;

-	XF86ConfScreenPtr adj_bottom;

-	char *adj_bottom_str;

-	XF86ConfScreenPtr adj_left;

-	char *adj_left_str;

-	XF86ConfScreenPtr adj_right;

-	char *adj_right_str;

-	int adj_where;

-	int adj_x;

-	int adj_y;

-	char *adj_refscreen;

-}

-XF86ConfAdjacencyRec, *XF86ConfAdjacencyPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *inactive_device_str;

-	XF86ConfDevicePtr inactive_device;

-}

-XF86ConfInactiveRec, *XF86ConfInactivePtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *lay_identifier;

-	XF86ConfAdjacencyPtr lay_adjacency_lst;

-	XF86ConfInactivePtr lay_inactive_lst;

-	XF86ConfInputrefPtr lay_input_lst;

-	XF86OptionPtr lay_option_lst;

-	char *lay_comment;

-}

-XF86ConfLayoutRec, *XF86ConfLayoutPtr;

-

-typedef struct 

-{ 

-	GenericListRec list; 

-	char *vs_name;

-	char *vs_identifier;

-	XF86OptionPtr vs_option_lst;

-	char *vs_comment;

-}

-XF86ConfVendSubRec, *XF86ConfVendSubPtr;

-

-typedef struct

-{

-	GenericListRec list;

-	char *vnd_identifier;

-	XF86OptionPtr vnd_option_lst;

-	XF86ConfVendSubPtr vnd_sub_lst;

-	char *vnd_comment;

-}

-XF86ConfVendorRec, *XF86ConfVendorPtr;

-

-typedef struct

-{

-	char *dri_group_name;

-	int dri_group;

-	int dri_mode;

-	char *dri_comment;

-}

-XF86ConfDRIRec, *XF86ConfDRIPtr;

-

-typedef struct

-{

-	XF86OptionPtr ext_option_lst;

-	char *extensions_comment;

-}

-XF86ConfExtensionsRec, *XF86ConfExtensionsPtr;

-

-typedef struct

-{

-	XF86ConfFilesPtr conf_files;

-	XF86ConfModulePtr conf_modules;

-	XF86ConfFlagsPtr conf_flags;

-	XF86ConfVideoAdaptorPtr conf_videoadaptor_lst;

-	XF86ConfModesPtr conf_modes_lst;

-	XF86ConfMonitorPtr conf_monitor_lst;

-	XF86ConfDevicePtr conf_device_lst;

-	XF86ConfScreenPtr conf_screen_lst;

-	XF86ConfInputPtr conf_input_lst;

-	XF86ConfInputClassPtr conf_inputclass_lst;

-	XF86ConfLayoutPtr conf_layout_lst;

-	XF86ConfVendorPtr conf_vendor_lst;

-	XF86ConfDRIPtr conf_dri;

-	XF86ConfExtensionsPtr conf_extensions;

-	char *conf_comment;

-}

-XF86ConfigRec, *XF86ConfigPtr;

-

-typedef struct

-{

-	int token;			/* id of the token */

-	char *name;			/* pointer to the LOWERCASED name */

-}

-xf86ConfigSymTabRec, *xf86ConfigSymTabPtr;

-

-/*

- * prototypes for public functions

- */

-extern void xf86initConfigFiles(void);

-extern const char *xf86openConfigFile(const char *path, const char *cmdline,

-				      const char *projroot);

-extern const char *xf86openConfigDirFiles(const char *path, const char *cmdline,

-					  const char *projroot);

-extern void xf86setBuiltinConfig(const char *config[]);

-extern XF86ConfigPtr xf86readConfigFile(void);

-extern void xf86closeConfigFile(void);

-extern void xf86freeConfig(XF86ConfigPtr p);

-extern int xf86writeConfigFile(const char *, XF86ConfigPtr);

-extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);

-extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);

-extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);

-extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);

-extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p);

-extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p);

-extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p);

-extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p);

-extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,

-						XF86ConfVideoAdaptorPtr p);

-extern int xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout);

-

-extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new);

-extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2);

-

-extern _X_EXPORT int xf86pathIsAbsolute(const char *path);

-extern _X_EXPORT int xf86pathIsSafe(const char *path);

-extern _X_EXPORT char *xf86addComment(char *cur, char *add);

-extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str);

-

-#endif /* _xf86Parser_h_ */

+/* 
+ * 
+ * Copyright (c) 1997  Metro Link Incorporated
+ * 
+ * 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
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE X CONSORTIUM 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.
+ * 
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+ * 
+ */
+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+
+/* 
+ * This file contains the external interfaces for the XFree86 configuration
+ * file parser.
+ */
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef _xf86Parser_h_
+#define _xf86Parser_h_
+
+#include <X11/Xdefs.h>
+#include "xf86Optrec.h"
+#include "list.h"
+
+#define HAVE_PARSER_DECLS
+
+typedef struct
+{
+	char *file_logfile;
+	char *file_modulepath;
+	char *file_fontpath;
+	char *file_comment;
+	char *file_xkbdir;
+}
+XF86ConfFilesRec, *XF86ConfFilesPtr;
+
+/* Values for load_type */
+#define XF86_LOAD_MODULE	0
+#define XF86_LOAD_DRIVER	1
+#define XF86_DISABLE_MODULE	2
+
+typedef struct
+{
+	GenericListRec list;
+	int load_type;
+	char *load_name;
+	XF86OptionPtr load_opt;
+	char *load_comment;
+        int ignore;
+}
+XF86LoadRec, *XF86LoadPtr;
+
+typedef struct
+{
+	XF86LoadPtr mod_load_lst;
+    XF86LoadPtr mod_disable_lst;
+	char *mod_comment;
+}
+XF86ConfModuleRec, *XF86ConfModulePtr;
+
+#define CONF_IMPLICIT_KEYBOARD	"Implicit Core Keyboard"
+
+#define CONF_IMPLICIT_POINTER	"Implicit Core Pointer"
+
+#define XF86CONF_PHSYNC    0x0001
+#define XF86CONF_NHSYNC    0x0002
+#define XF86CONF_PVSYNC    0x0004
+#define XF86CONF_NVSYNC    0x0008
+#define XF86CONF_INTERLACE 0x0010
+#define XF86CONF_DBLSCAN   0x0020
+#define XF86CONF_CSYNC     0x0040
+#define XF86CONF_PCSYNC    0x0080
+#define XF86CONF_NCSYNC    0x0100
+#define XF86CONF_HSKEW     0x0200	/* hskew provided */
+#define XF86CONF_BCAST     0x0400
+#define XF86CONF_VSCAN     0x1000
+
+typedef struct
+{
+	GenericListRec list;
+	char *ml_identifier;
+	int ml_clock;
+	int ml_hdisplay;
+	int ml_hsyncstart;
+	int ml_hsyncend;
+	int ml_htotal;
+	int ml_vdisplay;
+	int ml_vsyncstart;
+	int ml_vsyncend;
+	int ml_vtotal;
+	int ml_vscan;
+	int ml_flags;
+	int ml_hskew;
+	char *ml_comment;
+}
+XF86ConfModeLineRec, *XF86ConfModeLinePtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *vp_identifier;
+	XF86OptionPtr vp_option_lst;
+	char *vp_comment;
+}
+XF86ConfVideoPortRec, *XF86ConfVideoPortPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *va_identifier;
+	char *va_vendor;
+	char *va_board;
+	char *va_busid;
+	char *va_driver;
+	XF86OptionPtr va_option_lst;
+	XF86ConfVideoPortPtr va_port_lst;
+	char *va_fwdref;
+	char *va_comment;
+}
+XF86ConfVideoAdaptorRec, *XF86ConfVideoAdaptorPtr;
+
+#define CONF_MAX_HSYNC 8
+#define CONF_MAX_VREFRESH 8
+
+typedef struct
+{
+	float hi, lo;
+}
+parser_range;
+
+typedef struct
+{
+	int red, green, blue;
+}
+parser_rgb;
+
+typedef struct
+{
+	GenericListRec list;
+	char *modes_identifier;
+	XF86ConfModeLinePtr mon_modeline_lst;
+	char *modes_comment;
+}
+XF86ConfModesRec, *XF86ConfModesPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *ml_modes_str;
+	XF86ConfModesPtr ml_modes;
+}
+XF86ConfModesLinkRec, *XF86ConfModesLinkPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *mon_identifier;
+	char *mon_vendor;
+	char *mon_modelname;
+	int mon_width;				/* in mm */
+	int mon_height;				/* in mm */
+	XF86ConfModeLinePtr mon_modeline_lst;
+	int mon_n_hsync;
+	parser_range mon_hsync[CONF_MAX_HSYNC];
+	int mon_n_vrefresh;
+	parser_range mon_vrefresh[CONF_MAX_VREFRESH];
+	float mon_gamma_red;
+	float mon_gamma_green;
+	float mon_gamma_blue;
+	XF86OptionPtr mon_option_lst;
+	XF86ConfModesLinkPtr mon_modes_sect_lst;
+	char *mon_comment;
+}
+XF86ConfMonitorRec, *XF86ConfMonitorPtr;
+
+#define CONF_MAXDACSPEEDS 4
+#define CONF_MAXCLOCKS    128
+
+typedef struct
+{
+	GenericListRec list;
+	char *dev_identifier;
+	char *dev_vendor;
+	char *dev_board;
+	char *dev_chipset;
+	char *dev_busid;
+	char *dev_card;
+	char *dev_driver;
+	char *dev_ramdac;
+	int dev_dacSpeeds[CONF_MAXDACSPEEDS];
+	int dev_videoram;
+	int dev_textclockfreq;
+	unsigned long dev_bios_base;
+	unsigned long dev_mem_base;
+	unsigned long dev_io_base;
+	char *dev_clockchip;
+	int dev_clocks;
+	int dev_clock[CONF_MAXCLOCKS];
+	int dev_chipid;
+	int dev_chiprev;
+	int dev_irq;
+	int dev_screen;
+	XF86OptionPtr dev_option_lst;
+	char *dev_comment;
+}
+XF86ConfDeviceRec, *XF86ConfDevicePtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *mode_name;
+}
+XF86ModeRec, *XF86ModePtr;
+
+typedef struct
+{
+	GenericListRec list;
+	int disp_frameX0;
+	int disp_frameY0;
+	int disp_virtualX;
+	int disp_virtualY;
+	int disp_depth;
+	int disp_bpp;
+	char *disp_visual;
+	parser_rgb disp_weight;
+	parser_rgb disp_black;
+	parser_rgb disp_white;
+	XF86ModePtr disp_mode_lst;
+	XF86OptionPtr disp_option_lst;
+	char *disp_comment;
+}
+XF86ConfDisplayRec, *XF86ConfDisplayPtr;
+
+typedef struct
+{
+	XF86OptionPtr flg_option_lst;
+	char *flg_comment;
+}
+XF86ConfFlagsRec, *XF86ConfFlagsPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *al_adaptor_str;
+	XF86ConfVideoAdaptorPtr al_adaptor;
+}
+XF86ConfAdaptorLinkRec, *XF86ConfAdaptorLinkPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *scrn_identifier;
+	char *scrn_obso_driver;
+	int scrn_defaultdepth;
+	int scrn_defaultbpp;
+	int scrn_defaultfbbpp;
+	char *scrn_monitor_str;
+	XF86ConfMonitorPtr scrn_monitor;
+	char *scrn_device_str;
+	XF86ConfDevicePtr scrn_device;
+	XF86ConfAdaptorLinkPtr scrn_adaptor_lst;
+	XF86ConfDisplayPtr scrn_display_lst;
+	XF86OptionPtr scrn_option_lst;
+	char *scrn_comment;
+	int scrn_virtualX, scrn_virtualY;
+}
+XF86ConfScreenRec, *XF86ConfScreenPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *inp_identifier;
+	char *inp_driver;
+	XF86OptionPtr inp_option_lst;
+	char *inp_comment;
+}
+XF86ConfInputRec, *XF86ConfInputPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	XF86ConfInputPtr iref_inputdev;
+	char *iref_inputdev_str;
+	XF86OptionPtr iref_option_lst;
+}
+XF86ConfInputrefRec, *XF86ConfInputrefPtr;
+
+typedef struct
+{
+	Bool set;
+	Bool val;
+}
+xf86TriState;
+
+typedef struct
+{
+	struct list entry;
+	char **values;
+}
+xf86MatchGroup;
+
+typedef struct
+{
+	GenericListRec list;
+	char *identifier;
+	char *driver;
+	struct list match_product;
+	struct list match_vendor;
+	struct list match_device;
+	struct list match_os;
+	struct list match_pnpid;
+	struct list match_usbid;
+	struct list match_driver;
+	struct list match_tag;
+	struct list match_layout;
+	xf86TriState is_keyboard;
+	xf86TriState is_pointer;
+	xf86TriState is_joystick;
+	xf86TriState is_tablet;
+	xf86TriState is_touchpad;
+	xf86TriState is_touchscreen;
+	XF86OptionPtr option_lst;
+	char *comment;
+}
+XF86ConfInputClassRec, *XF86ConfInputClassPtr;
+
+/* Values for adj_where */
+#define CONF_ADJ_OBSOLETE	-1
+#define CONF_ADJ_ABSOLUTE	0
+#define CONF_ADJ_RIGHTOF	1
+#define CONF_ADJ_LEFTOF		2
+#define CONF_ADJ_ABOVE		3
+#define CONF_ADJ_BELOW		4
+#define CONF_ADJ_RELATIVE	5
+
+typedef struct
+{
+	GenericListRec list;
+	int adj_scrnum;
+	XF86ConfScreenPtr adj_screen;
+	char *adj_screen_str;
+	XF86ConfScreenPtr adj_top;
+	char *adj_top_str;
+	XF86ConfScreenPtr adj_bottom;
+	char *adj_bottom_str;
+	XF86ConfScreenPtr adj_left;
+	char *adj_left_str;
+	XF86ConfScreenPtr adj_right;
+	char *adj_right_str;
+	int adj_where;
+	int adj_x;
+	int adj_y;
+	char *adj_refscreen;
+}
+XF86ConfAdjacencyRec, *XF86ConfAdjacencyPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *inactive_device_str;
+	XF86ConfDevicePtr inactive_device;
+}
+XF86ConfInactiveRec, *XF86ConfInactivePtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *lay_identifier;
+	XF86ConfAdjacencyPtr lay_adjacency_lst;
+	XF86ConfInactivePtr lay_inactive_lst;
+	XF86ConfInputrefPtr lay_input_lst;
+	XF86OptionPtr lay_option_lst;
+	char *lay_comment;
+}
+XF86ConfLayoutRec, *XF86ConfLayoutPtr;
+
+typedef struct 
+{ 
+	GenericListRec list; 
+	char *vs_name;
+	char *vs_identifier;
+	XF86OptionPtr vs_option_lst;
+	char *vs_comment;
+}
+XF86ConfVendSubRec, *XF86ConfVendSubPtr;
+
+typedef struct
+{
+	GenericListRec list;
+	char *vnd_identifier;
+	XF86OptionPtr vnd_option_lst;
+	XF86ConfVendSubPtr vnd_sub_lst;
+	char *vnd_comment;
+}
+XF86ConfVendorRec, *XF86ConfVendorPtr;
+
+typedef struct
+{
+	char *dri_group_name;
+	int dri_group;
+	int dri_mode;
+	char *dri_comment;
+}
+XF86ConfDRIRec, *XF86ConfDRIPtr;
+
+typedef struct
+{
+	XF86OptionPtr ext_option_lst;
+	char *extensions_comment;
+}
+XF86ConfExtensionsRec, *XF86ConfExtensionsPtr;
+
+typedef struct
+{
+	XF86ConfFilesPtr conf_files;
+	XF86ConfModulePtr conf_modules;
+	XF86ConfFlagsPtr conf_flags;
+	XF86ConfVideoAdaptorPtr conf_videoadaptor_lst;
+	XF86ConfModesPtr conf_modes_lst;
+	XF86ConfMonitorPtr conf_monitor_lst;
+	XF86ConfDevicePtr conf_device_lst;
+	XF86ConfScreenPtr conf_screen_lst;
+	XF86ConfInputPtr conf_input_lst;
+	XF86ConfInputClassPtr conf_inputclass_lst;
+	XF86ConfLayoutPtr conf_layout_lst;
+	XF86ConfVendorPtr conf_vendor_lst;
+	XF86ConfDRIPtr conf_dri;
+	XF86ConfExtensionsPtr conf_extensions;
+	char *conf_comment;
+}
+XF86ConfigRec, *XF86ConfigPtr;
+
+typedef struct
+{
+	int token;			/* id of the token */
+	char *name;			/* pointer to the LOWERCASED name */
+}
+xf86ConfigSymTabRec, *xf86ConfigSymTabPtr;
+
+/*
+ * prototypes for public functions
+ */
+extern void xf86initConfigFiles(void);
+extern const char *xf86openConfigFile(const char *path, const char *cmdline,
+				      const char *projroot);
+extern const char *xf86openConfigDirFiles(const char *path, const char *cmdline,
+					  const char *projroot);
+extern void xf86setBuiltinConfig(const char *config[]);
+extern XF86ConfigPtr xf86readConfigFile(void);
+extern void xf86closeConfigFile(void);
+extern void xf86freeConfig(XF86ConfigPtr p);
+extern int xf86writeConfigFile(const char *, XF86ConfigPtr);
+extern _X_EXPORT XF86ConfDevicePtr xf86findDevice(const char *ident, XF86ConfDevicePtr p);
+extern _X_EXPORT XF86ConfLayoutPtr xf86findLayout(const char *name, XF86ConfLayoutPtr list);
+extern _X_EXPORT XF86ConfMonitorPtr xf86findMonitor(const char *ident, XF86ConfMonitorPtr p);
+extern _X_EXPORT XF86ConfModesPtr xf86findModes(const char *ident, XF86ConfModesPtr p);
+extern _X_EXPORT XF86ConfModeLinePtr xf86findModeLine(const char *ident, XF86ConfModeLinePtr p);
+extern _X_EXPORT XF86ConfScreenPtr xf86findScreen(const char *ident, XF86ConfScreenPtr p);
+extern _X_EXPORT XF86ConfInputPtr xf86findInput(const char *ident, XF86ConfInputPtr p);
+extern _X_EXPORT XF86ConfInputPtr xf86findInputByDriver(const char *driver, XF86ConfInputPtr p);
+extern _X_EXPORT XF86ConfVideoAdaptorPtr xf86findVideoAdaptor(const char *ident,
+						XF86ConfVideoAdaptorPtr p);
+extern int xf86layoutAddInputDevices(XF86ConfigPtr config, XF86ConfLayoutPtr layout);
+
+extern _X_EXPORT GenericListPtr xf86addListItem(GenericListPtr head, GenericListPtr c_new);
+extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr list_2);
+
+extern _X_EXPORT int xf86pathIsAbsolute(const char *path);
+extern _X_EXPORT int xf86pathIsSafe(const char *path);
+extern _X_EXPORT char *xf86addComment(char *cur, char *add);
+extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str);
+
+#endif /* _xf86Parser_h_ */
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h
index d91755d7e..abcafcf8e 100644
--- a/xorg-server/hw/xfree86/parser/xf86tokens.h
+++ b/xorg-server/hw/xfree86/parser/xf86tokens.h
@@ -1,293 +1,294 @@
-/* 

- * 

- * Copyright (c) 1997  Metro Link Incorporated

- * 

- * 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

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE X CONSORTIUM 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.

- * 

- * Except as contained in this notice, the name of the Metro Link shall not be

- * used in advertising or otherwise to promote the sale, use or other dealings

- * in this Software without prior written authorization from Metro Link.

- * 

- */

-/*

- * Copyright (c) 1997-2003 by The XFree86 Project, Inc.

- *

- * 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

- * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL

- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.

- *

- * Except as contained in this notice, the name of the copyright holder(s)

- * and author(s) shall not be used in advertising or otherwise to promote

- * the sale, use or other dealings in this Software without prior written

- * authorization from the copyright holder(s) and author(s).

- */

-

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#ifndef _xf86_tokens_h

-#define _xf86_tokens_h

-

-/* Undefine symbols that some OSs might define */

-#undef IOBASE

-

-/* 

- * Each token should have a unique value regardless of the section

- * it is used in.

- */

-

-typedef enum {

-    /* errno-style tokens */

-    OBSOLETE_TOKEN	= -5,

-    EOF_TOKEN		= -4,

-    LOCK_TOKEN		= -3,

-    ERROR_TOKEN		= -2,

-

-    /* value type tokens */

-    NUMBER		= 1,

-    STRING,

-

-    /* Tokens that can appear in many sections */

-    SECTION,

-    SUBSECTION,

-    ENDSECTION,

-    ENDSUBSECTION,

-    IDENTIFIER,

-    VENDOR,

-    DASH,

-    COMMA,

-    OPTION,

-    COMMENT,

-

-    /* Frequency units */

-    HRZ,

-    KHZ,

-    MHZ,

-

-    /* File tokens */

-    FONTPATH,

-    MODULEPATH,

-    LOGFILEPATH,

-    XKBDIR,

-

-    /* Server Flag tokens.  These are deprecated in favour of generic Options */

-    NOTRAPSIGNALS,

-    DONTZAP,

-    DONTZOOM,

-    DISABLEVIDMODE,

-    ALLOWNONLOCAL,

-    DISABLEMODINDEV,

-    MODINDEVALLOWNONLOCAL,

-    ALLOWMOUSEOPENFAIL,

-    BLANKTIME,

-    STANDBYTIME,

-    SUSPENDTIME,

-    OFFTIME,

-    DEFAULTLAYOUT,

-

-    /* Monitor tokens */

-    MODEL,

-    MODELINE,

-    DISPLAYSIZE,

-    HORIZSYNC,

-    VERTREFRESH,

-    MODE,

-    GAMMA,

-    USEMODES,

-

-    /* Modes tokens */

-    /* no new ones */

-

-    /* Mode tokens */

-    DOTCLOCK,

-    HTIMINGS,

-    VTIMINGS,

-    FLAGS,

-    HSKEW,

-    BCAST,

-    VSCAN,

-    ENDMODE,

-

-    /* Screen tokens */

-    OBSDRIVER,

-    MDEVICE,

-    MONITOR,

-    SCREENNO,

-    DEFAULTDEPTH,

-    DEFAULTBPP,

-    DEFAULTFBBPP,

-    

-    /* VideoAdaptor tokens */

-    VIDEOADAPTOR,

-

-    /* Mode timing tokens */

-    TT_INTERLACE,

-    TT_PHSYNC,

-    TT_NHSYNC,

-    TT_PVSYNC,

-    TT_NVSYNC,

-    TT_CSYNC,

-    TT_PCSYNC,

-    TT_NCSYNC,

-    TT_DBLSCAN,

-    TT_HSKEW,

-    TT_BCAST,

-    TT_VSCAN,

-

-    /* Module tokens */

-    LOAD,

-    LOAD_DRIVER,

-    DISABLE,

-    

-    /* Device tokens */

-    DRIVER,

-    CHIPSET,

-    CLOCKS,

-    VIDEORAM,

-    BOARD,

-    IOBASE,

-    RAMDAC,

-    DACSPEED,

-    BIOSBASE,

-    MEMBASE,

-    CLOCKCHIP,

-    CHIPID,

-    CHIPREV,

-    CARD,

-    BUSID,

-    TEXTCLOCKFRQ,

-    IRQ,

-

-    /* Keyboard tokens */

-    AUTOREPEAT,

-    XLEDS,

-    KPROTOCOL,

-    XKBKEYMAP,

-    XKBCOMPAT,

-    XKBTYPES,

-    XKBKEYCODES,

-    XKBGEOMETRY,

-    XKBSYMBOLS,

-    XKBDISABLE,

-    PANIX106,

-    XKBRULES,

-    XKBMODEL,

-    XKBLAYOUT,

-    XKBVARIANT,

-    XKBOPTIONS,

-    /* The next two have become ServerFlags options */

-    VTSYSREQ,

-    /* Obsolete keyboard tokens */

-    SERVERNUM,

-    LEFTALT,

-    RIGHTALT,

-    SCROLLLOCK_TOK,

-    RIGHTCTL,

-    /* arguments for the above obsolete tokens */

-    CONF_KM_META,

-    CONF_KM_COMPOSE,

-    CONF_KM_MODESHIFT,

-    CONF_KM_MODELOCK,

-    CONF_KM_SCROLLLOCK,

-    CONF_KM_CONTROL,

-

-    /* Pointer tokens */

-    EMULATE3,

-    BAUDRATE,

-    SAMPLERATE,

-    PRESOLUTION,

-    CLEARDTR,

-    CLEARRTS,

-    CHORDMIDDLE,

-    PROTOCOL,

-    PDEVICE,

-    EM3TIMEOUT,

-    DEVICE_NAME,

-    ALWAYSCORE,

-    PBUTTONS,

-    ZAXISMAPPING,

-

-    /* Pointer Z axis mapping tokens */

-    XAXIS,

-    YAXIS,

-

-    /* Display tokens */

-    MODES,

-    VIEWPORT,

-    VIRTUAL,

-    VISUAL,

-    BLACK_TOK,

-    WHITE_TOK,

-    DEPTH,

-    BPP,

-    WEIGHT,

-    

-    /* Layout Tokens */

-    SCREEN,

-    INACTIVE,

-    INPUTDEVICE,

-

-    /* Adjaceny Tokens */

-    RIGHTOF,

-    LEFTOF,

-    ABOVE,

-    BELOW,

-    RELATIVE,

-    ABSOLUTE,

-

-    /* Vendor Tokens */

-    VENDORNAME,

-

-    /* DRI Tokens */

-    GROUP,

-

-    /* InputClass Tokens */

-    MATCH_PRODUCT,

-    MATCH_VENDOR,

-    MATCH_DEVICE_PATH,

-    MATCH_OS,

-    MATCH_PNPID,

-    MATCH_USBID,

-    MATCH_DRIVER,

-    MATCH_TAG,

-    MATCH_IS_KEYBOARD,

-    MATCH_IS_POINTER,

-    MATCH_IS_JOYSTICK,

-    MATCH_IS_TABLET,

-    MATCH_IS_TOUCHPAD,

-    MATCH_IS_TOUCHSCREEN

-} ParserTokens;

-

-#endif /* _xf86_tokens_h */

+/* 
+ * 
+ * Copyright (c) 1997  Metro Link Incorporated
+ * 
+ * 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
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE X CONSORTIUM 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.
+ * 
+ * Except as contained in this notice, the name of the Metro Link shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from Metro Link.
+ * 
+ */
+/*
+ * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
+ *
+ * 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
+ * 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 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef _xf86_tokens_h
+#define _xf86_tokens_h
+
+/* Undefine symbols that some OSs might define */
+#undef IOBASE
+
+/* 
+ * Each token should have a unique value regardless of the section
+ * it is used in.
+ */
+
+typedef enum {
+    /* errno-style tokens */
+    OBSOLETE_TOKEN	= -5,
+    EOF_TOKEN		= -4,
+    LOCK_TOKEN		= -3,
+    ERROR_TOKEN		= -2,
+
+    /* value type tokens */
+    NUMBER		= 1,
+    STRING,
+
+    /* Tokens that can appear in many sections */
+    SECTION,
+    SUBSECTION,
+    ENDSECTION,
+    ENDSUBSECTION,
+    IDENTIFIER,
+    VENDOR,
+    DASH,
+    COMMA,
+    OPTION,
+    COMMENT,
+
+    /* Frequency units */
+    HRZ,
+    KHZ,
+    MHZ,
+
+    /* File tokens */
+    FONTPATH,
+    MODULEPATH,
+    LOGFILEPATH,
+    XKBDIR,
+
+    /* Server Flag tokens.  These are deprecated in favour of generic Options */
+    NOTRAPSIGNALS,
+    DONTZAP,
+    DONTZOOM,
+    DISABLEVIDMODE,
+    ALLOWNONLOCAL,
+    DISABLEMODINDEV,
+    MODINDEVALLOWNONLOCAL,
+    ALLOWMOUSEOPENFAIL,
+    BLANKTIME,
+    STANDBYTIME,
+    SUSPENDTIME,
+    OFFTIME,
+    DEFAULTLAYOUT,
+
+    /* Monitor tokens */
+    MODEL,
+    MODELINE,
+    DISPLAYSIZE,
+    HORIZSYNC,
+    VERTREFRESH,
+    MODE,
+    GAMMA,
+    USEMODES,
+
+    /* Modes tokens */
+    /* no new ones */
+
+    /* Mode tokens */
+    DOTCLOCK,
+    HTIMINGS,
+    VTIMINGS,
+    FLAGS,
+    HSKEW,
+    BCAST,
+    VSCAN,
+    ENDMODE,
+
+    /* Screen tokens */
+    OBSDRIVER,
+    MDEVICE,
+    MONITOR,
+    SCREENNO,
+    DEFAULTDEPTH,
+    DEFAULTBPP,
+    DEFAULTFBBPP,
+    
+    /* VideoAdaptor tokens */
+    VIDEOADAPTOR,
+
+    /* Mode timing tokens */
+    TT_INTERLACE,
+    TT_PHSYNC,
+    TT_NHSYNC,
+    TT_PVSYNC,
+    TT_NVSYNC,
+    TT_CSYNC,
+    TT_PCSYNC,
+    TT_NCSYNC,
+    TT_DBLSCAN,
+    TT_HSKEW,
+    TT_BCAST,
+    TT_VSCAN,
+
+    /* Module tokens */
+    LOAD,
+    LOAD_DRIVER,
+    DISABLE,
+    
+    /* Device tokens */
+    DRIVER,
+    CHIPSET,
+    CLOCKS,
+    VIDEORAM,
+    BOARD,
+    IOBASE,
+    RAMDAC,
+    DACSPEED,
+    BIOSBASE,
+    MEMBASE,
+    CLOCKCHIP,
+    CHIPID,
+    CHIPREV,
+    CARD,
+    BUSID,
+    TEXTCLOCKFRQ,
+    IRQ,
+
+    /* Keyboard tokens */
+    AUTOREPEAT,
+    XLEDS,
+    KPROTOCOL,
+    XKBKEYMAP,
+    XKBCOMPAT,
+    XKBTYPES,
+    XKBKEYCODES,
+    XKBGEOMETRY,
+    XKBSYMBOLS,
+    XKBDISABLE,
+    PANIX106,
+    XKBRULES,
+    XKBMODEL,
+    XKBLAYOUT,
+    XKBVARIANT,
+    XKBOPTIONS,
+    /* The next two have become ServerFlags options */
+    VTSYSREQ,
+    /* Obsolete keyboard tokens */
+    SERVERNUM,
+    LEFTALT,
+    RIGHTALT,
+    SCROLLLOCK_TOK,
+    RIGHTCTL,
+    /* arguments for the above obsolete tokens */
+    CONF_KM_META,
+    CONF_KM_COMPOSE,
+    CONF_KM_MODESHIFT,
+    CONF_KM_MODELOCK,
+    CONF_KM_SCROLLLOCK,
+    CONF_KM_CONTROL,
+
+    /* Pointer tokens */
+    EMULATE3,
+    BAUDRATE,
+    SAMPLERATE,
+    PRESOLUTION,
+    CLEARDTR,
+    CLEARRTS,
+    CHORDMIDDLE,
+    PROTOCOL,
+    PDEVICE,
+    EM3TIMEOUT,
+    DEVICE_NAME,
+    ALWAYSCORE,
+    PBUTTONS,
+    ZAXISMAPPING,
+
+    /* Pointer Z axis mapping tokens */
+    XAXIS,
+    YAXIS,
+
+    /* Display tokens */
+    MODES,
+    VIEWPORT,
+    VIRTUAL,
+    VISUAL,
+    BLACK_TOK,
+    WHITE_TOK,
+    DEPTH,
+    BPP,
+    WEIGHT,
+    
+    /* Layout Tokens */
+    SCREEN,
+    INACTIVE,
+    INPUTDEVICE,
+
+    /* Adjaceny Tokens */
+    RIGHTOF,
+    LEFTOF,
+    ABOVE,
+    BELOW,
+    RELATIVE,
+    ABSOLUTE,
+
+    /* Vendor Tokens */
+    VENDORNAME,
+
+    /* DRI Tokens */
+    GROUP,
+
+    /* InputClass Tokens */
+    MATCH_PRODUCT,
+    MATCH_VENDOR,
+    MATCH_DEVICE_PATH,
+    MATCH_OS,
+    MATCH_PNPID,
+    MATCH_USBID,
+    MATCH_DRIVER,
+    MATCH_TAG,
+    MATCH_LAYOUT,
+    MATCH_IS_KEYBOARD,
+    MATCH_IS_POINTER,
+    MATCH_IS_JOYSTICK,
+    MATCH_IS_TABLET,
+    MATCH_IS_TOUCHPAD,
+    MATCH_IS_TOUCHSCREEN
+} ParserTokens;
+
+#endif /* _xf86_tokens_h */
diff --git a/xorg-server/hw/xwin/winkeybd.c b/xorg-server/hw/xwin/winkeybd.c
index 255015a24..2cd8caff1 100644
--- a/xorg-server/hw/xwin/winkeybd.c
+++ b/xorg-server/hw/xwin/winkeybd.c
@@ -487,8 +487,6 @@ winKeybdReleaseKeys (void)
 void

 winSendKeyEvent (DWORD dwKey, Bool fDown)

 {

-  InternalEvent* events;

-

   /*

    * When alt-tabing between screens we can get phantom key up messages

    * Here we only pass them through it we think we should!

diff --git a/xorg-server/hw/xwin/winmouse.c b/xorg-server/hw/xwin/winmouse.c
index efe71103c..6d2e43f07 100644
--- a/xorg-server/hw/xwin/winmouse.c
+++ b/xorg-server/hw/xwin/winmouse.c
@@ -250,7 +250,12 @@ winMouseButtonsSendEvent (int iEventType, int iButton)
   QueuePointerEvents(g_pwinPointer, iEventType, iButton,

 		     POINTER_RELATIVE, &mask);

 

+#if CYGDEBUG

+  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d, nEvents %d\n",

+          iEventType, iButton, nevents);

   winDebug("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",

+#if CYGDEBUG

+  ErrorF("winMouseButtonsSendEvent: iEventType: %d, iButton: %d\n",

           iEventType, iButton);

 }