Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/dix/dispatch.c
	xorg-server/dix/registry.c
	xorg-server/include/resource.h
	xorg-server/os/access.c
	xorg-server/os/auth.c

84 files changed, 7447 insertions, 7243 deletions

diff --git a/xorg-server/Xext/security.c b/xorg-server/Xext/security.c
index 680e53a31..bc2930ce7 100644
--- a/xorg-server/Xext/security.c
+++ b/xorg-server/Xext/security.c
@@ -99,7 +99,7 @@ static const Mask SecurityClientMask = DixGetAttrAccess;
  *	Writes the message to the log file if security logging is on.
  */
 
-static void
+static void _X_ATTRIBUTE_PRINTF(1,2)
 SecurityAudit(const char *format, ...)
 {
     va_list args;
@@ -173,7 +173,8 @@ SecurityDeleteAuthorization(
 {
     SecurityAuthorizationPtr pAuth = (SecurityAuthorizationPtr)value;
     unsigned short name_len, data_len;
-    char *name, *data;
+    const char *name;
+    char *data;
     int status;
     int i;
     OtherClientsPtr pEventClient;
diff --git a/xorg-server/Xext/xres.c b/xorg-server/Xext/xres.c
index b95272882..232fbab5b 100644
--- a/xorg-server/Xext/xres.c
+++ b/xorg-server/Xext/xres.c
@@ -147,12 +147,12 @@ ProcXResQueryClientResources (ClientPtr client)
 
     if(num_types) {
         xXResType scratch;
-	char *name;
+	const char *name;
 
         for(i = 0; i < lastResourceType; i++) {
             if(!counts[i]) continue;
 
-	    name = (char *)LookupResourceName(i + 1);
+	    name = LookupResourceName(i + 1);
             if (strcmp(name, XREGISTRY_UNKNOWN))
 		scratch.resource_type = MakeAtom(name, strlen(name), TRUE);
 	    else {
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 1fa030a92..1c8633a8f 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -706,6 +706,55 @@ ChangeMasterDeviceClasses(DeviceIntPtr device, DeviceChangedEvent *dce)
 }
 
 /**
+ * Add state and motionMask to the filter for this event. The protocol
+ * supports some extra masks for motion when a button is down:
+ * ButtonXMotionMask and the DeviceButtonMotionMask to trigger only when at
+ * least one button (or that specific button is down). These masks need to
+ * be added to the filters for core/XI motion events.
+ *
+ * @param device The device to update the mask for
+ * @param state The current button state mask
+ * @param motion_mask The motion mask (DeviceButtonMotionMask or 0)
+ */
+static void
+UpdateDeviceMotionMask(DeviceIntPtr device, unsigned short state,
+                       Mask motion_mask)
+{
+    Mask mask;
+
+    mask = DevicePointerMotionMask | state | motion_mask;
+    SetMaskForEvent(device->id, mask, DeviceMotionNotify);
+    mask = PointerMotionMask | state | motion_mask;
+    SetMaskForEvent(device->id, mask, MotionNotify);
+}
+
+static void
+IncreaseButtonCount(DeviceIntPtr dev, int key, CARD8 *buttons_down,
+                    Mask *motion_mask, unsigned short *state)
+{
+    if (dev->valuator)
+        dev->valuator->motionHintWindow = NullWindow;
+
+    (*buttons_down)++;
+    *motion_mask = DeviceButtonMotionMask;
+    if (dev->button->map[key] <= 5)
+        *state |= (Button1Mask >> 1) << dev->button->map[key];
+}
+
+static void
+DecreaseButtonCount(DeviceIntPtr dev, int key, CARD8 *buttons_down,
+                    Mask *motion_mask, unsigned short *state)
+{
+    if (dev->valuator)
+        dev->valuator->motionHintWindow = NullWindow;
+
+    if (*buttons_down >= 1 && !--(*buttons_down))
+        *motion_mask = 0;
+    if (dev->button->map[key] <= 5)
+        *state &= ~((Button1Mask >> 1) << dev->button->map[key]);
+}
+
+/**
  * Update the device state according to the data in the event.
  *
  * return values are
@@ -803,7 +852,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
 	    device->valuator->motionHintWindow = NullWindow;
 	set_key_up(device, key, KEY_PROCESSED);
     } else if (event->type == ET_ButtonPress) {
-        Mask mask;
         if (!b)
             return DONT_PROCESS;
 
@@ -811,22 +859,13 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
             return DONT_PROCESS;
 
         set_button_down(device, key, BUTTON_PROCESSED);
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
+
         if (!b->map[key])
             return DONT_PROCESS;
-        b->buttonsDown++;
-	b->motionMask = DeviceButtonMotionMask;
-        if (b->map[key] <= 5)
-	    b->state |= (Button1Mask >> 1) << b->map[key];
-
-        /* Add state and motionMask to the filter for this event */
-        mask = DevicePointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, DeviceMotionNotify);
-        mask = PointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, MotionNotify);
+
+        IncreaseButtonCount(device, key, &b->buttonsDown, &b->motionMask, &b->state);
+        UpdateDeviceMotionMask(device, b->state, b->motionMask);
     } else if (event->type == ET_ButtonRelease) {
-        Mask mask;
         if (!b)
             return DONT_PROCESS;
 
@@ -852,20 +891,11 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent* event)
             }
         }
         set_button_up(device, key, BUTTON_PROCESSED);
-	if (device->valuator)
-	    device->valuator->motionHintWindow = NullWindow;
         if (!b->map[key])
             return DONT_PROCESS;
-        if (b->buttonsDown >= 1 && !--b->buttonsDown)
-	    b->motionMask = 0;
-	if (b->map[key] <= 5)
-	    b->state &= ~((Button1Mask >> 1) << b->map[key]);
-
-        /* Add state and motionMask to the filter for this event */
-        mask = DevicePointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, DeviceMotionNotify);
-        mask = PointerMotionMask | b->state | b->motionMask;
-        SetMaskForEvent(device->id, mask, MotionNotify);
+
+        DecreaseButtonCount(device, key, &b->buttonsDown, &b->motionMask, &b->state);
+        UpdateDeviceMotionMask(device,  b->state, b->motionMask);
     } else if (event->type == ET_ProximityIn)
 	device->proximity->in_proximity = TRUE;
     else if (event->type == ET_ProximityOut)
@@ -887,7 +917,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
     int key = 0, rootX, rootY;
     ButtonClassPtr b;
     int ret = 0;
-    int corestate, i;
+    int corestate;
     DeviceIntPtr mouse = NULL, kbd = NULL;
     DeviceEvent *event = &ev->device_event;
 
@@ -917,33 +947,8 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
             mouse = NULL;
     }
 
-    /* core state needs to be assembled BEFORE the device is updated. */
-    corestate = (kbd && kbd->key) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0;
-    corestate |= (mouse && mouse->button) ? (mouse->button->state) : 0;
-
-    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
-        if (BitIsOn(mouse->button->down, i))
-            SetBit(event->buttons, i);
-
-    if (kbd && kbd->key)
-    {
-        XkbStatePtr state;
-        /* we need the state before the event happens */
-        if (event->type == ET_KeyPress || event->type == ET_KeyRelease)
-            state = &kbd->key->xkbInfo->prev_state;
-        else
-            state = &kbd->key->xkbInfo->state;
-
-        event->mods.base = state->base_mods;
-        event->mods.latched = state->latched_mods;
-        event->mods.locked = state->locked_mods;
-        event->mods.effective = state->mods;
-
-        event->group.base = state->base_group;
-        event->group.latched = state->latched_group;
-        event->group.locked = state->locked_group;
-        event->group.effective = state->group;
-    }
+    corestate = event_get_corestate(mouse, kbd);
+    event_set_state(mouse, kbd, event);
 
     ret = UpdateDeviceState(device, event);
     if (ret == DONT_PROCESS)
@@ -1000,9 +1005,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
         case ET_KeyRelease:
             if (grab && device->deviceGrab.fromPassiveGrab &&
                 (key == device->deviceGrab.activatingKey) &&
-                (device->deviceGrab.grab->type == KeyPress ||
-                 device->deviceGrab.grab->type == DeviceKeyPress ||
-                 device->deviceGrab.grab->type == XI_KeyPress))
+                GrabIsKeyboardGrab(device->deviceGrab.grab))
                 deactivateDeviceGrab = TRUE;
             break;
         case ET_ButtonPress:
@@ -1022,9 +1025,7 @@ ProcessOtherEvent(InternalEvent *ev, DeviceIntPtr device)
             event->detail.button = b->map[key];
             if (grab && !b->buttonsDown &&
                 device->deviceGrab.fromPassiveGrab &&
-                (device->deviceGrab.grab->type == ButtonPress ||
-                 device->deviceGrab.grab->type == DeviceButtonPress ||
-                 device->deviceGrab.grab->type == XI_ButtonPress))
+                GrabIsPointerGrab(device->deviceGrab.grab))
                 deactivateDeviceGrab = TRUE;
         default:
             break;
@@ -1392,9 +1393,9 @@ DeviceFocusEvent(DeviceIntPtr dev, int type, int mode, int detail,
 int
 CheckGrabValues(ClientPtr client, GrabParameters* param)
 {
-    if (param->grabtype != GRABTYPE_CORE &&
-        param->grabtype != GRABTYPE_XI &&
-        param->grabtype != GRABTYPE_XI2)
+    if (param->grabtype != CORE &&
+        param->grabtype != XI &&
+        param->grabtype != XI2)
     {
         ErrorF("[Xi] grabtype is invalid. This is a bug.\n");
         return BadImplementation;
@@ -1411,7 +1412,7 @@ CheckGrabValues(ClientPtr client, GrabParameters* param)
 	return BadValue;
     }
 
-    if (param->grabtype != GRABTYPE_XI2 && (param->modifiers != AnyModifier) &&
+    if (param->grabtype != XI2 && (param->modifiers != AnyModifier) &&
         (param->modifiers & ~AllModifiersMask)) {
 	client->errorValue = param->modifiers;
 	return BadValue;
@@ -1426,7 +1427,7 @@ CheckGrabValues(ClientPtr client, GrabParameters* param)
 
 int
 GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-           int button, GrabParameters *param, GrabType grabtype,
+           int button, GrabParameters *param, enum InputLevel grabtype,
 	   GrabMask *mask)
 {
     WindowPtr pWin, confineTo;
@@ -1466,9 +1467,9 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
     if (rc != Success)
 	return rc;
 
-    if (grabtype == GRABTYPE_XI)
+    if (grabtype == XI)
         type = DeviceButtonPress;
-    else if (grabtype == GRABTYPE_XI2)
+    else if (grabtype == XI2)
         type = XI_ButtonPress;
 
     grab = CreateGrab(client->index, dev, modifier_device, pWin, grabtype,
@@ -1479,12 +1480,12 @@ GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
 }
 
 /**
- * Grab the given key. If grabtype is GRABTYPE_XI, the key is a keycode. If
- * grabtype is GRABTYPE_XI2, the key is a keysym.
+ * Grab the given key. If grabtype is XI, the key is a keycode. If
+ * grabtype is XI2, the key is a keysym.
  */
 int
 GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-        int key, GrabParameters *param, GrabType grabtype, GrabMask *mask)
+        int key, GrabParameters *param, enum InputLevel grabtype, GrabMask *mask)
 {
     WindowPtr pWin;
     GrabPtr grab;
@@ -1497,7 +1498,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
         return rc;
     if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
 	return BadMatch;
-    if (grabtype == GRABTYPE_XI)
+    if (grabtype == XI)
     {
         if ((key > k->xkbInfo->desc->max_key_code ||
                     key < k->xkbInfo->desc->min_key_code)
@@ -1506,7 +1507,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
             return BadValue;
         }
         type = DeviceKeyPress;
-    } else if (grabtype == GRABTYPE_XI2)
+    } else if (grabtype == XI2)
         type = XI_KeyPress;
 
     rc = dixLookupWindow(&pWin, param->grabWindow, client, DixSetAttrAccess);
@@ -1561,7 +1562,7 @@ GrabWindow(ClientPtr client, DeviceIntPtr dev, int type,
     if (rc != Success)
 	return rc;
 
-    grab = CreateGrab(client->index, dev, dev, pWin, GRABTYPE_XI2,
+    grab = CreateGrab(client->index, dev, dev, pWin, XI2,
                       mask, param, (type == XIGrabtypeEnter) ? XI_Enter : XI_FocusIn,
                       0, NULL, cursor);
 
diff --git a/xorg-server/Xi/grabdev.c b/xorg-server/Xi/grabdev.c
index 4572c33fc..8fd114e60 100644
--- a/xorg-server/Xi/grabdev.c
+++ b/xorg-server/Xi/grabdev.c
@@ -130,7 +130,7 @@ ProcXGrabDevice(ClientPtr client)
     rc = GrabDevice(client, dev, stuff->other_devices_mode,
                     stuff->this_device_mode, stuff->grabWindow,
 		    stuff->ownerEvents, stuff->time,
-		    &mask, GRABTYPE_XI, None, None,
+		    &mask, XI, None, None,
 		    &rep.status);
 
     if (rc != Success)
diff --git a/xorg-server/Xi/grabdevb.c b/xorg-server/Xi/grabdevb.c
index 2897d410b..dda0da8bb 100644
--- a/xorg-server/Xi/grabdevb.c
+++ b/xorg-server/Xi/grabdevb.c
@@ -137,7 +137,7 @@ ProcXGrabDeviceButton(ClientPtr client)
 	return ret;
 
     memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_XI;
+    param.grabtype = XI;
     param.ownerEvents = stuff->ownerEvents;
     param.this_device_mode = stuff->this_device_mode;
     param.other_devices_mode = stuff->other_devices_mode;
@@ -146,7 +146,7 @@ ProcXGrabDeviceButton(ClientPtr client)
     mask.xi = tmp[stuff->grabbed_device].mask;
 
     ret = GrabButton(client, dev, mdev, stuff->button, &param,
-                     GRABTYPE_XI, &mask);
+                     XI, &mask);
 
     return ret;
 }
diff --git a/xorg-server/Xi/grabdevk.c b/xorg-server/Xi/grabdevk.c
index cedd90d9c..61ab43a20 100644
--- a/xorg-server/Xi/grabdevk.c
+++ b/xorg-server/Xi/grabdevk.c
@@ -135,7 +135,7 @@ ProcXGrabDeviceKey(ClientPtr client)
 
 
     memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_XI;
+    param.grabtype = XI;
     param.ownerEvents = stuff->ownerEvents;
     param.this_device_mode = stuff->this_device_mode;
     param.other_devices_mode = stuff->other_devices_mode;
@@ -143,7 +143,7 @@ ProcXGrabDeviceKey(ClientPtr client)
     param.modifiers = stuff->modifiers;
     mask.xi = tmp[stuff->grabbed_device].mask;
 
-    ret = GrabKey(client, dev, mdev, stuff->key, &param, GRABTYPE_XI, &mask);
+    ret = GrabKey(client, dev, mdev, stuff->key, &param, XI, &mask);
 
     return ret;
 }
diff --git a/xorg-server/Xi/ungrdev.c b/xorg-server/Xi/ungrdev.c
index bc66cfc4b..58c1f57ef 100644
--- a/xorg-server/Xi/ungrdev.c
+++ b/xorg-server/Xi/ungrdev.c
@@ -102,7 +102,7 @@ ProcXUngrabDevice(ClientPtr client)
     time = ClientTimeToServerTime(stuff->time);
     if ((CompareTimeStamps(time, currentTime) != LATER) &&
 	(CompareTimeStamps(time, dev->deviceGrab.grabTime) != EARLIER) &&
-	(grab) && SameClient(grab, client) && grab->grabtype == GRABTYPE_XI)
+	(grab) && SameClient(grab, client) && grab->grabtype == XI)
 	(*dev->deviceGrab.DeactivateGrab) (dev);
     return Success;
 }
diff --git a/xorg-server/Xi/ungrdevb.c b/xorg-server/Xi/ungrdevb.c
index 628024870..0ba395cf3 100644
--- a/xorg-server/Xi/ungrdevb.c
+++ b/xorg-server/Xi/ungrdevb.c
@@ -134,7 +134,7 @@ ProcXUngrabDeviceButton(ClientPtr client)
     temporaryGrab->device = dev;
     temporaryGrab->window = pWin;
     temporaryGrab->type = DeviceButtonPress;
-    temporaryGrab->grabtype = GRABTYPE_XI;
+    temporaryGrab->grabtype = XI;
     temporaryGrab->modifierDevice = mdev;
     temporaryGrab->modifiersDetail.exact = stuff->modifiers;
     temporaryGrab->modifiersDetail.pMask = NULL;
diff --git a/xorg-server/Xi/ungrdevk.c b/xorg-server/Xi/ungrdevk.c
index b0d83cbbc..8785989b0 100644
--- a/xorg-server/Xi/ungrdevk.c
+++ b/xorg-server/Xi/ungrdevk.c
@@ -141,7 +141,7 @@ ProcXUngrabDeviceKey(ClientPtr client)
     temporaryGrab->device = dev;
     temporaryGrab->window = pWin;
     temporaryGrab->type = DeviceKeyPress;
-    temporaryGrab->grabtype = GRABTYPE_XI;
+    temporaryGrab->grabtype = XI;
     temporaryGrab->modifierDevice = mdev;
     temporaryGrab->modifiersDetail.exact = stuff->modifiers;
     temporaryGrab->modifiersDetail.pMask = NULL;
diff --git a/xorg-server/Xi/xigrabdev.c b/xorg-server/Xi/xigrabdev.c
index 1cfbf243b..2b3055004 100644
--- a/xorg-server/Xi/xigrabdev.c
+++ b/xorg-server/Xi/xigrabdev.c
@@ -96,7 +96,7 @@ ProcXIGrabDevice(ClientPtr client)
                      stuff->owner_events,
                      stuff->time,
                      &mask,
-                     GRABTYPE_XI2,
+                     XI2,
                      stuff->cursor,
                      None /* confineTo */,
                      &status);
@@ -148,7 +148,7 @@ ProcXIUngrabDevice(ClientPtr client)
     time = ClientTimeToServerTime(stuff->time);
     if ((CompareTimeStamps(time, currentTime) != LATER) &&
 	(CompareTimeStamps(time, dev->deviceGrab.grabTime) != EARLIER) &&
-	(grab) && SameClient(grab, client) && grab->grabtype == GRABTYPE_XI2)
+	(grab) && SameClient(grab, client) && grab->grabtype == XI2)
 	(*dev->deviceGrab.DeactivateGrab) (dev);
 
     return Success;
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index 4860757fc..713a1654e 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -139,7 +139,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
     rep.num_modifiers = 0;
 
     memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_XI2;
+    param.grabtype = XI2;
     param.ownerEvents = stuff->owner_events;
     param.this_device_mode = stuff->grab_mode;
     param.other_devices_mode = stuff->paired_device_mode;
@@ -183,11 +183,11 @@ ProcXIPassiveGrabDevice(ClientPtr client)
         {
             case XIGrabtypeButton:
                 status = GrabButton(client, dev, mod_dev, stuff->detail,
-                                    &param, GRABTYPE_XI2, &mask);
+                                    &param, XI2, &mask);
                 break;
             case XIGrabtypeKeycode:
                 status = GrabKey(client, dev, mod_dev, stuff->detail,
-                                 &param, GRABTYPE_XI2, &mask);
+                                 &param, XI2, &mask);
                 break;
             case XIGrabtypeEnter:
             case XIGrabtypeFocusIn:
@@ -313,7 +313,7 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
         case XIGrabtypeEnter:   tempGrab->type = XI_Enter;       break;
         case XIGrabtypeFocusIn: tempGrab->type = XI_FocusIn;     break;
     }
-    tempGrab->grabtype = GRABTYPE_XI2;
+    tempGrab->grabtype = XI2;
     tempGrab->modifierDevice = mod_dev;
     tempGrab->modifiersDetail.pMask = NULL;
     tempGrab->detail.exact = stuff->detail;
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 27bf7dbb2..27bf6abfd 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -771,6 +771,20 @@ VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
 WINDOWSWMPROTO="windowswmproto"
 APPLEWMPROTO="applewmproto >= 1.4"
 
+dnl Required modules
+XPROTO="xproto >= 7.0.22"
+RANDRPROTO="randrproto >= 1.2.99.3"
+RENDERPROTO="renderproto >= 0.11"
+XEXTPROTO="xextproto >= 7.1.99"
+INPUTPROTO="inputproto >= 2.0.99.1"
+KBPROTO="kbproto >= 1.0.3"
+FONTSPROTO="fontsproto"
+FIXESPROTO="fixesproto >= 5.0"
+DAMAGEPROTO="damageproto >= 1.1"
+XCMISCPROTO="xcmiscproto >= 1.2.0"
+BIGREQSPROTO="bigreqsproto >= 1.1.0"
+XTRANS="xtrans >= 1.2.2"
+
 dnl List of libraries that require a specific version
 LIBAPPLEWM="applewm >= 1.4"
 LIBDMX="dmx >= 1.0.99.1"
@@ -793,11 +807,11 @@ PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
 REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
 
 dnl Core modules for most extensions, et al.
-SDK_REQUIRED_MODULES="[xproto >= 7.0.22] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 2.0.99.1] [kbproto >= 1.0.3] fontsproto $LIBPIXMAN"
+SDK_REQUIRED_MODULES="$XPROTO $RANDRPROTO $RENDERPROTO $XEXTPROTO $INPUTPROTO $KBPROTO $FONTSPROTO $LIBPIXMAN"
 # Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
 AC_SUBST(SDK_REQUIRED_MODULES)
 
-REQUIRED_MODULES="[fixesproto >= 5.0] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
+REQUIRED_MODULES="$FIXESPROTO $DAMAGEPROTO $XCMISCPROTO $XTRANS $BIGREQSPROTO $SDK_REQUIRED_MODULES"
 
 if test "x$CONFIG_UDEV" = xyes &&
  { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
diff --git a/xorg-server/dix/cursor.c b/xorg-server/dix/cursor.c
index f29cb1125..6bff44723 100644
--- a/xorg-server/dix/cursor.c
+++ b/xorg-server/dix/cursor.c
@@ -152,7 +152,7 @@ CheckForEmptyMask(CursorBitsPtr bits)
     if (bits->argb)
     {
 	CARD32 *argb = bits->argb;
-	int n = bits->width * bits->height;
+	n = bits->width * bits->height;
 	while (n--)
 	    if (*argb++ & 0xff000000) return;
     }
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 8a96bcc49..e79ea5996 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -279,6 +279,7 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
     dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
     dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
     dev->deviceGrab.activeGrab = AllocGrab();
+    dev->deviceGrab.sync.event = calloc(1, sizeof(DeviceEvent));
 
     XkbSetExtension(dev, ProcessKeyboardEvent);
 
diff --git a/xorg-server/dix/dispatch.c b/xorg-server/dix/dispatch.c
index 922b7ecbe..29fb78160 100644
--- a/xorg-server/dix/dispatch.c
+++ b/xorg-server/dix/dispatch.c
@@ -3641,7 +3641,7 @@ ProcInitialConnection(ClientPtr client)
 }

 

 static int

-SendConnSetup(ClientPtr client, char *reason)

+SendConnSetup(ClientPtr client, const char *reason)

 {

     xWindowRoot *root;

     int i;

@@ -3740,7 +3740,8 @@ SendConnSetup(ClientPtr client, char *reason)
 int

 ProcEstablishConnection(ClientPtr client)

 {

-    char *reason, *auth_proto, *auth_string;

+    const char *reason;

+    char *auth_proto, *auth_string;

     xConnClientPrefix *prefix;

     REQUEST(xReq);

 

diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c
index 1e3134663..00bbde67c 100644
--- a/xorg-server/dix/dixutils.c
+++ b/xorg-server/dix/dixutils.c
@@ -167,8 +167,8 @@ ISOLatin1ToLower (unsigned char source)
 
 
 int
-CompareISOLatin1Lowered(unsigned char *s1, int s1len, 
-			unsigned char *s2, int s2len)
+CompareISOLatin1Lowered(const unsigned char *s1, int s1len,
+			const unsigned char *s2, int s2len)
 {
     unsigned char   c1, c2;
     
diff --git a/xorg-server/dix/eventconvert.c b/xorg-server/dix/eventconvert.c
index d7b161e02..5caae0551 100644
--- a/xorg-server/dix/eventconvert.c
+++ b/xorg-server/dix/eventconvert.c
@@ -647,7 +647,7 @@ eventToDeviceEvent(DeviceEvent *ev, xEvent **xi)
     xde = (xXIDeviceEvent*)*xi;
     xde->type           = GenericEvent;
     xde->extension      = IReqCode;
-    xde->evtype         = GetXI2Type((InternalEvent*)ev);
+    xde->evtype         = GetXI2Type(ev->type);
     xde->time           = ev->time;
     xde->length         = bytes_to_int32(len - sizeof(xEvent));
     xde->detail         = ev->detail.button;
@@ -714,7 +714,7 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
     raw = (xXIRawEvent*)*xi;
     raw->type           = GenericEvent;
     raw->extension      = IReqCode;
-    raw->evtype         = GetXI2Type((InternalEvent*)ev);
+    raw->evtype         = GetXI2Type(ev->type);
     raw->time           = ev->time;
     raw->length         = bytes_to_int32(len - sizeof(xEvent));
     raw->detail         = ev->detail.button;
@@ -746,10 +746,10 @@ eventToRawEvent(RawDeviceEvent *ev, xEvent **xi)
  * equivalent exists.
  */
 int
-GetCoreType(InternalEvent *event)
+GetCoreType(enum EventType type)
 {
     int coretype = 0;
-    switch(event->any.type)
+    switch(type)
     {
         case ET_Motion:         coretype = MotionNotify;  break;
         case ET_ButtonPress:    coretype = ButtonPress;   break;
@@ -767,10 +767,10 @@ GetCoreType(InternalEvent *event)
  * equivalent exists.
  */
 int
-GetXIType(InternalEvent *event)
+GetXIType(enum EventType type)
 {
     int xitype = 0;
-    switch(event->any.type)
+    switch(type)
     {
         case ET_Motion:         xitype = DeviceMotionNotify;  break;
         case ET_ButtonPress:    xitype = DeviceButtonPress;   break;
@@ -790,11 +790,11 @@ GetXIType(InternalEvent *event)
  * equivalent exists.
  */
 int
-GetXI2Type(InternalEvent *event)
+GetXI2Type(enum EventType type)
 {
     int xi2type = 0;
 
-    switch(event->any.type)
+    switch(type)
     {
         case ET_Motion:         xi2type = XI_Motion;           break;
         case ET_ButtonPress:    xi2type = XI_ButtonPress;      break;
diff --git a/xorg-server/dix/events.c b/xorg-server/dix/events.c
index 16afb7548..42f7c1b06 100644
--- a/xorg-server/dix/events.c
+++ b/xorg-server/dix/events.c
@@ -190,7 +190,7 @@ core_get_type(const xEvent *event)
 static inline int
 xi2_get_type(const xEvent *event)
 {
-    xGenericEvent* e = (xGenericEvent*)event;
+    const xGenericEvent* e = (const xGenericEvent*)event;
 
     return (e->type != GenericEvent || e->extension != IReqCode) ? 0 : e->evtype;
 }
@@ -367,9 +367,9 @@ extern int DeviceMotionNotify;
  * time a button is pressed, the filter is modified to also contain the
  * matching ButtonXMotion mask.
  */
-static Mask filters[MAXDEVICES][128];
+Mask event_filters[MAXDEVICES][MAXEVENTS];
 
-static const Mask default_filter[128] =
+static const Mask default_filter[MAXEVENTS] =
 {
 	NoSuchEvent,		       /* 0 */
 	NoSuchEvent,		       /* 1 */
@@ -408,18 +408,6 @@ static const Mask default_filter[128] =
 	CantBeFiltered		       /* MappingNotify */
 };
 
-static inline Mask
-GetEventFilterMask(DeviceIntPtr dev, int evtype)
-{
-    return filters[dev ? dev->id : 0][evtype];
-}
-
-static inline Mask
-GetXI2EventFilterMask(int evtype)
-{
-    return (1 << (evtype % 8));
-}
-
 /**
  * For the given event, return the matching event filter. This filter may then
  * be AND'ed with the selected event mask.
@@ -441,9 +429,9 @@ GetEventFilter(DeviceIntPtr dev, xEvent *event)
     int evtype = 0;
 
     if (event->u.u.type != GenericEvent)
-        return GetEventFilterMask(dev, event->u.u.type);
+        return event_get_filter_from_type(dev, event->u.u.type);
     else if ((evtype = xi2_get_type(event)))
-        return GetXI2EventFilterMask(evtype);
+        return event_get_filter_from_xi2type(evtype);
     ErrorF("[dix] Unknown event type %d. No filter\n", event->u.u.type);
     return 0;
 }
@@ -452,14 +440,14 @@ GetEventFilter(DeviceIntPtr dev, xEvent *event)
  * Return the single byte of the device's XI2 mask that contains the mask
  * for the event_type.
  */
-static int
+int
 GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type)
 {
     /* we just return the matching filter because that's the only use
      * for this mask anyway.
      */
     if (xi2mask_isset(mask, dev, event_type))
-        return GetXI2EventFilterMask(event_type);
+        return event_get_filter_from_xi2type(event_type);
     else
         return 0;
 }
@@ -679,13 +667,13 @@ SetMaskForEvent(int deviceid, Mask mask, int event)
 {
     if (deviceid < 0 || deviceid >= MAXDEVICES)
         FatalError("SetMaskForEvent: bogus device id");
-    filters[deviceid][event] = mask;
+    event_filters[deviceid][event] = mask;
 }
 
 void
 SetCriticalEvent(int event)
 {
-    if (event >= 128)
+    if (event >= MAXEVENTS)
 	FatalError("SetCriticalEvent: bogus event number");
     criticalEvents[event >> 3] |= 1 << (event & 7);
 }
@@ -1487,7 +1475,7 @@ ActivatePointerGrab(DeviceIntPtr mouse, GrabPtr grab,
     Bool isPassive = autoGrab & ~ImplicitGrabMask;
 
     /* slave devices need to float for the duration of the grab. */
-    if (grab->grabtype == GRABTYPE_XI2 &&
+    if (grab->grabtype == XI2 &&
         !(autoGrab & ImplicitGrabMask) && !IsMaster(mouse))
         DetachFromMaster(mouse);
 
@@ -1546,7 +1534,7 @@ DeactivatePointerGrab(DeviceIntPtr mouse)
     if (grab->cursor)
 	FreeCursor(grab->cursor, (Cursor)0);
 
-    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)
+    if (!wasImplicit && grab->grabtype == XI2)
         ReattachToOldMaster(mouse);
 
     ComputeFreezes();
@@ -1564,7 +1552,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
     WindowPtr oldWin;
 
     /* slave devices need to float for the duration of the grab. */
-    if (grab->grabtype == GRABTYPE_XI2 &&
+    if (grab->grabtype == XI2 &&
         !(passive & ImplicitGrabMask) &&
         !IsMaster(keybd))
         DetachFromMaster(keybd);
@@ -1619,7 +1607,7 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
     }
     DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
 
-    if (!wasImplicit && grab->grabtype == GRABTYPE_XI2)
+    if (!wasImplicit && grab->grabtype == XI2)
         ReattachToOldMaster(keybd);
 
     ComputeFreezes();
@@ -1977,14 +1965,14 @@ ActivateImplicitGrab(DeviceIntPtr dev, ClientPtr client, WindowPtr win,
     GrabPtr tempGrab;
     OtherInputMasks *inputMasks;
     CARD8 type = event->u.u.type;
-    GrabType grabtype;
+    enum InputLevel grabtype;
 
     if (type == ButtonPress)
-        grabtype = GRABTYPE_CORE;
+        grabtype = CORE;
     else if (type == DeviceButtonPress)
-        grabtype = GRABTYPE_XI;
+        grabtype = XI;
     else if ((type = xi2_get_type(event)) == XI_ButtonPress)
-        grabtype = GRABTYPE_XI2;
+        grabtype = XI2;
     else
         return FALSE;
 
@@ -2017,13 +2005,6 @@ ActivateImplicitGrab(DeviceIntPtr dev, ClientPtr client, WindowPtr win,
     return TRUE;
 }
 
-enum EventDeliveryState {
-    EVENT_DELIVERED,     /**< Event has been delivered to a client  */
-    EVENT_NOT_DELIVERED, /**< Event was not delivered to any client */
-    EVENT_SKIP,          /**< Event can be discarded by the caller  */
-    EVENT_REJECTED,      /**< Event was rejected for delivery to the client */
-};
-
 /**
  * Attempt event delivery to the client owning the window.
  */
@@ -2542,29 +2523,29 @@ FixUpEventFromWindow(
  * client.
  *
  * @param[in] dev The device this event is being sent for.
- * @param[in] event The event that is to be sent.
+ * @param[in] evtype The event type of the event that is to be sent.
  * @param[in] win The current event window.
  *
  * @return Bitmask of ::EVENT_XI2_MASK, ::EVENT_XI1_MASK, ::EVENT_CORE_MASK, and
  *         ::EVENT_DONT_PROPAGATE_MASK.
  */
 int
-EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
+EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win)
 {
     int rc = 0;
     int filter = 0;
     int type;
     OtherInputMasks *inputMasks = wOtherInputMasks(win);
 
-    if ((type = GetXI2Type(event)) != 0)
+    if ((type = GetXI2Type(evtype)) != 0)
     {
         if (inputMasks && xi2mask_isset(inputMasks->xi2mask, dev, type))
             rc |= EVENT_XI2_MASK;
     }
 
-    if ((type = GetXIType(event)) != 0)
+    if ((type = GetXIType(evtype)) != 0)
     {
-        filter = GetEventFilterMask(dev, type);
+        filter = event_get_filter_from_type(dev, type);
 
         /* Check for XI mask */
         if (inputMasks &&
@@ -2578,9 +2559,9 @@ EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
 
     }
 
-    if ((type = GetCoreType(event)) != 0)
+    if ((type = GetCoreType(evtype)) != 0)
     {
-        filter = GetEventFilterMask(dev, type);
+        filter = event_get_filter_from_type(dev, type);
 
         /* Check for core mask */
         if ((win->deliverableEvents & filter) &&
@@ -2595,6 +2576,57 @@ EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event, WindowPtr win)
     return rc;
 }
 
+static int
+DeliverEvent(DeviceIntPtr dev, xEvent *xE, int count,
+             WindowPtr win, Window child, GrabPtr grab)
+{
+    SpritePtr pSprite = dev->spriteInfo->sprite;
+    Mask filter;
+    int deliveries = 0;
+
+    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, win, xE, count) == Success) {
+        filter = GetEventFilter(dev, xE);
+        FixUpEventFromWindow(pSprite, xE, win, child, FALSE);
+        deliveries = DeliverEventsToWindow(dev, win, xE, count,
+                filter, grab);
+    }
+
+    return deliveries;
+}
+
+static int
+DeliverOneEvent(InternalEvent *event, DeviceIntPtr dev, enum InputLevel level,
+                WindowPtr win, Window child, GrabPtr grab)
+{
+    xEvent *xE = NULL;
+    int count = 0;
+    int deliveries = 0;
+    int rc;
+
+    switch(level)
+    {
+        case XI2:
+            rc = EventToXI2(event, &xE);
+            count = 1;
+            break;
+        case XI:
+            rc = EventToXI(event, &xE, &count);
+            break;
+        case CORE:
+            rc = EventToCore(event, &xE, &count);
+            break;
+    }
+
+    if (rc == Success)
+    {
+        deliveries = DeliverEvent(dev, xE, count, win, child, grab);
+        free(xE);
+    } else
+        BUG_WARN_MSG(rc != BadMatch, "%s: conversion to level %d failed with rc %d\n",
+                     dev->name, level, rc);
+    return deliveries;
+}
+
 /**
  * Deliver events caused by input devices.
  *
@@ -2618,90 +2650,53 @@ int
 DeliverDeviceEvents(WindowPtr pWin, InternalEvent *event, GrabPtr grab,
                     WindowPtr stopAt, DeviceIntPtr dev)
 {
-    SpritePtr pSprite = dev->spriteInfo->sprite;
     Window child = None;
-    Mask filter;
     int deliveries = 0;
-    xEvent *xE = NULL, *core = NULL;
-    int rc, mask, count = 0;
+    int mask;
 
     verify_internal_event(event);
 
     while (pWin)
     {
-        if ((mask = EventIsDeliverable(dev, event, pWin)))
+        if ((mask = EventIsDeliverable(dev, event->any.type, pWin)))
         {
             /* XI2 events first */
             if (mask & EVENT_XI2_MASK)
             {
-                xEvent *xi2 = NULL;
-                rc = EventToXI2(event, &xi2);
-                if (rc == Success)
-                {
-                    /* XXX: XACE */
-                    filter = GetEventFilter(dev, xi2);
-                    FixUpEventFromWindow(pSprite, xi2, pWin, child, FALSE);
-                    deliveries = DeliverEventsToWindow(dev, pWin, xi2, 1,
-                                                       filter, grab);
-                    free(xi2);
-                    if (deliveries > 0)
-                        goto unwind;
-                } else if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI2 conversion failed in DDE (%d).\n",
-                            dev->name, rc);
+                deliveries = DeliverOneEvent(event, dev, XI2, pWin, child, grab);
+                if (deliveries > 0)
+                    break;
             }
 
             /* XI events */
             if (mask & EVENT_XI1_MASK)
             {
-                rc = EventToXI(event, &xE, &count);
-                if (rc == Success) {
-                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, xE, count) == Success) {
-                        filter = GetEventFilter(dev, xE);
-                        FixUpEventFromWindow(pSprite, xE, pWin, child, FALSE);
-                        deliveries = DeliverEventsToWindow(dev, pWin, xE, count,
-                                                           filter, grab);
-                        if (deliveries > 0)
-                            goto unwind;
-                    }
-                } else if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI conversion failed in DDE (%d, %d). Skipping delivery.\n",
-                            dev->name, event->any.type, rc);
+                deliveries = DeliverOneEvent(event, dev, XI, pWin, child, grab);
+                if (deliveries > 0)
+                    break;
             }
 
             /* Core event */
             if ((mask & EVENT_CORE_MASK) && IsMaster(dev) && dev->coreEvents)
             {
-                rc = EventToCore(event, &core, &count);
-                if (rc == Success) {
-                    if (XaceHook(XACE_SEND_ACCESS, NULL, dev, pWin, core, count) == Success) {
-                        filter = GetEventFilter(dev, core);
-                        FixUpEventFromWindow(pSprite, core, pWin, child, FALSE);
-                        deliveries = DeliverEventsToWindow(dev, pWin, core,
-                                                           count, filter, grab);
-                        if (deliveries > 0)
-                            goto unwind;
-                    }
-                } else if (rc != BadMatch)
-                        ErrorF("[dix] %s: Core conversion failed in DDE (%d, %d).\n",
-                                dev->name, event->any.type, rc);
+                deliveries = DeliverOneEvent(event, dev, CORE, pWin, child, grab);
+                if (deliveries > 0)
+                    break;
             }
 
-            if ((deliveries < 0) || (pWin == stopAt) ||
-                (mask & EVENT_DONT_PROPAGATE_MASK))
-            {
-                deliveries = 0;
-                goto unwind;
-            }
+        }
+
+        if ((deliveries < 0) || (pWin == stopAt) ||
+            (mask & EVENT_DONT_PROPAGATE_MASK))
+        {
+            deliveries = 0;
+            break;
         }
 
         child = pWin->drawable.id;
         pWin = pWin->parent;
     }
 
-unwind:
-    free(core);
-    free(xE);
     return deliveries;
 }
 
@@ -3635,6 +3630,257 @@ BorderSizeNotEmpty(DeviceIntPtr pDev, WindowPtr pWin)
 }
 
 /**
+ * Activate the given passive grab. If the grab is activated successfully, the
+ * event has been delivered to the client.
+ *
+ * @param device The device of the event to check.
+ * @param grab The grab to check.
+ * @param event The current device event.
+ *
+ * @return Whether the grab has been activated.
+ */
+Bool
+ActivatePassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event)
+{
+    SpritePtr pSprite = device->spriteInfo->sprite;
+    GrabInfoPtr grabinfo = &device->deviceGrab;
+    xEvent *xE = NULL;
+    int count;
+    int rc;
+
+    /* The only consumers of corestate are Xi 1.x and core events, which
+     * are guaranteed to come from DeviceEvents. */
+    if (grab->grabtype == XI || grab->grabtype == CORE)
+    {
+        DeviceIntPtr gdev;
+
+        event->device_event.corestate &= 0x1f00;
+
+        if (grab->grabtype == CORE)
+            gdev = GetMaster(device, KEYBOARD_OR_FLOAT);
+        else
+            gdev = grab->modifierDevice;
+
+        if (gdev && gdev->key && gdev->key->xkbInfo)
+            event->device_event.corestate |=
+                gdev->key->xkbInfo->state.grab_mods & (~0x1f00);
+    }
+
+    if (grab->grabtype == CORE)
+    {
+        rc = EventToCore(event, &xE, &count);
+        if (rc != Success)
+        {
+            BUG_WARN_MSG(rc != BadMatch,"[dix] %s: core conversion failed"
+                         "(%d, %d).\n", device->name, event->any.type, rc);
+            return FALSE;
+        }
+    } else if (grab->grabtype == XI2)
+    {
+        rc = EventToXI2(event, &xE);
+        if (rc != Success)
+        {
+            if (rc != BadMatch)
+                BUG_WARN_MSG(rc != BadMatch,"[dix] %s: XI2 conversion failed"
+                             "(%d, %d).\n", device->name, event->any.type, rc);
+            return FALSE;
+        }
+        count = 1;
+    } else
+    {
+        rc = EventToXI(event, &xE, &count);
+        if (rc != Success)
+        {
+            if (rc != BadMatch)
+                BUG_WARN_MSG(rc != BadMatch,"[dix] %s: XI conversion failed"
+                             "(%d, %d).\n", device->name, event->any.type, rc);
+            return FALSE;
+        }
+    }
+
+    (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
+
+    if (xE)
+    {
+        FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);
+
+        /* XXX: XACE? */
+        TryClientEvents(rClient(grab), device, xE, count,
+                        GetEventFilter(device, xE),
+                        GetEventFilter(device, xE), grab);
+    }
+
+    if (grabinfo->sync.state == FROZEN_NO_EVENT)
+        grabinfo->sync.state = FROZEN_WITH_EVENT;
+    *grabinfo->sync.event = event->device_event;
+
+    free(xE);
+    return TRUE;
+}
+
+static BOOL
+CoreGrabInterferes(DeviceIntPtr device, GrabPtr grab)
+{
+    DeviceIntPtr other;
+    BOOL interfering = FALSE;
+
+    for (other = inputInfo.devices; other; other = other->next)
+    {
+        GrabPtr othergrab = other->deviceGrab.grab;
+        if (othergrab && othergrab->grabtype == CORE &&
+                SameClient(grab, rClient(othergrab)) &&
+                ((IsPointerDevice(grab->device) &&
+                  IsPointerDevice(othergrab->device)) ||
+                 (IsKeyboardDevice(grab->device) &&
+                  IsKeyboardDevice(othergrab->device))))
+        {
+            interfering = TRUE;
+            break;
+        }
+    }
+
+    return interfering;
+}
+
+enum MatchFlags {
+    NO_MATCH    = 0x0,
+    CORE_MATCH  = 0x1,
+    XI_MATCH    = 0x2,
+    XI2_MATCH   = 0x4,
+};
+
+/**
+ * Match the grab against the temporary grab on the given input level.
+ * Modifies the temporary grab pointer.
+ *
+ * @param grab The grab to match against
+ * @param tmp The temporary grab to use for matching
+ * @param level The input level we want to match on
+ * @param event_type Wire protocol event type
+ *
+ * @return The respective matched flag or 0 for no match
+ */
+static enum MatchFlags
+MatchForType(const GrabPtr grab, GrabPtr tmp, enum InputLevel level, int event_type)
+{
+    enum MatchFlags match;
+    BOOL ignore_device = FALSE;
+    int grabtype;
+    int evtype;
+
+    switch(level)
+    {
+        case XI2:
+            grabtype = XI2;
+            evtype = GetXI2Type(event_type);
+            BUG_WARN(!evtype);
+            match = XI2_MATCH;
+            break;
+        case XI:
+            grabtype = XI;
+            evtype = GetXIType(event_type);
+            match = XI_MATCH;
+            break;
+        case CORE:
+            grabtype = CORE;
+            evtype = GetCoreType(event_type);
+            match = CORE_MATCH;
+            ignore_device = TRUE;
+            break;
+    }
+
+    tmp->grabtype = grabtype;
+    tmp->type = evtype;
+
+    if (tmp->type && GrabMatchesSecond(tmp, grab, ignore_device))
+        return match;
+
+    return NO_MATCH;
+}
+
+/**
+ * Check an individual grab against an event to determine if a passive grab
+ * should be activated.
+ *
+ * @param device The device of the event to check.
+ * @param grab The grab to check.
+ * @param event The current device event.
+ * @param checkCore Check for core grabs too.
+ * @param tempGrab A pre-allocated temporary grab record for matching. This
+ *        must have the window and device values filled in.
+ *
+ * @return Whether the grab matches the event.
+ */
+static Bool
+CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
+                 Bool checkCore, GrabPtr tempGrab)
+{
+    DeviceIntPtr gdev;
+    XkbSrvInfoPtr xkbi = NULL;
+    enum MatchFlags match = 0;
+
+    gdev = grab->modifierDevice;
+    if (grab->grabtype == CORE)
+    {
+        gdev = GetMaster(device, KEYBOARD_OR_FLOAT);
+    } else if (grab->grabtype == XI2)
+    {
+        /* if the device is an attached slave device, gdev must be the
+         * attached master keyboard. Since the slave may have been
+         * reattached after the grab, the modifier device may not be the
+         * same. */
+        if (!IsMaster(grab->device) && !IsFloating(device))
+            gdev = GetMaster(device, MASTER_KEYBOARD);
+    }
+
+    if (gdev && gdev->key)
+        xkbi= gdev->key->xkbInfo;
+    tempGrab->modifierDevice = grab->modifierDevice;
+    tempGrab->modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0;
+
+    /* Check for XI2 and XI grabs first */
+    match = MatchForType(grab, tempGrab, XI2, GetXI2Type(event->any.type));
+
+    if (!match)
+        match = MatchForType(grab, tempGrab, XI, GetXIType(event->any.type));
+
+    if (!match && checkCore)
+        match = MatchForType(grab, tempGrab, CORE, GetCoreType(event->any.type));
+
+    if (!match || (grab->confineTo &&
+                   (!grab->confineTo->realized ||
+                    !BorderSizeNotEmpty(device, grab->confineTo))))
+        return FALSE;
+
+    /* In some cases a passive core grab may exist, but the client
+     * already has a core grab on some other device. In this case we
+     * must not get the grab, otherwise we may never ungrab the
+     * device.
+     */
+
+    if (grab->grabtype == CORE)
+    {
+        /* A passive grab may have been created for a different device
+           than it is assigned to at this point in time.
+           Update the grab's device and modifier device to reflect the
+           current state.
+           Since XGrabDeviceButton requires to specify the
+           modifierDevice explicitly, we don't override this choice.
+         */
+        if (grab->type < GenericEvent)
+        {
+            grab->device = device;
+            grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD);
+        }
+
+        if (CoreGrabInterferes(device, grab))
+            return FALSE;
+    }
+
+    return TRUE;
+}
+
+/**
  * "CheckPassiveGrabsOnWindow" checks to see if the event passed in causes a
  * passive grab set on the window to be activated.
  * If activate is true and a passive grab is found, it will be activated,
@@ -3655,14 +3901,8 @@ CheckPassiveGrabsOnWindow(
     BOOL checkCore,
     BOOL activate)
 {
-    SpritePtr pSprite = device->spriteInfo->sprite;
     GrabPtr grab = wPassiveGrabs(pWin);
     GrabPtr tempGrab;
-    GrabInfoPtr grabinfo;
-#define CORE_MATCH      0x1
-#define XI_MATCH        0x2
-#define XI2_MATCH        0x4
-    int match = 0;
 
     if (!grab)
 	return NULL;
@@ -3690,185 +3930,20 @@ CheckPassiveGrabsOnWindow(
     tempGrab->detail.pMask = NULL;
     tempGrab->modifiersDetail.pMask = NULL;
     tempGrab->next = NULL;
+
     for (; grab; grab = grab->next)
     {
-	DeviceIntPtr	gdev;
-	XkbSrvInfoPtr	xkbi = NULL;
-	xEvent *xE = NULL;
-        int count, rc;
-
-	gdev= grab->modifierDevice;
-        if (grab->grabtype == GRABTYPE_CORE)
-        {
-            gdev = GetMaster(device, KEYBOARD_OR_FLOAT);
-        } else if (grab->grabtype == GRABTYPE_XI2)
-        {
-            /* if the device is an attached slave device, gdev must be the
-             * attached master keyboard. Since the slave may have been
-             * reattached after the grab, the modifier device may not be the
-             * same. */
-            if (!IsMaster(grab->device) && !IsFloating(device))
-                gdev = GetMaster(device, MASTER_KEYBOARD);
-        }
-
-
-        if (gdev && gdev->key)
-            xkbi= gdev->key->xkbInfo;
-        tempGrab->modifierDevice = grab->modifierDevice;
-        tempGrab->modifiersDetail.exact = xkbi ? xkbi->state.grab_mods : 0;
-
-        /* Check for XI2 and XI grabs first */
-        tempGrab->type = GetXI2Type(event);
-        tempGrab->grabtype = GRABTYPE_XI2;
-        if (GrabMatchesSecond(tempGrab, grab, FALSE))
-            match = XI2_MATCH;
-
-        if (!match)
-        {
-            tempGrab->grabtype = GRABTYPE_XI;
-            if ((tempGrab->type = GetXIType(event)) &&
-                (GrabMatchesSecond(tempGrab, grab, FALSE)))
-                match = XI_MATCH;
-        }
-
-        /* Check for a core grab (ignore the device when comparing) */
-        if (!match && checkCore)
-        {
-            tempGrab->grabtype = GRABTYPE_CORE;
-            if ((tempGrab->type = GetCoreType(event)) &&
-                (GrabMatchesSecond(tempGrab, grab, TRUE)))
-                match = CORE_MATCH;
-        }
-
-        if (!match || (grab->confineTo &&
-                       (!grab->confineTo->realized ||
-                        !BorderSizeNotEmpty(device, grab->confineTo))))
+        if (!CheckPassiveGrab(device, grab, event, checkCore, tempGrab))
             continue;
 
-        grabinfo = &device->deviceGrab;
-        /* In some cases a passive core grab may exist, but the client
-         * already has a core grab on some other device. In this case we
-         * must not get the grab, otherwise we may never ungrab the
-         * device.
-         */
-
-        if (grab->grabtype == GRABTYPE_CORE)
-        {
-            DeviceIntPtr other;
-            BOOL interfering = FALSE;
-
-            /* A passive grab may have been created for a different device
-               than it is assigned to at this point in time.
-               Update the grab's device and modifier device to reflect the
-               current state.
-               Since XGrabDeviceButton requires to specify the
-               modifierDevice explicitly, we don't override this choice.
-               */
-            if (tempGrab->type < GenericEvent)
-            {
-                grab->device = device;
-                grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD);
-            }
-
-            for (other = inputInfo.devices; other; other = other->next)
-            {
-                GrabPtr othergrab = other->deviceGrab.grab;
-                if (othergrab && othergrab->grabtype == GRABTYPE_CORE &&
-                    SameClient(grab, rClient(othergrab)) &&
-                    ((IsPointerDevice(grab->device) &&
-                     IsPointerDevice(othergrab->device)) ||
-                     (IsKeyboardDevice(grab->device) &&
-                      IsKeyboardDevice(othergrab->device))))
-                {
-                    interfering = TRUE;
-                    break;
-                }
-            }
-            if (interfering)
-                continue;
-        }
-
-        if (!activate)
-            break;
-        else if (!GetXIType(event) && !GetCoreType(event))
-        {
-            ErrorF("Event type %d in CheckPassiveGrabsOnWindow is neither"
-                   " XI 1.x nor core\n", event->any.type);
-            grab = NULL;
-            break;
-        }
-
-        /* The only consumers of corestate are Xi 1.x and core events, which
-         * are guaranteed to come from DeviceEvents. */
-        if (match & (XI_MATCH | CORE_MATCH))
-        {
-            event->device_event.corestate &= 0x1f00;
-            event->device_event.corestate |= tempGrab->modifiersDetail.exact &
-                                              (~0x1f00);
-        }
-
-        if (match & CORE_MATCH)
-        {
-            rc = EventToCore(event, &xE, &count);
-            if (rc != Success)
-            {
-                if (rc != BadMatch)
-                    ErrorF("[dix] %s: core conversion failed in CPGFW "
-                            "(%d, %d).\n", device->name, event->any.type, rc);
-                continue;
-            }
-        } else if (match & XI2_MATCH)
-        {
-            rc = EventToXI2(event, &xE);
-            if (rc != Success)
-            {
-                if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI2 conversion failed in CPGFW "
-                            "(%d, %d).\n", device->name, event->any.type, rc);
-                continue;
-            }
-            count = 1;
-        } else
-        {
-            rc = EventToXI(event, &xE, &count);
-            if (rc != Success)
-            {
-                if (rc != BadMatch)
-                    ErrorF("[dix] %s: XI conversion failed in CPGFW "
-                            "(%d, %d).\n", device->name, event->any.type, rc);
-                continue;
-            }
-        }
-
-        (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
-
-        if (xE)
-        {
-            FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);
-
-            /* XXX: XACE? */
-            TryClientEvents(rClient(grab), device, xE, count,
-                            GetEventFilter(device, xE),
-                            GetEventFilter(device, xE), grab);
-        }
-
-        if (grabinfo->sync.state == FROZEN_NO_EVENT)
-        {
-            if (!grabinfo->sync.event)
-                grabinfo->sync.event = calloc(1, sizeof(DeviceEvent));
-            *grabinfo->sync.event = event->device_event;
-            grabinfo->sync.state = FROZEN_WITH_EVENT;
-        }
+        if (activate && !ActivatePassiveGrab(device, grab, event))
+            continue;
 
-        free(xE);
         break;
     }
 
     FreeGrab(tempGrab);
     return grab;
-#undef CORE_MATCH
-#undef XI_MATCH
-#undef XI2_MATCH
 }
 
 /**
@@ -4054,6 +4129,75 @@ unwind:
     return;
 }
 
+
+int
+DeliverOneGrabbedEvent(InternalEvent *event, DeviceIntPtr dev, enum InputLevel level)
+{
+    SpritePtr pSprite = dev->spriteInfo->sprite;
+    int rc;
+    xEvent *xE = NULL;
+    int count = 0;
+    int deliveries = 0;
+    Mask mask;
+    GrabInfoPtr grabinfo = &dev->deviceGrab;
+    GrabPtr grab = grabinfo->grab;
+    Mask filter;
+
+    switch(level)
+    {
+        case XI2:
+            rc = EventToXI2(event, &xE);
+            count = 1;
+            if (rc == Success)
+            {
+                int evtype = xi2_get_type(xE);
+                mask = xi2mask_isset(grab->xi2mask, dev, evtype);
+                filter = 1;
+            }
+            break;
+        case XI:
+            if (grabinfo->fromPassiveGrab && grabinfo->implicitGrab)
+                mask = grab->deviceMask;
+            else
+                mask = grab->eventMask;
+            rc = EventToXI(event, &xE, &count);
+            if (rc == Success)
+                filter = GetEventFilter(dev, xE);
+            break;
+        case CORE:
+            rc = EventToCore(event, &xE, &count);
+            mask = grab->eventMask;
+            if (rc == Success)
+                filter = GetEventFilter(dev, xE);
+            break;
+        default:
+            BUG_WARN_MSG(1, "Invalid input level %d\n", level);
+            return 0;
+    }
+
+    if (rc == Success)
+    {
+        FixUpEventFromWindow(pSprite, xE, grab->window, None, TRUE);
+        if (XaceHook(XACE_SEND_ACCESS, 0, dev,
+                    grab->window, xE, count) ||
+                XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
+                    grab->window, xE, count))
+            deliveries = 1; /* don't send, but pretend we did */
+        else if (level != CORE || !IsInterferingGrab(rClient(grab), dev, xE))
+        {
+            deliveries = TryClientEvents(rClient(grab), dev,
+                    xE, count, mask, filter,
+                    grab);
+        }
+    } else
+        BUG_WARN_MSG(rc != BadMatch, "%s: conversion to mode %d failed on %d with %d\n",
+                dev->name, level, event->any.type, rc);
+
+    free(xE);
+    return deliveries;
+}
+
+
 /**
  * Deliver an event from a device that is currently grabbed. Uses
  * DeliverDeviceEvents() for further delivery if a ownerEvents is set on the
@@ -4073,10 +4217,6 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
     DeviceIntPtr dev;
     SpritePtr pSprite = thisDev->spriteInfo->sprite;
     BOOL sendCore = FALSE;
-    int rc, count = 0;
-    xEvent *xi = NULL;
-    xEvent *xi2 = NULL;
-    xEvent *core = NULL;
 
     grabinfo = &thisDev->deviceGrab;
     grab = grabinfo->grab;
@@ -4084,6 +4224,7 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
     if (grab->ownerEvents)
     {
 	WindowPtr focus;
+	WindowPtr win;
 
         /* Hack: Some pointer device have a focus class. So we need to check
          * for the type of event, to see if we really want to deliver it to
@@ -4100,99 +4241,40 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
 	else
 	    focus = PointerRootWin;
 	if (focus == PointerRootWin)
-	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab,
-                                             NullWindow, thisDev);
-	else if (focus && (focus == pSprite->win ||
-                    IsParent(focus, pSprite->win)))
-	    deliveries = DeliverDeviceEvents(pSprite->win, event, grab, focus,
-					     thisDev);
+	{
+	    win = pSprite->win;
+	    focus = NullWindow;
+	} else if (focus && (focus == pSprite->win ||
+		    IsParent(focus, pSprite->win)))
+	    win = pSprite->win;
 	else if (focus)
-	    deliveries = DeliverDeviceEvents(focus, event, grab, focus,
-					     thisDev);
+	    win = focus;
+
+	deliveries = DeliverDeviceEvents(win, event, grab, focus, thisDev);
     }
     if (!deliveries)
     {
-        Mask mask;
-
         /* XXX: In theory, we could pass the internal events through to
          * everything and only convert just before hitting the wire. We can't
          * do that yet, so DGE is the last stop for internal events. From here
          * onwards, we deal with core/XI events.
          */
 
-        mask = grab->eventMask;
-
         sendCore = (IsMaster(thisDev) && thisDev->coreEvents);
         /* try core event */
-        if (sendCore && grab->grabtype == GRABTYPE_CORE)
+        if (sendCore && grab->grabtype == CORE)
         {
-            rc = EventToCore(event, &core, &count);
-            if (rc == Success)
-            {
-                FixUpEventFromWindow(pSprite, core, grab->window, None, TRUE);
-                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
-                            grab->window, core, count) ||
-                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                            grab->window, core, count))
-                    deliveries = 1; /* don't send, but pretend we did */
-                else if (!IsInterferingGrab(rClient(grab), thisDev, core))
-                {
-                    deliveries = TryClientEvents(rClient(grab), thisDev,
-                            core, count, mask,
-                            GetEventFilter(thisDev, core),
-                            grab);
-                }
-            } else if (rc != BadMatch)
-                ErrorF("[dix] DeliverGrabbedEvent. Core conversion failed.\n");
+            deliveries = DeliverOneGrabbedEvent(event, thisDev, CORE);
         }
 
         if (!deliveries)
         {
-            rc = EventToXI2(event, &xi2);
-            if (rc == Success)
-            {
-                int evtype = xi2_get_type(xi2);
-                mask = xi2mask_isset(grab->xi2mask, thisDev, evtype);
-                /* try XI2 event */
-                FixUpEventFromWindow(pSprite, xi2, grab->window, None, TRUE);
-                /* XXX: XACE */
-                deliveries = TryClientEvents(rClient(grab), thisDev, xi2, 1, mask, 1, grab);
-            } else if (rc != BadMatch)
-                ErrorF("[dix] %s: XI2 conversion failed in DGE (%d, %d). Skipping delivery.\n",
-                        thisDev->name, event->any.type, rc);
+            deliveries = DeliverOneGrabbedEvent(event, thisDev, XI2);
         }
 
         if (!deliveries)
         {
-            rc = EventToXI(event, &xi, &count);
-            if (rc == Success)
-            {
-                /* try XI event */
-                if (grabinfo->fromPassiveGrab  &&
-                        grabinfo->implicitGrab)
-                    mask = grab->deviceMask;
-                else
-                    mask = grab->eventMask;
-
-                FixUpEventFromWindow(pSprite, xi, grab->window, None, TRUE);
-
-                if (XaceHook(XACE_SEND_ACCESS, 0, thisDev,
-                            grab->window, xi, count) ||
-                        XaceHook(XACE_RECEIVE_ACCESS, rClient(grab),
-                            grab->window, xi, count))
-                    deliveries = 1; /* don't send, but pretend we did */
-                else
-                {
-                    deliveries =
-                        TryClientEvents(rClient(grab), thisDev,
-                                xi, count,
-                                mask,
-                                GetEventFilter(thisDev, xi),
-                                grab);
-                }
-            } else if (rc != BadMatch)
-                ErrorF("[dix] %s: XI conversion failed in DGE (%d, %d). Skipping delivery.\n",
-                        thisDev->name, event->any.type, rc);
+            deliveries = DeliverOneGrabbedEvent(event, thisDev, XI);
         }
 
         if (deliveries && (event->any.type == ET_Motion))
@@ -4218,17 +4300,11 @@ DeliverGrabbedEvent(InternalEvent *event, DeviceIntPtr thisDev,
 	case FREEZE_NEXT_EVENT:
 	    grabinfo->sync.state = FROZEN_WITH_EVENT;
 	    FreezeThaw(thisDev, TRUE);
-	    if (!grabinfo->sync.event)
-		grabinfo->sync.event = calloc(1, sizeof(InternalEvent));
 	    *grabinfo->sync.event = event->device_event;
 	    break;
 	}
     }
 
-    free(core);
-    free(xi);
-    free(xi2);
-
     return deliveries;
 }
 
@@ -4882,7 +4958,7 @@ ProcGrabPointer(ClientPtr client)
 
     rc = GrabDevice(client, device, stuff->pointerMode, stuff->keyboardMode,
                     stuff->grabWindow, stuff->ownerEvents, stuff->time,
-                    &mask, GRABTYPE_CORE, stuff->cursor,
+                    &mask, CORE, stuff->cursor,
                     stuff->confineTo, &rep.status);
     if (rc != Success)
         return rc;
@@ -5090,9 +5166,9 @@ GrabDevice(ClientPtr client, DeviceIntPtr dev,
 	tempGrab->ownerEvents = ownerEvents;
 	tempGrab->keyboardMode = keyboard_mode;
 	tempGrab->pointerMode = pointer_mode;
-	if (grabtype == GRABTYPE_CORE)
+	if (grabtype == CORE)
 	    tempGrab->eventMask = mask->core;
-	else if (grabtype == GRABTYPE_XI)
+	else if (grabtype == XI)
 	    tempGrab->eventMask = mask->xi;
 	else
             xi2mask_merge(tempGrab->xi2mask, mask->xi2mask);
@@ -5129,7 +5205,7 @@ ProcGrabKeyboard(ClientPtr client)
 
     result = GrabDevice(client, keyboard, stuff->pointerMode,
             stuff->keyboardMode, stuff->grabWindow, stuff->ownerEvents,
-            stuff->time, &mask, GRABTYPE_CORE, None, None,
+            stuff->time, &mask, CORE, None, None,
             &rep.status);
 
     if (result != Success)
@@ -5162,7 +5238,7 @@ ProcUngrabKeyboard(ClientPtr client)
     time = ClientTimeToServerTime(stuff->id);
     if ((CompareTimeStamps(time, currentTime) != LATER) &&
 	(CompareTimeStamps(time, device->deviceGrab.grabTime) != EARLIER) &&
-	(grab) && SameClient(grab, client) && grab->grabtype == GRABTYPE_CORE)
+	(grab) && SameClient(grab, client) && grab->grabtype == CORE)
 	(*device->deviceGrab.DeactivateGrab)(device);
     return Success;
 }
@@ -5269,7 +5345,7 @@ InitEvents(void)
     inputInfo.pointer = (DeviceIntPtr)NULL;
     for (i = 0; i < MAXDEVICES; i++)
     {
-        memcpy(&filters[i], default_filter, sizeof(default_filter));
+        memcpy(&event_filters[i], default_filter, sizeof(default_filter));
     }
 
     syncEvents.replayDev = (DeviceIntPtr)NULL;
@@ -5455,7 +5531,7 @@ ProcUngrabKey(ClientPtr client)
     tempGrab->modifiersDetail.pMask = NULL;
     tempGrab->modifierDevice = keybd;
     tempGrab->type = KeyPress;
-    tempGrab->grabtype = GRABTYPE_CORE;
+    tempGrab->grabtype = CORE;
     tempGrab->detail.exact = stuff->key;
     tempGrab->detail.pMask = NULL;
     tempGrab->next = NULL;
@@ -5488,7 +5564,7 @@ ProcGrabKey(ClientPtr client)
     REQUEST_SIZE_MATCH(xGrabKeyReq);
 
     memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_CORE;
+    param.grabtype = CORE;
     param.ownerEvents = stuff->ownerEvents;
     param.this_device_mode = stuff->keyboardMode;
     param.other_devices_mode = stuff->pointerMode;
@@ -5512,7 +5588,7 @@ ProcGrabKey(ClientPtr client)
 
     mask.core = (KeyPressMask | KeyReleaseMask);
 
-    grab = CreateGrab(client->index, keybd, keybd, pWin, GRABTYPE_CORE, &mask,
+    grab = CreateGrab(client->index, keybd, keybd, pWin, CORE, &mask,
                       &param, KeyPress, stuff->key, NullWindow, NullCursor);
     if (!grab)
 	return BadAlloc;
@@ -5603,7 +5679,7 @@ ProcGrabButton(ClientPtr client)
 	return rc;
 
     memset(&param, 0, sizeof(param));
-    param.grabtype = GRABTYPE_CORE;
+    param.grabtype = CORE;
     param.ownerEvents = stuff->ownerEvents;
     param.this_device_mode = stuff->keyboardMode;
     param.other_devices_mode = stuff->pointerMode;
@@ -5612,7 +5688,7 @@ ProcGrabButton(ClientPtr client)
     mask.core = stuff->eventMask;
 
     grab = CreateGrab(client->index, ptr, modifierDevice, pWin,
-                      GRABTYPE_CORE, &mask, &param, ButtonPress,
+                      CORE, &mask, &param, ButtonPress,
                       stuff->button, confineTo, cursor);
     if (!grab)
 	return BadAlloc;
@@ -5657,7 +5733,7 @@ ProcUngrabButton(ClientPtr client)
     tempGrab->modifierDevice = GetMaster(ptr, MASTER_KEYBOARD);
     tempGrab->type = ButtonPress;
     tempGrab->detail.exact = stuff->button;
-    tempGrab->grabtype = GRABTYPE_CORE;
+    tempGrab->grabtype = CORE;
     tempGrab->detail.pMask = NULL;
     tempGrab->next = NULL;
 
@@ -6064,7 +6140,7 @@ PickPointer(ClientPtr client)
     for(it = inputInfo.devices; it; it = it->next)
     {
         GrabPtr grab = it->deviceGrab.grab;
-        if (grab && grab->grabtype == GRABTYPE_CORE && SameClient(grab, client))
+        if (grab && grab->grabtype == CORE && SameClient(grab, client))
         {
             it = GetMaster(it, MASTER_POINTER);
             return it; /* Always return a core grabbed device */
diff --git a/xorg-server/dix/extension.c b/xorg-server/dix/extension.c
index cc516b6ba..af9ba312d 100644
--- a/xorg-server/dix/extension.c
+++ b/xorg-server/dix/extension.c
@@ -61,7 +61,6 @@ SOFTWARE.
 #include "registry.h"
 #include "xace.h"
 
-#define LAST_EVENT  128
 #define LAST_ERROR 255
 
 static ExtensionEntry **extensions = (ExtensionEntry **)NULL;
@@ -82,7 +81,7 @@ AddExtension(const char *name, int NumEvents, int NumErrors,
 
     if (!MainProc || !SwappedMainProc || !MinorOpcodeProc)
         return((ExtensionEntry *) NULL);
-    if ((lastEvent + NumEvents > LAST_EVENT) || 
+    if ((lastEvent + NumEvents > MAXEVENTS) || 
 	        (unsigned)(lastError + NumErrors > LAST_ERROR)) {
         LogMessage(X_ERROR, "Not enabling extension %s: maximum number of "
                    "events or errors exceeded.\n", name);
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 983bbc0e2..c843568b3 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1115,6 +1115,30 @@ transformAbsolute(DeviceIntPtr dev, ValuatorMask *mask)
         valuator_mask_set_double(mask, 1, y);
 }
 
+static void
+storeLastValuators(DeviceIntPtr dev, ValuatorMask *mask,
+                   int xaxis, int yaxis,
+                   double devx, double devy)
+{
+    int i;
+
+    /* store desktop-wide in last.valuators */
+    if (valuator_mask_isset(mask, xaxis))
+        dev->last.valuators[0] = devx;
+    if (valuator_mask_isset(mask, yaxis))
+        dev->last.valuators[1] = devy;
+
+    for (i = 0; i < valuator_mask_size(mask); i++)
+    {
+        if (i == xaxis || i == yaxis)
+            continue;
+
+        if (valuator_mask_isset(mask, i))
+            dev->last.valuators[i] = valuator_mask_get_double(mask, i);
+    }
+
+}
+
 /**
  * Generate internal events representing this pointer event and enqueue them
  * on the event queue.
@@ -1183,7 +1207,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
                     int buttons, CARD32 ms, int flags,
                     const ValuatorMask *mask_in)
 {
-    int num_events = 1, i;
+    int num_events = 1;
     DeviceEvent *event;
     RawDeviceEvent *raw;
     double screenx = 0.0, screeny = 0.0; /* desktop coordinate system */
@@ -1258,17 +1282,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
 
     clipValuators(pDev, &mask);
 
-    /* store desktop-wide in last.valuators */
-    if (valuator_mask_isset(&mask, 0))
-        pDev->last.valuators[0] = devx;
-    if (valuator_mask_isset(&mask, 1))
-        pDev->last.valuators[1] = devy;
-
-    for (i = 2; i < valuator_mask_size(&mask); i++)
-    {
-        if (valuator_mask_isset(&mask, i))
-            pDev->last.valuators[i] = valuator_mask_get_double(&mask, i);
-    }
+    storeLastValuators(pDev, &mask, 0, 1, devx, devy);
 
     /* Update the MD's co-ordinates, which are always in desktop space. */
     if (!IsMaster(pDev) || !IsFloating(pDev)) {
diff --git a/xorg-server/dix/grabs.c b/xorg-server/dix/grabs.c
index aced130a7..da014dfc3 100644
--- a/xorg-server/dix/grabs.c
+++ b/xorg-server/dix/grabs.c
@@ -60,7 +60,9 @@ SOFTWARE.
 #include "dixgrabs.h"
 #include "xace.h"
 #include "exevents.h"
+#include "exglobals.h"
 #include "inpututils.h"
+#include "client.h"
 
 #define BITMASK(i) (((Mask)1) << ((i) & 31))
 #define MASKIDX(i) ((i) >> 5)
@@ -77,25 +79,41 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
     int i, j;
     GrabInfoPtr devGrab = &dev->deviceGrab;
     GrabPtr grab = devGrab->grab;
+    Bool clientIdPrinted = FALSE;
 
-    ErrorF("Active grab 0x%lx (%s) on device '%s' (%d):",
+    ErrorF("Active grab 0x%lx (%s) on device '%s' (%d):\n",
            (unsigned long) grab->resource,
-           (grab->grabtype == GRABTYPE_XI2) ? "xi2" :
-            ((grab->grabtype == GRABTYPE_CORE) ? "core" : "xi1"),
+           (grab->grabtype == XI2) ? "xi2" :
+            ((grab->grabtype == CORE) ? "core" : "xi1"),
            dev->name, dev->id);
 
     client = clients[CLIENT_ID(grab->resource)];
-    if (client && GetLocalClientCreds(client, &lcc) != -1)
+    if (client)
     {
-        ErrorF("      client pid %ld uid %ld gid %ld\n",
-               (lcc->fieldsSet & LCC_PID_SET) ? (long) lcc->pid : 0,
-               (lcc->fieldsSet & LCC_UID_SET) ? (long) lcc->euid : 0,
-               (lcc->fieldsSet & LCC_GID_SET) ? (long) lcc->egid : 0);
-        FreeLocalClientCreds(lcc);
+        pid_t clientpid = GetClientPid(client);
+        const char *cmdname = GetClientCmdName(client);
+        const char *cmdargs = GetClientCmdArgs(client);
+
+        if ((clientpid > 0) && (cmdname != NULL))
+        {
+            ErrorF("      client pid %ld %s %s\n",
+                   (long) clientpid, cmdname, cmdargs ? cmdargs : "");
+            clientIdPrinted = TRUE;
+        }
+        else if (GetLocalClientCreds(client, &lcc) != -1)
+        {
+            ErrorF("      client pid %ld uid %ld gid %ld\n",
+                   (lcc->fieldsSet & LCC_PID_SET) ? (long) lcc->pid : 0,
+                   (lcc->fieldsSet & LCC_UID_SET) ? (long) lcc->euid : 0,
+                   (lcc->fieldsSet & LCC_GID_SET) ? (long) lcc->egid : 0);
+            FreeLocalClientCreds(lcc);
+            clientIdPrinted = TRUE;
+        }
     }
-    else
+    if (!clientIdPrinted)
     {
-        ErrorF("      (no client information available)\n");
+        ErrorF("      (no client information available for client %d)\n",
+               CLIENT_ID(grab->resource));
     }
 
     /* XXX is this even correct? */
@@ -110,18 +128,18 @@ PrintDeviceGrabInfo(DeviceIntPtr dev)
            devGrab->sync.frozen ? "frozen" : "thawed",
            devGrab->sync.state);
 
-    if (grab->grabtype == GRABTYPE_CORE)
+    if (grab->grabtype == CORE)
     {
         ErrorF("        core event mask 0x%lx\n",
                (unsigned long) grab->eventMask);
     }
-    else if (grab->grabtype == GRABTYPE_XI)
+    else if (grab->grabtype == XI)
     {
         ErrorF("      xi1 event mask 0x%lx\n",
                devGrab->implicitGrab ? (unsigned long) grab->deviceMask :
                                        (unsigned long) grab->eventMask);
     }
-    else if (grab->grabtype == GRABTYPE_XI2)
+    else if (grab->grabtype == XI2)
     {
         for (i = 0; i < xi2mask_num_masks(grab->xi2mask); i++)
         {
@@ -205,7 +223,7 @@ CreateGrab(
     DeviceIntPtr device,
     DeviceIntPtr modDevice,
     WindowPtr window,
-    GrabType grabtype,
+    enum InputLevel grabtype,
     GrabMask *mask,
     GrabParameters *param,
     int type,
@@ -237,7 +255,7 @@ CreateGrab(
     grab->cursor = cursor;
     grab->next = NULL;
 
-    if (grabtype == GRABTYPE_XI2)
+    if (grabtype == XI2)
         xi2mask_merge(grab->xi2mask, mask->xi2mask);
     if (cursor)
 	cursor->refcnt++;
@@ -409,7 +427,7 @@ DetailSupersedesSecond(
 static Bool
 GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
 {
-    unsigned int any_modifier = (pFirstGrab->grabtype == GRABTYPE_XI2) ?
+    unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
                                 (unsigned int)XIAnyModifier :
                                 (unsigned int)AnyModifier;
     if (!DetailSupersedesSecond(pFirstGrab->modifiersDetail,
@@ -440,14 +458,14 @@ GrabSupersedesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
 Bool
 GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab, Bool ignoreDevice)
 {
-    unsigned int any_modifier = (pFirstGrab->grabtype == GRABTYPE_XI2) ?
+    unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
                                 (unsigned int)XIAnyModifier :
                                 (unsigned int)AnyModifier;
 
     if (pFirstGrab->grabtype != pSecondGrab->grabtype)
         return FALSE;
 
-    if (pFirstGrab->grabtype == GRABTYPE_XI2)
+    if (pFirstGrab->grabtype == XI2)
     {
         if (pFirstGrab->device == inputInfo.all_devices ||
             pSecondGrab->device == inputInfo.all_devices)
@@ -499,7 +517,7 @@ GrabMatchesSecond(GrabPtr pFirstGrab, GrabPtr pSecondGrab, Bool ignoreDevice)
 static Bool
 GrabsAreIdentical(GrabPtr pFirstGrab, GrabPtr pSecondGrab)
 {
-    unsigned int any_modifier = (pFirstGrab->grabtype == GRABTYPE_XI2) ?
+    unsigned int any_modifier = (pFirstGrab->grabtype == XI2) ?
                                 (unsigned int)XIAnyModifier :
                                 (unsigned int)AnyModifier;
 
@@ -549,7 +567,7 @@ AddPassiveGrabToList(ClientPtr client, GrabPtr pGrab)
 
     for (grab = wPassiveGrabs(pGrab->window); grab; grab = grab->next)
     {
-	if (GrabMatchesSecond(pGrab, grab, (pGrab->grabtype == GRABTYPE_CORE)))
+	if (GrabMatchesSecond(pGrab, grab, (pGrab->grabtype == CORE)))
 	{
 	    if (CLIENT_BITS(pGrab->resource) != CLIENT_BITS(grab->resource))
 	    {
@@ -627,9 +645,9 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
 	return FALSE;
     }
 
-    any_modifier = (pMinuendGrab->grabtype == GRABTYPE_XI2) ?
+    any_modifier = (pMinuendGrab->grabtype == XI2) ?
                    (unsigned int)XIAnyModifier : (unsigned int)AnyModifier;
-    any_key = (pMinuendGrab->grabtype == GRABTYPE_XI2) ?
+    any_key = (pMinuendGrab->grabtype == XI2) ?
                    (unsigned int)XIAnyKeycode : (unsigned int)AnyKey;
     ndels = nadds = nups = 0;
     ok = TRUE;
@@ -639,7 +657,7 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
     {
 	if ((CLIENT_BITS(grab->resource) != CLIENT_BITS(pMinuendGrab->resource)) ||
 	    !GrabMatchesSecond(grab, pMinuendGrab,
-                               (grab->grabtype == GRABTYPE_CORE)))
+                               (grab->grabtype == CORE)))
 	    continue;
 	if (GrabSupersedesSecond(pMinuendGrab, grab))
 	{
@@ -737,3 +755,19 @@ DeletePassiveGrabFromList(GrabPtr pMinuendGrab)
 
 #undef UPDATE
 }
+
+Bool
+GrabIsPointerGrab(GrabPtr grab)
+{
+    return (grab->type == ButtonPress ||
+            grab->type == DeviceButtonPress ||
+            grab->type == XI_ButtonPress);
+}
+
+Bool
+GrabIsKeyboardGrab(GrabPtr grab)
+{
+   return (grab->type == KeyPress ||
+           grab->type == DeviceKeyPress ||
+           grab->type == XI_KeyPress);
+}
diff --git a/xorg-server/dix/inpututils.c b/xorg-server/dix/inpututils.c
index 60f9fa0a8..8cd4d5921 100644
--- a/xorg-server/dix/inpututils.c
+++ b/xorg-server/dix/inpututils.c
@@ -626,7 +626,7 @@ void verify_internal_event(const InternalEvent *ev)
     if (ev && ev->any.header != ET_Internal)
     {
         int i;
-        unsigned char *data = (unsigned char*)ev;
+        const unsigned char *data = (const unsigned char*)ev;
 
         ErrorF("dix: invalid event type %d\n", ev->any.header);
 
@@ -657,6 +657,64 @@ void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms)
     event->sourceid = dev->id;
 }
 
+int event_get_corestate(DeviceIntPtr mouse, DeviceIntPtr kbd)
+{
+    int corestate;
+    /* core state needs to be assembled BEFORE the device is updated. */
+    corestate = (kbd && kbd->key) ? XkbStateFieldFromRec(&kbd->key->xkbInfo->state) : 0;
+    corestate |= (mouse && mouse->button) ? (mouse->button->state) : 0;
+    return corestate;
+}
+
+void event_set_state(DeviceIntPtr mouse, DeviceIntPtr kbd, DeviceEvent *event)
+{
+    int i;
+
+    for (i = 0; mouse && mouse->button && i < mouse->button->numButtons; i++)
+        if (BitIsOn(mouse->button->down, i))
+            SetBit(event->buttons, i);
+
+    if (kbd && kbd->key)
+    {
+        XkbStatePtr state;
+        /* we need the state before the event happens */
+        if (event->type == ET_KeyPress || event->type == ET_KeyRelease)
+            state = &kbd->key->xkbInfo->prev_state;
+        else
+            state = &kbd->key->xkbInfo->state;
+
+        event->mods.base = state->base_mods;
+        event->mods.latched = state->latched_mods;
+        event->mods.locked = state->locked_mods;
+        event->mods.effective = state->mods;
+
+        event->group.base = state->base_group;
+        event->group.latched = state->latched_group;
+        event->group.locked = state->locked_group;
+        event->group.effective = state->group;
+    }
+}
+
+/**
+ * Return the event filter mask for the given device and the given core or
+ * XI1 protocol type.
+ */
+Mask
+event_get_filter_from_type(DeviceIntPtr dev, int evtype)
+{
+    return event_filters[dev ? dev->id : 0][evtype];
+}
+
+/**
+ * Return the event filter mask for the given device and the given core or
+ * XI2 protocol type.
+ */
+Mask
+event_get_filter_from_xi2type(int evtype)
+{
+    return (1 << (evtype % 8));
+}
+
 Bool
 point_on_screen(ScreenPtr pScreen, int x, int y)
 {
diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index 7221359b8..aa2edf3e8 100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
@@ -1,337 +1,338 @@
-/************************************************************

-

-Author: Eamon Walsh <ewalsh@tycho.nsa.gov>

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-this permission notice appear in supporting documentation.  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

-AUTHOR 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.

-

-********************************************************/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#ifdef XREGISTRY

-

-#include <stdlib.h>

-#include <string.h>

-#include <unistd.h>

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "resource.h"

-#include "registry.h"

-

-#define BASE_SIZE 16

-#define CORE "X11"

-#define FILENAME SERVER_MISC_CONFIG_PATH "/protocol.txt"

-

-#define PROT_COMMENT '#'

-#define PROT_REQUEST 'R'

-#define PROT_EVENT 'V'

-#define PROT_ERROR 'E'

-

-static FILE *fh;

-

-static char ***requests, **events, **errors, **resources;

-static unsigned nmajor, *nminor, nevent, nerror, nresource;

-

-/*

- * File parsing routines

- */

-static int double_size(void *p, unsigned n, unsigned size)

-{

-    char **ptr = (char **)p;

-    unsigned s, f;

-

-    if (n) {

-	s = n * size;

-	n *= 2 * size;

-	f = n;

-    } else {

-	s = 0;

-	n = f = BASE_SIZE * size;

-    }

-

-    *ptr = realloc(*ptr, n);

-    if (!*ptr) {

-	dixResetRegistry();

-	return FALSE;

-    }

-    memset(*ptr + s, 0, f - s);

-    return TRUE;

-}       

-

-static void

-RegisterRequestName(unsigned major, unsigned minor, char *name)

-{

-    while (major >= nmajor) {

-	if (!double_size(&requests, nmajor, sizeof(char **)))

-	    return;

-	if (!double_size(&nminor, nmajor, sizeof(unsigned)))

-	    return;

-	nmajor = nmajor ? nmajor * 2 : BASE_SIZE;

-    }

-    while (minor >= nminor[major]) {

-	if (!double_size(requests+major, nminor[major], sizeof(char *)))

-	    return;

-	nminor[major] = nminor[major] ? nminor[major] * 2 : BASE_SIZE;

-    }

-

-    free(requests[major][minor]);

-    requests[major][minor] = name;

-}

-

-static void

-RegisterEventName(unsigned event, char *name) {

-    while (event >= nevent) {

-	if (!double_size(&events, nevent, sizeof(char *)))

-	    return;

-	nevent = nevent ? nevent * 2 : BASE_SIZE;

-    }

-

-    free(events[event]);

-    events[event] = name;

-}

-

-static void

-RegisterErrorName(unsigned error, char *name) {

-    while (error >= nerror) {

-	if (!double_size(&errors, nerror, sizeof(char *)))

-	    return;

-	nerror = nerror ? nerror * 2 : BASE_SIZE;

-    }

-

-    free(errors[error]);

-    errors[error] = name;

-}

-

-void

-RegisterExtensionNames(ExtensionEntry *extEntry)

-{

-    char buf[256], *lineobj, *ptr;

-    unsigned offset;

-

-    if (fh == NULL)

-	return;

-

-    rewind(fh);

-

-    while (fgets(buf, sizeof(buf), fh)) {

-	lineobj = NULL;

-	ptr = strchr(buf, '\n');

-	if (ptr)

-	    *ptr = 0;

-

-	/* Check for comments or empty lines */

-	switch (buf[0]) {

-	case PROT_REQUEST:

-	case PROT_EVENT:

-	case PROT_ERROR:

-	    break;

-	case PROT_COMMENT:

-	case '\0':

-	    continue;

-	default:

-	    goto invalid;

-	}

-

-	/* Check for space character in the fifth position */

-	ptr = strchr(buf, ' ');

-	if (!ptr || ptr != buf + 4)

-	    goto invalid;

-

-	/* Duplicate the string after the space */

-	lineobj = strdup(ptr + 1);

-	if (!lineobj)

-	    continue;

-

-	/* Check for a colon somewhere on the line */

-	ptr = strchr(buf, ':');

-	if (!ptr)

-	    goto invalid;

-

-	/* Compare the part before colon with the target extension name */

-	*ptr = 0;

-	if (strcmp(buf + 5, extEntry->name))

-	    goto skip;

-

-	/* Get the opcode for the request, event, or error */

-	offset = strtol(buf + 1, &ptr, 10);

-	if (offset == 0 && ptr == buf + 1)

-	    goto invalid;

-

-	/* Save the strdup result in the registry */

-	switch(buf[0]) {

-	case PROT_REQUEST:

-	    if (extEntry->base)

-		RegisterRequestName(extEntry->base, offset, lineobj);

-	    else

-		RegisterRequestName(offset, 0, lineobj);

-	    continue;

-	case PROT_EVENT:

-	    RegisterEventName(extEntry->eventBase + offset, lineobj);

-	    continue;

-	case PROT_ERROR:

-	    RegisterErrorName(extEntry->errorBase + offset, lineobj);

-	    continue;

-	}

-

-    invalid:

-	LogMessage(X_WARNING, "Invalid line in " FILENAME ", skipping\n");

-    skip:

-	free(lineobj);

-    }

-}

-

-/*

- * Registration functions

- */

-

-void

-RegisterResourceName(RESTYPE resource, char *name)

-{

-    resource &= TypeMask;

-

-    while (resource >= nresource) {

-	if (!double_size(&resources, nresource, sizeof(char *)))

-	    return;

-	nresource = nresource ? nresource * 2 : BASE_SIZE;

-    }

-

-    resources[resource] = name;

-}

-

-/*

- * Lookup functions

- */

-

-const char *

-LookupRequestName(int major, int minor)

-{

-    if (major >= nmajor)

-	return XREGISTRY_UNKNOWN;

-    if (minor >= nminor[major])

-	return XREGISTRY_UNKNOWN;

-

-    return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN;

-}

-

-const char *

-LookupMajorName(int major)

-{

-    if (major < 128) {

-	const char *retval;

-

-	if (major >= nmajor)

-	    return XREGISTRY_UNKNOWN;

-	if (0 >= nminor[major])

-	    return XREGISTRY_UNKNOWN;

-

-	retval = requests[major][0];

-	return retval ? retval + sizeof(CORE) : XREGISTRY_UNKNOWN;

-    } else {

-	ExtensionEntry *extEntry = GetExtensionEntry(major);

-	return extEntry ? extEntry->name : XREGISTRY_UNKNOWN;

-    }

-}

-

-const char *

-LookupEventName(int event)

-{

-    event &= 127;

-    if (event >= nevent)

-	return XREGISTRY_UNKNOWN;

-

-    return events[event] ? events[event] : XREGISTRY_UNKNOWN;

-}

-

-const char *

-LookupErrorName(int error)

-{

-    if (error >= nerror)

-	return XREGISTRY_UNKNOWN;

-

-    return errors[error] ? errors[error] : XREGISTRY_UNKNOWN;

-}

-

-const char *

-LookupResourceName(RESTYPE resource)

-{

-    resource &= TypeMask;

-    if (resource >= nresource)

-	return XREGISTRY_UNKNOWN;

-

-    return resources[resource] ? resources[resource] : XREGISTRY_UNKNOWN;

-}

-

-/*

- * Setup and teardown

- */

-void

-dixResetRegistry(void)

-{

-    ExtensionEntry extEntry;

-

-    /* Free all memory */

-    while (nmajor--) {

-	while (nminor[nmajor])

-	    free(requests[nmajor][--nminor[nmajor]]);

-	free(requests[nmajor]);

-    }

-    free(requests);

-    free(nminor);

-

-    while (nevent--)

-	free(events[nevent]);

-    free(events);

-

-    while (nerror--)

-	free(errors[nerror]);

-    free(errors);

-

-    free(resources);

-

-    requests = NULL;

-    nminor = NULL;

-    events = NULL;

-    errors = NULL;

-    resources = NULL;

-

-    nmajor = nevent = nerror = nresource = 0;

-

-    /* Open the protocol file */

-    if (fh)

-	fclose(fh);

-    fh = fopen(FILENAME, "r");

-    if (!fh)

-	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");

-

-    /* Add built-in resources */

-    RegisterResourceName(RT_NONE, "NONE");

-    RegisterResourceName(RT_WINDOW, "WINDOW");

-    RegisterResourceName(RT_PIXMAP, "PIXMAP");

-    RegisterResourceName(RT_GC, "GC");

-    RegisterResourceName(RT_FONT, "FONT");

-    RegisterResourceName(RT_CURSOR, "CURSOR");

-    RegisterResourceName(RT_COLORMAP, "COLORMAP");

-    RegisterResourceName(RT_CMAPENTRY, "COLORMAP ENTRY");

-    RegisterResourceName(RT_OTHERCLIENT, "OTHER CLIENT");

-    RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");

-

-    /* Add the core protocol */

-    memset(&extEntry, 0, sizeof(extEntry));

-    extEntry.name = CORE;

-    RegisterExtensionNames(&extEntry);

-}

-

-#endif /* XREGISTRY */

+/************************************************************
+
+Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+this permission notice appear in supporting documentation.  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
+AUTHOR 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.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifdef XREGISTRY
+
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "resource.h"
+#include "registry.h"
+
+#define BASE_SIZE 16
+#define CORE "X11"
+#define FILENAME SERVER_MISC_CONFIG_PATH "/protocol.txt"
+
+#define PROT_COMMENT '#'
+#define PROT_REQUEST 'R'
+#define PROT_EVENT 'V'
+#define PROT_ERROR 'E'
+
+static FILE *fh;
+
+static char ***requests, **events, **errors;
+static const char **resources;
+static unsigned nmajor, *nminor, nevent, nerror, nresource;
+
+/*
+ * File parsing routines
+ */
+static int double_size(void *p, unsigned n, unsigned size)
+{
+    char **ptr = (char **)p;
+    unsigned s, f;
+
+    if (n) {
+	s = n * size;
+	n *= 2 * size;
+	f = n;
+    } else {
+	s = 0;
+	n = f = BASE_SIZE * size;
+    }
+
+    *ptr = realloc(*ptr, n);
+    if (!*ptr) {
+	dixResetRegistry();
+	return FALSE;
+    }
+    memset(*ptr + s, 0, f - s);
+    return TRUE;
+}       
+
+static void
+RegisterRequestName(unsigned major, unsigned minor, char *name)
+{
+    while (major >= nmajor) {
+	if (!double_size(&requests, nmajor, sizeof(char **)))
+	    return;
+	if (!double_size(&nminor, nmajor, sizeof(unsigned)))
+	    return;
+	nmajor = nmajor ? nmajor * 2 : BASE_SIZE;
+    }
+    while (minor >= nminor[major]) {
+	if (!double_size(requests+major, nminor[major], sizeof(char *)))
+	    return;
+	nminor[major] = nminor[major] ? nminor[major] * 2 : BASE_SIZE;
+    }
+
+    free(requests[major][minor]);
+    requests[major][minor] = name;
+}
+
+static void
+RegisterEventName(unsigned event, char *name) {
+    while (event >= nevent) {
+	if (!double_size(&events, nevent, sizeof(char *)))
+	    return;
+	nevent = nevent ? nevent * 2 : BASE_SIZE;
+    }
+
+    free(events[event]);
+    events[event] = name;
+}
+
+static void
+RegisterErrorName(unsigned error, char *name) {
+    while (error >= nerror) {
+	if (!double_size(&errors, nerror, sizeof(char *)))
+	    return;
+	nerror = nerror ? nerror * 2 : BASE_SIZE;
+    }
+
+    free(errors[error]);
+    errors[error] = name;
+}
+
+void
+RegisterExtensionNames(ExtensionEntry *extEntry)
+{
+    char buf[256], *lineobj, *ptr;
+    unsigned offset;
+
+    if (fh == NULL)
+	return;
+
+    rewind(fh);
+
+    while (fgets(buf, sizeof(buf), fh)) {
+	lineobj = NULL;
+	ptr = strchr(buf, '\n');
+	if (ptr)
+	    *ptr = 0;
+
+	/* Check for comments or empty lines */
+	switch (buf[0]) {
+	case PROT_REQUEST:
+	case PROT_EVENT:
+	case PROT_ERROR:
+	    break;
+	case PROT_COMMENT:
+	case '\0':
+	    continue;
+	default:
+	    goto invalid;
+	}
+
+	/* Check for space character in the fifth position */
+	ptr = strchr(buf, ' ');
+	if (!ptr || ptr != buf + 4)
+	    goto invalid;
+
+	/* Duplicate the string after the space */
+	lineobj = strdup(ptr + 1);
+	if (!lineobj)
+	    continue;
+
+	/* Check for a colon somewhere on the line */
+	ptr = strchr(buf, ':');
+	if (!ptr)
+	    goto invalid;
+
+	/* Compare the part before colon with the target extension name */
+	*ptr = 0;
+	if (strcmp(buf + 5, extEntry->name))
+	    goto skip;
+
+	/* Get the opcode for the request, event, or error */
+	offset = strtol(buf + 1, &ptr, 10);
+	if (offset == 0 && ptr == buf + 1)
+	    goto invalid;
+
+	/* Save the strdup result in the registry */
+	switch(buf[0]) {
+	case PROT_REQUEST:
+	    if (extEntry->base)
+		RegisterRequestName(extEntry->base, offset, lineobj);
+	    else
+		RegisterRequestName(offset, 0, lineobj);
+	    continue;
+	case PROT_EVENT:
+	    RegisterEventName(extEntry->eventBase + offset, lineobj);
+	    continue;
+	case PROT_ERROR:
+	    RegisterErrorName(extEntry->errorBase + offset, lineobj);
+	    continue;
+	}
+
+    invalid:
+	LogMessage(X_WARNING, "Invalid line in " FILENAME ", skipping\n");
+    skip:
+	free(lineobj);
+    }
+}
+
+/*
+ * Registration functions
+ */
+
+void
+RegisterResourceName(RESTYPE resource, const char *name)
+{
+    resource &= TypeMask;
+
+    while (resource >= nresource) {
+	if (!double_size(&resources, nresource, sizeof(char *)))
+	    return;
+	nresource = nresource ? nresource * 2 : BASE_SIZE;
+    }
+
+    resources[resource] = name;
+}
+
+/*
+ * Lookup functions
+ */
+
+const char *
+LookupRequestName(int major, int minor)
+{
+    if (major >= nmajor)
+	return XREGISTRY_UNKNOWN;
+    if (minor >= nminor[major])
+	return XREGISTRY_UNKNOWN;
+
+    return requests[major][minor] ? requests[major][minor] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupMajorName(int major)
+{
+    if (major < 128) {
+	const char *retval;
+
+	if (major >= nmajor)
+	    return XREGISTRY_UNKNOWN;
+	if (0 >= nminor[major])
+	    return XREGISTRY_UNKNOWN;
+
+	retval = requests[major][0];
+	return retval ? retval + sizeof(CORE) : XREGISTRY_UNKNOWN;
+    } else {
+	ExtensionEntry *extEntry = GetExtensionEntry(major);
+	return extEntry ? extEntry->name : XREGISTRY_UNKNOWN;
+    }
+}
+
+const char *
+LookupEventName(int event)
+{
+    event &= 127;
+    if (event >= nevent)
+	return XREGISTRY_UNKNOWN;
+
+    return events[event] ? events[event] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupErrorName(int error)
+{
+    if (error >= nerror)
+	return XREGISTRY_UNKNOWN;
+
+    return errors[error] ? errors[error] : XREGISTRY_UNKNOWN;
+}
+
+const char *
+LookupResourceName(RESTYPE resource)
+{
+    resource &= TypeMask;
+    if (resource >= nresource)
+	return XREGISTRY_UNKNOWN;
+
+    return resources[resource] ? resources[resource] : XREGISTRY_UNKNOWN;
+}
+
+/*
+ * Setup and teardown
+ */
+void
+dixResetRegistry(void)
+{
+    ExtensionEntry extEntry;
+
+    /* Free all memory */
+    while (nmajor--) {
+	while (nminor[nmajor])
+	    free(requests[nmajor][--nminor[nmajor]]);
+	free(requests[nmajor]);
+    }
+    free(requests);
+    free(nminor);
+
+    while (nevent--)
+	free(events[nevent]);
+    free(events);
+
+    while (nerror--)
+	free(errors[nerror]);
+    free(errors);
+
+    free(resources);
+
+    requests = NULL;
+    nminor = NULL;
+    events = NULL;
+    errors = NULL;
+    resources = NULL;
+
+    nmajor = nevent = nerror = nresource = 0;
+
+    /* Open the protocol file */
+    if (fh)
+	fclose(fh);
+    fh = fopen(FILENAME, "r");
+    if (!fh)
+	LogMessage(X_WARNING, "Failed to open protocol names file " FILENAME "\n");
+
+    /* Add built-in resources */
+    RegisterResourceName(RT_NONE, "NONE");
+    RegisterResourceName(RT_WINDOW, "WINDOW");
+    RegisterResourceName(RT_PIXMAP, "PIXMAP");
+    RegisterResourceName(RT_GC, "GC");
+    RegisterResourceName(RT_FONT, "FONT");
+    RegisterResourceName(RT_CURSOR, "CURSOR");
+    RegisterResourceName(RT_COLORMAP, "COLORMAP");
+    RegisterResourceName(RT_CMAPENTRY, "COLORMAP ENTRY");
+    RegisterResourceName(RT_OTHERCLIENT, "OTHER CLIENT");
+    RegisterResourceName(RT_PASSIVEGRAB, "PASSIVE GRAB");
+
+    /* Add the core protocol */
+    memset(&extEntry, 0, sizeof(extEntry));
+    extEntry.name = CORE;
+    RegisterExtensionNames(&extEntry);
+}
+
+#endif /* XREGISTRY */
diff --git a/xorg-server/dix/resource.c b/xorg-server/dix/resource.c
index ac76f1d11..3368339fb 100644
--- a/xorg-server/dix/resource.c
+++ b/xorg-server/dix/resource.c
@@ -243,7 +243,7 @@ CallResourceStateCallback(ResourceState state, ResourceRec *res)
 }
 
 RESTYPE
-CreateNewResourceType(DeleteType deleteFunc, char *name)
+CreateNewResourceType(DeleteType deleteFunc, const char *name)
 {
     RESTYPE next = lastResourceType + 1;
     struct ResourceType *types;
diff --git a/xorg-server/dix/tables.c b/xorg-server/dix/tables.c
index a11423187..45ae2a9d1 100644
--- a/xorg-server/dix/tables.c
+++ b/xorg-server/dix/tables.c
@@ -1,986 +1,986 @@
-/***********************************************************

-

-Copyright 1987, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-

-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "windowstr.h"

-#include "extnsionst.h"

-#include "dixstruct.h"

-#include "dixevents.h"

-#include "dispatch.h"

-#include "swaprep.h"

-#include "swapreq.h"

-

-int (* InitialVector[3]) (

-	ClientPtr /* client */

-    ) =

-{

-    0,

-    ProcInitialConnection,

-    ProcEstablishConnection

-};

-

-int (* ProcVector[256]) (

-	ClientPtr /* client */

-    ) =

-{

-    ProcBadRequest,

-    ProcCreateWindow,

-    ProcChangeWindowAttributes,

-    ProcGetWindowAttributes,

-    ProcDestroyWindow,

-    ProcDestroySubwindows,		/* 5 */

-    ProcChangeSaveSet,

-    ProcReparentWindow,

-    ProcMapWindow,

-    ProcMapSubwindows,

-    ProcUnmapWindow,			/* 10 */

-    ProcUnmapSubwindows,

-    ProcConfigureWindow,

-    ProcCirculateWindow,

-    ProcGetGeometry,

-    ProcQueryTree,			/* 15 */

-    ProcInternAtom,

-    ProcGetAtomName,

-    ProcChangeProperty,

-    ProcDeleteProperty,

-    ProcGetProperty,			/* 20 */

-    ProcListProperties,

-    ProcSetSelectionOwner,

-    ProcGetSelectionOwner,

-    ProcConvertSelection,

-    ProcSendEvent,			/* 25 */

-    ProcGrabPointer,

-    ProcUngrabPointer,

-    ProcGrabButton,

-    ProcUngrabButton,

-    ProcChangeActivePointerGrab,	/* 30 */

-    ProcGrabKeyboard,

-    ProcUngrabKeyboard,

-    ProcGrabKey,

-    ProcUngrabKey,

-    ProcAllowEvents,			/* 35 */

-    ProcGrabServer,

-    ProcUngrabServer,

-    ProcQueryPointer,

-    ProcGetMotionEvents,

-    ProcTranslateCoords,		/* 40 */

-    ProcWarpPointer,

-    ProcSetInputFocus,

-    ProcGetInputFocus,

-    ProcQueryKeymap,

-    ProcOpenFont,			/* 45 */

-    ProcCloseFont,

-    ProcQueryFont,

-    ProcQueryTextExtents,

-    ProcListFonts,

-    ProcListFontsWithInfo,		/* 50 */

-    ProcSetFontPath,

-    ProcGetFontPath,

-    ProcCreatePixmap,

-    ProcFreePixmap,

-    ProcCreateGC,			/* 55 */

-    ProcChangeGC,

-    ProcCopyGC,

-    ProcSetDashes,

-    ProcSetClipRectangles,

-    ProcFreeGC,				/* 60 */

-    ProcClearToBackground,

-    ProcCopyArea,

-    ProcCopyPlane,

-    ProcPolyPoint,

-    ProcPolyLine,			/* 65 */

-    ProcPolySegment,

-    ProcPolyRectangle,

-    ProcPolyArc,

-    ProcFillPoly,

-    ProcPolyFillRectangle,		/* 70 */

-    ProcPolyFillArc,

-    ProcPutImage,

-    ProcGetImage,

-    ProcPolyText,

-    ProcPolyText,			/* 75 */

-    ProcImageText8,

-    ProcImageText16,

-    ProcCreateColormap,

-    ProcFreeColormap,

-    ProcCopyColormapAndFree,		/* 80 */

-    ProcInstallColormap,

-    ProcUninstallColormap,

-    ProcListInstalledColormaps,

-    ProcAllocColor,

-    ProcAllocNamedColor,		/* 85 */

-    ProcAllocColorCells,

-    ProcAllocColorPlanes,

-    ProcFreeColors,

-    ProcStoreColors,

-    ProcStoreNamedColor,		/* 90 */

-    ProcQueryColors,

-    ProcLookupColor,

-    ProcCreateCursor,

-    ProcCreateGlyphCursor,

-    ProcFreeCursor,			/* 95 */

-    ProcRecolorCursor,

-    ProcQueryBestSize,

-    ProcQueryExtension,

-    ProcListExtensions,

-    ProcChangeKeyboardMapping,		/* 100 */

-    ProcGetKeyboardMapping,

-    ProcChangeKeyboardControl,

-    ProcGetKeyboardControl,

-    ProcBell,

-    ProcChangePointerControl,		/* 105 */

-    ProcGetPointerControl,

-    ProcSetScreenSaver,

-    ProcGetScreenSaver,

-    ProcChangeHosts,

-    ProcListHosts,			/* 110 */

-    ProcChangeAccessControl,

-    ProcChangeCloseDownMode,

-    ProcKillClient,

-    ProcRotateProperties,

-    ProcForceScreenSaver,		/* 115 */

-    ProcSetPointerMapping,

-    ProcGetPointerMapping,

-    ProcSetModifierMapping,

-    ProcGetModifierMapping,

-    ProcBadRequest,				/* 120 */

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,				/* 125 */

-    ProcBadRequest,

-    ProcNoOperation,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest

-};

-

-int (* SwappedProcVector[256]) (

-	ClientPtr /* client */

-    ) =

-{

-    ProcBadRequest,

-    SProcCreateWindow,

-    SProcChangeWindowAttributes,

-    SProcResourceReq,			/* GetWindowAttributes */

-    SProcResourceReq,			/* DestroyWindow */

-    SProcResourceReq,			/* 5 DestroySubwindows */

-    SProcResourceReq,			/* SProcChangeSaveSet, */

-    SProcReparentWindow,

-    SProcResourceReq,			/* MapWindow */

-    SProcResourceReq,			/* MapSubwindows */

-    SProcResourceReq,			/* 10 UnmapWindow */

-    SProcResourceReq,			/* UnmapSubwindows */

-    SProcConfigureWindow,

-    SProcResourceReq,			/* SProcCirculateWindow, */

-    SProcResourceReq,			/* GetGeometry */

-    SProcResourceReq,			/* 15 QueryTree */

-    SProcInternAtom,

-    SProcResourceReq,			/* SProcGetAtomName, */

-    SProcChangeProperty,

-    SProcDeleteProperty,

-    SProcGetProperty,			/* 20 */

-    SProcResourceReq,			/* SProcListProperties, */

-    SProcSetSelectionOwner,

-    SProcResourceReq, 			/* SProcGetSelectionOwner, */

-    SProcConvertSelection,

-    SProcSendEvent,			/* 25 */

-    SProcGrabPointer,

-    SProcResourceReq, 			/* SProcUngrabPointer, */

-    SProcGrabButton,

-    SProcUngrabButton,

-    SProcChangeActivePointerGrab,	/* 30 */

-    SProcGrabKeyboard,

-    SProcResourceReq,			/* SProcUngrabKeyboard, */

-    SProcGrabKey,

-    SProcUngrabKey,

-    SProcResourceReq,			/* 35 SProcAllowEvents, */

-    SProcSimpleReq,			/* SProcGrabServer, */

-    SProcSimpleReq,			/* SProcUngrabServer, */

-    SProcResourceReq,			/* SProcQueryPointer, */

-    SProcGetMotionEvents,

-    SProcTranslateCoords,		/*40 */

-    SProcWarpPointer,

-    SProcSetInputFocus,

-    SProcSimpleReq,			/* SProcGetInputFocus, */

-    SProcSimpleReq,			/* QueryKeymap, */

-    SProcOpenFont,			/* 45 */

-    SProcResourceReq,			/* SProcCloseFont, */

-    SProcResourceReq, 			/* SProcQueryFont, */

-    SProcResourceReq,			/* SProcQueryTextExtents,  */

-    SProcListFonts,

-    SProcListFontsWithInfo,		/* 50 */

-    SProcSetFontPath,

-    SProcSimpleReq,			/* GetFontPath, */

-    SProcCreatePixmap,

-    SProcResourceReq,			/* SProcFreePixmap, */

-    SProcCreateGC,			/* 55 */

-    SProcChangeGC,

-    SProcCopyGC,

-    SProcSetDashes,

-    SProcSetClipRectangles,

-    SProcResourceReq,			/* 60 SProcFreeGC, */

-    SProcClearToBackground,

-    SProcCopyArea,

-    SProcCopyPlane,

-    SProcPoly,				/* PolyPoint, */

-    SProcPoly,				/* 65 PolyLine */

-    SProcPoly,				/* PolySegment, */

-    SProcPoly,				/* PolyRectangle, */

-    SProcPoly,				/* PolyArc, */

-    SProcFillPoly,

-    SProcPoly,				/* 70 PolyFillRectangle */

-    SProcPoly,				/* PolyFillArc, */

-    SProcPutImage,

-    SProcGetImage,

-    SProcPolyText,

-    SProcPolyText,			/* 75 */

-    SProcImageText,

-    SProcImageText,

-    SProcCreateColormap,

-    SProcResourceReq,			/* SProcFreeColormap, */

-    SProcCopyColormapAndFree,		/* 80 */

-    SProcResourceReq,			/* SProcInstallColormap, */

-    SProcResourceReq,			/* SProcUninstallColormap, */

-    SProcResourceReq, 			/* SProcListInstalledColormaps, */

-    SProcAllocColor,

-    SProcAllocNamedColor,		/* 85 */

-    SProcAllocColorCells,

-    SProcAllocColorPlanes,

-    SProcFreeColors,

-    SProcStoreColors,

-    SProcStoreNamedColor,		/* 90 */

-    SProcQueryColors,

-    SProcLookupColor,

-    SProcCreateCursor,

-    SProcCreateGlyphCursor,

-    SProcResourceReq,			/* 95 SProcFreeCursor, */

-    SProcRecolorCursor,

-    SProcQueryBestSize,

-    SProcQueryExtension,

-    SProcSimpleReq,			/* ListExtensions, */

-    SProcChangeKeyboardMapping,		/* 100 */

-    SProcSimpleReq,			/* GetKeyboardMapping, */

-    SProcChangeKeyboardControl,

-    SProcSimpleReq,			/* GetKeyboardControl, */

-    SProcSimpleReq,			/* Bell, */

-    SProcChangePointerControl,		/* 105 */

-    SProcSimpleReq,			/* GetPointerControl, */

-    SProcSetScreenSaver,

-    SProcSimpleReq,			/* GetScreenSaver, */

-    SProcChangeHosts,

-    SProcSimpleReq,			/* 110 ListHosts, */

-    SProcSimpleReq,			/* SProcChangeAccessControl, */

-    SProcSimpleReq,			/* SProcChangeCloseDownMode, */

-    SProcResourceReq,			/* SProcKillClient, */

-    SProcRotateProperties,

-    SProcSimpleReq,			/* 115 ForceScreenSaver */

-    SProcSimpleReq,			/* SetPointerMapping, */

-    SProcSimpleReq,			/* GetPointerMapping, */

-    SProcSimpleReq,			/* SetModifierMapping, */

-    SProcSimpleReq,			/* GetModifierMapping, */

-    ProcBadRequest,				/* 120 */

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,				/* 125 */

-    ProcBadRequest,

-    SProcNoOperation,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest,

-    ProcBadRequest

-};

-

-EventSwapPtr EventSwapVector[128] =

-{

-    (EventSwapPtr)SErrorEvent,

-    NotImplemented,

-    SKeyButtonPtrEvent,

-    SKeyButtonPtrEvent,

-    SKeyButtonPtrEvent,

-    SKeyButtonPtrEvent,			/* 5 */

-    SKeyButtonPtrEvent,

-    SEnterLeaveEvent,

-    SEnterLeaveEvent,

-    SFocusEvent,

-    SFocusEvent,			/* 10 */

-    SKeymapNotifyEvent,

-    SExposeEvent,

-    SGraphicsExposureEvent,

-    SNoExposureEvent,

-    SVisibilityEvent,			/* 15 */

-    SCreateNotifyEvent,

-    SDestroyNotifyEvent,

-    SUnmapNotifyEvent,

-    SMapNotifyEvent,

-    SMapRequestEvent,			/* 20 */

-    SReparentEvent,

-    SConfigureNotifyEvent,

-    SConfigureRequestEvent,

-    SGravityEvent,

-    SResizeRequestEvent,		/* 25 */

-    SCirculateEvent,

-    SCirculateEvent,

-    SPropertyEvent,

-    SSelectionClearEvent,

-    SSelectionRequestEvent,		/* 30 */

-    SSelectionNotifyEvent,

-    SColormapEvent,

-    SClientMessageEvent,

-    SMappingEvent,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented,

-    NotImplemented

-};

-

-

-ReplySwapPtr ReplySwapVector[256] =

-{

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetWindowAttributesReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 5 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 10 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetGeometryReply,

-    (ReplySwapPtr)SQueryTreeReply,		/* 15 */

-    (ReplySwapPtr)SInternAtomReply,

-    (ReplySwapPtr)SGetAtomNameReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetPropertyReply,		/* 20 */

-    (ReplySwapPtr)SListPropertiesReply,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetSelectionOwnerReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 25 */

-    (ReplySwapPtr)SGenericReply,		/* SGrabPointerReply, */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 30 */

-    (ReplySwapPtr)SGenericReply,		/* SGrabKeyboardReply, */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 35 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SQueryPointerReply,

-    (ReplySwapPtr)SGetMotionEventsReply,

-    (ReplySwapPtr)STranslateCoordsReply,	/* 40 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetInputFocusReply,

-    (ReplySwapPtr)SQueryKeymapReply,

-    ReplyNotSwappd,				/* 45 */

-    ReplyNotSwappd,

-    (ReplySwapPtr)SQueryFontReply,

-    (ReplySwapPtr)SQueryTextExtentsReply,

-    (ReplySwapPtr)SListFontsReply,

-    (ReplySwapPtr)SListFontsWithInfoReply,	/* 50 */

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetFontPathReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 55 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 60 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 65 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 70 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetImageReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 75 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 80 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SListInstalledColormapsReply,

-    (ReplySwapPtr)SAllocColorReply,

-    (ReplySwapPtr)SAllocNamedColorReply,	/* 85 */

-    (ReplySwapPtr)SAllocColorCellsReply,

-    (ReplySwapPtr)SAllocColorPlanesReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 90 */

-    (ReplySwapPtr)SQueryColorsReply,

-    (ReplySwapPtr)SLookupColorReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 95 */

-    ReplyNotSwappd,

-    (ReplySwapPtr)SQueryBestSizeReply,

-    (ReplySwapPtr)SGenericReply,		/* SQueryExtensionReply, */

-    (ReplySwapPtr)SListExtensionsReply,

-    ReplyNotSwappd,				/* 100 */

-    (ReplySwapPtr)SGetKeyboardMappingReply,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetKeyboardControlReply,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 105 */

-    (ReplySwapPtr)SGetPointerControlReply,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SGetScreenSaverReply,

-    ReplyNotSwappd,

-    (ReplySwapPtr)SListHostsReply,		/* 110 */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,				/* 115 */

-    (ReplySwapPtr)SGenericReply,		/* SetPointerMapping */

-    (ReplySwapPtr)SGetPointerMappingReply,

-    (ReplySwapPtr)SGenericReply,		/* SetModifierMapping */

-    (ReplySwapPtr)SGetModifierMappingReply,	/* 119 */

-    ReplyNotSwappd,				/* 120 */

-    ReplyNotSwappd,				/* 121 */

-    ReplyNotSwappd,				/* 122 */

-    ReplyNotSwappd,				/* 123 */

-    ReplyNotSwappd,				/* 124 */

-    ReplyNotSwappd,				/* 125 */

-    ReplyNotSwappd,				/* 126 */

-    ReplyNotSwappd,				/* NoOperation */

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd,

-    ReplyNotSwappd

-};

+/***********************************************************
+
+Copyright 1987, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "windowstr.h"
+#include "extnsionst.h"
+#include "dixstruct.h"
+#include "dixevents.h"
+#include "dispatch.h"
+#include "swaprep.h"
+#include "swapreq.h"
+
+int (* InitialVector[3]) (
+	ClientPtr /* client */
+    ) =
+{
+    0,
+    ProcInitialConnection,
+    ProcEstablishConnection
+};
+
+int (* ProcVector[256]) (
+	ClientPtr /* client */
+    ) =
+{
+    ProcBadRequest,
+    ProcCreateWindow,
+    ProcChangeWindowAttributes,
+    ProcGetWindowAttributes,
+    ProcDestroyWindow,
+    ProcDestroySubwindows,		/* 5 */
+    ProcChangeSaveSet,
+    ProcReparentWindow,
+    ProcMapWindow,
+    ProcMapSubwindows,
+    ProcUnmapWindow,			/* 10 */
+    ProcUnmapSubwindows,
+    ProcConfigureWindow,
+    ProcCirculateWindow,
+    ProcGetGeometry,
+    ProcQueryTree,			/* 15 */
+    ProcInternAtom,
+    ProcGetAtomName,
+    ProcChangeProperty,
+    ProcDeleteProperty,
+    ProcGetProperty,			/* 20 */
+    ProcListProperties,
+    ProcSetSelectionOwner,
+    ProcGetSelectionOwner,
+    ProcConvertSelection,
+    ProcSendEvent,			/* 25 */
+    ProcGrabPointer,
+    ProcUngrabPointer,
+    ProcGrabButton,
+    ProcUngrabButton,
+    ProcChangeActivePointerGrab,	/* 30 */
+    ProcGrabKeyboard,
+    ProcUngrabKeyboard,
+    ProcGrabKey,
+    ProcUngrabKey,
+    ProcAllowEvents,			/* 35 */
+    ProcGrabServer,
+    ProcUngrabServer,
+    ProcQueryPointer,
+    ProcGetMotionEvents,
+    ProcTranslateCoords,		/* 40 */
+    ProcWarpPointer,
+    ProcSetInputFocus,
+    ProcGetInputFocus,
+    ProcQueryKeymap,
+    ProcOpenFont,			/* 45 */
+    ProcCloseFont,
+    ProcQueryFont,
+    ProcQueryTextExtents,
+    ProcListFonts,
+    ProcListFontsWithInfo,		/* 50 */
+    ProcSetFontPath,
+    ProcGetFontPath,
+    ProcCreatePixmap,
+    ProcFreePixmap,
+    ProcCreateGC,			/* 55 */
+    ProcChangeGC,
+    ProcCopyGC,
+    ProcSetDashes,
+    ProcSetClipRectangles,
+    ProcFreeGC,				/* 60 */
+    ProcClearToBackground,
+    ProcCopyArea,
+    ProcCopyPlane,
+    ProcPolyPoint,
+    ProcPolyLine,			/* 65 */
+    ProcPolySegment,
+    ProcPolyRectangle,
+    ProcPolyArc,
+    ProcFillPoly,
+    ProcPolyFillRectangle,		/* 70 */
+    ProcPolyFillArc,
+    ProcPutImage,
+    ProcGetImage,
+    ProcPolyText,
+    ProcPolyText,			/* 75 */
+    ProcImageText8,
+    ProcImageText16,
+    ProcCreateColormap,
+    ProcFreeColormap,
+    ProcCopyColormapAndFree,		/* 80 */
+    ProcInstallColormap,
+    ProcUninstallColormap,
+    ProcListInstalledColormaps,
+    ProcAllocColor,
+    ProcAllocNamedColor,		/* 85 */
+    ProcAllocColorCells,
+    ProcAllocColorPlanes,
+    ProcFreeColors,
+    ProcStoreColors,
+    ProcStoreNamedColor,		/* 90 */
+    ProcQueryColors,
+    ProcLookupColor,
+    ProcCreateCursor,
+    ProcCreateGlyphCursor,
+    ProcFreeCursor,			/* 95 */
+    ProcRecolorCursor,
+    ProcQueryBestSize,
+    ProcQueryExtension,
+    ProcListExtensions,
+    ProcChangeKeyboardMapping,		/* 100 */
+    ProcGetKeyboardMapping,
+    ProcChangeKeyboardControl,
+    ProcGetKeyboardControl,
+    ProcBell,
+    ProcChangePointerControl,		/* 105 */
+    ProcGetPointerControl,
+    ProcSetScreenSaver,
+    ProcGetScreenSaver,
+    ProcChangeHosts,
+    ProcListHosts,			/* 110 */
+    ProcChangeAccessControl,
+    ProcChangeCloseDownMode,
+    ProcKillClient,
+    ProcRotateProperties,
+    ProcForceScreenSaver,		/* 115 */
+    ProcSetPointerMapping,
+    ProcGetPointerMapping,
+    ProcSetModifierMapping,
+    ProcGetModifierMapping,
+    ProcBadRequest,				/* 120 */
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,				/* 125 */
+    ProcBadRequest,
+    ProcNoOperation,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest
+};
+
+int (* SwappedProcVector[256]) (
+	ClientPtr /* client */
+    ) =
+{
+    ProcBadRequest,
+    SProcCreateWindow,
+    SProcChangeWindowAttributes,
+    SProcResourceReq,			/* GetWindowAttributes */
+    SProcResourceReq,			/* DestroyWindow */
+    SProcResourceReq,			/* 5 DestroySubwindows */
+    SProcResourceReq,			/* SProcChangeSaveSet, */
+    SProcReparentWindow,
+    SProcResourceReq,			/* MapWindow */
+    SProcResourceReq,			/* MapSubwindows */
+    SProcResourceReq,			/* 10 UnmapWindow */
+    SProcResourceReq,			/* UnmapSubwindows */
+    SProcConfigureWindow,
+    SProcResourceReq,			/* SProcCirculateWindow, */
+    SProcResourceReq,			/* GetGeometry */
+    SProcResourceReq,			/* 15 QueryTree */
+    SProcInternAtom,
+    SProcResourceReq,			/* SProcGetAtomName, */
+    SProcChangeProperty,
+    SProcDeleteProperty,
+    SProcGetProperty,			/* 20 */
+    SProcResourceReq,			/* SProcListProperties, */
+    SProcSetSelectionOwner,
+    SProcResourceReq, 			/* SProcGetSelectionOwner, */
+    SProcConvertSelection,
+    SProcSendEvent,			/* 25 */
+    SProcGrabPointer,
+    SProcResourceReq, 			/* SProcUngrabPointer, */
+    SProcGrabButton,
+    SProcUngrabButton,
+    SProcChangeActivePointerGrab,	/* 30 */
+    SProcGrabKeyboard,
+    SProcResourceReq,			/* SProcUngrabKeyboard, */
+    SProcGrabKey,
+    SProcUngrabKey,
+    SProcResourceReq,			/* 35 SProcAllowEvents, */
+    SProcSimpleReq,			/* SProcGrabServer, */
+    SProcSimpleReq,			/* SProcUngrabServer, */
+    SProcResourceReq,			/* SProcQueryPointer, */
+    SProcGetMotionEvents,
+    SProcTranslateCoords,		/*40 */
+    SProcWarpPointer,
+    SProcSetInputFocus,
+    SProcSimpleReq,			/* SProcGetInputFocus, */
+    SProcSimpleReq,			/* QueryKeymap, */
+    SProcOpenFont,			/* 45 */
+    SProcResourceReq,			/* SProcCloseFont, */
+    SProcResourceReq, 			/* SProcQueryFont, */
+    SProcResourceReq,			/* SProcQueryTextExtents,  */
+    SProcListFonts,
+    SProcListFontsWithInfo,		/* 50 */
+    SProcSetFontPath,
+    SProcSimpleReq,			/* GetFontPath, */
+    SProcCreatePixmap,
+    SProcResourceReq,			/* SProcFreePixmap, */
+    SProcCreateGC,			/* 55 */
+    SProcChangeGC,
+    SProcCopyGC,
+    SProcSetDashes,
+    SProcSetClipRectangles,
+    SProcResourceReq,			/* 60 SProcFreeGC, */
+    SProcClearToBackground,
+    SProcCopyArea,
+    SProcCopyPlane,
+    SProcPoly,				/* PolyPoint, */
+    SProcPoly,				/* 65 PolyLine */
+    SProcPoly,				/* PolySegment, */
+    SProcPoly,				/* PolyRectangle, */
+    SProcPoly,				/* PolyArc, */
+    SProcFillPoly,
+    SProcPoly,				/* 70 PolyFillRectangle */
+    SProcPoly,				/* PolyFillArc, */
+    SProcPutImage,
+    SProcGetImage,
+    SProcPolyText,
+    SProcPolyText,			/* 75 */
+    SProcImageText,
+    SProcImageText,
+    SProcCreateColormap,
+    SProcResourceReq,			/* SProcFreeColormap, */
+    SProcCopyColormapAndFree,		/* 80 */
+    SProcResourceReq,			/* SProcInstallColormap, */
+    SProcResourceReq,			/* SProcUninstallColormap, */
+    SProcResourceReq, 			/* SProcListInstalledColormaps, */
+    SProcAllocColor,
+    SProcAllocNamedColor,		/* 85 */
+    SProcAllocColorCells,
+    SProcAllocColorPlanes,
+    SProcFreeColors,
+    SProcStoreColors,
+    SProcStoreNamedColor,		/* 90 */
+    SProcQueryColors,
+    SProcLookupColor,
+    SProcCreateCursor,
+    SProcCreateGlyphCursor,
+    SProcResourceReq,			/* 95 SProcFreeCursor, */
+    SProcRecolorCursor,
+    SProcQueryBestSize,
+    SProcQueryExtension,
+    SProcSimpleReq,			/* ListExtensions, */
+    SProcChangeKeyboardMapping,		/* 100 */
+    SProcSimpleReq,			/* GetKeyboardMapping, */
+    SProcChangeKeyboardControl,
+    SProcSimpleReq,			/* GetKeyboardControl, */
+    SProcSimpleReq,			/* Bell, */
+    SProcChangePointerControl,		/* 105 */
+    SProcSimpleReq,			/* GetPointerControl, */
+    SProcSetScreenSaver,
+    SProcSimpleReq,			/* GetScreenSaver, */
+    SProcChangeHosts,
+    SProcSimpleReq,			/* 110 ListHosts, */
+    SProcSimpleReq,			/* SProcChangeAccessControl, */
+    SProcSimpleReq,			/* SProcChangeCloseDownMode, */
+    SProcResourceReq,			/* SProcKillClient, */
+    SProcRotateProperties,
+    SProcSimpleReq,			/* 115 ForceScreenSaver */
+    SProcSimpleReq,			/* SetPointerMapping, */
+    SProcSimpleReq,			/* GetPointerMapping, */
+    SProcSimpleReq,			/* SetModifierMapping, */
+    SProcSimpleReq,			/* GetModifierMapping, */
+    ProcBadRequest,				/* 120 */
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,				/* 125 */
+    ProcBadRequest,
+    SProcNoOperation,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest,
+    ProcBadRequest
+};
+
+EventSwapPtr EventSwapVector[MAXEVENTS] =
+{
+    (EventSwapPtr)SErrorEvent,
+    NotImplemented,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,
+    SKeyButtonPtrEvent,			/* 5 */
+    SKeyButtonPtrEvent,
+    SEnterLeaveEvent,
+    SEnterLeaveEvent,
+    SFocusEvent,
+    SFocusEvent,			/* 10 */
+    SKeymapNotifyEvent,
+    SExposeEvent,
+    SGraphicsExposureEvent,
+    SNoExposureEvent,
+    SVisibilityEvent,			/* 15 */
+    SCreateNotifyEvent,
+    SDestroyNotifyEvent,
+    SUnmapNotifyEvent,
+    SMapNotifyEvent,
+    SMapRequestEvent,			/* 20 */
+    SReparentEvent,
+    SConfigureNotifyEvent,
+    SConfigureRequestEvent,
+    SGravityEvent,
+    SResizeRequestEvent,		/* 25 */
+    SCirculateEvent,
+    SCirculateEvent,
+    SPropertyEvent,
+    SSelectionClearEvent,
+    SSelectionRequestEvent,		/* 30 */
+    SSelectionNotifyEvent,
+    SColormapEvent,
+    SClientMessageEvent,
+    SMappingEvent,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented,
+    NotImplemented
+};
+
+
+ReplySwapPtr ReplySwapVector[256] =
+{
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetWindowAttributesReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 5 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 10 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetGeometryReply,
+    (ReplySwapPtr)SQueryTreeReply,		/* 15 */
+    (ReplySwapPtr)SInternAtomReply,
+    (ReplySwapPtr)SGetAtomNameReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetPropertyReply,		/* 20 */
+    (ReplySwapPtr)SListPropertiesReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetSelectionOwnerReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 25 */
+    (ReplySwapPtr)SGenericReply,		/* SGrabPointerReply, */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 30 */
+    (ReplySwapPtr)SGenericReply,		/* SGrabKeyboardReply, */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 35 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryPointerReply,
+    (ReplySwapPtr)SGetMotionEventsReply,
+    (ReplySwapPtr)STranslateCoordsReply,	/* 40 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetInputFocusReply,
+    (ReplySwapPtr)SQueryKeymapReply,
+    ReplyNotSwappd,				/* 45 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryFontReply,
+    (ReplySwapPtr)SQueryTextExtentsReply,
+    (ReplySwapPtr)SListFontsReply,
+    (ReplySwapPtr)SListFontsWithInfoReply,	/* 50 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetFontPathReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 55 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 60 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 65 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 70 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetImageReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 75 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 80 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SListInstalledColormapsReply,
+    (ReplySwapPtr)SAllocColorReply,
+    (ReplySwapPtr)SAllocNamedColorReply,	/* 85 */
+    (ReplySwapPtr)SAllocColorCellsReply,
+    (ReplySwapPtr)SAllocColorPlanesReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 90 */
+    (ReplySwapPtr)SQueryColorsReply,
+    (ReplySwapPtr)SLookupColorReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 95 */
+    ReplyNotSwappd,
+    (ReplySwapPtr)SQueryBestSizeReply,
+    (ReplySwapPtr)SGenericReply,		/* SQueryExtensionReply, */
+    (ReplySwapPtr)SListExtensionsReply,
+    ReplyNotSwappd,				/* 100 */
+    (ReplySwapPtr)SGetKeyboardMappingReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetKeyboardControlReply,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 105 */
+    (ReplySwapPtr)SGetPointerControlReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SGetScreenSaverReply,
+    ReplyNotSwappd,
+    (ReplySwapPtr)SListHostsReply,		/* 110 */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,				/* 115 */
+    (ReplySwapPtr)SGenericReply,		/* SetPointerMapping */
+    (ReplySwapPtr)SGetPointerMappingReply,
+    (ReplySwapPtr)SGenericReply,		/* SetModifierMapping */
+    (ReplySwapPtr)SGetModifierMappingReply,	/* 119 */
+    ReplyNotSwappd,				/* 120 */
+    ReplyNotSwappd,				/* 121 */
+    ReplyNotSwappd,				/* 122 */
+    ReplyNotSwappd,				/* 123 */
+    ReplyNotSwappd,				/* 124 */
+    ReplyNotSwappd,				/* 125 */
+    ReplyNotSwappd,				/* 126 */
+    ReplyNotSwappd,				/* NoOperation */
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd,
+    ReplyNotSwappd
+};
diff --git a/xorg-server/hw/dmx/glxProxy/Makefile.am b/xorg-server/hw/dmx/glxProxy/Makefile.am
index 851604883..4ee1036b3 100644
--- a/xorg-server/hw/dmx/glxProxy/Makefile.am
+++ b/xorg-server/hw/dmx/glxProxy/Makefile.am
@@ -1,10 +1,12 @@
 noinst_LIBRARIES = libglxproxy.a
 
 libglxproxy_a_SOURCES = compsize.c \
+                        compsize.h \
                         g_disptab.c \
                         g_disptab.h \
                         global.c \
                         glxcmds.c \
+                        glxcmds.h \
                         glxcmdsswap.c \
                         glxcontext.h \
                         glxdrawable.h \
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index f5af57e82..78b0017a6 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -113,19 +113,14 @@ KdDisableScreen (ScreenPtr pScreen)
 }
 
 static void
-KdDoSwitchCmd (char *reason)
+KdDoSwitchCmd (const char *reason)
 {
     if (kdSwitchCmd)
     {
-	char    *command = malloc(strlen (kdSwitchCmd) +
-				   1 +
-				   strlen (reason) +
-				   1);
-	if (!command)
+	char    *command;
+
+	if (asprintf(&command, "%s %s", kdSwitchCmd, reason) == -1)
 	    return;
-	strcpy (command, kdSwitchCmd);
-	strcat (command, " ");
-	strcat (command, reason);
 	system (command);
 	free(command);
     }
@@ -260,7 +255,7 @@ Bool	kdDumbDriver;
 Bool	kdSoftCursor;
 
 char *
-KdParseFindNext (char *cur, char *delim, char *save, char *last)
+KdParseFindNext (char *cur, const char *delim, char *save, char *last)
 {
     while (*cur && !strchr (delim, *cur))
     {
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 00f07df41..7289e30dd 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -424,7 +424,7 @@ KdKeyboardInfo *
 KdParseKeyboard (char *arg);
 
 char *
-KdParseFindNext (char *cur, char *delim, char *save, char *last);
+KdParseFindNext (char *cur, const char *delim, char *save, char *last);
 
 void
 KdParseRgba (char *rgba);
@@ -503,12 +503,6 @@ KdInitInput(void);
 void
 KdCloseInput(void);
 
-void
-KdAddPointerDriver(KdPointerDriver *);
-
-void
-KdAddKeyboardDriver(KdKeyboardDriver *);
-
 Bool
 KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
 
diff --git a/xorg-server/hw/xfree86/common/xf86.h b/xorg-server/hw/xfree86/common/xf86.h
index f216d5e8c..b711f0555 100644
--- a/xorg-server/hw/xfree86/common/xf86.h
+++ b/xorg-server/hw/xfree86/common/xf86.h
@@ -232,7 +232,7 @@ extern _X_EXPORT void xf86SetDpi(ScrnInfoPtr pScrn, int x, int y);
 extern _X_EXPORT void xf86SetBlackWhitePixels(ScreenPtr pScreen);
 extern _X_EXPORT void xf86EnableDisableFBAccess(int scrnIndex, Bool enable);
 extern _X_EXPORT void xf86VDrvMsgVerb(int scrnIndex, MessageType type, int verb,
-		     const char *format, va_list args);
+		     const char *format, va_list args) _X_ATTRIBUTE_PRINTF(4,0);
 extern _X_EXPORT void xf86DrvMsgVerb(int scrnIndex, MessageType type, int verb,
 		    const char *format, ...) _X_ATTRIBUTE_PRINTF(4,5);
 extern _X_EXPORT void xf86DrvMsg(int scrnIndex, MessageType type, const char *format, ...)
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index fef4bf1fe..569695c8a 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -552,7 +552,7 @@ xf86DriverlistFromCompile(void)
  *      Print a READABLE ErrorMessage!!!  All information that is 
  *      available is printed.
  */
-static void
+static void _X_ATTRIBUTE_PRINTF(1,2)
 xf86ConfigError(const char *msg, ...)
 {
     va_list ap;
@@ -2300,15 +2300,16 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
 ConfigStatus
 xf86HandleConfigFile(Bool autoconfig)
 {
-    char *filename, *dirname, *sysdirname;
-    const char *filesearch, *dirsearch;
-    MessageType filefrom = X_DEFAULT;
-    MessageType dirfrom = X_DEFAULT;
     char *scanptr;
     Bool singlecard = 0;
     Bool implicit_layout = FALSE;
 
     if (!autoconfig) {
+	char *filename, *dirname, *sysdirname;
+	const char *filesearch, *dirsearch;
+	MessageType filefrom = X_DEFAULT;
+	MessageType dirfrom = X_DEFAULT;
+
 	if (getuid() == 0) {
 	    filesearch = ROOT_CONFIGPATH;
 	    dirsearch = ROOT_CONFIGDIRPATH;
@@ -2350,11 +2351,11 @@ xf86HandleConfigFile(Bool autoconfig)
 			sysdirname);
 	if (!filename && !dirname && !sysdirname)
 	    return CONFIG_NOFILE;
-    }
 
-    free(filename);
-    free(dirname);
-    free(sysdirname);
+	free(filename);
+	free(dirname);
+	free(sysdirname);
+    }
 
     if ((xf86configptr = xf86readConfigFile ()) == NULL) {
 	xf86Msg(X_ERROR, "Problem parsing the config file\n");
diff --git a/xorg-server/hw/xfree86/common/xf86Configure.c b/xorg-server/hw/xfree86/common/xf86Configure.c
index 24f367ec0..994d46fc2 100644
--- a/xorg-server/hw/xfree86/common/xf86Configure.c
+++ b/xorg-server/hw/xfree86/common/xf86Configure.c
@@ -778,7 +778,8 @@ void DoShowOptions (void) {
 	free(vlist);
 	for (i = 0; i < xf86NumDrivers; i++) {
 		if (xf86DriverList[i]->AvailableOptions) {
-			OptionInfoPtr pOption = (OptionInfoPtr)(*xf86DriverList[i]->AvailableOptions)(0,0);
+			const OptionInfoRec *pOption =
+			    (*xf86DriverList[i]->AvailableOptions)(0,0);
 			if (! pOption) {
 				ErrorF ("(EE) Couldn't read option table for %s driver\n",
 					xf86DriverList[i]->driverName
@@ -790,7 +791,7 @@ void DoShowOptions (void) {
 			initData = LoaderSymbol (pSymbol);
 			if (initData) {
 				XF86ModuleVersionInfo *vers = initData->vers;
-				OptionInfoPtr p;
+				const OptionInfoRec *p;
 				ErrorF ("Driver[%d]:%s[%s] {\n",
 					i,xf86DriverList[i]->driverName,vers->vendor
 				);
diff --git a/xorg-server/hw/xfree86/common/xf86DGA.c b/xorg-server/hw/xfree86/common/xf86DGA.c
index 46e3005fa..0c958cdf3 100644
--- a/xorg-server/hw/xfree86/common/xf86DGA.c
+++ b/xorg-server/hw/xfree86/common/xf86DGA.c
@@ -1037,7 +1037,7 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
     if (pScreenPriv->client)
     {
         dgaEvent de;
-        de.u.u.type = *XDGAEventBase + GetCoreType((InternalEvent*)&ev);
+        de.u.u.type = *XDGAEventBase + GetCoreType(ev.type);
         de.u.u.detail = event->detail;
         de.u.event.time = event->time;
         de.u.event.dx = event->dx;
@@ -1091,7 +1091,7 @@ DGAProcessPointerEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr mouse)
         dgaEvent        de;
         int		coreEquiv;
 
-        coreEquiv = GetCoreType((InternalEvent*)&ev);
+        coreEquiv = GetCoreType(ev.type);
 
         de.u.u.type = *XDGAEventBase + coreEquiv;
         de.u.u.detail = event->detail;
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index d99522cf6..248ccf47e 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1734,7 +1734,6 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
 			       int format, unsigned long len, pointer value )
 {
     RootWinPropPtr pNewProp = NULL, pRegProp;
-    int i;
     Bool existing = FALSE;
 
     DebugF("xf86RegisterRootWindowProperty(%d, %ld, %ld, %d, %ld, %p)\n",
@@ -1775,15 +1774,11 @@ xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
 
     DebugF("new property filled\n");
 
-    if (NULL==xf86RegisteredPropertiesTable) {
+    if (xf86RegisteredPropertiesTable == NULL) {
       DebugF("creating xf86RegisteredPropertiesTable[] size %d\n",
 	     xf86NumScreens);
-      if ( NULL==(xf86RegisteredPropertiesTable=(RootWinPropPtr*)xnfcalloc(sizeof(RootWinProp),xf86NumScreens) )) {
-	return BadAlloc;
-      }
-      for (i=0; i<xf86NumScreens; i++) {
-	xf86RegisteredPropertiesTable[i] = NULL;
-      }
+      xf86RegisteredPropertiesTable =
+	  xnfcalloc(sizeof(RootWinProp), xf86NumScreens);
     }
 
     DebugF("xf86RegisteredPropertiesTable %p\n",
diff --git a/xorg-server/hw/xfree86/common/xf86Priv.h b/xorg-server/hw/xfree86/common/xf86Priv.h
index 8c698591e..e0b18098e 100644
--- a/xorg-server/hw/xfree86/common/xf86Priv.h
+++ b/xorg-server/hw/xfree86/common/xf86Priv.h
@@ -125,10 +125,8 @@ extern _X_EXPORT const DisplayModeRec xf86DefaultModes[];
 extern _X_EXPORT const int xf86NumDefaultModes;
 
 /* xf86Configure.c */
-extern _X_EXPORT void DoConfigure(void);
-
-/* xf86ShowOpts.c */
-extern _X_EXPORT void DoShowOptions(void);
+extern _X_EXPORT void DoConfigure(void) _X_NORETURN;
+extern _X_EXPORT void DoShowOptions(void) _X_NORETURN;
 
 /* xf86Events.c */
 
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 909fb57d6..7d96fac78 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -173,7 +173,7 @@ extern _X_EXPORT void xf86VIDrvMsgVerb(InputInfoPtr dev,
 				       MessageType type,
 				       int verb,
 				       const char *format,
-				       va_list args);
+				       va_list args) _X_ATTRIBUTE_PRINTF(4,0);
 
 /* xf86Option.c */
 extern _X_EXPORT void xf86CollectInputOptions(InputInfoPtr pInfo, const char **defaultOpts);
diff --git a/xorg-server/hw/xfree86/modes/xf86Modes.h b/xorg-server/hw/xfree86/modes/xf86Modes.h
index c72a93537..89ec0d81d 100644
--- a/xorg-server/hw/xfree86/modes/xf86Modes.h
+++ b/xorg-server/hw/xfree86/modes/xf86Modes.h
@@ -99,10 +99,6 @@ extern _X_EXPORT DisplayModePtr
 xf86PruneDuplicateModes(DisplayModePtr modes);
 
 extern _X_EXPORT void
-xf86ValidateModesFlags(ScrnInfoPtr pScrn, DisplayModePtr modeList,
-		       int flags);
-
-extern _X_EXPORT void
 xf86ValidateModesUserConfig(ScrnInfoPtr pScrn, DisplayModePtr modeList);
 
 extern _X_EXPORT DisplayModePtr
diff --git a/xorg-server/hw/xfree86/parser/Configint.h b/xorg-server/hw/xfree86/parser/Configint.h
index 670c24da5..3f84ff0fa 100644
--- a/xorg-server/hw/xfree86/parser/Configint.h
+++ b/xorg-server/hw/xfree86/parser/Configint.h
@@ -1,213 +1,213 @@
-/*

- * 

- * 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-2002 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).

- */

-

-

-/* 

- * These definitions are used through out the configuration file parser, but

- * they should not be visible outside of the parser.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#ifndef _Configint_h_

-#define _Configint_h_

-

-#include <stdio.h>

-#include <string.h>

-#include <stdarg.h>

-#include <stddef.h>

-#include "xf86Parser.h"

-

-typedef enum { PARSE_DECIMAL, PARSE_OCTAL, PARSE_HEX } ParserNumType;

-

-typedef struct

-{

-	int num;		/* returned number */

-	char *str;		/* private copy of the return-string */

-	double realnum;		/* returned number as a real */

-        ParserNumType numType;  /* used to enforce correct number formatting */

-}

-LexRec, *LexPtr;

-

-#ifndef TRUE

-#define TRUE 1

-#endif

-

-#ifndef FALSE

-#define FALSE 0

-#endif

-

-#include "configProcs.h"

-#include <stdlib.h>

-

-#define TestFree(a) if (a) { free (a); a = NULL; }

-

-#define parsePrologue(typeptr,typerec) typeptr ptr; \

-if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return NULL; }

-

-#define HANDLE_RETURN(f,func)\

-if ((ptr->f=func) == NULL)\

-{\

-	CLEANUP (ptr);\

-	return NULL;\

-}

-

-#define HANDLE_LIST(field,func,type)\

-{\

-type p = func ();\

-if (p == NULL)\

-{\

-	CLEANUP (ptr);\

-	return NULL;\

-}\

-else\

-{\

-	ptr->field = (type) xf86addListItem ((glp) ptr->field, (glp) p);\

-}\

-}

-

-#define Error(a,b) do { \

-			xf86parseError (a, b); CLEANUP (ptr); return NULL; \

-		   } while (0)

-

-/* 

- * These are defines for error messages to promote consistency.

- * error messages are preceded by the line number, section and file name,

- * so these messages should be about the specific keyword and syntax in error.

- * To help limit namespace polution, end each with _MSG.

- * limit messages to 70 characters if possible.

- */

-

-#define BAD_OPTION_MSG \

-"The Option keyword requires 1 or 2 quoted strings to follow it."

-#define INVALID_KEYWORD_MSG \

-"\"%s\" is not a valid keyword in this section."

-#define INVALID_SECTION_MSG \

-"\"%s\" is not a valid section name."

-#define UNEXPECTED_EOF_MSG \

-"Unexpected EOF. Missing EndSection keyword?"

-#define QUOTE_MSG \

-"The %s keyword requires a quoted string to follow it."

-#define NUMBER_MSG \

-"The %s keyword requires a number to follow it."

-#define POSITIVE_INT_MSG \

-"The %s keyword requires a positive integer to follow it."

-#define BOOL_MSG \

-"The %s keyword requires a boolean to follow it."

-#define ZAXISMAPPING_MSG \

-"The ZAxisMapping keyword requires 2 positive numbers or X or Y to follow it."

-#define DACSPEED_MSG \

-"The DacSpeed keyword must be followed by a list of up to %d numbers."

-#define DISPLAYSIZE_MSG \

-"The DisplaySize keyword must be followed by the width and height in mm."

-#define HORIZSYNC_MSG \

-"The HorizSync keyword must be followed by a list of numbers or ranges."

-#define VERTREFRESH_MSG \

-"The VertRefresh keyword must be followed by a list of numbers or ranges."

-#define VIEWPORT_MSG \

-"The Viewport keyword must be followed by an X and Y value."

-#define VIRTUAL_MSG \

-"The Virtual keyword must be followed by a width and height value."

-#define WEIGHT_MSG \

-"The Weight keyword must be followed by red, green and blue values."

-#define BLACK_MSG \

-"The Black keyword must be followed by red, green and blue values."

-#define WHITE_MSG \

-"The White keyword must be followed by red, green and blue values."

-#define SCREEN_MSG \

-"The Screen keyword must be followed by an optional number, a screen name\n" \

-"\tin quotes, and optional position/layout information."

-#define INVALID_SCR_MSG \

-"Invalid Screen line."

-#define INPUTDEV_MSG \

-"The InputDevice keyword must be followed by an input device name in quotes."

-#define INACTIVE_MSG \

-"The Inactive keyword must be followed by a Device name in quotes."

-#define UNDEFINED_SCREEN_MSG \

-"Undefined Screen \"%s\" referenced by ServerLayout \"%s\"."

-#define UNDEFINED_MODES_MSG \

-"Undefined Modes Section \"%s\" referenced by Monitor \"%s\"."

-#define UNDEFINED_DEVICE_MSG \

-"Undefined Device \"%s\" referenced by Screen \"%s\"."

-#define UNDEFINED_ADAPTOR_MSG \

-"Undefined VideoAdaptor \"%s\" referenced by Screen \"%s\"."

-#define ADAPTOR_REF_TWICE_MSG \

-"VideoAdaptor \"%s\" already referenced by Screen \"%s\"."

-#define UNDEFINED_DEVICE_LAY_MSG \

-"Undefined Device \"%s\" referenced by ServerLayout \"%s\"."

-#define UNDEFINED_INPUT_MSG \

-"Undefined InputDevice \"%s\" referenced by ServerLayout \"%s\"."

-#define NO_IDENT_MSG \

-"This section must have an Identifier line."

-#define ONLY_ONE_MSG \

-"This section must have only one of either %s line."

-#define UNDEFINED_INPUTDRIVER_MSG \

-"InputDevice section \"%s\" must have a Driver line."

-#define INVALID_GAMMA_MSG \

-"gamma correction value(s) expected\n either one value or three r/g/b values."

-#define GROUP_MSG \

-"The Group keyword must be followed by either a group name in quotes or\n" \

-"\ta numerical group id."

-#define MULTIPLE_MSG \

-"Multiple \"%s\" lines."

-#define MUST_BE_OCTAL_MSG \

-"The number \"%d\" given in this section must be in octal (0xxx) format."

-

-/* Warning messages */

-#define OBSOLETE_MSG \

-"Ignoring obsolete keyword \"%s\"."

-

-#endif /* _Configint_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-2002 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).
+ */
+
+
+/* 
+ * These definitions are used through out the configuration file parser, but
+ * they should not be visible outside of the parser.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#ifndef _Configint_h_
+#define _Configint_h_
+
+#include <stdio.h>
+#include <string.h>
+#include <stdarg.h>
+#include <stddef.h>
+#include "xf86Parser.h"
+
+typedef enum { PARSE_DECIMAL, PARSE_OCTAL, PARSE_HEX } ParserNumType;
+
+typedef struct
+{
+	int num;		/* returned number */
+	char *str;		/* private copy of the return-string */
+	double realnum;		/* returned number as a real */
+        ParserNumType numType;  /* used to enforce correct number formatting */
+}
+LexRec, *LexPtr;
+
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#include "configProcs.h"
+#include <stdlib.h>
+
+#define TestFree(a) if (a) { free (a); a = NULL; }
+
+#define parsePrologue(typeptr,typerec) typeptr ptr; \
+if( (ptr=calloc(1,sizeof(typerec))) == NULL ) { return NULL; }
+
+#define HANDLE_RETURN(f,func)\
+if ((ptr->f=func) == NULL)\
+{\
+	CLEANUP (ptr);\
+	return NULL;\
+}
+
+#define HANDLE_LIST(field,func,type)\
+{\
+type p = func ();\
+if (p == NULL)\
+{\
+	CLEANUP (ptr);\
+	return NULL;\
+}\
+else\
+{\
+	ptr->field = (type) xf86addListItem ((glp) ptr->field, (glp) p);\
+}\
+}
+
+#define Error(...) do { \
+		xf86parseError (__VA_ARGS__); CLEANUP (ptr); return NULL; \
+		   } while (0)
+
+/* 
+ * These are defines for error messages to promote consistency.
+ * error messages are preceded by the line number, section and file name,
+ * so these messages should be about the specific keyword and syntax in error.
+ * To help limit namespace polution, end each with _MSG.
+ * limit messages to 70 characters if possible.
+ */
+
+#define BAD_OPTION_MSG \
+"The Option keyword requires 1 or 2 quoted strings to follow it."
+#define INVALID_KEYWORD_MSG \
+"\"%s\" is not a valid keyword in this section."
+#define INVALID_SECTION_MSG \
+"\"%s\" is not a valid section name."
+#define UNEXPECTED_EOF_MSG \
+"Unexpected EOF. Missing EndSection keyword?"
+#define QUOTE_MSG \
+"The %s keyword requires a quoted string to follow it."
+#define NUMBER_MSG \
+"The %s keyword requires a number to follow it."
+#define POSITIVE_INT_MSG \
+"The %s keyword requires a positive integer to follow it."
+#define BOOL_MSG \
+"The %s keyword requires a boolean to follow it."
+#define ZAXISMAPPING_MSG \
+"The ZAxisMapping keyword requires 2 positive numbers or X or Y to follow it."
+#define DACSPEED_MSG \
+"The DacSpeed keyword must be followed by a list of up to %d numbers."
+#define DISPLAYSIZE_MSG \
+"The DisplaySize keyword must be followed by the width and height in mm."
+#define HORIZSYNC_MSG \
+"The HorizSync keyword must be followed by a list of numbers or ranges."
+#define VERTREFRESH_MSG \
+"The VertRefresh keyword must be followed by a list of numbers or ranges."
+#define VIEWPORT_MSG \
+"The Viewport keyword must be followed by an X and Y value."
+#define VIRTUAL_MSG \
+"The Virtual keyword must be followed by a width and height value."
+#define WEIGHT_MSG \
+"The Weight keyword must be followed by red, green and blue values."
+#define BLACK_MSG \
+"The Black keyword must be followed by red, green and blue values."
+#define WHITE_MSG \
+"The White keyword must be followed by red, green and blue values."
+#define SCREEN_MSG \
+"The Screen keyword must be followed by an optional number, a screen name\n" \
+"\tin quotes, and optional position/layout information."
+#define INVALID_SCR_MSG \
+"Invalid Screen line."
+#define INPUTDEV_MSG \
+"The InputDevice keyword must be followed by an input device name in quotes."
+#define INACTIVE_MSG \
+"The Inactive keyword must be followed by a Device name in quotes."
+#define UNDEFINED_SCREEN_MSG \
+"Undefined Screen \"%s\" referenced by ServerLayout \"%s\"."
+#define UNDEFINED_MODES_MSG \
+"Undefined Modes Section \"%s\" referenced by Monitor \"%s\"."
+#define UNDEFINED_DEVICE_MSG \
+"Undefined Device \"%s\" referenced by Screen \"%s\"."
+#define UNDEFINED_ADAPTOR_MSG \
+"Undefined VideoAdaptor \"%s\" referenced by Screen \"%s\"."
+#define ADAPTOR_REF_TWICE_MSG \
+"VideoAdaptor \"%s\" already referenced by Screen \"%s\"."
+#define UNDEFINED_DEVICE_LAY_MSG \
+"Undefined Device \"%s\" referenced by ServerLayout \"%s\"."
+#define UNDEFINED_INPUT_MSG \
+"Undefined InputDevice \"%s\" referenced by ServerLayout \"%s\"."
+#define NO_IDENT_MSG \
+"This section must have an Identifier line."
+#define ONLY_ONE_MSG \
+"This section must have only one of either %s line."
+#define UNDEFINED_INPUTDRIVER_MSG \
+"InputDevice section \"%s\" must have a Driver line."
+#define INVALID_GAMMA_MSG \
+"gamma correction value(s) expected\n either one value or three r/g/b values."
+#define GROUP_MSG \
+"The Group keyword must be followed by either a group name in quotes or\n" \
+"\ta numerical group id."
+#define MULTIPLE_MSG \
+"Multiple \"%s\" lines."
+#define MUST_BE_OCTAL_MSG \
+"The number \"%d\" given in this section must be in octal (0xxx) format."
+
+/* Warning messages */
+#define OBSOLETE_MSG \
+"Ignoring obsolete keyword \"%s\"."
+
+#endif /* _Configint_h_ */
diff --git a/xorg-server/hw/xfree86/parser/DRI.c b/xorg-server/hw/xfree86/parser/DRI.c
index 4847bef2c..77846da2b 100644
--- a/xorg-server/hw/xfree86/parser/DRI.c
+++ b/xorg-server/hw/xfree86/parser/DRI.c
@@ -1,123 +1,123 @@
-/* DRI.c -- DRI Section in XF86Config file

- * Created: Fri Mar 19 08:40:22 1999 by faith@precisioninsight.com

- * Revised: Thu Jun 17 16:08:05 1999 by faith@precisioninsight.com

- *

- * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.

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

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

- * PRECISION INSIGHT AND/OR ITS 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.

- * 

- * 

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec DRITab[] =

-{

-    {ENDSECTION, "endsection"},

-    {GROUP,      "group"},

-    {MODE,       "mode"},

-    {-1,         ""},

-};

-

-#define CLEANUP xf86freeDRI

-

-XF86ConfDRIPtr

-xf86parseDRISection (void)

-{

-    int token;

-    parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);

-

-    /* Zero is a valid value for this. */

-    ptr->dri_group = -1;

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

-	switch (token)

-	    {

-	    case GROUP:

-		if ((token = xf86getSubToken (&(ptr->dri_comment))) == STRING)

-		    ptr->dri_group_name = val.str;

-		else if (token == NUMBER)

-		    ptr->dri_group = val.num;

-		else

-		    Error (GROUP_MSG, NULL);

-		break;

-	    case MODE:

-		if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)

-		    Error (NUMBER_MSG, "Mode");

-                if (val.numType != PARSE_OCTAL)

-                    Error (MUST_BE_OCTAL_MSG, val.num);

-		ptr->dri_mode = val.num;

-		break;

-	    case EOF_TOKEN:

-		Error (UNEXPECTED_EOF_MSG, NULL);

-		break;

-	    case COMMENT:

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

-		break;

-	    default:

-		Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-		break;

-	    }

-    }

-    

-#ifdef DEBUG

-    ErrorF("DRI section parsed\n");

-#endif

-    

-    return ptr;

-}

-

-#undef CLEANUP

-

-void

-xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)

-{

-    if (ptr == NULL)

-	return;

-    

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

-    if (ptr->dri_comment)

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

-    if (ptr->dri_group_name)

-	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);

-    else if (ptr->dri_group >= 0)

-	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);

-    if (ptr->dri_mode)

-	fprintf (cf, "\tMode         0%o\n", ptr->dri_mode);

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

-}

-

-void

-xf86freeDRI (XF86ConfDRIPtr ptr)

-{

-    if (ptr == NULL)

-	return;

-    

-    TestFree (ptr->dri_comment);

-    free (ptr);

-}

+/* DRI.c -- DRI Section in XF86Config file
+ * Created: Fri Mar 19 08:40:22 1999 by faith@precisioninsight.com
+ * Revised: Thu Jun 17 16:08:05 1999 by faith@precisioninsight.com
+ *
+ * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas.
+ * 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
+ * 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 NONINFRINGEMENT.  IN NO EVENT SHALL
+ * PRECISION INSIGHT AND/OR ITS 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.
+ * 
+ * 
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec DRITab[] =
+{
+    {ENDSECTION, "endsection"},
+    {GROUP,      "group"},
+    {MODE,       "mode"},
+    {-1,         ""},
+};
+
+#define CLEANUP xf86freeDRI
+
+XF86ConfDRIPtr
+xf86parseDRISection (void)
+{
+    int token;
+    parsePrologue (XF86ConfDRIPtr, XF86ConfDRIRec);
+
+    /* Zero is a valid value for this. */
+    ptr->dri_group = -1;
+    while ((token = xf86getToken (DRITab)) != ENDSECTION) {
+	switch (token)
+	    {
+	    case GROUP:
+		if ((token = xf86getSubToken (&(ptr->dri_comment))) == STRING)
+		    ptr->dri_group_name = val.str;
+		else if (token == NUMBER)
+		    ptr->dri_group = val.num;
+		else
+		    Error (GROUP_MSG);
+		break;
+	    case MODE:
+		if (xf86getSubToken (&(ptr->dri_comment)) != NUMBER)
+		    Error (NUMBER_MSG, "Mode");
+                if (val.numType != PARSE_OCTAL)
+                    Error (MUST_BE_OCTAL_MSG, val.num);
+		ptr->dri_mode = val.num;
+		break;
+	    case EOF_TOKEN:
+		Error (UNEXPECTED_EOF_MSG);
+		break;
+	    case COMMENT:
+		ptr->dri_comment = xf86addComment(ptr->dri_comment, val.str);
+		break;
+	    default:
+		Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+		break;
+	    }
+    }
+    
+#ifdef DEBUG
+    ErrorF("DRI section parsed\n");
+#endif
+    
+    return ptr;
+}
+
+#undef CLEANUP
+
+void
+xf86printDRISection (FILE * cf, XF86ConfDRIPtr ptr)
+{
+    if (ptr == NULL)
+	return;
+    
+    fprintf (cf, "Section \"DRI\"\n");
+    if (ptr->dri_comment)
+	fprintf (cf, "%s", ptr->dri_comment);
+    if (ptr->dri_group_name)
+	fprintf (cf, "\tGroup        \"%s\"\n", ptr->dri_group_name);
+    else if (ptr->dri_group >= 0)
+	fprintf (cf, "\tGroup        %d\n", ptr->dri_group);
+    if (ptr->dri_mode)
+	fprintf (cf, "\tMode         0%o\n", ptr->dri_mode);
+    fprintf (cf, "EndSection\n\n");
+}
+
+void
+xf86freeDRI (XF86ConfDRIPtr ptr)
+{
+    if (ptr == NULL)
+	return;
+    
+    TestFree (ptr->dri_comment);
+    free (ptr);
+}
diff --git a/xorg-server/hw/xfree86/parser/Device.c b/xorg-server/hw/xfree86/parser/Device.c
index c81aa05d9..d99dbf79d 100644
--- a/xorg-server/hw/xfree86/parser/Device.c
+++ b/xorg-server/hw/xfree86/parser/Device.c
@@ -1,371 +1,371 @@
-/* 

- * 

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

- */

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static

-xf86ConfigSymTabRec DeviceTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{VENDOR, "vendorname"},

-	{BOARD, "boardname"},

-	{CHIPSET, "chipset"},

-	{RAMDAC, "ramdac"},

-	{DACSPEED, "dacspeed"},

-	{CLOCKS, "clocks"},

-	{OPTION, "option"},

-	{VIDEORAM, "videoram"},

-	{BIOSBASE, "biosbase"},

-	{MEMBASE, "membase"},

-	{IOBASE, "iobase"},

-	{CLOCKCHIP, "clockchip"},

-	{CHIPID, "chipid"},

-	{CHIPREV, "chiprev"},

-	{CARD, "card"},

-	{DRIVER, "driver"},

-	{BUSID, "busid"},

-	{TEXTCLOCKFRQ, "textclockfreq"},

-	{IRQ, "irq"},

-	{SCREEN, "screen"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeDeviceList

-

-XF86ConfDevicePtr

-xf86parseDeviceSection (void)

-{

-	int i;

-	int has_ident = FALSE;

-	int token;

-	parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)

-

-	/* Zero is a valid value for these */

-	ptr->dev_chipid = -1;

-	ptr->dev_chiprev = -1;

-	ptr->dev_irq = -1;

-	while ((token = xf86getToken (DeviceTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			ptr->dev_identifier = val.str;

-			has_ident = TRUE;

-			break;

-		case VENDOR:

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

-				Error (QUOTE_MSG, "Vendor");

-			ptr->dev_vendor = val.str;

-			break;

-		case BOARD:

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

-				Error (QUOTE_MSG, "Board");

-			ptr->dev_board = val.str;

-			break;

-		case CHIPSET:

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

-				Error (QUOTE_MSG, "Chipset");

-			ptr->dev_chipset = val.str;

-			break;

-		case CARD:

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

-				Error (QUOTE_MSG, "Card");

-			ptr->dev_card = val.str;

-			break;

-		case DRIVER:

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

-				Error (QUOTE_MSG, "Driver");

-			ptr->dev_driver = val.str;

-			break;

-		case RAMDAC:

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

-				Error (QUOTE_MSG, "Ramdac");

-			ptr->dev_ramdac = val.str;

-			break;

-		case DACSPEED:

-			for (i = 0; i < CONF_MAXDACSPEEDS; i++)

-				ptr->dev_dacSpeeds[i] = 0;

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-			{

-				Error (DACSPEED_MSG, CONF_MAXDACSPEEDS);

-			}

-			else

-			{

-				ptr->dev_dacSpeeds[0] = (int) (val.realnum * 1000.0 + 0.5);

-				for (i = 1; i < CONF_MAXDACSPEEDS; i++)

-				{

-					if (xf86getSubToken (&(ptr->dev_comment)) == NUMBER)

-						ptr->dev_dacSpeeds[i] = (int)

-							(val.realnum * 1000.0 + 0.5);

-					else

-					{

-						xf86unGetToken (token);

-						break;

-					}

-				}

-			}

-			break;

-		case VIDEORAM:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "VideoRam");

-			ptr->dev_videoram = val.num;

-			break;

-		case BIOSBASE:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "BIOSBase");

-			ptr->dev_bios_base = val.num;

-			break;

-		case MEMBASE:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "MemBase");

-			ptr->dev_mem_base = val.num;

-			break;

-		case IOBASE:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "IOBase");

-			ptr->dev_io_base = val.num;

-			break;

-		case CLOCKCHIP:

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

-				Error (QUOTE_MSG, "ClockChip");

-			ptr->dev_clockchip = val.str;

-			break;

-		case CHIPID:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "ChipID");

-			ptr->dev_chipid = val.num;

-			break;

-		case CHIPREV:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "ChipRev");

-			ptr->dev_chiprev = val.num;

-			break;

-

-		case CLOCKS:

-			token = xf86getSubToken(&(ptr->dev_comment));

-			for( i = ptr->dev_clocks;

-				token == NUMBER && i < CONF_MAXCLOCKS; i++ ) {

-				ptr->dev_clock[i] = (int)(val.realnum * 1000.0 + 0.5);

-				token = xf86getSubToken(&(ptr->dev_comment));

-			}

-			ptr->dev_clocks = i;

-			xf86unGetToken (token);

-			break;

-		case TEXTCLOCKFRQ:

-			if ((token = xf86getSubToken(&(ptr->dev_comment))) != NUMBER)

-				Error (NUMBER_MSG, "TextClockFreq");

-			ptr->dev_textclockfreq = (int)(val.realnum * 1000.0 + 0.5);

-			break;

-		case OPTION:

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

-			break;

-		case BUSID:

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

-				Error (QUOTE_MSG, "BusID");

-			ptr->dev_busid = val.str;

-			break;

-		case IRQ:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (QUOTE_MSG, "IRQ");

-			ptr->dev_irq = val.num;

-			break;

-		case SCREEN:

-			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)

-				Error (NUMBER_MSG, "Screen");

-			ptr->dev_screen = val.num;

-			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 ("Device section parsed\n");

-#endif

-

-	return ptr;

-}

-

-#undef CLEANUP

-

-void

-xf86printDeviceSection (FILE * cf, XF86ConfDevicePtr ptr)

-{

-	int i;

-

-	while (ptr)

-	{

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

-		if (ptr->dev_comment)

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

-		if (ptr->dev_identifier)

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

-		if (ptr->dev_driver)

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

-		if (ptr->dev_vendor)

-			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->dev_vendor);

-		if (ptr->dev_board)

-			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->dev_board);

-		if (ptr->dev_chipset)

-			fprintf (cf, "\tChipSet     \"%s\"\n", ptr->dev_chipset);

-		if (ptr->dev_card)

-			fprintf (cf, "\tCard        \"%s\"\n", ptr->dev_card);

-		if (ptr->dev_ramdac)

-			fprintf (cf, "\tRamDac      \"%s\"\n", ptr->dev_ramdac);

-		if (ptr->dev_dacSpeeds[0] > 0 ) {

-			fprintf (cf, "\tDacSpeed    ");

-			for (i = 0; i < CONF_MAXDACSPEEDS

-					&& ptr->dev_dacSpeeds[i] > 0; i++ )

-				fprintf (cf, "%g ", (double) (ptr->dev_dacSpeeds[i])/ 1000.0 );

-			fprintf (cf, "\n");

-		}

-		if (ptr->dev_videoram)

-			fprintf (cf, "\tVideoRam    %d\n", ptr->dev_videoram);

-		if (ptr->dev_bios_base)

-			fprintf (cf, "\tBiosBase    0x%lx\n", ptr->dev_bios_base);

-		if (ptr->dev_mem_base)

-			fprintf (cf, "\tMemBase     0x%lx\n", ptr->dev_mem_base);

-		if (ptr->dev_io_base)

-			fprintf (cf, "\tIOBase      0x%lx\n", ptr->dev_io_base);

-		if (ptr->dev_clockchip)

-			fprintf (cf, "\tClockChip   \"%s\"\n", ptr->dev_clockchip);

-		if (ptr->dev_chipid != -1)

-			fprintf (cf, "\tChipId      0x%x\n", ptr->dev_chipid);

-		if (ptr->dev_chiprev != -1)

-			fprintf (cf, "\tChipRev     0x%x\n", ptr->dev_chiprev);

-

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

-		if (ptr->dev_clocks > 0 ) {

-			fprintf (cf, "\tClocks      ");

-			for (i = 0; i < ptr->dev_clocks; i++ )

-				fprintf (cf, "%.1f ", (double)ptr->dev_clock[i] / 1000.0 );

-			fprintf (cf, "\n");

-		}

-		if (ptr->dev_textclockfreq) {

-			fprintf (cf, "\tTextClockFreq %.1f\n",

-					 (double)ptr->dev_textclockfreq / 1000.0);

-		}

-		if (ptr->dev_busid)

-			fprintf (cf, "\tBusID       \"%s\"\n", ptr->dev_busid);

-		if (ptr->dev_screen > 0)

-			fprintf (cf, "\tScreen      %d\n", ptr->dev_screen);

-		if (ptr->dev_irq >= 0)

-			fprintf (cf, "\tIRQ         %d\n", ptr->dev_irq);

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

-		ptr = ptr->list.next;

-	}

-}

-

-void

-xf86freeDeviceList (XF86ConfDevicePtr ptr)

-{

-	XF86ConfDevicePtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->dev_identifier);

-		TestFree (ptr->dev_vendor);

-		TestFree (ptr->dev_board);

-		TestFree (ptr->dev_chipset);

-		TestFree (ptr->dev_card);

-		TestFree (ptr->dev_driver);

-		TestFree (ptr->dev_ramdac);

-		TestFree (ptr->dev_clockchip);

-		TestFree (ptr->dev_comment);

-		xf86optionListFree (ptr->dev_option_lst);

-

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-XF86ConfDevicePtr

-xf86findDevice (const char *ident, XF86ConfDevicePtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->dev_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

+/* 
+ * 
+ * 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).
+ */
+
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static
+xf86ConfigSymTabRec DeviceTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{VENDOR, "vendorname"},
+	{BOARD, "boardname"},
+	{CHIPSET, "chipset"},
+	{RAMDAC, "ramdac"},
+	{DACSPEED, "dacspeed"},
+	{CLOCKS, "clocks"},
+	{OPTION, "option"},
+	{VIDEORAM, "videoram"},
+	{BIOSBASE, "biosbase"},
+	{MEMBASE, "membase"},
+	{IOBASE, "iobase"},
+	{CLOCKCHIP, "clockchip"},
+	{CHIPID, "chipid"},
+	{CHIPREV, "chiprev"},
+	{CARD, "card"},
+	{DRIVER, "driver"},
+	{BUSID, "busid"},
+	{TEXTCLOCKFRQ, "textclockfreq"},
+	{IRQ, "irq"},
+	{SCREEN, "screen"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeDeviceList
+
+XF86ConfDevicePtr
+xf86parseDeviceSection (void)
+{
+	int i;
+	int has_ident = FALSE;
+	int token;
+	parsePrologue (XF86ConfDevicePtr, XF86ConfDeviceRec)
+
+	/* Zero is a valid value for these */
+	ptr->dev_chipid = -1;
+	ptr->dev_chiprev = -1;
+	ptr->dev_irq = -1;
+	while ((token = xf86getToken (DeviceTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->dev_comment = xf86addComment(ptr->dev_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			ptr->dev_identifier = val.str;
+			has_ident = TRUE;
+			break;
+		case VENDOR:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Vendor");
+			ptr->dev_vendor = val.str;
+			break;
+		case BOARD:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Board");
+			ptr->dev_board = val.str;
+			break;
+		case CHIPSET:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Chipset");
+			ptr->dev_chipset = val.str;
+			break;
+		case CARD:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Card");
+			ptr->dev_card = val.str;
+			break;
+		case DRIVER:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Driver");
+			ptr->dev_driver = val.str;
+			break;
+		case RAMDAC:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "Ramdac");
+			ptr->dev_ramdac = val.str;
+			break;
+		case DACSPEED:
+			for (i = 0; i < CONF_MAXDACSPEEDS; i++)
+				ptr->dev_dacSpeeds[i] = 0;
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+			{
+				Error (DACSPEED_MSG, CONF_MAXDACSPEEDS);
+			}
+			else
+			{
+				ptr->dev_dacSpeeds[0] = (int) (val.realnum * 1000.0 + 0.5);
+				for (i = 1; i < CONF_MAXDACSPEEDS; i++)
+				{
+					if (xf86getSubToken (&(ptr->dev_comment)) == NUMBER)
+						ptr->dev_dacSpeeds[i] = (int)
+							(val.realnum * 1000.0 + 0.5);
+					else
+					{
+						xf86unGetToken (token);
+						break;
+					}
+				}
+			}
+			break;
+		case VIDEORAM:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "VideoRam");
+			ptr->dev_videoram = val.num;
+			break;
+		case BIOSBASE:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "BIOSBase");
+			ptr->dev_bios_base = val.num;
+			break;
+		case MEMBASE:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "MemBase");
+			ptr->dev_mem_base = val.num;
+			break;
+		case IOBASE:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "IOBase");
+			ptr->dev_io_base = val.num;
+			break;
+		case CLOCKCHIP:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "ClockChip");
+			ptr->dev_clockchip = val.str;
+			break;
+		case CHIPID:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "ChipID");
+			ptr->dev_chipid = val.num;
+			break;
+		case CHIPREV:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "ChipRev");
+			ptr->dev_chiprev = val.num;
+			break;
+
+		case CLOCKS:
+			token = xf86getSubToken(&(ptr->dev_comment));
+			for( i = ptr->dev_clocks;
+				token == NUMBER && i < CONF_MAXCLOCKS; i++ ) {
+				ptr->dev_clock[i] = (int)(val.realnum * 1000.0 + 0.5);
+				token = xf86getSubToken(&(ptr->dev_comment));
+			}
+			ptr->dev_clocks = i;
+			xf86unGetToken (token);
+			break;
+		case TEXTCLOCKFRQ:
+			if ((token = xf86getSubToken(&(ptr->dev_comment))) != NUMBER)
+				Error (NUMBER_MSG, "TextClockFreq");
+			ptr->dev_textclockfreq = (int)(val.realnum * 1000.0 + 0.5);
+			break;
+		case OPTION:
+			ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst);
+			break;
+		case BUSID:
+			if (xf86getSubToken (&(ptr->dev_comment)) != STRING)
+				Error (QUOTE_MSG, "BusID");
+			ptr->dev_busid = val.str;
+			break;
+		case IRQ:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (QUOTE_MSG, "IRQ");
+			ptr->dev_irq = val.num;
+			break;
+		case SCREEN:
+			if (xf86getSubToken (&(ptr->dev_comment)) != NUMBER)
+				Error (NUMBER_MSG, "Screen");
+			ptr->dev_screen = val.num;
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+	if (!has_ident)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("Device section parsed\n");
+#endif
+
+	return ptr;
+}
+
+#undef CLEANUP
+
+void
+xf86printDeviceSection (FILE * cf, XF86ConfDevicePtr ptr)
+{
+	int i;
+
+	while (ptr)
+	{
+		fprintf (cf, "Section \"Device\"\n");
+		if (ptr->dev_comment)
+			fprintf (cf, "%s", ptr->dev_comment);
+		if (ptr->dev_identifier)
+			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->dev_identifier);
+		if (ptr->dev_driver)
+			fprintf (cf, "\tDriver      \"%s\"\n", ptr->dev_driver);
+		if (ptr->dev_vendor)
+			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->dev_vendor);
+		if (ptr->dev_board)
+			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->dev_board);
+		if (ptr->dev_chipset)
+			fprintf (cf, "\tChipSet     \"%s\"\n", ptr->dev_chipset);
+		if (ptr->dev_card)
+			fprintf (cf, "\tCard        \"%s\"\n", ptr->dev_card);
+		if (ptr->dev_ramdac)
+			fprintf (cf, "\tRamDac      \"%s\"\n", ptr->dev_ramdac);
+		if (ptr->dev_dacSpeeds[0] > 0 ) {
+			fprintf (cf, "\tDacSpeed    ");
+			for (i = 0; i < CONF_MAXDACSPEEDS
+					&& ptr->dev_dacSpeeds[i] > 0; i++ )
+				fprintf (cf, "%g ", (double) (ptr->dev_dacSpeeds[i])/ 1000.0 );
+			fprintf (cf, "\n");
+		}
+		if (ptr->dev_videoram)
+			fprintf (cf, "\tVideoRam    %d\n", ptr->dev_videoram);
+		if (ptr->dev_bios_base)
+			fprintf (cf, "\tBiosBase    0x%lx\n", ptr->dev_bios_base);
+		if (ptr->dev_mem_base)
+			fprintf (cf, "\tMemBase     0x%lx\n", ptr->dev_mem_base);
+		if (ptr->dev_io_base)
+			fprintf (cf, "\tIOBase      0x%lx\n", ptr->dev_io_base);
+		if (ptr->dev_clockchip)
+			fprintf (cf, "\tClockChip   \"%s\"\n", ptr->dev_clockchip);
+		if (ptr->dev_chipid != -1)
+			fprintf (cf, "\tChipId      0x%x\n", ptr->dev_chipid);
+		if (ptr->dev_chiprev != -1)
+			fprintf (cf, "\tChipRev     0x%x\n", ptr->dev_chiprev);
+
+		xf86printOptionList(cf, ptr->dev_option_lst, 1);
+		if (ptr->dev_clocks > 0 ) {
+			fprintf (cf, "\tClocks      ");
+			for (i = 0; i < ptr->dev_clocks; i++ )
+				fprintf (cf, "%.1f ", (double)ptr->dev_clock[i] / 1000.0 );
+			fprintf (cf, "\n");
+		}
+		if (ptr->dev_textclockfreq) {
+			fprintf (cf, "\tTextClockFreq %.1f\n",
+					 (double)ptr->dev_textclockfreq / 1000.0);
+		}
+		if (ptr->dev_busid)
+			fprintf (cf, "\tBusID       \"%s\"\n", ptr->dev_busid);
+		if (ptr->dev_screen > 0)
+			fprintf (cf, "\tScreen      %d\n", ptr->dev_screen);
+		if (ptr->dev_irq >= 0)
+			fprintf (cf, "\tIRQ         %d\n", ptr->dev_irq);
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+}
+
+void
+xf86freeDeviceList (XF86ConfDevicePtr ptr)
+{
+	XF86ConfDevicePtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->dev_identifier);
+		TestFree (ptr->dev_vendor);
+		TestFree (ptr->dev_board);
+		TestFree (ptr->dev_chipset);
+		TestFree (ptr->dev_card);
+		TestFree (ptr->dev_driver);
+		TestFree (ptr->dev_ramdac);
+		TestFree (ptr->dev_clockchip);
+		TestFree (ptr->dev_comment);
+		xf86optionListFree (ptr->dev_option_lst);
+
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+XF86ConfDevicePtr
+xf86findDevice (const char *ident, XF86ConfDevicePtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->dev_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
diff --git a/xorg-server/hw/xfree86/parser/Extensions.c b/xorg-server/hw/xfree86/parser/Extensions.c
index 4003b521a..662f5260c 100644
--- a/xorg-server/hw/xfree86/parser/Extensions.c
+++ b/xorg-server/hw/xfree86/parser/Extensions.c
@@ -62,7 +62,7 @@ xf86parseExtensionsSection (void)
 		ptr->ext_option_lst = xf86parseOption(ptr->ext_option_lst);
 		break;
 	    case EOF_TOKEN:
-		Error (UNEXPECTED_EOF_MSG, NULL);
+		Error (UNEXPECTED_EOF_MSG);
 		break;
 	    case COMMENT:
 		ptr->extensions_comment =
diff --git a/xorg-server/hw/xfree86/parser/Files.c b/xorg-server/hw/xfree86/parser/Files.c
index 0c718354e..a95be9ee2 100644
--- a/xorg-server/hw/xfree86/parser/Files.c
+++ b/xorg-server/hw/xfree86/parser/Files.c
@@ -162,7 +162,7 @@ xf86parseFilesSection (void)
 			ptr->file_xkbdir = val.str;
 			break;
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		case OBSOLETE_TOKEN:
 			xf86parseError (OBSOLETE_MSG, xf86tokenString ());
diff --git a/xorg-server/hw/xfree86/parser/Flags.c b/xorg-server/hw/xfree86/parser/Flags.c
index 87fd3edf6..c2a04062c 100644
--- a/xorg-server/hw/xfree86/parser/Flags.c
+++ b/xorg-server/hw/xfree86/parser/Flags.c
@@ -160,7 +160,7 @@ xf86parseFlagsSection (void)
 			break;
 
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		default:
 			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@@ -440,7 +440,7 @@ xf86parseOption(XF86OptionPtr head)
 	int token;
 
 	if ((token = xf86getSubToken(&comment)) != STRING) {
-		xf86parseError(BAD_OPTION_MSG, NULL);
+		xf86parseError(BAD_OPTION_MSG);
 		free(comment);
 		return head;
 	}
diff --git a/xorg-server/hw/xfree86/parser/Input.c b/xorg-server/hw/xfree86/parser/Input.c
index 739e49ba4..e6037732a 100644
--- a/xorg-server/hw/xfree86/parser/Input.c
+++ b/xorg-server/hw/xfree86/parser/Input.c
@@ -1,213 +1,213 @@
-/* 

- * 

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

- */

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "os.h"

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static

-xf86ConfigSymTabRec InputTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{OPTION, "option"},

-	{DRIVER, "driver"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeInputList

-

-XF86ConfInputPtr

-xf86parseInputSection (void)

-{

-	int has_ident = FALSE;

-	int token;

-	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)

-

-	while ((token = xf86getToken (InputTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			ptr->inp_identifier = val.str;

-			has_ident = TRUE;

-			break;

-		case DRIVER:

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

-				Error (QUOTE_MSG, "Driver");

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

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

-                            free(val.str);

-                        }

-                        else

-			    ptr->inp_driver = val.str;

-			break;

-		case OPTION:

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

-			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 ("InputDevice section parsed\n");

-#endif

-

-	return ptr;

-}

-

-#undef CLEANUP

-

-void

-xf86printInputSection (FILE * cf, XF86ConfInputPtr ptr)

-{

-	while (ptr)

-	{

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

-		if (ptr->inp_comment)

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

-		if (ptr->inp_identifier)

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

-		if (ptr->inp_driver)

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

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

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

-		ptr = ptr->list.next;

-	}

-}

-

-void

-xf86freeInputList (XF86ConfInputPtr ptr)

-{

-	XF86ConfInputPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->inp_identifier);

-		TestFree (ptr->inp_driver);

-		TestFree (ptr->inp_comment);

-		xf86optionListFree (ptr->inp_option_lst);

-

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-int

-xf86validateInput (XF86ConfigPtr p)

-{

-	XF86ConfInputPtr input = p->conf_input_lst;

-

-	while (input) {

-		if (!input->inp_driver) {

-			xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier);

-			return FALSE;

-		}

-		input = input->list.next;

-	}

-	return TRUE;

-}

-

-XF86ConfInputPtr

-xf86findInput (const char *ident, XF86ConfInputPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->inp_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

-XF86ConfInputPtr

-xf86findInputByDriver (const char *driver, XF86ConfInputPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (driver, p->inp_driver) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

+/* 
+ * 
+ * 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).
+ */
+
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "os.h"
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static
+xf86ConfigSymTabRec InputTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{OPTION, "option"},
+	{DRIVER, "driver"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeInputList
+
+XF86ConfInputPtr
+xf86parseInputSection (void)
+{
+	int has_ident = FALSE;
+	int token;
+	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
+
+	while ((token = xf86getToken (InputTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			ptr->inp_identifier = val.str;
+			has_ident = TRUE;
+			break;
+		case DRIVER:
+			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
+				Error (QUOTE_MSG, "Driver");
+                        if (strcmp(val.str, "keyboard") == 0) {
+                            ptr->inp_driver = strdup("kbd");
+                            free(val.str);
+                        }
+                        else
+			    ptr->inp_driver = val.str;
+			break;
+		case OPTION:
+			ptr->inp_option_lst = xf86parseOption(ptr->inp_option_lst);
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+	if (!has_ident)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("InputDevice section parsed\n");
+#endif
+
+	return ptr;
+}
+
+#undef CLEANUP
+
+void
+xf86printInputSection (FILE * cf, XF86ConfInputPtr ptr)
+{
+	while (ptr)
+	{
+		fprintf (cf, "Section \"InputDevice\"\n");
+		if (ptr->inp_comment)
+			fprintf (cf, "%s", ptr->inp_comment);
+		if (ptr->inp_identifier)
+			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->inp_identifier);
+		if (ptr->inp_driver)
+			fprintf (cf, "\tDriver      \"%s\"\n", ptr->inp_driver);
+		xf86printOptionList(cf, ptr->inp_option_lst, 1);
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+}
+
+void
+xf86freeInputList (XF86ConfInputPtr ptr)
+{
+	XF86ConfInputPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->inp_identifier);
+		TestFree (ptr->inp_driver);
+		TestFree (ptr->inp_comment);
+		xf86optionListFree (ptr->inp_option_lst);
+
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+int
+xf86validateInput (XF86ConfigPtr p)
+{
+	XF86ConfInputPtr input = p->conf_input_lst;
+
+	while (input) {
+		if (!input->inp_driver) {
+			xf86validationError (UNDEFINED_INPUTDRIVER_MSG, input->inp_identifier);
+			return FALSE;
+		}
+		input = input->list.next;
+	}
+	return TRUE;
+}
+
+XF86ConfInputPtr
+xf86findInput (const char *ident, XF86ConfInputPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->inp_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
+XF86ConfInputPtr
+xf86findInputByDriver (const char *driver, XF86ConfInputPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (driver, p->inp_driver) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
diff --git a/xorg-server/hw/xfree86/parser/InputClass.c b/xorg-server/hw/xfree86/parser/InputClass.c
index 2cdc9125a..919ae1869 100644
--- a/xorg-server/hw/xfree86/parser/InputClass.c
+++ b/xorg-server/hw/xfree86/parser/InputClass.c
@@ -241,7 +241,7 @@ xf86parseInputClassSection(void)
                 Error(BOOL_MSG, "MatchIsTouchscreen");
             break;
         case EOF_TOKEN:
-            Error(UNEXPECTED_EOF_MSG, NULL);
+            Error(UNEXPECTED_EOF_MSG);
             break;
         default:
             Error(INVALID_KEYWORD_MSG, xf86tokenString ());
@@ -250,7 +250,7 @@ xf86parseInputClassSection(void)
     }
 
     if (!has_ident)
-        Error(NO_IDENT_MSG, NULL);
+        Error(NO_IDENT_MSG);
 
 #ifdef DEBUG
     printf("InputClass section parsed\n");
diff --git a/xorg-server/hw/xfree86/parser/Layout.c b/xorg-server/hw/xfree86/parser/Layout.c
index 4487b0df6..7dd4ebfc6 100644
--- a/xorg-server/hw/xfree86/parser/Layout.c
+++ b/xorg-server/hw/xfree86/parser/Layout.c
@@ -124,7 +124,7 @@ xf86parseLayoutSection (void)
 				iptr->list.next = NULL;
 				if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
 					free (iptr);
-					Error (INACTIVE_MSG, NULL);
+					Error (INACTIVE_MSG);
 				}
 				iptr->inactive_device_str = val.str;
 				ptr->lay_inactive_lst = (XF86ConfInactivePtr)
@@ -150,7 +150,7 @@ xf86parseLayoutSection (void)
 				token = xf86getSubToken(&(ptr->lay_comment));
 				if (token != STRING) {
 					free(aptr);
-					Error (SCREEN_MSG, NULL);
+					Error (SCREEN_MSG);
 				}
 				aptr->adj_screen_str = val.str;
 
@@ -178,7 +178,7 @@ xf86parseLayoutSection (void)
 					break;
 				case EOF_TOKEN:
 					free(aptr);
-					Error (UNEXPECTED_EOF_MSG, NULL);
+					Error (UNEXPECTED_EOF_MSG);
 					break;
 				default:
 					xf86unGetToken (token);
@@ -199,13 +199,13 @@ xf86parseLayoutSection (void)
 						token = xf86getSubToken(&(ptr->lay_comment));
 						if (token != NUMBER) {
 							free(aptr);
-							Error(INVALID_SCR_MSG, NULL);
+							Error(INVALID_SCR_MSG);
 						}
 						aptr->adj_y = val.num;
 					} else {
 						if (absKeyword) {
 							free(aptr);
-							Error(INVALID_SCR_MSG, NULL);
+							Error(INVALID_SCR_MSG);
 						} else
 							xf86unGetToken (token);
 					}
@@ -218,7 +218,7 @@ xf86parseLayoutSection (void)
 					token = xf86getSubToken(&(ptr->lay_comment));
 					if (token != STRING) {
 						free(aptr);
-						Error(INVALID_SCR_MSG, NULL);
+						Error(INVALID_SCR_MSG);
 					}
 					aptr->adj_refscreen = val.str;
 					if (aptr->adj_where == CONF_ADJ_RELATIVE)
@@ -226,13 +226,13 @@ xf86parseLayoutSection (void)
 						token = xf86getSubToken(&(ptr->lay_comment));
 						if (token != NUMBER) {
 							free(aptr);
-							Error(INVALID_SCR_MSG, NULL);
+							Error(INVALID_SCR_MSG);
 						}
 						aptr->adj_x = val.num;
 						token = xf86getSubToken(&(ptr->lay_comment));
 						if (token != NUMBER) {
 							free(aptr);
-							Error(INVALID_SCR_MSG, NULL);
+							Error(INVALID_SCR_MSG);
 						}
 						aptr->adj_y = val.num;
 					}
@@ -244,21 +244,21 @@ xf86parseLayoutSection (void)
 					/* bottom */
 					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
 						free(aptr);
-						Error (SCREEN_MSG, NULL);
+						Error (SCREEN_MSG);
 					}
 					aptr->adj_bottom_str = val.str;
 
 					/* left */
 					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
 						free(aptr);
-						Error (SCREEN_MSG, NULL);
+						Error (SCREEN_MSG);
 					}
 					aptr->adj_left_str = val.str;
 
 					/* right */
 					if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
 						free(aptr);
-						Error (SCREEN_MSG, NULL);
+						Error (SCREEN_MSG);
 					}
 					aptr->adj_right_str = val.str;
 
@@ -276,7 +276,7 @@ xf86parseLayoutSection (void)
 				iptr->iref_option_lst = NULL;
 				if (xf86getSubToken (&(ptr->lay_comment)) != STRING) {
 					free(iptr);
-					Error (INPUTDEV_MSG, NULL);
+					Error (INPUTDEV_MSG);
 				}
 				iptr->iref_inputdev_str = val.str;
 				while ((token = xf86getSubToken (&(ptr->lay_comment))) == STRING)
@@ -293,7 +293,7 @@ xf86parseLayoutSection (void)
 			ptr->lay_option_lst = xf86parseOption(ptr->lay_option_lst);
 			break;
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		default:
 			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@@ -302,7 +302,7 @@ xf86parseLayoutSection (void)
 	}
 
 	if (!has_ident)
-		Error (NO_IDENT_MSG, NULL);
+		Error (NO_IDENT_MSG);
 
 #ifdef DEBUG
 	printf ("Layout section parsed\n");
diff --git a/xorg-server/hw/xfree86/parser/Module.c b/xorg-server/hw/xfree86/parser/Module.c
index ca323fc5a..3c4cefc18 100644
--- a/xorg-server/hw/xfree86/parser/Module.c
+++ b/xorg-server/hw/xfree86/parser/Module.c
@@ -107,7 +107,7 @@ xf86parseModuleSubSection (XF86LoadPtr head, char *name)
 			ptr->load_opt = xf86parseOption(ptr->load_opt);
 			break;
 		case EOF_TOKEN:
-			xf86parseError (UNEXPECTED_EOF_MSG, NULL);
+			xf86parseError (UNEXPECTED_EOF_MSG);
 			free(ptr);
 			return NULL;
 		default:
@@ -163,7 +163,7 @@ xf86parseModuleSection (void)
 				xf86parseModuleSubSection (ptr->mod_load_lst, val.str);
 			break;
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		default:
 			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
diff --git a/xorg-server/hw/xfree86/parser/Monitor.c b/xorg-server/hw/xfree86/parser/Monitor.c
index 24fe4ba0d..52c55007e 100644
--- a/xorg-server/hw/xfree86/parser/Monitor.c
+++ b/xorg-server/hw/xfree86/parser/Monitor.c
@@ -1,897 +1,897 @@
-/* 

- * 

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

- */

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec MonitorTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{VENDOR, "vendorname"},

-	{MODEL, "modelname"},

-	{USEMODES, "usemodes"},

-	{MODELINE, "modeline"},

-	{DISPLAYSIZE, "displaysize"},

-	{HORIZSYNC, "horizsync"},

-	{VERTREFRESH, "vertrefresh"},

-	{MODE, "mode"},

-	{GAMMA, "gamma"},

-	{OPTION, "option"},

-	{-1, ""},

-};

-

-static xf86ConfigSymTabRec ModesTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{MODELINE, "modeline"},

-	{MODE, "mode"},

-	{-1, ""},

-};

-

-static xf86ConfigSymTabRec TimingTab[] =

-{

-	{TT_INTERLACE, "interlace"},

-	{TT_PHSYNC, "+hsync"},

-	{TT_NHSYNC, "-hsync"},

-	{TT_PVSYNC, "+vsync"},

-	{TT_NVSYNC, "-vsync"},

-	{TT_CSYNC, "composite"},

-	{TT_PCSYNC, "+csync"},

-	{TT_NCSYNC, "-csync"},

-	{TT_DBLSCAN, "doublescan"},

-	{TT_HSKEW, "hskew"},

-	{TT_BCAST, "bcast"},

-	{TT_VSCAN, "vscan"},

-	{-1, ""},

-};

-

-static xf86ConfigSymTabRec ModeTab[] =

-{

-	{DOTCLOCK, "dotclock"},

-	{HTIMINGS, "htimings"},

-	{VTIMINGS, "vtimings"},

-	{FLAGS, "flags"},

-	{HSKEW, "hskew"},

-	{BCAST, "bcast"},

-	{VSCAN, "vscan"},

-	{ENDMODE, "endmode"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeModeLineList

-

-static void

-xf86freeModeLineList (XF86ConfModeLinePtr ptr)

-{

-	XF86ConfModeLinePtr prev;

-	while (ptr)

-	{

-		TestFree (ptr->ml_identifier);

-		TestFree (ptr->ml_comment);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-static XF86ConfModeLinePtr

-xf86parseModeLine (void)

-{

-	int token;

-	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)

-

-	/* Identifier */

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

-		Error ("ModeLine identifier expected", NULL);

-	ptr->ml_identifier = val.str;

-

-	/* DotClock */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine dotclock expected", NULL);

-	ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);

-

-	/* HDisplay */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine Hdisplay expected", NULL);

-	ptr->ml_hdisplay = val.num;

-

-	/* HSyncStart */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine HSyncStart expected", NULL);

-	ptr->ml_hsyncstart = val.num;

-

-	/* HSyncEnd */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine HSyncEnd expected", NULL);

-	ptr->ml_hsyncend = val.num;

-

-	/* HTotal */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine HTotal expected", NULL);

-	ptr->ml_htotal = val.num;

-

-	/* VDisplay */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine Vdisplay expected", NULL);

-	ptr->ml_vdisplay = val.num;

-

-	/* VSyncStart */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine VSyncStart expected", NULL);

-	ptr->ml_vsyncstart = val.num;

-

-	/* VSyncEnd */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine VSyncEnd expected", NULL);

-	ptr->ml_vsyncend = val.num;

-

-	/* VTotal */

-	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-		Error ("ModeLine VTotal expected", NULL);

-	ptr->ml_vtotal = val.num;

-

-	token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);

-	while ((token == TT_INTERLACE) || (token == TT_PHSYNC) ||

-		   (token == TT_NHSYNC) || (token == TT_PVSYNC) ||

-		   (token == TT_NVSYNC) || (token == TT_CSYNC) ||

-		   (token == TT_PCSYNC) || (token == TT_NCSYNC) ||

-		   (token == TT_DBLSCAN) || (token == TT_HSKEW) ||

-		   (token == TT_VSCAN) || (token == TT_BCAST))

-	{

-		switch (token)

-		{

-

-		case TT_INTERLACE:

-			ptr->ml_flags |= XF86CONF_INTERLACE;

-			break;

-		case TT_PHSYNC:

-			ptr->ml_flags |= XF86CONF_PHSYNC;

-			break;

-		case TT_NHSYNC:

-			ptr->ml_flags |= XF86CONF_NHSYNC;

-			break;

-		case TT_PVSYNC:

-			ptr->ml_flags |= XF86CONF_PVSYNC;

-			break;

-		case TT_NVSYNC:

-			ptr->ml_flags |= XF86CONF_NVSYNC;

-			break;

-		case TT_CSYNC:

-			ptr->ml_flags |= XF86CONF_CSYNC;

-			break;

-		case TT_PCSYNC:

-			ptr->ml_flags |= XF86CONF_PCSYNC;

-			break;

-		case TT_NCSYNC:

-			ptr->ml_flags |= XF86CONF_NCSYNC;

-			break;

-		case TT_DBLSCAN:

-			ptr->ml_flags |= XF86CONF_DBLSCAN;

-			break;

-		case TT_HSKEW:

-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-				Error (NUMBER_MSG, "Hskew");

-			ptr->ml_hskew = val.num;

-			ptr->ml_flags |= XF86CONF_HSKEW;

-			break;

-		case TT_BCAST:

-			ptr->ml_flags |= XF86CONF_BCAST;

-			break;

-		case TT_VSCAN:

-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-				Error (NUMBER_MSG, "Vscan");

-			ptr->ml_vscan = val.num;

-			ptr->ml_flags |= XF86CONF_VSCAN;

-			break;

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-			break;

-		}

-		token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);

-	}

-	xf86unGetToken (token);

-

-#ifdef DEBUG

-	printf ("ModeLine parsed\n");

-#endif

-	return ptr;

-}

-

-static XF86ConfModeLinePtr

-xf86parseVerboseMode (void)

-{

-	int token, token2;

-	int had_dotclock = 0, had_htimings = 0, had_vtimings = 0;

-	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)

-

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

-		Error ("Mode name expected", NULL);

-	ptr->ml_identifier = val.str;

-	while ((token = xf86getToken (ModeTab)) != ENDMODE)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case DOTCLOCK:

-			if ((token = xf86getSubToken (&(ptr->ml_comment))) != NUMBER)

-				Error (NUMBER_MSG, "DotClock");

-			ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);

-			had_dotclock = 1;

-			break;

-		case HTIMINGS:

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_hdisplay = val.num;

-			else

-				Error ("Horizontal display expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_hsyncstart = val.num;

-			else

-				Error ("Horizontal sync start expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_hsyncend = val.num;

-			else

-				Error ("Horizontal sync end expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_htotal = val.num;

-			else

-				Error ("Horizontal total expected", NULL);

-			had_htimings = 1;

-			break;

-		case VTIMINGS:

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_vdisplay = val.num;

-			else

-				Error ("Vertical display expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_vsyncstart = val.num;

-			else

-				Error ("Vertical sync start expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_vsyncend = val.num;

-			else

-				Error ("Vertical sync end expected", NULL);

-

-			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)

-				ptr->ml_vtotal = val.num;

-			else

-				Error ("Vertical total expected", NULL);

-			had_vtimings = 1;

-			break;

-		case FLAGS:

-			token = xf86getSubToken (&(ptr->ml_comment));

-			if (token != STRING)

-				Error (QUOTE_MSG, "Flags");

-			while (token == STRING)

-			{

-				token2 = xf86getStringToken (TimingTab);

-				switch (token2)

-				{

-				case TT_INTERLACE:

-					ptr->ml_flags |= XF86CONF_INTERLACE;

-					break;

-				case TT_PHSYNC:

-					ptr->ml_flags |= XF86CONF_PHSYNC;

-					break;

-				case TT_NHSYNC:

-					ptr->ml_flags |= XF86CONF_NHSYNC;

-					break;

-				case TT_PVSYNC:

-					ptr->ml_flags |= XF86CONF_PVSYNC;

-					break;

-				case TT_NVSYNC:

-					ptr->ml_flags |= XF86CONF_NVSYNC;

-					break;

-				case TT_CSYNC:

-					ptr->ml_flags |= XF86CONF_CSYNC;

-					break;

-				case TT_PCSYNC:

-					ptr->ml_flags |= XF86CONF_PCSYNC;

-					break;

-				case TT_NCSYNC:

-					ptr->ml_flags |= XF86CONF_NCSYNC;

-					break;

-				case TT_DBLSCAN:

-					ptr->ml_flags |= XF86CONF_DBLSCAN;

-					break;

-				case EOF_TOKEN:

-					Error (UNEXPECTED_EOF_MSG, NULL);

-					break;

-				default:

-					Error ("Unknown flag string", NULL);

-					break;

-				}

-				token = xf86getSubToken (&(ptr->ml_comment));

-			}

-			xf86unGetToken (token);

-			break;

-		case HSKEW:

-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-				Error ("Horizontal skew expected", NULL);

-			ptr->ml_flags |= XF86CONF_HSKEW;

-			ptr->ml_hskew = val.num;

-			break;

-		case VSCAN:

-			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)

-				Error ("Vertical scan count expected", NULL);

-			ptr->ml_flags |= XF86CONF_VSCAN;

-			ptr->ml_vscan = val.num;

-			break;

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error ("Unexepcted token in verbose \"Mode\" entry\n", NULL);

-		}

-	}

-	if (!had_dotclock)

-		Error ("the dotclock is missing", NULL);

-	if (!had_htimings)

-		Error ("the horizontal timings are missing", NULL);

-	if (!had_vtimings)

-		Error ("the vertical timings are missing", NULL);

-

-#ifdef DEBUG

-	printf ("Verbose Mode parsed\n");

-#endif

-	return ptr;

-}

-

-#undef CLEANUP

-

-#define CLEANUP xf86freeMonitorList

-

-XF86ConfMonitorPtr

-xf86parseMonitorSection (void)

-{

-	int has_ident = FALSE;

-	int token;

-	parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)

-

-		while ((token = xf86getToken (MonitorTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			ptr->mon_identifier = val.str;

-			has_ident = TRUE;

-			break;

-		case VENDOR:

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

-				Error (QUOTE_MSG, "Vendor");

-			ptr->mon_vendor = val.str;

-			break;

-		case MODEL:

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

-				Error (QUOTE_MSG, "ModelName");

-			ptr->mon_modelname = val.str;

-			break;

-		case MODE:

-			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,

-						 XF86ConfModeLinePtr);

-			break;

-		case MODELINE:

-			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,

-						 XF86ConfModeLinePtr);

-			break;

-		case DISPLAYSIZE:

-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)

-				Error (DISPLAYSIZE_MSG, NULL);

-			ptr->mon_width = val.realnum;

-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)

-				Error (DISPLAYSIZE_MSG, NULL);

-			ptr->mon_height = val.realnum;

-			break;

-

-		case HORIZSYNC:

-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)

-				Error (HORIZSYNC_MSG, NULL);

-			do {

-				if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)

-					Error ("Sorry. Too many horizontal sync intervals.", NULL);

-				ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;

-				switch (token = xf86getSubToken (&(ptr->mon_comment)))

-				{

-					case COMMA:

-						ptr->mon_hsync[ptr->mon_n_hsync].hi =

-						ptr->mon_hsync[ptr->mon_n_hsync].lo;

-						break;

-					case DASH:

-						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||

-						    (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo)

-							Error (HORIZSYNC_MSG, NULL);

-						ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;

-						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)

-							break;

-						ptr->mon_n_hsync++;

-						goto HorizDone;

-					default:

-						/* We cannot currently know if a '\n' was found,

-						 * or this is a real error

-						 */

-						ptr->mon_hsync[ptr->mon_n_hsync].hi =

-						ptr->mon_hsync[ptr->mon_n_hsync].lo;

-						ptr->mon_n_hsync++;

-						goto HorizDone;

-				}

-				ptr->mon_n_hsync++;

-			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);

-HorizDone:

-			xf86unGetToken (token);

-			break;

-

-		case VERTREFRESH:

-			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)

-				Error (VERTREFRESH_MSG, NULL);

-			do {

-				ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;

-				switch (token = xf86getSubToken (&(ptr->mon_comment)))

-				{

-					case COMMA:

-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =

-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;

-						break;

-					case DASH:

-						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||

-						    (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)

-							Error (VERTREFRESH_MSG, NULL);

-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;

-						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)

-							break;

-						ptr->mon_n_vrefresh++;

-						goto VertDone;

-					default:

-						/* We cannot currently know if a '\n' was found,

-						 * or this is a real error

-						 */

-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =

-						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;

-						ptr->mon_n_vrefresh++;

-						goto VertDone;

-				}

-				if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)

-					Error ("Sorry. Too many vertical refresh intervals.", NULL);

-				ptr->mon_n_vrefresh++;

-			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);

-VertDone:

-			xf86unGetToken (token);

-			break;

-

-		case GAMMA:

-			if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER )

-			{

-				Error (INVALID_GAMMA_MSG, NULL);

-			}

-			else

-			{

-				ptr->mon_gamma_red = ptr->mon_gamma_green =

-					ptr->mon_gamma_blue = val.realnum;

-				if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )

-				{

-					ptr->mon_gamma_green = val.realnum;

-					if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )

-					{

-						ptr->mon_gamma_blue = val.realnum;

-					}

-					else

-					{

-						Error (INVALID_GAMMA_MSG, NULL);

-					}

-				}

-				else

-					xf86unGetToken (token);

-			}

-			break;

-		case OPTION:

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

-			break;

-		case USEMODES:

-		        {

-				XF86ConfModesLinkPtr mptr;

-

-				if ((token = xf86getSubToken (&(ptr->mon_comment))) != STRING)

-					Error (QUOTE_MSG, "UseModes");

-

-				/* add to the end of the list of modes sections 

-				   referenced here */

-				mptr = calloc (1, sizeof (XF86ConfModesLinkRec));

-				mptr->list.next = NULL;

-				mptr->ml_modes_str = val.str;

-				mptr->ml_modes = NULL;

-				ptr->mon_modes_sect_lst = (XF86ConfModesLinkPtr)

-					xf86addListItem((GenericListPtr)ptr->mon_modes_sect_lst,

-						    (GenericListPtr)mptr);

-			}

-			break;

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());

-			CLEANUP (ptr);

-			return NULL;

-			break;

-		}

-	}

-

-	if (!has_ident)

-		Error (NO_IDENT_MSG, NULL);

-

-#ifdef DEBUG

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

-#endif

-	return ptr;

-}

-

-#undef CLEANUP

-#define CLEANUP xf86freeModesList

-

-XF86ConfModesPtr

-xf86parseModesSection (void)

-{

-	int has_ident = FALSE;

-	int token;

-	parsePrologue (XF86ConfModesPtr, XF86ConfModesRec)

-

-	while ((token = xf86getToken (ModesTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			ptr->modes_identifier = val.str;

-			has_ident = TRUE;

-			break;

-		case MODE:

-			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,

-						 XF86ConfModeLinePtr);

-			break;

-		case MODELINE:

-			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,

-						 XF86ConfModeLinePtr);

-			break;

-		default:

-			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());

-			CLEANUP (ptr);

-			return NULL;

-			break;

-		}

-	}

-

-	if (!has_ident)

-		Error (NO_IDENT_MSG, NULL);

-

-#ifdef DEBUG

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

-#endif

-	return ptr;

-}

-

-#undef CLEANUP

-

-void

-xf86printMonitorSection (FILE * cf, XF86ConfMonitorPtr ptr)

-{

-	int i;

-	XF86ConfModeLinePtr mlptr;

-	XF86ConfModesLinkPtr mptr;

-

-	while (ptr)

-	{

-		mptr = ptr->mon_modes_sect_lst;

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

-		if (ptr->mon_comment)

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

-		if (ptr->mon_identifier)

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

-		if (ptr->mon_vendor)

-			fprintf (cf, "\tVendorName   \"%s\"\n", ptr->mon_vendor);

-		if (ptr->mon_modelname)

-			fprintf (cf, "\tModelName    \"%s\"\n", ptr->mon_modelname);

-		while (mptr) {

-			fprintf (cf, "\tUseModes     \"%s\"\n", mptr->ml_modes_str);

-			mptr = mptr->list.next;

-		}

-		if (ptr->mon_width)

-			fprintf (cf, "\tDisplaySize  %d\t%d\n",

-					 ptr->mon_width,

-					 ptr->mon_height);

-		for (i = 0; i < ptr->mon_n_hsync; i++)

-		{

-			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",

-					 ptr->mon_hsync[i].lo,

-					 ptr->mon_hsync[i].hi);

-		}

-		for (i = 0; i < ptr->mon_n_vrefresh; i++)

-		{

-			fprintf (cf, "\tVertRefresh  %2.1f - %2.1f\n",

-					 ptr->mon_vrefresh[i].lo,

-					 ptr->mon_vrefresh[i].hi);

-		}

-		if (ptr->mon_gamma_red) {

-			if (ptr->mon_gamma_red == ptr->mon_gamma_green

-				&& ptr->mon_gamma_red == ptr->mon_gamma_blue)

-			{

-				fprintf (cf, "\tGamma        %.4g\n",

-					ptr->mon_gamma_red);

-			} else {

-				fprintf (cf, "\tGamma        %.4g %.4g %.4g\n",

-					ptr->mon_gamma_red,

-					ptr->mon_gamma_green,

-					ptr->mon_gamma_blue);

-			}

-		}

-		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)

-		{

-			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",

-					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);

-			fprintf (cf, "%d %d %d %d %d %d %d %d",

-					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,

-					 mlptr->ml_hsyncend, mlptr->ml_htotal,

-					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,

-					 mlptr->ml_vsyncend, mlptr->ml_vtotal);

-			if (mlptr->ml_flags & XF86CONF_PHSYNC)

-				fprintf (cf, " +hsync");

-			if (mlptr->ml_flags & XF86CONF_NHSYNC)

-				fprintf (cf, " -hsync");

-			if (mlptr->ml_flags & XF86CONF_PVSYNC)

-				fprintf (cf, " +vsync");

-			if (mlptr->ml_flags & XF86CONF_NVSYNC)

-				fprintf (cf, " -vsync");

-			if (mlptr->ml_flags & XF86CONF_INTERLACE)

-				fprintf (cf, " interlace");

-			if (mlptr->ml_flags & XF86CONF_CSYNC)

-				fprintf (cf, " composite");

-			if (mlptr->ml_flags & XF86CONF_PCSYNC)

-				fprintf (cf, " +csync");

-			if (mlptr->ml_flags & XF86CONF_NCSYNC)

-				fprintf (cf, " -csync");

-			if (mlptr->ml_flags & XF86CONF_DBLSCAN)

-				fprintf (cf, " doublescan");

-			if (mlptr->ml_flags & XF86CONF_HSKEW)

-				fprintf (cf, " hskew %d", mlptr->ml_hskew);

-			if (mlptr->ml_flags & XF86CONF_BCAST)

-				fprintf (cf, " bcast");

-			fprintf (cf, "\n");

-		}

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

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

-		ptr = ptr->list.next;

-	}

-}

-

-void

-xf86printModesSection (FILE * cf, XF86ConfModesPtr ptr)

-{

-	XF86ConfModeLinePtr mlptr;

-

-	while (ptr)

-	{

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

-		if (ptr->modes_comment)

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

-		if (ptr->modes_identifier)

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

-		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)

-		{

-			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",

-					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);

-			fprintf (cf, "%d %d %d %d %d %d %d %d",

-					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,

-					 mlptr->ml_hsyncend, mlptr->ml_htotal,

-					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,

-					 mlptr->ml_vsyncend, mlptr->ml_vtotal);

-			if (mlptr->ml_flags & XF86CONF_PHSYNC)

-				fprintf (cf, " +hsync");

-			if (mlptr->ml_flags & XF86CONF_NHSYNC)

-				fprintf (cf, " -hsync");

-			if (mlptr->ml_flags & XF86CONF_PVSYNC)

-				fprintf (cf, " +vsync");

-			if (mlptr->ml_flags & XF86CONF_NVSYNC)

-				fprintf (cf, " -vsync");

-			if (mlptr->ml_flags & XF86CONF_INTERLACE)

-				fprintf (cf, " interlace");

-			if (mlptr->ml_flags & XF86CONF_CSYNC)

-				fprintf (cf, " composite");

-			if (mlptr->ml_flags & XF86CONF_PCSYNC)

-				fprintf (cf, " +csync");

-			if (mlptr->ml_flags & XF86CONF_NCSYNC)

-				fprintf (cf, " -csync");

-			if (mlptr->ml_flags & XF86CONF_DBLSCAN)

-				fprintf (cf, " doublescan");

-			if (mlptr->ml_flags & XF86CONF_HSKEW)

-				fprintf (cf, " hskew %d", mlptr->ml_hskew);

-			if (mlptr->ml_flags & XF86CONF_VSCAN)

-				fprintf (cf, " vscan %d", mlptr->ml_vscan);

-			if (mlptr->ml_flags & XF86CONF_BCAST)

-				fprintf (cf, " bcast");

-			if (mlptr->ml_comment)

-				fprintf (cf, "%s", mlptr->ml_comment);

-			else

-				fprintf (cf, "\n");

-		}

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

-		ptr = ptr->list.next;

-	}

-}

-

-void

-xf86freeMonitorList (XF86ConfMonitorPtr ptr)

-{

-	XF86ConfMonitorPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->mon_identifier);

-		TestFree (ptr->mon_vendor);

-		TestFree (ptr->mon_modelname);

-		TestFree (ptr->mon_comment);

-		xf86optionListFree (ptr->mon_option_lst);

-		xf86freeModeLineList (ptr->mon_modeline_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-void

-xf86freeModesList (XF86ConfModesPtr ptr)

-{

-	XF86ConfModesPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->modes_identifier);

-		TestFree (ptr->modes_comment);

-		xf86freeModeLineList (ptr->mon_modeline_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-XF86ConfMonitorPtr

-xf86findMonitor (const char *ident, XF86ConfMonitorPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->mon_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

-XF86ConfModesPtr

-xf86findModes (const char *ident, XF86ConfModesPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->modes_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

-XF86ConfModeLinePtr

-xf86findModeLine (const char *ident, XF86ConfModeLinePtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->ml_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

-int

-xf86validateMonitor (XF86ConfigPtr p, XF86ConfScreenPtr screen)

-{

-	XF86ConfMonitorPtr monitor = screen->scrn_monitor;

-	XF86ConfModesLinkPtr modeslnk = monitor->mon_modes_sect_lst;

-	XF86ConfModesPtr modes;

-	while(modeslnk)

-	{

-		modes = xf86findModes (modeslnk->ml_modes_str, p->conf_modes_lst);

-		if (!modes)

-		{

-			xf86validationError (UNDEFINED_MODES_MSG, 

-					     modeslnk->ml_modes_str, 

-					     screen->scrn_identifier);

-			return FALSE;

-		}

-		modeslnk->ml_modes = modes;

-		modeslnk = modeslnk->list.next;

-	}

-	return TRUE;

-}

+/* 
+ * 
+ * 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).
+ */
+
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec MonitorTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{VENDOR, "vendorname"},
+	{MODEL, "modelname"},
+	{USEMODES, "usemodes"},
+	{MODELINE, "modeline"},
+	{DISPLAYSIZE, "displaysize"},
+	{HORIZSYNC, "horizsync"},
+	{VERTREFRESH, "vertrefresh"},
+	{MODE, "mode"},
+	{GAMMA, "gamma"},
+	{OPTION, "option"},
+	{-1, ""},
+};
+
+static xf86ConfigSymTabRec ModesTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{MODELINE, "modeline"},
+	{MODE, "mode"},
+	{-1, ""},
+};
+
+static xf86ConfigSymTabRec TimingTab[] =
+{
+	{TT_INTERLACE, "interlace"},
+	{TT_PHSYNC, "+hsync"},
+	{TT_NHSYNC, "-hsync"},
+	{TT_PVSYNC, "+vsync"},
+	{TT_NVSYNC, "-vsync"},
+	{TT_CSYNC, "composite"},
+	{TT_PCSYNC, "+csync"},
+	{TT_NCSYNC, "-csync"},
+	{TT_DBLSCAN, "doublescan"},
+	{TT_HSKEW, "hskew"},
+	{TT_BCAST, "bcast"},
+	{TT_VSCAN, "vscan"},
+	{-1, ""},
+};
+
+static xf86ConfigSymTabRec ModeTab[] =
+{
+	{DOTCLOCK, "dotclock"},
+	{HTIMINGS, "htimings"},
+	{VTIMINGS, "vtimings"},
+	{FLAGS, "flags"},
+	{HSKEW, "hskew"},
+	{BCAST, "bcast"},
+	{VSCAN, "vscan"},
+	{ENDMODE, "endmode"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeModeLineList
+
+static void
+xf86freeModeLineList (XF86ConfModeLinePtr ptr)
+{
+	XF86ConfModeLinePtr prev;
+	while (ptr)
+	{
+		TestFree (ptr->ml_identifier);
+		TestFree (ptr->ml_comment);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+static XF86ConfModeLinePtr
+xf86parseModeLine (void)
+{
+	int token;
+	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
+
+	/* Identifier */
+	if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
+		Error ("ModeLine identifier expected");
+	ptr->ml_identifier = val.str;
+
+	/* DotClock */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine dotclock expected");
+	ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
+
+	/* HDisplay */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine Hdisplay expected");
+	ptr->ml_hdisplay = val.num;
+
+	/* HSyncStart */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine HSyncStart expected");
+	ptr->ml_hsyncstart = val.num;
+
+	/* HSyncEnd */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine HSyncEnd expected");
+	ptr->ml_hsyncend = val.num;
+
+	/* HTotal */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine HTotal expected");
+	ptr->ml_htotal = val.num;
+
+	/* VDisplay */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine Vdisplay expected");
+	ptr->ml_vdisplay = val.num;
+
+	/* VSyncStart */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine VSyncStart expected");
+	ptr->ml_vsyncstart = val.num;
+
+	/* VSyncEnd */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine VSyncEnd expected");
+	ptr->ml_vsyncend = val.num;
+
+	/* VTotal */
+	if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+		Error ("ModeLine VTotal expected");
+	ptr->ml_vtotal = val.num;
+
+	token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
+	while ((token == TT_INTERLACE) || (token == TT_PHSYNC) ||
+		   (token == TT_NHSYNC) || (token == TT_PVSYNC) ||
+		   (token == TT_NVSYNC) || (token == TT_CSYNC) ||
+		   (token == TT_PCSYNC) || (token == TT_NCSYNC) ||
+		   (token == TT_DBLSCAN) || (token == TT_HSKEW) ||
+		   (token == TT_VSCAN) || (token == TT_BCAST))
+	{
+		switch (token)
+		{
+
+		case TT_INTERLACE:
+			ptr->ml_flags |= XF86CONF_INTERLACE;
+			break;
+		case TT_PHSYNC:
+			ptr->ml_flags |= XF86CONF_PHSYNC;
+			break;
+		case TT_NHSYNC:
+			ptr->ml_flags |= XF86CONF_NHSYNC;
+			break;
+		case TT_PVSYNC:
+			ptr->ml_flags |= XF86CONF_PVSYNC;
+			break;
+		case TT_NVSYNC:
+			ptr->ml_flags |= XF86CONF_NVSYNC;
+			break;
+		case TT_CSYNC:
+			ptr->ml_flags |= XF86CONF_CSYNC;
+			break;
+		case TT_PCSYNC:
+			ptr->ml_flags |= XF86CONF_PCSYNC;
+			break;
+		case TT_NCSYNC:
+			ptr->ml_flags |= XF86CONF_NCSYNC;
+			break;
+		case TT_DBLSCAN:
+			ptr->ml_flags |= XF86CONF_DBLSCAN;
+			break;
+		case TT_HSKEW:
+			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+				Error (NUMBER_MSG, "Hskew");
+			ptr->ml_hskew = val.num;
+			ptr->ml_flags |= XF86CONF_HSKEW;
+			break;
+		case TT_BCAST:
+			ptr->ml_flags |= XF86CONF_BCAST;
+			break;
+		case TT_VSCAN:
+			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+				Error (NUMBER_MSG, "Vscan");
+			ptr->ml_vscan = val.num;
+			ptr->ml_flags |= XF86CONF_VSCAN;
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+		token = xf86getSubTokenWithTab (&(ptr->ml_comment), TimingTab);
+	}
+	xf86unGetToken (token);
+
+#ifdef DEBUG
+	printf ("ModeLine parsed\n");
+#endif
+	return ptr;
+}
+
+static XF86ConfModeLinePtr
+xf86parseVerboseMode (void)
+{
+	int token, token2;
+	int had_dotclock = 0, had_htimings = 0, had_vtimings = 0;
+	parsePrologue (XF86ConfModeLinePtr, XF86ConfModeLineRec)
+
+		if (xf86getSubToken (&(ptr->ml_comment)) != STRING)
+		Error ("Mode name expected");
+	ptr->ml_identifier = val.str;
+	while ((token = xf86getToken (ModeTab)) != ENDMODE)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->ml_comment = xf86addComment(ptr->ml_comment, val.str);
+			break;
+		case DOTCLOCK:
+			if ((token = xf86getSubToken (&(ptr->ml_comment))) != NUMBER)
+				Error (NUMBER_MSG, "DotClock");
+			ptr->ml_clock = (int) (val.realnum * 1000.0 + 0.5);
+			had_dotclock = 1;
+			break;
+		case HTIMINGS:
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_hdisplay = val.num;
+			else
+				Error ("Horizontal display expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_hsyncstart = val.num;
+			else
+				Error ("Horizontal sync start expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_hsyncend = val.num;
+			else
+				Error ("Horizontal sync end expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_htotal = val.num;
+			else
+				Error ("Horizontal total expected");
+			had_htimings = 1;
+			break;
+		case VTIMINGS:
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_vdisplay = val.num;
+			else
+				Error ("Vertical display expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_vsyncstart = val.num;
+			else
+				Error ("Vertical sync start expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_vsyncend = val.num;
+			else
+				Error ("Vertical sync end expected");
+
+			if (xf86getSubToken (&(ptr->ml_comment)) == NUMBER)
+				ptr->ml_vtotal = val.num;
+			else
+				Error ("Vertical total expected");
+			had_vtimings = 1;
+			break;
+		case FLAGS:
+			token = xf86getSubToken (&(ptr->ml_comment));
+			if (token != STRING)
+				Error (QUOTE_MSG, "Flags");
+			while (token == STRING)
+			{
+				token2 = xf86getStringToken (TimingTab);
+				switch (token2)
+				{
+				case TT_INTERLACE:
+					ptr->ml_flags |= XF86CONF_INTERLACE;
+					break;
+				case TT_PHSYNC:
+					ptr->ml_flags |= XF86CONF_PHSYNC;
+					break;
+				case TT_NHSYNC:
+					ptr->ml_flags |= XF86CONF_NHSYNC;
+					break;
+				case TT_PVSYNC:
+					ptr->ml_flags |= XF86CONF_PVSYNC;
+					break;
+				case TT_NVSYNC:
+					ptr->ml_flags |= XF86CONF_NVSYNC;
+					break;
+				case TT_CSYNC:
+					ptr->ml_flags |= XF86CONF_CSYNC;
+					break;
+				case TT_PCSYNC:
+					ptr->ml_flags |= XF86CONF_PCSYNC;
+					break;
+				case TT_NCSYNC:
+					ptr->ml_flags |= XF86CONF_NCSYNC;
+					break;
+				case TT_DBLSCAN:
+					ptr->ml_flags |= XF86CONF_DBLSCAN;
+					break;
+				case EOF_TOKEN:
+					Error (UNEXPECTED_EOF_MSG);
+					break;
+				default:
+					Error ("Unknown flag string");
+					break;
+				}
+				token = xf86getSubToken (&(ptr->ml_comment));
+			}
+			xf86unGetToken (token);
+			break;
+		case HSKEW:
+			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+				Error ("Horizontal skew expected");
+			ptr->ml_flags |= XF86CONF_HSKEW;
+			ptr->ml_hskew = val.num;
+			break;
+		case VSCAN:
+			if (xf86getSubToken (&(ptr->ml_comment)) != NUMBER)
+				Error ("Vertical scan count expected");
+			ptr->ml_flags |= XF86CONF_VSCAN;
+			ptr->ml_vscan = val.num;
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error ("Unexepcted token in verbose \"Mode\" entry\n");
+		}
+	}
+	if (!had_dotclock)
+		Error ("the dotclock is missing");
+	if (!had_htimings)
+		Error ("the horizontal timings are missing");
+	if (!had_vtimings)
+		Error ("the vertical timings are missing");
+
+#ifdef DEBUG
+	printf ("Verbose Mode parsed\n");
+#endif
+	return ptr;
+}
+
+#undef CLEANUP
+
+#define CLEANUP xf86freeMonitorList
+
+XF86ConfMonitorPtr
+xf86parseMonitorSection (void)
+{
+	int has_ident = FALSE;
+	int token;
+	parsePrologue (XF86ConfMonitorPtr, XF86ConfMonitorRec)
+
+		while ((token = xf86getToken (MonitorTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->mon_comment = xf86addComment(ptr->mon_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			ptr->mon_identifier = val.str;
+			has_ident = TRUE;
+			break;
+		case VENDOR:
+			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
+				Error (QUOTE_MSG, "Vendor");
+			ptr->mon_vendor = val.str;
+			break;
+		case MODEL:
+			if (xf86getSubToken (&(ptr->mon_comment)) != STRING)
+				Error (QUOTE_MSG, "ModelName");
+			ptr->mon_modelname = val.str;
+			break;
+		case MODE:
+			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,
+						 XF86ConfModeLinePtr);
+			break;
+		case MODELINE:
+			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,
+						 XF86ConfModeLinePtr);
+			break;
+		case DISPLAYSIZE:
+			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
+				Error (DISPLAYSIZE_MSG);
+			ptr->mon_width = val.realnum;
+			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
+				Error (DISPLAYSIZE_MSG);
+			ptr->mon_height = val.realnum;
+			break;
+
+		case HORIZSYNC:
+			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
+				Error (HORIZSYNC_MSG);
+			do {
+				if (ptr->mon_n_hsync >= CONF_MAX_HSYNC)
+					Error ("Sorry. Too many horizontal sync intervals.");
+				ptr->mon_hsync[ptr->mon_n_hsync].lo = val.realnum;
+				switch (token = xf86getSubToken (&(ptr->mon_comment)))
+				{
+					case COMMA:
+						ptr->mon_hsync[ptr->mon_n_hsync].hi =
+						ptr->mon_hsync[ptr->mon_n_hsync].lo;
+						break;
+					case DASH:
+						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
+						    (float)val.realnum < ptr->mon_hsync[ptr->mon_n_hsync].lo)
+							Error (HORIZSYNC_MSG);
+						ptr->mon_hsync[ptr->mon_n_hsync].hi = val.realnum;
+						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
+							break;
+						ptr->mon_n_hsync++;
+						goto HorizDone;
+					default:
+						/* We cannot currently know if a '\n' was found,
+						 * or this is a real error
+						 */
+						ptr->mon_hsync[ptr->mon_n_hsync].hi =
+						ptr->mon_hsync[ptr->mon_n_hsync].lo;
+						ptr->mon_n_hsync++;
+						goto HorizDone;
+				}
+				ptr->mon_n_hsync++;
+			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
+HorizDone:
+			xf86unGetToken (token);
+			break;
+
+		case VERTREFRESH:
+			if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER)
+				Error (VERTREFRESH_MSG);
+			do {
+				ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo = val.realnum;
+				switch (token = xf86getSubToken (&(ptr->mon_comment)))
+				{
+					case COMMA:
+						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
+						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
+						break;
+					case DASH:
+						if (xf86getSubToken (&(ptr->mon_comment)) != NUMBER ||
+						    (float)val.realnum < ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo)
+							Error (VERTREFRESH_MSG);
+						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi = val.realnum;
+						if ((token = xf86getSubToken (&(ptr->mon_comment))) == COMMA)
+							break;
+						ptr->mon_n_vrefresh++;
+						goto VertDone;
+					default:
+						/* We cannot currently know if a '\n' was found,
+						 * or this is a real error
+						 */
+						ptr->mon_vrefresh[ptr->mon_n_vrefresh].hi =
+						ptr->mon_vrefresh[ptr->mon_n_vrefresh].lo;
+						ptr->mon_n_vrefresh++;
+						goto VertDone;
+				}
+				if (ptr->mon_n_vrefresh >= CONF_MAX_VREFRESH)
+					Error ("Sorry. Too many vertical refresh intervals.");
+				ptr->mon_n_vrefresh++;
+			} while ((token = xf86getSubToken (&(ptr->mon_comment))) == NUMBER);
+VertDone:
+			xf86unGetToken (token);
+			break;
+
+		case GAMMA:
+			if( xf86getSubToken (&(ptr->mon_comment)) != NUMBER )
+			{
+				Error (INVALID_GAMMA_MSG);
+			}
+			else
+			{
+				ptr->mon_gamma_red = ptr->mon_gamma_green =
+					ptr->mon_gamma_blue = val.realnum;
+				if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )
+				{
+					ptr->mon_gamma_green = val.realnum;
+					if( xf86getSubToken (&(ptr->mon_comment)) == NUMBER )
+					{
+						ptr->mon_gamma_blue = val.realnum;
+					}
+					else
+					{
+						Error (INVALID_GAMMA_MSG);
+					}
+				}
+				else
+					xf86unGetToken (token);
+			}
+			break;
+		case OPTION:
+			ptr->mon_option_lst = xf86parseOption(ptr->mon_option_lst);
+			break;
+		case USEMODES:
+		        {
+				XF86ConfModesLinkPtr mptr;
+
+				if ((token = xf86getSubToken (&(ptr->mon_comment))) != STRING)
+					Error (QUOTE_MSG, "UseModes");
+
+				/* add to the end of the list of modes sections 
+				   referenced here */
+				mptr = calloc (1, sizeof (XF86ConfModesLinkRec));
+				mptr->list.next = NULL;
+				mptr->ml_modes_str = val.str;
+				mptr->ml_modes = NULL;
+				ptr->mon_modes_sect_lst = (XF86ConfModesLinkPtr)
+					xf86addListItem((GenericListPtr)ptr->mon_modes_sect_lst,
+						    (GenericListPtr)mptr);
+			}
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
+			CLEANUP (ptr);
+			return NULL;
+			break;
+		}
+	}
+
+	if (!has_ident)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("Monitor section parsed\n");
+#endif
+	return ptr;
+}
+
+#undef CLEANUP
+#define CLEANUP xf86freeModesList
+
+XF86ConfModesPtr
+xf86parseModesSection (void)
+{
+	int has_ident = FALSE;
+	int token;
+	parsePrologue (XF86ConfModesPtr, XF86ConfModesRec)
+
+	while ((token = xf86getToken (ModesTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->modes_comment = xf86addComment(ptr->modes_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->modes_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			ptr->modes_identifier = val.str;
+			has_ident = TRUE;
+			break;
+		case MODE:
+			HANDLE_LIST (mon_modeline_lst, xf86parseVerboseMode,
+						 XF86ConfModeLinePtr);
+			break;
+		case MODELINE:
+			HANDLE_LIST (mon_modeline_lst, xf86parseModeLine,
+						 XF86ConfModeLinePtr);
+			break;
+		default:
+			xf86parseError (INVALID_KEYWORD_MSG, xf86tokenString ());
+			CLEANUP (ptr);
+			return NULL;
+			break;
+		}
+	}
+
+	if (!has_ident)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("Modes section parsed\n");
+#endif
+	return ptr;
+}
+
+#undef CLEANUP
+
+void
+xf86printMonitorSection (FILE * cf, XF86ConfMonitorPtr ptr)
+{
+	int i;
+	XF86ConfModeLinePtr mlptr;
+	XF86ConfModesLinkPtr mptr;
+
+	while (ptr)
+	{
+		mptr = ptr->mon_modes_sect_lst;
+		fprintf (cf, "Section \"Monitor\"\n");
+		if (ptr->mon_comment)
+			fprintf (cf, "%s", ptr->mon_comment);
+		if (ptr->mon_identifier)
+			fprintf (cf, "\tIdentifier   \"%s\"\n", ptr->mon_identifier);
+		if (ptr->mon_vendor)
+			fprintf (cf, "\tVendorName   \"%s\"\n", ptr->mon_vendor);
+		if (ptr->mon_modelname)
+			fprintf (cf, "\tModelName    \"%s\"\n", ptr->mon_modelname);
+		while (mptr) {
+			fprintf (cf, "\tUseModes     \"%s\"\n", mptr->ml_modes_str);
+			mptr = mptr->list.next;
+		}
+		if (ptr->mon_width)
+			fprintf (cf, "\tDisplaySize  %d\t%d\n",
+					 ptr->mon_width,
+					 ptr->mon_height);
+		for (i = 0; i < ptr->mon_n_hsync; i++)
+		{
+			fprintf (cf, "\tHorizSync    %2.1f - %2.1f\n",
+					 ptr->mon_hsync[i].lo,
+					 ptr->mon_hsync[i].hi);
+		}
+		for (i = 0; i < ptr->mon_n_vrefresh; i++)
+		{
+			fprintf (cf, "\tVertRefresh  %2.1f - %2.1f\n",
+					 ptr->mon_vrefresh[i].lo,
+					 ptr->mon_vrefresh[i].hi);
+		}
+		if (ptr->mon_gamma_red) {
+			if (ptr->mon_gamma_red == ptr->mon_gamma_green
+				&& ptr->mon_gamma_red == ptr->mon_gamma_blue)
+			{
+				fprintf (cf, "\tGamma        %.4g\n",
+					ptr->mon_gamma_red);
+			} else {
+				fprintf (cf, "\tGamma        %.4g %.4g %.4g\n",
+					ptr->mon_gamma_red,
+					ptr->mon_gamma_green,
+					ptr->mon_gamma_blue);
+			}
+		}
+		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)
+		{
+			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",
+					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
+			fprintf (cf, "%d %d %d %d %d %d %d %d",
+					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
+					 mlptr->ml_hsyncend, mlptr->ml_htotal,
+					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
+					 mlptr->ml_vsyncend, mlptr->ml_vtotal);
+			if (mlptr->ml_flags & XF86CONF_PHSYNC)
+				fprintf (cf, " +hsync");
+			if (mlptr->ml_flags & XF86CONF_NHSYNC)
+				fprintf (cf, " -hsync");
+			if (mlptr->ml_flags & XF86CONF_PVSYNC)
+				fprintf (cf, " +vsync");
+			if (mlptr->ml_flags & XF86CONF_NVSYNC)
+				fprintf (cf, " -vsync");
+			if (mlptr->ml_flags & XF86CONF_INTERLACE)
+				fprintf (cf, " interlace");
+			if (mlptr->ml_flags & XF86CONF_CSYNC)
+				fprintf (cf, " composite");
+			if (mlptr->ml_flags & XF86CONF_PCSYNC)
+				fprintf (cf, " +csync");
+			if (mlptr->ml_flags & XF86CONF_NCSYNC)
+				fprintf (cf, " -csync");
+			if (mlptr->ml_flags & XF86CONF_DBLSCAN)
+				fprintf (cf, " doublescan");
+			if (mlptr->ml_flags & XF86CONF_HSKEW)
+				fprintf (cf, " hskew %d", mlptr->ml_hskew);
+			if (mlptr->ml_flags & XF86CONF_BCAST)
+				fprintf (cf, " bcast");
+			fprintf (cf, "\n");
+		}
+		xf86printOptionList(cf, ptr->mon_option_lst, 1);
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+}
+
+void
+xf86printModesSection (FILE * cf, XF86ConfModesPtr ptr)
+{
+	XF86ConfModeLinePtr mlptr;
+
+	while (ptr)
+	{
+		fprintf (cf, "Section \"Modes\"\n");
+		if (ptr->modes_comment)
+			fprintf (cf, "%s", ptr->modes_comment);
+		if (ptr->modes_identifier)
+			fprintf (cf, "\tIdentifier     \"%s\"\n", ptr->modes_identifier);
+		for (mlptr = ptr->mon_modeline_lst; mlptr; mlptr = mlptr->list.next)
+		{
+			fprintf (cf, "\tModeLine     \"%s\" %2.1f ",
+					 mlptr->ml_identifier, mlptr->ml_clock / 1000.0);
+			fprintf (cf, "%d %d %d %d %d %d %d %d",
+					 mlptr->ml_hdisplay, mlptr->ml_hsyncstart,
+					 mlptr->ml_hsyncend, mlptr->ml_htotal,
+					 mlptr->ml_vdisplay, mlptr->ml_vsyncstart,
+					 mlptr->ml_vsyncend, mlptr->ml_vtotal);
+			if (mlptr->ml_flags & XF86CONF_PHSYNC)
+				fprintf (cf, " +hsync");
+			if (mlptr->ml_flags & XF86CONF_NHSYNC)
+				fprintf (cf, " -hsync");
+			if (mlptr->ml_flags & XF86CONF_PVSYNC)
+				fprintf (cf, " +vsync");
+			if (mlptr->ml_flags & XF86CONF_NVSYNC)
+				fprintf (cf, " -vsync");
+			if (mlptr->ml_flags & XF86CONF_INTERLACE)
+				fprintf (cf, " interlace");
+			if (mlptr->ml_flags & XF86CONF_CSYNC)
+				fprintf (cf, " composite");
+			if (mlptr->ml_flags & XF86CONF_PCSYNC)
+				fprintf (cf, " +csync");
+			if (mlptr->ml_flags & XF86CONF_NCSYNC)
+				fprintf (cf, " -csync");
+			if (mlptr->ml_flags & XF86CONF_DBLSCAN)
+				fprintf (cf, " doublescan");
+			if (mlptr->ml_flags & XF86CONF_HSKEW)
+				fprintf (cf, " hskew %d", mlptr->ml_hskew);
+			if (mlptr->ml_flags & XF86CONF_VSCAN)
+				fprintf (cf, " vscan %d", mlptr->ml_vscan);
+			if (mlptr->ml_flags & XF86CONF_BCAST)
+				fprintf (cf, " bcast");
+			if (mlptr->ml_comment)
+				fprintf (cf, "%s", mlptr->ml_comment);
+			else
+				fprintf (cf, "\n");
+		}
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+}
+
+void
+xf86freeMonitorList (XF86ConfMonitorPtr ptr)
+{
+	XF86ConfMonitorPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->mon_identifier);
+		TestFree (ptr->mon_vendor);
+		TestFree (ptr->mon_modelname);
+		TestFree (ptr->mon_comment);
+		xf86optionListFree (ptr->mon_option_lst);
+		xf86freeModeLineList (ptr->mon_modeline_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+void
+xf86freeModesList (XF86ConfModesPtr ptr)
+{
+	XF86ConfModesPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->modes_identifier);
+		TestFree (ptr->modes_comment);
+		xf86freeModeLineList (ptr->mon_modeline_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+XF86ConfMonitorPtr
+xf86findMonitor (const char *ident, XF86ConfMonitorPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->mon_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
+XF86ConfModesPtr
+xf86findModes (const char *ident, XF86ConfModesPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->modes_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
+XF86ConfModeLinePtr
+xf86findModeLine (const char *ident, XF86ConfModeLinePtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->ml_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
+int
+xf86validateMonitor (XF86ConfigPtr p, XF86ConfScreenPtr screen)
+{
+	XF86ConfMonitorPtr monitor = screen->scrn_monitor;
+	XF86ConfModesLinkPtr modeslnk = monitor->mon_modes_sect_lst;
+	XF86ConfModesPtr modes;
+	while(modeslnk)
+	{
+		modes = xf86findModes (modeslnk->ml_modes_str, p->conf_modes_lst);
+		if (!modes)
+		{
+			xf86validationError (UNDEFINED_MODES_MSG, 
+					     modeslnk->ml_modes_str, 
+					     screen->scrn_identifier);
+			return FALSE;
+		}
+		modeslnk->ml_modes = modes;
+		modeslnk = modeslnk->list.next;
+	}
+	return TRUE;
+}
diff --git a/xorg-server/hw/xfree86/parser/Pointer.c b/xorg-server/hw/xfree86/parser/Pointer.c
index a7ee3f213..4edbf74d9 100644
--- a/xorg-server/hw/xfree86/parser/Pointer.c
+++ b/xorg-server/hw/xfree86/parser/Pointer.c
@@ -1,233 +1,233 @@
-/* 

- * 

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

- */

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-#include "Xprintf.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec PointerTab[] =

-{

-	{PROTOCOL, "protocol"},

-	{EMULATE3, "emulate3buttons"},

-	{EM3TIMEOUT, "emulate3timeout"},

-	{ENDSUBSECTION, "endsubsection"},

-	{ENDSECTION, "endsection"},

-	{PDEVICE, "device"},

-	{PDEVICE, "port"},

-	{BAUDRATE, "baudrate"},

-	{SAMPLERATE, "samplerate"},

-	{CLEARDTR, "cleardtr"},

-	{CLEARRTS, "clearrts"},

-	{CHORDMIDDLE, "chordmiddle"},

-	{PRESOLUTION, "resolution"},

-	{DEVICE_NAME, "devicename"},

-	{ALWAYSCORE, "alwayscore"},

-	{PBUTTONS, "buttons"},

-	{ZAXISMAPPING, "zaxismapping"},

-	{-1, ""},

-};

-

-static xf86ConfigSymTabRec ZMapTab[] =

-{

-	{XAXIS, "x"},

-	{YAXIS, "y"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeInputList

-

-XF86ConfInputPtr

-xf86parsePointerSection (void)

-{

-	char *s;

-	unsigned long val1;

-	int token;

-	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)

-

-	while ((token = xf86getToken (PointerTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case PROTOCOL:

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

-				Error (QUOTE_MSG, "Protocol");

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Protocol"),

-												val.str);

-			break;

-		case PDEVICE:

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

-				Error (QUOTE_MSG, "Device");

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Device"),

-												val.str);

-			break;

-		case EMULATE3:

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Emulate3Buttons"),

-												NULL);

-			break;

-		case EM3TIMEOUT:

-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)

-				Error (POSITIVE_INT_MSG, "Emulate3Timeout");

-			s = xf86uLongToString(val.num);

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Emulate3Timeout"),

-												s);

-			break;

-		case CHORDMIDDLE:

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("ChordMiddle"),

-												NULL);

-			break;

-		case PBUTTONS:

-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)

-				Error (POSITIVE_INT_MSG, "Buttons");

-			s = xf86uLongToString(val.num);

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Buttons"), s);

-			break;

-		case BAUDRATE:

-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)

-				Error (POSITIVE_INT_MSG, "BaudRate");

-			s = xf86uLongToString(val.num);

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("BaudRate"), s);

-			break;

-		case SAMPLERATE:

-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)

-				Error (POSITIVE_INT_MSG, "SampleRate");

-			s = xf86uLongToString(val.num);

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("SampleRate"), s);

-			break;

-		case PRESOLUTION:

-			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)

-				Error (POSITIVE_INT_MSG, "Resolution");

-			s = xf86uLongToString(val.num);

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("Resolution"), s);

-			break;

-		case CLEARDTR:

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("ClearDTR"), NULL);

-			break;

-		case CLEARRTS:

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("ClearRTS"), NULL);

-			break;

-		case ZAXISMAPPING:

-			switch (xf86getToken(ZMapTab)) {

-			case NUMBER:

-				if (val.num < 0)

-					Error (ZAXISMAPPING_MSG, NULL);

-				val1 = val.num;

-				if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {

-					Error (ZAXISMAPPING_MSG, NULL);

-				}

-				if (asprintf(&s, "%lu %u", val1, val.num) == -1)

-				    s = NULL;

-				break;

-			case XAXIS:

-				s = strdup("x");

-				break;

-			case YAXIS:

-				s = strdup("y");

-				break;

-			default:

-				Error (ZAXISMAPPING_MSG, NULL);

-				break;

-			}

-			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-												strdup("ZAxisMapping"),

-												s);

-			break;

-		case ALWAYSCORE:

-			break;

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-			break;

-		}

-	}

-

-	ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);

-	ptr->inp_driver = strdup("mouse");

-	ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,

-										strdup("CorePointer"), NULL);

-

-#ifdef DEBUG

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

-#endif

-

-	return ptr;

-}

-

-#undef CLEANUP

-

+/* 
+ * 
+ * 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).
+ */
+
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+#include "Xprintf.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec PointerTab[] =
+{
+	{PROTOCOL, "protocol"},
+	{EMULATE3, "emulate3buttons"},
+	{EM3TIMEOUT, "emulate3timeout"},
+	{ENDSUBSECTION, "endsubsection"},
+	{ENDSECTION, "endsection"},
+	{PDEVICE, "device"},
+	{PDEVICE, "port"},
+	{BAUDRATE, "baudrate"},
+	{SAMPLERATE, "samplerate"},
+	{CLEARDTR, "cleardtr"},
+	{CLEARRTS, "clearrts"},
+	{CHORDMIDDLE, "chordmiddle"},
+	{PRESOLUTION, "resolution"},
+	{DEVICE_NAME, "devicename"},
+	{ALWAYSCORE, "alwayscore"},
+	{PBUTTONS, "buttons"},
+	{ZAXISMAPPING, "zaxismapping"},
+	{-1, ""},
+};
+
+static xf86ConfigSymTabRec ZMapTab[] =
+{
+	{XAXIS, "x"},
+	{YAXIS, "y"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeInputList
+
+XF86ConfInputPtr
+xf86parsePointerSection (void)
+{
+	char *s;
+	unsigned long val1;
+	int token;
+	parsePrologue (XF86ConfInputPtr, XF86ConfInputRec)
+
+	while ((token = xf86getToken (PointerTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->inp_comment = xf86addComment(ptr->inp_comment, val.str);
+			break;
+		case PROTOCOL:
+			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
+				Error (QUOTE_MSG, "Protocol");
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Protocol"),
+												val.str);
+			break;
+		case PDEVICE:
+			if (xf86getSubToken (&(ptr->inp_comment)) != STRING)
+				Error (QUOTE_MSG, "Device");
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Device"),
+												val.str);
+			break;
+		case EMULATE3:
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Emulate3Buttons"),
+												NULL);
+			break;
+		case EM3TIMEOUT:
+			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
+				Error (POSITIVE_INT_MSG, "Emulate3Timeout");
+			s = xf86uLongToString(val.num);
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Emulate3Timeout"),
+												s);
+			break;
+		case CHORDMIDDLE:
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("ChordMiddle"),
+												NULL);
+			break;
+		case PBUTTONS:
+			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
+				Error (POSITIVE_INT_MSG, "Buttons");
+			s = xf86uLongToString(val.num);
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Buttons"), s);
+			break;
+		case BAUDRATE:
+			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
+				Error (POSITIVE_INT_MSG, "BaudRate");
+			s = xf86uLongToString(val.num);
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("BaudRate"), s);
+			break;
+		case SAMPLERATE:
+			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
+				Error (POSITIVE_INT_MSG, "SampleRate");
+			s = xf86uLongToString(val.num);
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("SampleRate"), s);
+			break;
+		case PRESOLUTION:
+			if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0)
+				Error (POSITIVE_INT_MSG, "Resolution");
+			s = xf86uLongToString(val.num);
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("Resolution"), s);
+			break;
+		case CLEARDTR:
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("ClearDTR"), NULL);
+			break;
+		case CLEARRTS:
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("ClearRTS"), NULL);
+			break;
+		case ZAXISMAPPING:
+			switch (xf86getToken(ZMapTab)) {
+			case NUMBER:
+				if (val.num < 0)
+					Error (ZAXISMAPPING_MSG);
+				val1 = val.num;
+				if (xf86getSubToken (&(ptr->inp_comment)) != NUMBER || val.num < 0) {
+					Error (ZAXISMAPPING_MSG);
+				}
+				if (asprintf(&s, "%lu %u", val1, val.num) == -1)
+				    s = NULL;
+				break;
+			case XAXIS:
+				s = strdup("x");
+				break;
+			case YAXIS:
+				s = strdup("y");
+				break;
+			default:
+				Error (ZAXISMAPPING_MSG);
+				break;
+			}
+			ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+												strdup("ZAxisMapping"),
+												s);
+			break;
+		case ALWAYSCORE:
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+	ptr->inp_identifier = strdup(CONF_IMPLICIT_POINTER);
+	ptr->inp_driver = strdup("mouse");
+	ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
+										strdup("CorePointer"), NULL);
+
+#ifdef DEBUG
+	printf ("Pointer section parsed\n");
+#endif
+
+	return ptr;
+}
+
+#undef CLEANUP
+
diff --git a/xorg-server/hw/xfree86/parser/Screen.c b/xorg-server/hw/xfree86/parser/Screen.c
index b5667a79e..2ca2c570d 100644
--- a/xorg-server/hw/xfree86/parser/Screen.c
+++ b/xorg-server/hw/xfree86/parser/Screen.c
@@ -1,569 +1,569 @@
-/* 

- * 

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

- */

-

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec DisplayTab[] =

-{

-	{ENDSUBSECTION, "endsubsection"},

-	{MODES, "modes"},

-	{VIEWPORT, "viewport"},

-	{VIRTUAL, "virtual"},

-	{VISUAL, "visual"},

-	{BLACK_TOK, "black"},

-	{WHITE_TOK, "white"},

-	{DEPTH, "depth"},

-	{BPP, "fbbpp"},

-	{WEIGHT, "weight"},

-	{OPTION, "option"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeDisplayList

-

-static XF86ConfDisplayPtr

-xf86parseDisplaySubSection (void)

-{

-	int token;

-	parsePrologue (XF86ConfDisplayPtr, XF86ConfDisplayRec)

-

-	ptr->disp_black.red = ptr->disp_black.green = ptr->disp_black.blue = -1;

-	ptr->disp_white.red = ptr->disp_white.green = ptr->disp_white.blue = -1;

-	ptr->disp_frameX0 = ptr->disp_frameY0 = -1;

-	while ((token = xf86getToken (DisplayTab)) != ENDSUBSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case VIEWPORT:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (VIEWPORT_MSG, NULL);

-			ptr->disp_frameX0 = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (VIEWPORT_MSG, NULL);

-			ptr->disp_frameY0 = val.num;

-			break;

-		case VIRTUAL:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (VIRTUAL_MSG, NULL);

-			ptr->disp_virtualX = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (VIRTUAL_MSG, NULL);

-			ptr->disp_virtualY = val.num;

-			break;

-		case DEPTH:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (NUMBER_MSG, "Display");

-			ptr->disp_depth = val.num;

-			break;

-		case BPP:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (NUMBER_MSG, "Display");

-			ptr->disp_bpp = val.num;

-			break;

-		case VISUAL:

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

-				Error (QUOTE_MSG, "Display");

-			ptr->disp_visual = val.str;

-			break;

-		case WEIGHT:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WEIGHT_MSG, NULL);

-			ptr->disp_weight.red = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WEIGHT_MSG, NULL);

-			ptr->disp_weight.green = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WEIGHT_MSG, NULL);

-			ptr->disp_weight.blue = val.num;

-			break;

-		case BLACK_TOK:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (BLACK_MSG, NULL);

-			ptr->disp_black.red = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (BLACK_MSG, NULL);

-			ptr->disp_black.green = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (BLACK_MSG, NULL);

-			ptr->disp_black.blue = val.num;

-			break;

-		case WHITE_TOK:

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WHITE_MSG, NULL);

-			ptr->disp_white.red = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WHITE_MSG, NULL);

-			ptr->disp_white.green = val.num;

-			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)

-				Error (WHITE_MSG, NULL);

-			ptr->disp_white.blue = val.num;

-			break;

-		case MODES:

-			{

-				XF86ModePtr mptr;

-

-				while ((token = xf86getSubTokenWithTab (&(ptr->disp_comment), DisplayTab)) == STRING)

-				{

-					mptr = calloc (1, sizeof (XF86ModeRec));

-					mptr->mode_name = val.str;

-					mptr->list.next = NULL;

-					ptr->disp_mode_lst = (XF86ModePtr)

-						xf86addListItem ((glp) ptr->disp_mode_lst, (glp) mptr);

-				}

-				xf86unGetToken (token);

-			}

-			break;

-		case OPTION:

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

-			break;

-			

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-			break;

-		}

-	}

-

-#ifdef DEBUG

-	printf ("Display subsection parsed\n");

-#endif

-

-	return ptr;

-}

-

-#undef CLEANUP

-

-static xf86ConfigSymTabRec ScreenTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{OBSDRIVER, "driver"},

-	{MDEVICE, "device"},

-	{MONITOR, "monitor"},

-	{VIDEOADAPTOR, "videoadaptor"},

-	{SCREENNO, "screenno"},

-	{SUBSECTION, "subsection"},

-	{DEFAULTDEPTH, "defaultcolordepth"},

-	{DEFAULTDEPTH, "defaultdepth"},

-	{DEFAULTBPP, "defaultbpp"},

-	{DEFAULTFBBPP, "defaultfbbpp"},

-	{VIRTUAL, "virtual"},

-	{OPTION, "option"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeScreenList

-XF86ConfScreenPtr

-xf86parseScreenSection (void)

-{

-	int has_ident = FALSE;

-	int has_driver= FALSE;

-	int token;

-

-	parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)

-

-		while ((token = xf86getToken (ScreenTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			ptr->scrn_identifier = val.str;

-			if (has_ident || has_driver)

-				Error (ONLY_ONE_MSG,"Identifier or Driver");

-			has_ident = TRUE;

-			break;

-		case OBSDRIVER:

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

-				Error (QUOTE_MSG, "Driver");

-			ptr->scrn_obso_driver = val.str;

-			if (has_ident || has_driver)

-				Error (ONLY_ONE_MSG,"Identifier or Driver");

-			has_driver = TRUE;

-			break;

-		case DEFAULTDEPTH:

-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)

-				Error (NUMBER_MSG, "DefaultDepth");

-			ptr->scrn_defaultdepth = val.num;

-			break;

-		case DEFAULTBPP:

-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)

-				Error (NUMBER_MSG, "DefaultBPP");

-			ptr->scrn_defaultbpp = val.num;

-			break;

-		case DEFAULTFBBPP:

-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)

-				Error (NUMBER_MSG, "DefaultFbBPP");

-			ptr->scrn_defaultfbbpp = val.num;

-			break;

-		case MDEVICE:

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

-				Error (QUOTE_MSG, "Device");

-			ptr->scrn_device_str = val.str;

-			break;

-		case MONITOR:

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

-				Error (QUOTE_MSG, "Monitor");

-			ptr->scrn_monitor_str = val.str;

-			break;

-		case VIDEOADAPTOR:

-			{

-				XF86ConfAdaptorLinkPtr aptr;

-

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

-					Error (QUOTE_MSG, "VideoAdaptor");

-

-				/* Don't allow duplicates */

-				for (aptr = ptr->scrn_adaptor_lst; aptr; 

-					aptr = (XF86ConfAdaptorLinkPtr) aptr->list.next)

-					if (xf86nameCompare (val.str, aptr->al_adaptor_str) == 0)

-						break;

-

-				if (aptr == NULL)

-				{

-					aptr = calloc (1, sizeof (XF86ConfAdaptorLinkRec));

-					aptr->list.next = NULL;

-					aptr->al_adaptor_str = val.str;

-					ptr->scrn_adaptor_lst = (XF86ConfAdaptorLinkPtr)

-						xf86addListItem ((glp) ptr->scrn_adaptor_lst, (glp) aptr);

-				}

-			}

-			break;

-		case VIRTUAL:

-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)

-				Error (VIRTUAL_MSG, NULL);

-			ptr->scrn_virtualX = val.num;

-			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)

-				Error (VIRTUAL_MSG, NULL);

-			ptr->scrn_virtualY = val.num;

-			break;

-		case OPTION:

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

-			break;

-		case SUBSECTION:

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

-				Error (QUOTE_MSG, "SubSection");

-			{

-				free(val.str);

-				HANDLE_LIST (scrn_display_lst, xf86parseDisplaySubSection,

-							 XF86ConfDisplayPtr);

-			}

-			break;

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-			break;

-		}

-	}

-

-	if (!has_ident && !has_driver)

-		Error (NO_IDENT_MSG, NULL);

-

-#ifdef DEBUG

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

-#endif

-

-	return ptr;

-}

-

-void

-xf86printScreenSection (FILE * cf, XF86ConfScreenPtr ptr)

-{

-	XF86ConfAdaptorLinkPtr aptr;

-	XF86ConfDisplayPtr dptr;

-	XF86ModePtr mptr;

-

-	while (ptr)

-	{

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

-		if (ptr->scrn_comment)

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

-		if (ptr->scrn_identifier)

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

-		if (ptr->scrn_obso_driver)

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

-		if (ptr->scrn_device_str)

-			fprintf (cf, "\tDevice     \"%s\"\n", ptr->scrn_device_str);

-		if (ptr->scrn_monitor_str)

-			fprintf (cf, "\tMonitor    \"%s\"\n", ptr->scrn_monitor_str);

-		if (ptr->scrn_defaultdepth)

-			fprintf (cf, "\tDefaultDepth     %d\n",

-					 ptr->scrn_defaultdepth);

-		if (ptr->scrn_defaultbpp)

-			fprintf (cf, "\tDefaultBPP     %d\n",

-					 ptr->scrn_defaultbpp);

-		if (ptr->scrn_defaultfbbpp)

-			fprintf (cf, "\tDefaultFbBPP     %d\n",

-					 ptr->scrn_defaultfbbpp);

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

-		for (aptr = ptr->scrn_adaptor_lst; aptr; aptr = aptr->list.next)

-		{

-			fprintf (cf, "\tVideoAdaptor \"%s\"\n", aptr->al_adaptor_str);

-		}

-		if (ptr->scrn_virtualX && ptr->scrn_virtualY)

-			fprintf (cf, "\tVirtual     %d %d\n",

-				 ptr->scrn_virtualX,

-				 ptr->scrn_virtualY);

-		for (dptr = ptr->scrn_display_lst; dptr; dptr = dptr->list.next)

-		{

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

-			if (dptr->disp_comment)

-				fprintf (cf, "%s", dptr->disp_comment);

-			if (dptr->disp_frameX0 >= 0 || dptr->disp_frameY0 >= 0)

-			{

-				fprintf (cf, "\t\tViewport   %d %d\n",

-						 dptr->disp_frameX0, dptr->disp_frameY0);

-			}

-			if (dptr->disp_virtualX != 0 || dptr->disp_virtualY != 0)

-			{

-				fprintf (cf, "\t\tVirtual   %d %d\n",

-						 dptr->disp_virtualX, dptr->disp_virtualY);

-			}

-			if (dptr->disp_depth)

-			{

-				fprintf (cf, "\t\tDepth     %d\n", dptr->disp_depth);

-			}

-			if (dptr->disp_bpp)

-			{

-				fprintf (cf, "\t\tFbBPP     %d\n", dptr->disp_bpp);

-			}

-			if (dptr->disp_visual)

-			{

-				fprintf (cf, "\t\tVisual    \"%s\"\n", dptr->disp_visual);

-			}

-			if (dptr->disp_weight.red != 0)

-			{

-				fprintf (cf, "\t\tWeight    %d %d %d\n",

-					 dptr->disp_weight.red, dptr->disp_weight.green, dptr->disp_weight.blue);

-			}

-			if (dptr->disp_black.red != -1)

-			{

-				fprintf (cf, "\t\tBlack     0x%04x 0x%04x 0x%04x\n",

-					  dptr->disp_black.red, dptr->disp_black.green, dptr->disp_black.blue);

-			}

-			if (dptr->disp_white.red != -1)

-			{

-				fprintf (cf, "\t\tWhite     0x%04x 0x%04x 0x%04x\n",

-					  dptr->disp_white.red, dptr->disp_white.green, dptr->disp_white.blue);

-			}

-			if (dptr->disp_mode_lst)

-			{

-				fprintf (cf, "\t\tModes   ");

-			}

-			for (mptr = dptr->disp_mode_lst; mptr; mptr = mptr->list.next)

-			{

-				fprintf (cf, " \"%s\"", mptr->mode_name);

-			}

-			if (dptr->disp_mode_lst)

-			{

-				fprintf (cf, "\n");

-			}

-			xf86printOptionList(cf, dptr->disp_option_lst, 2);

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

-		}

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

-		ptr = ptr->list.next;

-	}

-

-}

-

-void

-xf86freeScreenList (XF86ConfScreenPtr ptr)

-{

-	XF86ConfScreenPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->scrn_identifier);

-		TestFree (ptr->scrn_monitor_str);

-		TestFree (ptr->scrn_device_str);

-		TestFree (ptr->scrn_comment);

-		xf86optionListFree (ptr->scrn_option_lst);

-		xf86freeAdaptorLinkList (ptr->scrn_adaptor_lst);

-		xf86freeDisplayList (ptr->scrn_display_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-void

-xf86freeAdaptorLinkList (XF86ConfAdaptorLinkPtr ptr)

-{

-	XF86ConfAdaptorLinkPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->al_adaptor_str);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-void

-xf86freeDisplayList (XF86ConfDisplayPtr ptr)

-{

-	XF86ConfDisplayPtr prev;

-

-	while (ptr)

-	{

-		xf86freeModeList (ptr->disp_mode_lst);

-		xf86optionListFree (ptr->disp_option_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-void

-xf86freeModeList (XF86ModePtr ptr)

-{

-	XF86ModePtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->mode_name);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-int

-xf86validateScreen (XF86ConfigPtr p)

-{

-	XF86ConfScreenPtr screen = p->conf_screen_lst;

-	XF86ConfMonitorPtr monitor;

-	XF86ConfAdaptorLinkPtr adaptor;

-

-	while (screen)

-	{

-		if (screen->scrn_obso_driver && !screen->scrn_identifier)

-			screen->scrn_identifier = screen->scrn_obso_driver;

-

-		monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);

-		if (screen->scrn_monitor_str)

-		{

-			if (monitor)

-			{

-				screen->scrn_monitor = monitor;

-				if (!xf86validateMonitor(p, screen))

-					return FALSE;

-			}

-		}

-

-		screen->scrn_device= xf86findDevice (screen->scrn_device_str, p->conf_device_lst);

-

-		adaptor = screen->scrn_adaptor_lst;

-		while (adaptor)

-		{

-			adaptor->al_adaptor = xf86findVideoAdaptor (adaptor->al_adaptor_str, p->conf_videoadaptor_lst);

-			if (!adaptor->al_adaptor)

-			{

-				xf86validationError (UNDEFINED_ADAPTOR_MSG, adaptor->al_adaptor_str, screen->scrn_identifier);

-				return FALSE;

-			}

-			else if (adaptor->al_adaptor->va_fwdref)

-			{

-				xf86validationError (ADAPTOR_REF_TWICE_MSG, adaptor->al_adaptor_str,

-						     adaptor->al_adaptor->va_fwdref);

-				return FALSE;

-			}

-

-			adaptor->al_adaptor->va_fwdref = strdup(screen->scrn_identifier);

-			adaptor = adaptor->list.next;

-		}

-

-		screen = screen->list.next;

-	}

-

-	return TRUE;

-}

-

-XF86ConfScreenPtr

-xf86findScreen (const char *ident, XF86ConfScreenPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->scrn_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

-

+/* 
+ * 
+ * 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).
+ */
+
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec DisplayTab[] =
+{
+	{ENDSUBSECTION, "endsubsection"},
+	{MODES, "modes"},
+	{VIEWPORT, "viewport"},
+	{VIRTUAL, "virtual"},
+	{VISUAL, "visual"},
+	{BLACK_TOK, "black"},
+	{WHITE_TOK, "white"},
+	{DEPTH, "depth"},
+	{BPP, "fbbpp"},
+	{WEIGHT, "weight"},
+	{OPTION, "option"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeDisplayList
+
+static XF86ConfDisplayPtr
+xf86parseDisplaySubSection (void)
+{
+	int token;
+	parsePrologue (XF86ConfDisplayPtr, XF86ConfDisplayRec)
+
+	ptr->disp_black.red = ptr->disp_black.green = ptr->disp_black.blue = -1;
+	ptr->disp_white.red = ptr->disp_white.green = ptr->disp_white.blue = -1;
+	ptr->disp_frameX0 = ptr->disp_frameY0 = -1;
+	while ((token = xf86getToken (DisplayTab)) != ENDSUBSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->disp_comment = xf86addComment(ptr->disp_comment, val.str);
+			break;
+		case VIEWPORT:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (VIEWPORT_MSG);
+			ptr->disp_frameX0 = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (VIEWPORT_MSG);
+			ptr->disp_frameY0 = val.num;
+			break;
+		case VIRTUAL:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (VIRTUAL_MSG);
+			ptr->disp_virtualX = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (VIRTUAL_MSG);
+			ptr->disp_virtualY = val.num;
+			break;
+		case DEPTH:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (NUMBER_MSG, "Display");
+			ptr->disp_depth = val.num;
+			break;
+		case BPP:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (NUMBER_MSG, "Display");
+			ptr->disp_bpp = val.num;
+			break;
+		case VISUAL:
+			if (xf86getSubToken (&(ptr->disp_comment)) != STRING)
+				Error (QUOTE_MSG, "Display");
+			ptr->disp_visual = val.str;
+			break;
+		case WEIGHT:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WEIGHT_MSG);
+			ptr->disp_weight.red = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WEIGHT_MSG);
+			ptr->disp_weight.green = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WEIGHT_MSG);
+			ptr->disp_weight.blue = val.num;
+			break;
+		case BLACK_TOK:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (BLACK_MSG);
+			ptr->disp_black.red = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (BLACK_MSG);
+			ptr->disp_black.green = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (BLACK_MSG);
+			ptr->disp_black.blue = val.num;
+			break;
+		case WHITE_TOK:
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WHITE_MSG);
+			ptr->disp_white.red = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WHITE_MSG);
+			ptr->disp_white.green = val.num;
+			if (xf86getSubToken (&(ptr->disp_comment)) != NUMBER)
+				Error (WHITE_MSG);
+			ptr->disp_white.blue = val.num;
+			break;
+		case MODES:
+			{
+				XF86ModePtr mptr;
+
+				while ((token = xf86getSubTokenWithTab (&(ptr->disp_comment), DisplayTab)) == STRING)
+				{
+					mptr = calloc (1, sizeof (XF86ModeRec));
+					mptr->mode_name = val.str;
+					mptr->list.next = NULL;
+					ptr->disp_mode_lst = (XF86ModePtr)
+						xf86addListItem ((glp) ptr->disp_mode_lst, (glp) mptr);
+				}
+				xf86unGetToken (token);
+			}
+			break;
+		case OPTION:
+			ptr->disp_option_lst = xf86parseOption(ptr->disp_option_lst);
+			break;
+			
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+#ifdef DEBUG
+	printf ("Display subsection parsed\n");
+#endif
+
+	return ptr;
+}
+
+#undef CLEANUP
+
+static xf86ConfigSymTabRec ScreenTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{OBSDRIVER, "driver"},
+	{MDEVICE, "device"},
+	{MONITOR, "monitor"},
+	{VIDEOADAPTOR, "videoadaptor"},
+	{SCREENNO, "screenno"},
+	{SUBSECTION, "subsection"},
+	{DEFAULTDEPTH, "defaultcolordepth"},
+	{DEFAULTDEPTH, "defaultdepth"},
+	{DEFAULTBPP, "defaultbpp"},
+	{DEFAULTFBBPP, "defaultfbbpp"},
+	{VIRTUAL, "virtual"},
+	{OPTION, "option"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeScreenList
+XF86ConfScreenPtr
+xf86parseScreenSection (void)
+{
+	int has_ident = FALSE;
+	int has_driver= FALSE;
+	int token;
+
+	parsePrologue (XF86ConfScreenPtr, XF86ConfScreenRec)
+
+		while ((token = xf86getToken (ScreenTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->scrn_comment = xf86addComment(ptr->scrn_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			ptr->scrn_identifier = val.str;
+			if (has_ident || has_driver)
+				Error (ONLY_ONE_MSG,"Identifier or Driver");
+			has_ident = TRUE;
+			break;
+		case OBSDRIVER:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+				Error (QUOTE_MSG, "Driver");
+			ptr->scrn_obso_driver = val.str;
+			if (has_ident || has_driver)
+				Error (ONLY_ONE_MSG,"Identifier or Driver");
+			has_driver = TRUE;
+			break;
+		case DEFAULTDEPTH:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
+				Error (NUMBER_MSG, "DefaultDepth");
+			ptr->scrn_defaultdepth = val.num;
+			break;
+		case DEFAULTBPP:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
+				Error (NUMBER_MSG, "DefaultBPP");
+			ptr->scrn_defaultbpp = val.num;
+			break;
+		case DEFAULTFBBPP:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
+				Error (NUMBER_MSG, "DefaultFbBPP");
+			ptr->scrn_defaultfbbpp = val.num;
+			break;
+		case MDEVICE:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+				Error (QUOTE_MSG, "Device");
+			ptr->scrn_device_str = val.str;
+			break;
+		case MONITOR:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+				Error (QUOTE_MSG, "Monitor");
+			ptr->scrn_monitor_str = val.str;
+			break;
+		case VIDEOADAPTOR:
+			{
+				XF86ConfAdaptorLinkPtr aptr;
+
+				if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+					Error (QUOTE_MSG, "VideoAdaptor");
+
+				/* Don't allow duplicates */
+				for (aptr = ptr->scrn_adaptor_lst; aptr; 
+					aptr = (XF86ConfAdaptorLinkPtr) aptr->list.next)
+					if (xf86nameCompare (val.str, aptr->al_adaptor_str) == 0)
+						break;
+
+				if (aptr == NULL)
+				{
+					aptr = calloc (1, sizeof (XF86ConfAdaptorLinkRec));
+					aptr->list.next = NULL;
+					aptr->al_adaptor_str = val.str;
+					ptr->scrn_adaptor_lst = (XF86ConfAdaptorLinkPtr)
+						xf86addListItem ((glp) ptr->scrn_adaptor_lst, (glp) aptr);
+				}
+			}
+			break;
+		case VIRTUAL:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
+				Error (VIRTUAL_MSG);
+			ptr->scrn_virtualX = val.num;
+			if (xf86getSubToken (&(ptr->scrn_comment)) != NUMBER)
+				Error (VIRTUAL_MSG);
+			ptr->scrn_virtualY = val.num;
+			break;
+		case OPTION:
+			ptr->scrn_option_lst = xf86parseOption(ptr->scrn_option_lst);
+			break;
+		case SUBSECTION:
+			if (xf86getSubToken (&(ptr->scrn_comment)) != STRING)
+				Error (QUOTE_MSG, "SubSection");
+			{
+				free(val.str);
+				HANDLE_LIST (scrn_display_lst, xf86parseDisplaySubSection,
+							 XF86ConfDisplayPtr);
+			}
+			break;
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+	if (!has_ident && !has_driver)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("Screen section parsed\n");
+#endif
+
+	return ptr;
+}
+
+void
+xf86printScreenSection (FILE * cf, XF86ConfScreenPtr ptr)
+{
+	XF86ConfAdaptorLinkPtr aptr;
+	XF86ConfDisplayPtr dptr;
+	XF86ModePtr mptr;
+
+	while (ptr)
+	{
+		fprintf (cf, "Section \"Screen\"\n");
+		if (ptr->scrn_comment)
+			fprintf (cf, "%s", ptr->scrn_comment);
+		if (ptr->scrn_identifier)
+			fprintf (cf, "\tIdentifier \"%s\"\n", ptr->scrn_identifier);
+		if (ptr->scrn_obso_driver)
+			fprintf (cf, "\tDriver     \"%s\"\n", ptr->scrn_obso_driver);
+		if (ptr->scrn_device_str)
+			fprintf (cf, "\tDevice     \"%s\"\n", ptr->scrn_device_str);
+		if (ptr->scrn_monitor_str)
+			fprintf (cf, "\tMonitor    \"%s\"\n", ptr->scrn_monitor_str);
+		if (ptr->scrn_defaultdepth)
+			fprintf (cf, "\tDefaultDepth     %d\n",
+					 ptr->scrn_defaultdepth);
+		if (ptr->scrn_defaultbpp)
+			fprintf (cf, "\tDefaultBPP     %d\n",
+					 ptr->scrn_defaultbpp);
+		if (ptr->scrn_defaultfbbpp)
+			fprintf (cf, "\tDefaultFbBPP     %d\n",
+					 ptr->scrn_defaultfbbpp);
+		xf86printOptionList(cf, ptr->scrn_option_lst, 1);
+		for (aptr = ptr->scrn_adaptor_lst; aptr; aptr = aptr->list.next)
+		{
+			fprintf (cf, "\tVideoAdaptor \"%s\"\n", aptr->al_adaptor_str);
+		}
+		if (ptr->scrn_virtualX && ptr->scrn_virtualY)
+			fprintf (cf, "\tVirtual     %d %d\n",
+				 ptr->scrn_virtualX,
+				 ptr->scrn_virtualY);
+		for (dptr = ptr->scrn_display_lst; dptr; dptr = dptr->list.next)
+		{
+			fprintf (cf, "\tSubSection \"Display\"\n");
+			if (dptr->disp_comment)
+				fprintf (cf, "%s", dptr->disp_comment);
+			if (dptr->disp_frameX0 >= 0 || dptr->disp_frameY0 >= 0)
+			{
+				fprintf (cf, "\t\tViewport   %d %d\n",
+						 dptr->disp_frameX0, dptr->disp_frameY0);
+			}
+			if (dptr->disp_virtualX != 0 || dptr->disp_virtualY != 0)
+			{
+				fprintf (cf, "\t\tVirtual   %d %d\n",
+						 dptr->disp_virtualX, dptr->disp_virtualY);
+			}
+			if (dptr->disp_depth)
+			{
+				fprintf (cf, "\t\tDepth     %d\n", dptr->disp_depth);
+			}
+			if (dptr->disp_bpp)
+			{
+				fprintf (cf, "\t\tFbBPP     %d\n", dptr->disp_bpp);
+			}
+			if (dptr->disp_visual)
+			{
+				fprintf (cf, "\t\tVisual    \"%s\"\n", dptr->disp_visual);
+			}
+			if (dptr->disp_weight.red != 0)
+			{
+				fprintf (cf, "\t\tWeight    %d %d %d\n",
+					 dptr->disp_weight.red, dptr->disp_weight.green, dptr->disp_weight.blue);
+			}
+			if (dptr->disp_black.red != -1)
+			{
+				fprintf (cf, "\t\tBlack     0x%04x 0x%04x 0x%04x\n",
+					  dptr->disp_black.red, dptr->disp_black.green, dptr->disp_black.blue);
+			}
+			if (dptr->disp_white.red != -1)
+			{
+				fprintf (cf, "\t\tWhite     0x%04x 0x%04x 0x%04x\n",
+					  dptr->disp_white.red, dptr->disp_white.green, dptr->disp_white.blue);
+			}
+			if (dptr->disp_mode_lst)
+			{
+				fprintf (cf, "\t\tModes   ");
+			}
+			for (mptr = dptr->disp_mode_lst; mptr; mptr = mptr->list.next)
+			{
+				fprintf (cf, " \"%s\"", mptr->mode_name);
+			}
+			if (dptr->disp_mode_lst)
+			{
+				fprintf (cf, "\n");
+			}
+			xf86printOptionList(cf, dptr->disp_option_lst, 2);
+			fprintf (cf, "\tEndSubSection\n");
+		}
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+
+}
+
+void
+xf86freeScreenList (XF86ConfScreenPtr ptr)
+{
+	XF86ConfScreenPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->scrn_identifier);
+		TestFree (ptr->scrn_monitor_str);
+		TestFree (ptr->scrn_device_str);
+		TestFree (ptr->scrn_comment);
+		xf86optionListFree (ptr->scrn_option_lst);
+		xf86freeAdaptorLinkList (ptr->scrn_adaptor_lst);
+		xf86freeDisplayList (ptr->scrn_display_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+void
+xf86freeAdaptorLinkList (XF86ConfAdaptorLinkPtr ptr)
+{
+	XF86ConfAdaptorLinkPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->al_adaptor_str);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+void
+xf86freeDisplayList (XF86ConfDisplayPtr ptr)
+{
+	XF86ConfDisplayPtr prev;
+
+	while (ptr)
+	{
+		xf86freeModeList (ptr->disp_mode_lst);
+		xf86optionListFree (ptr->disp_option_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+void
+xf86freeModeList (XF86ModePtr ptr)
+{
+	XF86ModePtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->mode_name);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+int
+xf86validateScreen (XF86ConfigPtr p)
+{
+	XF86ConfScreenPtr screen = p->conf_screen_lst;
+	XF86ConfMonitorPtr monitor;
+	XF86ConfAdaptorLinkPtr adaptor;
+
+	while (screen)
+	{
+		if (screen->scrn_obso_driver && !screen->scrn_identifier)
+			screen->scrn_identifier = screen->scrn_obso_driver;
+
+		monitor = xf86findMonitor (screen->scrn_monitor_str, p->conf_monitor_lst);
+		if (screen->scrn_monitor_str)
+		{
+			if (monitor)
+			{
+				screen->scrn_monitor = monitor;
+				if (!xf86validateMonitor(p, screen))
+					return FALSE;
+			}
+		}
+
+		screen->scrn_device= xf86findDevice (screen->scrn_device_str, p->conf_device_lst);
+
+		adaptor = screen->scrn_adaptor_lst;
+		while (adaptor)
+		{
+			adaptor->al_adaptor = xf86findVideoAdaptor (adaptor->al_adaptor_str, p->conf_videoadaptor_lst);
+			if (!adaptor->al_adaptor)
+			{
+				xf86validationError (UNDEFINED_ADAPTOR_MSG, adaptor->al_adaptor_str, screen->scrn_identifier);
+				return FALSE;
+			}
+			else if (adaptor->al_adaptor->va_fwdref)
+			{
+				xf86validationError (ADAPTOR_REF_TWICE_MSG, adaptor->al_adaptor_str,
+						     adaptor->al_adaptor->va_fwdref);
+				return FALSE;
+			}
+
+			adaptor->al_adaptor->va_fwdref = strdup(screen->scrn_identifier);
+			adaptor = adaptor->list.next;
+		}
+
+		screen = screen->list.next;
+	}
+
+	return TRUE;
+}
+
+XF86ConfScreenPtr
+xf86findScreen (const char *ident, XF86ConfScreenPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->scrn_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
+
diff --git a/xorg-server/hw/xfree86/parser/Vendor.c b/xorg-server/hw/xfree86/parser/Vendor.c
index dce3f1ca1..d61f0a052 100644
--- a/xorg-server/hw/xfree86/parser/Vendor.c
+++ b/xorg-server/hw/xfree86/parser/Vendor.c
@@ -102,7 +102,7 @@ xf86parseVendorSubSection (void)
 			break;
 
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		default:
 			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@@ -164,7 +164,7 @@ xf86parseVendorSection (void)
 			}
 			break;
 		case EOF_TOKEN:
-			Error (UNEXPECTED_EOF_MSG, NULL);
+			Error (UNEXPECTED_EOF_MSG);
 			break;
 		default:
 			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
@@ -174,7 +174,7 @@ xf86parseVendorSection (void)
 	}
 
 	if (!has_ident)
-		Error (NO_IDENT_MSG, NULL);
+		Error (NO_IDENT_MSG);
 
 #ifdef DEBUG
 	printf ("Vendor section parsed\n");
diff --git a/xorg-server/hw/xfree86/parser/Video.c b/xorg-server/hw/xfree86/parser/Video.c
index 40a909707..19a5418b1 100644
--- a/xorg-server/hw/xfree86/parser/Video.c
+++ b/xorg-server/hw/xfree86/parser/Video.c
@@ -1,296 +1,296 @@
-/* 

- * 

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

- */

-

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

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86Parser.h"

-#include "xf86tokens.h"

-#include "Configint.h"

-

-extern LexRec val;

-

-static xf86ConfigSymTabRec VideoPortTab[] =

-{

-	{ENDSUBSECTION, "endsubsection"},

-	{IDENTIFIER, "identifier"},

-	{OPTION, "option"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeVideoPortList

-

-static void

-xf86freeVideoPortList (XF86ConfVideoPortPtr ptr)

-{

-	XF86ConfVideoPortPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->vp_identifier);

-		TestFree (ptr->vp_comment);

-		xf86optionListFree (ptr->vp_option_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-static XF86ConfVideoPortPtr

-xf86parseVideoPortSubSection (void)

-{

-	int has_ident = FALSE;

-	int token;

-	parsePrologue (XF86ConfVideoPortPtr, XF86ConfVideoPortRec)

-

-	while ((token = xf86getToken (VideoPortTab)) != ENDSUBSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			ptr->vp_identifier = val.str;

-			has_ident = TRUE;

-			break;

-		case OPTION:

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

-			break;

-

-		case EOF_TOKEN:

-			Error (UNEXPECTED_EOF_MSG, NULL);

-			break;

-		default:

-			Error (INVALID_KEYWORD_MSG, xf86tokenString ());

-			break;

-		}

-	}

-

-#ifdef DEBUG

-	printf ("VideoPort subsection parsed\n");

-#endif

-

-	return ptr;

-}

-

-#undef CLEANUP

-

-static xf86ConfigSymTabRec VideoAdaptorTab[] =

-{

-	{ENDSECTION, "endsection"},

-	{IDENTIFIER, "identifier"},

-	{VENDOR, "vendorname"},

-	{BOARD, "boardname"},

-	{BUSID, "busid"},

-	{DRIVER, "driver"},

-	{OPTION, "option"},

-	{SUBSECTION, "subsection"},

-	{-1, ""},

-};

-

-#define CLEANUP xf86freeVideoAdaptorList

-

-XF86ConfVideoAdaptorPtr

-xf86parseVideoAdaptorSection (void)

-{

-	int has_ident = FALSE;

-	int token;

-

-	parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec)

-

-	while ((token = xf86getToken (VideoAdaptorTab)) != ENDSECTION)

-	{

-		switch (token)

-		{

-		case COMMENT:

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

-			break;

-		case IDENTIFIER:

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

-				Error (QUOTE_MSG, "Identifier");

-			ptr->va_identifier = val.str;

-			if (has_ident == TRUE)

-				Error (MULTIPLE_MSG, "Identifier");

-			has_ident = TRUE;

-			break;

-		case VENDOR:

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

-				Error (QUOTE_MSG, "Vendor");

-			ptr->va_vendor = val.str;

-			break;

-		case BOARD:

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

-				Error (QUOTE_MSG, "Board");

-			ptr->va_board = val.str;

-			break;

-		case BUSID:

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

-				Error (QUOTE_MSG, "BusID");

-			ptr->va_busid = val.str;

-			break;

-		case DRIVER:

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

-				Error (QUOTE_MSG, "Driver");

-			ptr->va_driver = val.str;

-			break;

-		case OPTION:

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

-			break;

-		case SUBSECTION:

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

-				Error (QUOTE_MSG, "SubSection");

-			{

-				HANDLE_LIST (va_port_lst, xf86parseVideoPortSubSection,

-							 XF86ConfVideoPortPtr);

-			}

-			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 ("VideoAdaptor section parsed\n");

-#endif

-

-	return ptr;

-}

-

-void

-xf86printVideoAdaptorSection (FILE * cf, XF86ConfVideoAdaptorPtr ptr)

-{

-	XF86ConfVideoPortPtr pptr;

-

-	while (ptr)

-	{

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

-		if (ptr->va_comment)

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

-		if (ptr->va_identifier)

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

-		if (ptr->va_vendor)

-			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->va_vendor);

-		if (ptr->va_board)

-			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->va_board);

-		if (ptr->va_busid)

-			fprintf (cf, "\tBusID       \"%s\"\n", ptr->va_busid);

-		if (ptr->va_driver)

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

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

-		for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next)

-		{

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

-			if (pptr->vp_comment)

-				fprintf (cf, "%s", pptr->vp_comment);

-			if (pptr->vp_identifier)

-				fprintf (cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier);

-			xf86printOptionList(cf, pptr->vp_option_lst, 2);

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

-		}

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

-		ptr = ptr->list.next;

-	}

-

-}

-

-void

-xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr)

-{

-	XF86ConfVideoAdaptorPtr prev;

-

-	while (ptr)

-	{

-		TestFree (ptr->va_identifier);

-		TestFree (ptr->va_vendor);

-		TestFree (ptr->va_board);

-		TestFree (ptr->va_busid);

-		TestFree (ptr->va_driver);

-		TestFree (ptr->va_fwdref);

-		TestFree (ptr->va_comment);

-		xf86freeVideoPortList (ptr->va_port_lst);

-		xf86optionListFree (ptr->va_option_lst);

-		prev = ptr;

-		ptr = ptr->list.next;

-		free (prev);

-	}

-}

-

-XF86ConfVideoAdaptorPtr

-xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p)

-{

-	while (p)

-	{

-		if (xf86nameCompare (ident, p->va_identifier) == 0)

-			return p;

-

-		p = p->list.next;

-	}

-	return NULL;

-}

+/* 
+ * 
+ * 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).
+ */
+
+/* View/edit this file with tab stops set to 4 */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86Parser.h"
+#include "xf86tokens.h"
+#include "Configint.h"
+
+extern LexRec val;
+
+static xf86ConfigSymTabRec VideoPortTab[] =
+{
+	{ENDSUBSECTION, "endsubsection"},
+	{IDENTIFIER, "identifier"},
+	{OPTION, "option"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeVideoPortList
+
+static void
+xf86freeVideoPortList (XF86ConfVideoPortPtr ptr)
+{
+	XF86ConfVideoPortPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->vp_identifier);
+		TestFree (ptr->vp_comment);
+		xf86optionListFree (ptr->vp_option_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+static XF86ConfVideoPortPtr
+xf86parseVideoPortSubSection (void)
+{
+	int has_ident = FALSE;
+	int token;
+	parsePrologue (XF86ConfVideoPortPtr, XF86ConfVideoPortRec)
+
+	while ((token = xf86getToken (VideoPortTab)) != ENDSUBSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->vp_comment = xf86addComment(ptr->vp_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->vp_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			ptr->vp_identifier = val.str;
+			has_ident = TRUE;
+			break;
+		case OPTION:
+			ptr->vp_option_lst = xf86parseOption(ptr->vp_option_lst);
+			break;
+
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+#ifdef DEBUG
+	printf ("VideoPort subsection parsed\n");
+#endif
+
+	return ptr;
+}
+
+#undef CLEANUP
+
+static xf86ConfigSymTabRec VideoAdaptorTab[] =
+{
+	{ENDSECTION, "endsection"},
+	{IDENTIFIER, "identifier"},
+	{VENDOR, "vendorname"},
+	{BOARD, "boardname"},
+	{BUSID, "busid"},
+	{DRIVER, "driver"},
+	{OPTION, "option"},
+	{SUBSECTION, "subsection"},
+	{-1, ""},
+};
+
+#define CLEANUP xf86freeVideoAdaptorList
+
+XF86ConfVideoAdaptorPtr
+xf86parseVideoAdaptorSection (void)
+{
+	int has_ident = FALSE;
+	int token;
+
+	parsePrologue (XF86ConfVideoAdaptorPtr, XF86ConfVideoAdaptorRec)
+
+	while ((token = xf86getToken (VideoAdaptorTab)) != ENDSECTION)
+	{
+		switch (token)
+		{
+		case COMMENT:
+			ptr->va_comment = xf86addComment(ptr->va_comment, val.str);
+			break;
+		case IDENTIFIER:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "Identifier");
+			ptr->va_identifier = val.str;
+			if (has_ident == TRUE)
+				Error (MULTIPLE_MSG, "Identifier");
+			has_ident = TRUE;
+			break;
+		case VENDOR:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "Vendor");
+			ptr->va_vendor = val.str;
+			break;
+		case BOARD:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "Board");
+			ptr->va_board = val.str;
+			break;
+		case BUSID:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "BusID");
+			ptr->va_busid = val.str;
+			break;
+		case DRIVER:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "Driver");
+			ptr->va_driver = val.str;
+			break;
+		case OPTION:
+			ptr->va_option_lst = xf86parseOption(ptr->va_option_lst);
+			break;
+		case SUBSECTION:
+			if (xf86getSubToken (&(ptr->va_comment)) != STRING)
+				Error (QUOTE_MSG, "SubSection");
+			{
+				HANDLE_LIST (va_port_lst, xf86parseVideoPortSubSection,
+							 XF86ConfVideoPortPtr);
+			}
+			break;
+
+		case EOF_TOKEN:
+			Error (UNEXPECTED_EOF_MSG);
+			break;
+		default:
+			Error (INVALID_KEYWORD_MSG, xf86tokenString ());
+			break;
+		}
+	}
+
+	if (!has_ident)
+		Error (NO_IDENT_MSG);
+
+#ifdef DEBUG
+	printf ("VideoAdaptor section parsed\n");
+#endif
+
+	return ptr;
+}
+
+void
+xf86printVideoAdaptorSection (FILE * cf, XF86ConfVideoAdaptorPtr ptr)
+{
+	XF86ConfVideoPortPtr pptr;
+
+	while (ptr)
+	{
+		fprintf (cf, "Section \"VideoAdaptor\"\n");
+		if (ptr->va_comment)
+			fprintf (cf, "%s", ptr->va_comment);
+		if (ptr->va_identifier)
+			fprintf (cf, "\tIdentifier  \"%s\"\n", ptr->va_identifier);
+		if (ptr->va_vendor)
+			fprintf (cf, "\tVendorName  \"%s\"\n", ptr->va_vendor);
+		if (ptr->va_board)
+			fprintf (cf, "\tBoardName   \"%s\"\n", ptr->va_board);
+		if (ptr->va_busid)
+			fprintf (cf, "\tBusID       \"%s\"\n", ptr->va_busid);
+		if (ptr->va_driver)
+			fprintf (cf, "\tDriver      \"%s\"\n", ptr->va_driver);
+		xf86printOptionList(cf, ptr->va_option_lst, 1);
+		for (pptr = ptr->va_port_lst; pptr; pptr = pptr->list.next)
+		{
+			fprintf (cf, "\tSubSection \"VideoPort\"\n");
+			if (pptr->vp_comment)
+				fprintf (cf, "%s", pptr->vp_comment);
+			if (pptr->vp_identifier)
+				fprintf (cf, "\t\tIdentifier \"%s\"\n", pptr->vp_identifier);
+			xf86printOptionList(cf, pptr->vp_option_lst, 2);
+			fprintf (cf, "\tEndSubSection\n");
+		}
+		fprintf (cf, "EndSection\n\n");
+		ptr = ptr->list.next;
+	}
+
+}
+
+void
+xf86freeVideoAdaptorList (XF86ConfVideoAdaptorPtr ptr)
+{
+	XF86ConfVideoAdaptorPtr prev;
+
+	while (ptr)
+	{
+		TestFree (ptr->va_identifier);
+		TestFree (ptr->va_vendor);
+		TestFree (ptr->va_board);
+		TestFree (ptr->va_busid);
+		TestFree (ptr->va_driver);
+		TestFree (ptr->va_fwdref);
+		TestFree (ptr->va_comment);
+		xf86freeVideoPortList (ptr->va_port_lst);
+		xf86optionListFree (ptr->va_option_lst);
+		prev = ptr;
+		ptr = ptr->list.next;
+		free (prev);
+	}
+}
+
+XF86ConfVideoAdaptorPtr
+xf86findVideoAdaptor (const char *ident, XF86ConfVideoAdaptorPtr p)
+{
+	while (p)
+	{
+		if (xf86nameCompare (ident, p->va_identifier) == 0)
+			return p;
+
+		p = p->list.next;
+	}
+	return NULL;
+}
diff --git a/xorg-server/hw/xfree86/parser/configProcs.h b/xorg-server/hw/xfree86/parser/configProcs.h
index 114cdfe33..d67acc698 100644
--- a/xorg-server/hw/xfree86/parser/configProcs.h
+++ b/xorg-server/hw/xfree86/parser/configProcs.h
@@ -95,8 +95,8 @@ int xf86getSubToken(char **comment);
 int xf86getSubTokenWithTab(char **comment, xf86ConfigSymTabRec *tab);
 void xf86unGetToken(int token);
 char *xf86tokenString(void);
-void xf86parseError(const char *format, ...);
-void xf86validationError(const char *format, ...);
+void xf86parseError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
+void xf86validationError(const char *format, ...) _X_ATTRIBUTE_PRINTF(1,2);
 void xf86setSection(const char *section);
 int xf86getStringToken(xf86ConfigSymTabRec *tab);
 /* write.c */
diff --git a/xorg-server/hw/xfree86/x86emu/debug.c b/xorg-server/hw/xfree86/x86emu/debug.c
index 04d0741e0..6dea9c7bc 100644
--- a/xorg-server/hw/xfree86/x86emu/debug.c
+++ b/xorg-server/hw/xfree86/x86emu/debug.c
@@ -163,13 +163,13 @@ void x86emu_inc_decoded_inst_len (int x)
 	M.x86.enc_pos += x;
 }
 
-void x86emu_decode_printf (char *x)
+void x86emu_decode_printf (const char *x)
 {
 	sprintf(M.x86.decoded_buf+M.x86.enc_str_pos,"%s",x);
 	M.x86.enc_str_pos += strlen(x);
 }
 
-void x86emu_decode_printf2 (char *x, int y)
+void x86emu_decode_printf2 (const char *x, int y)
 {
 	char temp[100];
 	snprintf(temp,sizeof(temp),x,y);
diff --git a/xorg-server/hw/xfree86/x86emu/fpu.c b/xorg-server/hw/xfree86/x86emu/fpu.c
index b72de1ee5..fbc602da5 100644
--- a/xorg-server/hw/xfree86/x86emu/fpu.c
+++ b/xorg-server/hw/xfree86/x86emu/fpu.c
@@ -52,7 +52,7 @@ void x86emuOp_esc_coprocess_d8(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-static char *x86emu_fpu_op_d9_tab[] = {
+static const char *x86emu_fpu_op_d9_tab[] = {
     "FLD\tDWORD PTR ", "ESC_D9\t", "FST\tDWORD PTR ", "FSTP\tDWORD PTR ",
     "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
 
@@ -63,7 +63,7 @@ static char *x86emu_fpu_op_d9_tab[] = {
     "FLDENV\t", "FLDCW\t", "FSTENV\t", "FSTCW\t",
 };
 
-static char *x86emu_fpu_op_d9_tab1[] = {
+static const char *x86emu_fpu_op_d9_tab1[] = {
     "FLD\t", "FLD\t", "FLD\t", "FLD\t",
     "FLD\t", "FLD\t", "FLD\t", "FLD\t",
 
@@ -299,7 +299,7 @@ void x86emuOp_esc_coprocess_d9(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-char *x86emu_fpu_op_da_tab[] = {
+static const char *x86emu_fpu_op_da_tab[] = {
     "FIADD\tDWORD PTR ", "FIMUL\tDWORD PTR ", "FICOM\tDWORD PTR ",
     "FICOMP\tDWORD PTR ",
     "FISUB\tDWORD PTR ", "FISUBR\tDWORD PTR ", "FIDIV\tDWORD PTR ",
@@ -392,7 +392,7 @@ void x86emuOp_esc_coprocess_da(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-char *x86emu_fpu_op_db_tab[] = {
+static const char *x86emu_fpu_op_db_tab[] = {
     "FILD\tDWORD PTR ", "ESC_DB\t19", "FIST\tDWORD PTR ", "FISTP\tDWORD PTR ",
     "ESC_DB\t1C", "FLD\tTBYTE PTR ", "ESC_DB\t1E", "FSTP\tTBYTE PTR ",
 
@@ -513,7 +513,7 @@ void x86emuOp_esc_coprocess_db(u8 X86EMU_UNUSED(op1))
 }
 
 #ifdef DEBUG
-char *x86emu_fpu_op_dc_tab[] = {
+static const char *x86emu_fpu_op_dc_tab[] = {
     "FADD\tQWORD PTR ", "FMUL\tQWORD PTR ", "FCOM\tQWORD PTR ",
     "FCOMP\tQWORD PTR ",
     "FSUB\tQWORD PTR ", "FSUBR\tQWORD PTR ", "FDIV\tQWORD PTR ",
@@ -631,7 +631,7 @@ void x86emuOp_esc_coprocess_dc(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-static char *x86emu_fpu_op_dd_tab[] = {
+static const char *x86emu_fpu_op_dd_tab[] = {
     "FLD\tQWORD PTR ", "ESC_DD\t29,", "FST\tQWORD PTR ", "FSTP\tQWORD PTR ",
     "FRSTOR\t", "ESC_DD\t2D,", "FSAVE\t", "FSTSW\t",
 
@@ -734,7 +734,7 @@ void x86emuOp_esc_coprocess_dd(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-static char *x86emu_fpu_op_de_tab[] =
+static const char *x86emu_fpu_op_de_tab[] =
 {
     "FIADD\tWORD PTR ", "FIMUL\tWORD PTR ", "FICOM\tWORD PTR ",
     "FICOMP\tWORD PTR ",
@@ -856,7 +856,7 @@ void x86emuOp_esc_coprocess_de(u8 X86EMU_UNUSED(op1))
 
 #ifdef DEBUG
 
-static char *x86emu_fpu_op_df_tab[] = {
+static const char *x86emu_fpu_op_df_tab[] = {
     /* mod == 00 */
     "FILD\tWORD PTR ", "ESC_DF\t39\n", "FIST\tWORD PTR ", "FISTP\tWORD PTR ",
     "FBLD\tTBYTE PTR ", "FILD\tQWORD PTR ", "FBSTP\tTBYTE PTR ",
diff --git a/xorg-server/hw/xfree86/x86emu/ops2.c b/xorg-server/hw/xfree86/x86emu/ops2.c
index 39bd0411d..501d5fcb2 100644
--- a/xorg-server/hw/xfree86/x86emu/ops2.c
+++ b/xorg-server/hw/xfree86/x86emu/ops2.c
@@ -110,7 +110,7 @@ Handles opcode 0x0f,0x80-0x8F
 static void x86emuOp2_long_jump(u8 op2)
 {
     s32 target;
-    char *name = NULL;
+    const char *name = NULL;
     int cond = 0;
 
     /* conditional jump to word offset. */
@@ -204,7 +204,7 @@ static void x86emuOp2_set_byte(u8 op2)
     int mod, rl, rh;
     uint destoffset;
     u8  *destreg;
-    char *name = NULL;
+    const char *name = NULL;
     int cond = 0;
 
     START_OF_INSTR();
diff --git a/xorg-server/hw/xfree86/x86emu/x86emu/debug.h b/xorg-server/hw/xfree86/x86emu/x86emu/debug.h
index 47aacb6c3..5f78d0575 100644
--- a/xorg-server/hw/xfree86/x86emu/x86emu/debug.h
+++ b/xorg-server/hw/xfree86/x86emu/x86emu/debug.h
@@ -189,8 +189,8 @@ extern "C" {            			/* Use "C" linkage when in C++ mode */
 #endif
 
 extern void x86emu_inc_decoded_inst_len (int x);
-extern void x86emu_decode_printf (char *x);
-extern void x86emu_decode_printf2 (char *x, int y);
+extern void x86emu_decode_printf (const char *x);
+extern void x86emu_decode_printf2 (const char *x, int y);
 extern void x86emu_just_disassemble (void);
 extern void x86emu_single_step (void);
 extern void x86emu_end_instr (void);
diff --git a/xorg-server/include/dix.h b/xorg-server/include/dix.h
index cfbfa1f41..272fd4161 100644
--- a/xorg-server/include/dix.h
+++ b/xorg-server/include/dix.h
@@ -175,9 +175,9 @@ extern _X_HIDDEN Bool CreateConnectionBlock(void);
 /* dixutils.c */
 
 extern _X_EXPORT int CompareISOLatin1Lowered(
-    unsigned char * /*a*/,
+    const unsigned char * /*a*/,
     int alen,
-    unsigned char * /*b*/,
+    const unsigned char * /*b*/,
     int blen);
 
 extern _X_EXPORT int dixLookupWindow(
@@ -400,6 +400,11 @@ extern int DeliverDeviceEvents(
     WindowPtr /* stopAt */,
     DeviceIntPtr /* dev */);
 
+extern int DeliverOneGrabbedEvent(
+    InternalEvent* /* event*/,
+    DeviceIntPtr /* dev */,
+    enum InputLevel /* level */);
+
 extern void InitializeSprite(
     DeviceIntPtr /* pDev */,
     WindowPtr    /* pWin */);
diff --git a/xorg-server/include/dixgrabs.h b/xorg-server/include/dixgrabs.h
index 65ff45d1d..4dd5eae6d 100644
--- a/xorg-server/include/dixgrabs.h
+++ b/xorg-server/include/dixgrabs.h
@@ -40,7 +40,7 @@ extern GrabPtr CreateGrab(
 	DeviceIntPtr /* device */,
 	DeviceIntPtr /* modDevice */,
 	WindowPtr /* window */,
-        GrabType /* grabtype */,
+        enum InputLevel /* grabtype */,
         GrabMask * /* mask */,
         struct _GrabParameters * /* param */,
 	int /* type */,
@@ -64,4 +64,6 @@ extern _X_EXPORT int AddPassiveGrabToList(
 extern _X_EXPORT Bool DeletePassiveGrabFromList(
 	GrabPtr /* pMinuendGrab */);
 
+extern Bool GrabIsPointerGrab(GrabPtr grab);
+extern Bool GrabIsKeyboardGrab(GrabPtr grab);
 #endif /* DIXGRABS_H */
diff --git a/xorg-server/include/eventconvert.h b/xorg-server/include/eventconvert.h
index b000abc4b..571a51109 100644
--- a/xorg-server/include/eventconvert.h
+++ b/xorg-server/include/eventconvert.h
@@ -27,14 +27,15 @@
 #include <X11/extensions/XIproto.h>
 #include "input.h"
 #include "events.h"
+#include "eventstr.h"
 
 #define FP1616(integral, frac) ((integral) * (1 << 16) + (frac) * (1 << 16))
 
 _X_EXPORT int EventToCore(InternalEvent *event, xEvent **core, int *count);
 _X_EXPORT int EventToXI(InternalEvent *ev, xEvent **xi, int *count);
 _X_EXPORT int EventToXI2(InternalEvent *ev, xEvent **xi);
-_X_INTERNAL int GetCoreType(InternalEvent* ev);
-_X_INTERNAL int GetXIType(InternalEvent* ev);
-_X_INTERNAL int GetXI2Type(InternalEvent* ev);
+_X_INTERNAL int GetCoreType(enum EventType type);
+_X_INTERNAL int GetXIType(enum EventType type);
+_X_INTERNAL int GetXI2Type(enum EventType type);
 
 #endif /* _EVENTCONVERT_H_ */
diff --git a/xorg-server/include/exevents.h b/xorg-server/include/exevents.h
index 12ea37885..0ab04f525 100644
--- a/xorg-server/include/exevents.h
+++ b/xorg-server/include/exevents.h
@@ -159,7 +159,7 @@ typedef struct _XIClientRec {
 
 
 typedef struct _GrabParameters {
-    int                 grabtype;               /* GRABTYPE_CORE, etc. */
+    int                 grabtype;               /* CORE, etc. */
     unsigned int        ownerEvents;
     unsigned int        this_device_mode;
     unsigned int        other_devices_mode;
@@ -200,7 +200,7 @@ GrabButton(
 	DeviceIntPtr           /* modifier_device */,
 	int                    /* button */,
         GrabParameters*        /* param */,
-        GrabType               /* grabtype */,
+        enum InputLevel        /* grabtype */,
 	GrabMask*              /* eventMask */);
 
 extern int
@@ -210,7 +210,7 @@ GrabKey(
 	DeviceIntPtr           /* modifier_device */,
 	int                    /* key */,
         GrabParameters*        /* param */,
-        GrabType               /* grabtype */,
+        enum InputLevel        /* grabtype */,
 	GrabMask*              /* eventMask */);
 
 extern int
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index 8b0c18e70..bd12f6829 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -57,6 +57,7 @@ SOFTWARE.
 #include "xkbrules.h"
 #include "events.h"
 #include "list.h"
+#include <X11/extensions/XI2.h>
 
 #define DEVICE_INIT	0
 #define DEVICE_ON	1
@@ -101,6 +102,12 @@ SOFTWARE.
 #define RevertToFollowKeyboard	3
 #endif
 
+enum InputLevel {
+    CORE,
+    XI,
+    XI2,
+};
+
 typedef unsigned long Leds;
 typedef struct _OtherClients *OtherClientsPtr;
 typedef struct _InputClients *InputClientsPtr;
@@ -537,14 +544,16 @@ extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
 extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
 extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
 extern Bool WindowXI2MaskIsset(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
+extern int GetXI2MaskByte(XI2Mask *mask, DeviceIntPtr dev, int event_type);
 void FixUpEventFromWindow(SpritePtr pSprite,
                           xEvent *xE,
                           WindowPtr pWin,
                           Window child,
                           Bool calcChild);
 extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
-extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,
-                              WindowPtr win);
+extern int EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win);
+extern Bool ActivatePassiveGrab(DeviceIntPtr dev, GrabPtr grab,
+                                InternalEvent *ev);
 /**
  * Masks specifying the type of event to deliver for an InternalEvent; used
  * by EventIsDeliverable.
@@ -557,6 +566,13 @@ extern int EventIsDeliverable(DeviceIntPtr dev, InternalEvent* event,
 #define EVENT_XI2_MASK                (1 << 3) /**< XI2 mask set on window */
 /* @} */
 
+enum EventDeliveryState {
+    EVENT_DELIVERED,     /**< Event has been delivered to a client  */
+    EVENT_NOT_DELIVERED, /**< Event was not delivered to any client */
+    EVENT_SKIP,          /**< Event can be discarded by the caller  */
+    EVENT_REJECTED,      /**< Event was rejected for delivery to the client */
+};
+
 /* Implemented by the DDX. */
 extern _X_EXPORT int NewInputDeviceRequest(
     InputOption *options,
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index 5634f3cfc..5aae1b512 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -57,7 +57,7 @@ SOFTWARE.
 #include "geext.h"
 #include "privates.h"
 
-#define BitIsOn(ptr, bit) (!!(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
+#define BitIsOn(ptr, bit) (!!(((const BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7))))
 #define SetBit(ptr, bit)  (((BYTE *) (ptr))[(bit)>>3] |= (1 << ((bit) & 7)))
 #define ClearBit(ptr, bit) (((BYTE *)(ptr))[(bit)>>3] &= ~(1 << ((bit) & 7)))
 extern _X_EXPORT int CountBits(const uint8_t *mask, int len);
@@ -167,12 +167,6 @@ typedef struct _DetailRec {		/* Grab details may be bit masks */
     Mask                *pMask;
 } DetailRec;
 
-typedef enum {
-    GRABTYPE_CORE,
-    GRABTYPE_XI,
-    GRABTYPE_XI2
-} GrabType;
-
 union _GrabMask {
     Mask core;
     Mask xi;
@@ -200,7 +194,7 @@ typedef struct _GrabRec {
     unsigned		ownerEvents:1;
     unsigned		keyboardMode:1;
     unsigned		pointerMode:1;
-    GrabType		grabtype;
+    enum InputLevel	grabtype;
     CARD8		type;		/* event type */
     DetailRec		modifiersDetail;
     DeviceIntPtr	modifierDevice;
diff --git a/xorg-server/include/inpututils.h b/xorg-server/include/inpututils.h
index 5f9dfecc3..9e22c5a28 100644
--- a/xorg-server/include/inpututils.h
+++ b/xorg-server/include/inpututils.h
@@ -32,6 +32,8 @@
 #include "input.h"
 #include <X11/extensions/XI2proto.h>
 
+extern Mask event_filters[MAXDEVICES][MAXEVENTS];
+
 struct _ValuatorMask {
     int8_t      last_bit; /* highest bit set in mask */
     uint8_t     mask[(MAX_VALUATORS + 7)/8];
@@ -40,6 +42,10 @@ struct _ValuatorMask {
 
 extern void verify_internal_event(const InternalEvent *ev);
 extern void init_device_event(DeviceEvent *event, DeviceIntPtr dev, Time ms);
+extern int event_get_corestate(DeviceIntPtr mouse, DeviceIntPtr kbd);
+extern void event_set_state(DeviceIntPtr mouse, DeviceIntPtr kbd, DeviceEvent *event);
+extern Mask event_get_filter_from_type(DeviceIntPtr dev, int evtype);
+extern Mask event_get_filter_from_xi2type(int evtype);
 
 FP3232 double_to_fp3232(double in);
 FP1616 double_to_fp1616(double in);
diff --git a/xorg-server/include/misc.h b/xorg-server/include/misc.h
index ed280337a..d401537c6 100644
--- a/xorg-server/include/misc.h
+++ b/xorg-server/include/misc.h
@@ -99,6 +99,8 @@ static double __inline trunc(double d)
 #define MAXFORMATS	8
 #define MAXDEVICES	40 /* input devices */
 
+/* 128 event opcodes for core + extension events, excluding GE */
+#define MAXEVENTS       128
 #define EXTENSION_EVENT_BASE 64
 #define EXTENSION_BASE 128
 
diff --git a/xorg-server/include/os.h b/xorg-server/include/os.h
index 67493645d..f62ada207 100644
--- a/xorg-server/include/os.h
+++ b/xorg-server/include/os.h
@@ -129,7 +129,7 @@ extern _X_EXPORT void CloseWellKnownConnections(void);
 
 extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client*/);
 
-extern _X_EXPORT char *ClientAuthorized(
+extern _X_EXPORT const char *ClientAuthorized(
     ClientPtr /*client*/,
     unsigned int /*proto_n*/,
     char* /*auth_proto*/,
@@ -407,7 +407,7 @@ extern _X_EXPORT void InitAuthorization(char * /*filename*/);
 extern _X_EXPORT int AuthorizationFromID (
 	XID 		id,
 	unsigned short	*name_lenp,
-	char		**namep,
+	const char	**namep,
 	unsigned short	*data_lenp,
 	char		**datap);
 
@@ -417,7 +417,7 @@ extern _X_EXPORT XID CheckAuthorization(
     unsigned int /*datalength*/,
     const char * /*data*/,
     ClientPtr /*client*/,
-    char ** /*reason*/
+    const char ** /*reason*/
 );
 
 extern _X_EXPORT void ResetAuthorization(void);
diff --git a/xorg-server/include/registry.h b/xorg-server/include/registry.h
index 325f76515..44f79259e 100644
--- a/xorg-server/include/registry.h
+++ b/xorg-server/include/registry.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * Registration functions.  The name string is not copied, so it must
  * not be a stack variable.
  */
-extern _X_EXPORT void RegisterResourceName(RESTYPE type, char *name);
+extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
 extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry *ext);
 
 /*
diff --git a/xorg-server/include/resource.h b/xorg-server/include/resource.h
index 2bed80577..ea4043b2f 100644
--- a/xorg-server/include/resource.h
+++ b/xorg-server/include/resource.h
@@ -1,255 +1,255 @@
-/***********************************************************

-

-Copyright 1987, 1989, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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

-OPEN GROUP 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 Open Group 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 Open Group.

-

-

-Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.

-

-                        All Rights Reserved

-

-Permission to use, copy, modify, and distribute this software and its 

-documentation for any purpose and without fee is hereby granted, 

-provided that the above copyright notice appear in all copies and that

-both that copyright notice and this permission notice appear in 

-supporting documentation, and that the name of Digital not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.  

-

-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL

-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR

-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,

-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS

-SOFTWARE.

-

-******************************************************************/

-

-#ifndef RESOURCE_H

-#define RESOURCE_H 1

-#include "misc.h"

-#include "dixaccess.h"

-

-/*****************************************************************

- * STUFF FOR RESOURCES 

- *****************************************************************/

-

-/* classes for Resource routines */

-

-typedef uint32_t RESTYPE;

-

-#define RC_VANILLA	((RESTYPE)0)

-#define RC_CACHED	((RESTYPE)1<<31)

-#define RC_DRAWABLE	((RESTYPE)1<<30)

-/*  Use class RC_NEVERRETAIN for resources that should not be retained

- *  regardless of the close down mode when the client dies.  (A client's

- *  event selections on objects that it doesn't own are good candidates.)

- *  Extensions can use this too!

- */

-#define RC_NEVERRETAIN	((RESTYPE)1<<29)

-#define RC_LASTPREDEF	RC_NEVERRETAIN

-#define RC_ANY		(~(RESTYPE)0)

-

-/* types for Resource routines. When you change one of them, please also update the predefTypes array in resource.c*/

-

-#define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)

-#define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)

-#define RT_GC		((RESTYPE)3)

-#undef RT_FONT

-#undef RT_CURSOR

-#define RT_FONT		((RESTYPE)4)

-#define RT_CURSOR	((RESTYPE)5)

-#define RT_COLORMAP	((RESTYPE)6)

-#define RT_CMAPENTRY	((RESTYPE)7)

-#define RT_OTHERCLIENT	((RESTYPE)8|RC_NEVERRETAIN)

-#define RT_PASSIVEGRAB	((RESTYPE)9|RC_NEVERRETAIN)

-#define RT_LASTPREDEF	((RESTYPE)9)

-#define RT_NONE		((RESTYPE)0)

-

-/* bits and fields within a resource id */

-#define RESOURCE_AND_CLIENT_COUNT   29			/* 29 bits for XIDs */

-#if MAXCLIENTS == 64

-#define RESOURCE_CLIENT_BITS	6

-#endif

-#if MAXCLIENTS == 128

-#define RESOURCE_CLIENT_BITS	7

-#endif

-#if MAXCLIENTS == 256

-#define RESOURCE_CLIENT_BITS	8

-#endif

-#if MAXCLIENTS == 512

-#define RESOURCE_CLIENT_BITS	9

-#endif

-/* client field offset */

-#define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)

-/* resource field */

-#define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)

-/* client field */

-#define RESOURCE_CLIENT_MASK	(((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET)

-/* extract the client mask from an XID */

-#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)

-/* extract the client id from an XID */

-#define CLIENT_ID(id) ((int)(CLIENT_BITS(id) >> CLIENTOFFSET))

-#define SERVER_BIT		(Mask)0x40000000	/* use illegal bit */

-

-#ifdef INVALID

-#undef INVALID	/* needed on HP/UX */

-#endif

-

-/* Invalid resource id */

-#define INVALID	(0)

-

-#define BAD_RESOURCE 0xe0000000

-

-#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])

-

-/* Resource state callback */

-extern _X_EXPORT CallbackListPtr ResourceStateCallback;

-

-typedef enum {ResourceStateAdding,

-	      ResourceStateFreeing} ResourceState;

-

-typedef struct {

-    ResourceState state;

-    XID id;

-    RESTYPE type;

-    pointer value;

-} ResourceStateInfoRec;

-

-typedef int (*DeleteType)(

-    pointer /*value*/,

-    XID /*id*/);

-

-typedef void (*FindResType)(

-    pointer /*value*/,

-    XID /*id*/,

-    pointer /*cdata*/);

-

-typedef void (*FindAllRes)(

-    pointer /*value*/,

-    XID /*id*/,

-    RESTYPE /*type*/,

-    pointer /*cdata*/);

-

-typedef Bool (*FindComplexResType)(

-    pointer /*value*/,

-    XID /*id*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT RESTYPE CreateNewResourceType(

-    DeleteType /*deleteFunc*/, char * /*name*/);

-

-extern _X_EXPORT void SetResourceTypeErrorValue(

-    RESTYPE /*type*/, int /*errorValue*/);

-

-extern _X_EXPORT RESTYPE CreateNewResourceClass(void);

-

-extern _X_EXPORT Bool InitClientResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT XID FakeClientID(

-    int /*client*/);

-

-/* Quartz support on Mac OS X uses the CarbonCore

-   framework whose AddResource function conflicts here. */

-#ifdef __APPLE__

-#define AddResource Darwin_X_AddResource

-#endif

-extern _X_EXPORT Bool AddResource(

-    XID /*id*/,

-    RESTYPE /*type*/,

-    pointer /*value*/);

-

-extern _X_EXPORT void FreeResource(

-    XID /*id*/,

-    RESTYPE /*skipDeleteFuncType*/);

-

-extern _X_EXPORT void FreeResourceByType(

-    XID /*id*/,

-    RESTYPE /*type*/,

-    Bool /*skipFree*/);

-

-extern _X_EXPORT Bool ChangeResourceValue(

-    XID /*id*/,

-    RESTYPE /*rtype*/,

-    pointer /*value*/);

-

-extern _X_EXPORT void FindClientResourcesByType(

-    ClientPtr /*client*/,

-    RESTYPE /*type*/,

-    FindResType /*func*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT void FindAllClientResources(

-    ClientPtr /*client*/,

-    FindAllRes /*func*/,

-    pointer /*cdata*/);

-

-extern _X_EXPORT void FreeClientNeverRetainResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT void FreeClientResources(

-    ClientPtr /*client*/);

-

-extern _X_EXPORT void FreeAllResources(void);

-

-extern _X_EXPORT Bool LegalNewID(

-    XID /*id*/,

-    ClientPtr /*client*/);

-

-extern _X_EXPORT pointer LookupClientResourceComplex(

-    ClientPtr client,

-    RESTYPE type,

-    FindComplexResType func,

-    pointer cdata);

-

-extern _X_EXPORT int dixLookupResourceByType(

-    pointer *result,

-    XID id,

-    RESTYPE rtype,

-    ClientPtr client,

-    Mask access_mode);

-

-extern _X_EXPORT int dixLookupResourceByClass(

-    pointer *result,

-    XID id,

-    RESTYPE rclass,

-    ClientPtr client,

-    Mask access_mode);

-

-extern _X_EXPORT void GetXIDRange(

-    int /*client*/,

-    Bool /*server*/,

-    XID * /*minp*/,

-    XID * /*maxp*/);

-

-extern _X_EXPORT unsigned int GetXIDList(

-    ClientPtr /*client*/,

-    unsigned int /*count*/,

-    XID * /*pids*/);

-

-extern _X_EXPORT RESTYPE lastResourceType;

-extern _X_EXPORT RESTYPE TypeMask;

-

-#endif /* RESOURCE_H */

-

+/***********************************************************
+
+Copyright 1987, 1989, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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
+OPEN GROUP 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 Open Group 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 Open Group.
+
+
+Copyright 1987, 1989 by Digital Equipment Corporation, Maynard, Massachusetts.
+
+                        All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and its 
+documentation for any purpose and without fee is hereby granted, 
+provided that the above copyright notice appear in all copies and that
+both that copyright notice and this permission notice appear in 
+supporting documentation, and that the name of Digital not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.  
+
+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+SOFTWARE.
+
+******************************************************************/
+
+#ifndef RESOURCE_H
+#define RESOURCE_H 1
+#include "misc.h"
+#include "dixaccess.h"
+
+/*****************************************************************
+ * STUFF FOR RESOURCES 
+ *****************************************************************/
+
+/* classes for Resource routines */
+
+typedef uint32_t RESTYPE;
+
+#define RC_VANILLA	((RESTYPE)0)
+#define RC_CACHED	((RESTYPE)1<<31)
+#define RC_DRAWABLE	((RESTYPE)1<<30)
+/*  Use class RC_NEVERRETAIN for resources that should not be retained
+ *  regardless of the close down mode when the client dies.  (A client's
+ *  event selections on objects that it doesn't own are good candidates.)
+ *  Extensions can use this too!
+ */
+#define RC_NEVERRETAIN	((RESTYPE)1<<29)
+#define RC_LASTPREDEF	RC_NEVERRETAIN
+#define RC_ANY		(~(RESTYPE)0)
+
+/* types for Resource routines. When you change one of them, please also update the predefTypes array in resource.c*/
+
+#define RT_WINDOW	((RESTYPE)1|RC_DRAWABLE)
+#define RT_PIXMAP	((RESTYPE)2|RC_DRAWABLE)
+#define RT_GC		((RESTYPE)3)
+#undef RT_FONT
+#undef RT_CURSOR
+#define RT_FONT		((RESTYPE)4)
+#define RT_CURSOR	((RESTYPE)5)
+#define RT_COLORMAP	((RESTYPE)6)
+#define RT_CMAPENTRY	((RESTYPE)7)
+#define RT_OTHERCLIENT	((RESTYPE)8|RC_NEVERRETAIN)
+#define RT_PASSIVEGRAB	((RESTYPE)9|RC_NEVERRETAIN)
+#define RT_LASTPREDEF	((RESTYPE)9)
+#define RT_NONE		((RESTYPE)0)
+
+/* bits and fields within a resource id */
+#define RESOURCE_AND_CLIENT_COUNT   29			/* 29 bits for XIDs */
+#if MAXCLIENTS == 64
+#define RESOURCE_CLIENT_BITS	6
+#endif
+#if MAXCLIENTS == 128
+#define RESOURCE_CLIENT_BITS	7
+#endif
+#if MAXCLIENTS == 256
+#define RESOURCE_CLIENT_BITS	8
+#endif
+#if MAXCLIENTS == 512
+#define RESOURCE_CLIENT_BITS	9
+#endif
+/* client field offset */
+#define CLIENTOFFSET	    (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS)
+/* resource field */
+#define RESOURCE_ID_MASK	((1 << CLIENTOFFSET) - 1)
+/* client field */
+#define RESOURCE_CLIENT_MASK	(((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET)
+/* extract the client mask from an XID */
+#define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK)
+/* extract the client id from an XID */
+#define CLIENT_ID(id) ((int)(CLIENT_BITS(id) >> CLIENTOFFSET))
+#define SERVER_BIT		(Mask)0x40000000	/* use illegal bit */
+
+#ifdef INVALID
+#undef INVALID	/* needed on HP/UX */
+#endif
+
+/* Invalid resource id */
+#define INVALID	(0)
+
+#define BAD_RESOURCE 0xe0000000
+
+#define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
+
+/* Resource state callback */
+extern _X_EXPORT CallbackListPtr ResourceStateCallback;
+
+typedef enum {ResourceStateAdding,
+	      ResourceStateFreeing} ResourceState;
+
+typedef struct {
+    ResourceState state;
+    XID id;
+    RESTYPE type;
+    pointer value;
+} ResourceStateInfoRec;
+
+typedef int (*DeleteType)(
+    pointer /*value*/,
+    XID /*id*/);
+
+typedef void (*FindResType)(
+    pointer /*value*/,
+    XID /*id*/,
+    pointer /*cdata*/);
+
+typedef void (*FindAllRes)(
+    pointer /*value*/,
+    XID /*id*/,
+    RESTYPE /*type*/,
+    pointer /*cdata*/);
+
+typedef Bool (*FindComplexResType)(
+    pointer /*value*/,
+    XID /*id*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT RESTYPE CreateNewResourceType(
+    DeleteType /*deleteFunc*/, const char * /*name*/);
+
+extern _X_EXPORT void SetResourceTypeErrorValue(
+    RESTYPE /*type*/, int /*errorValue*/);
+
+extern _X_EXPORT RESTYPE CreateNewResourceClass(void);
+
+extern _X_EXPORT Bool InitClientResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT XID FakeClientID(
+    int /*client*/);
+
+/* Quartz support on Mac OS X uses the CarbonCore
+   framework whose AddResource function conflicts here. */
+#ifdef __APPLE__
+#define AddResource Darwin_X_AddResource
+#endif
+extern _X_EXPORT Bool AddResource(
+    XID /*id*/,
+    RESTYPE /*type*/,
+    pointer /*value*/);
+
+extern _X_EXPORT void FreeResource(
+    XID /*id*/,
+    RESTYPE /*skipDeleteFuncType*/);
+
+extern _X_EXPORT void FreeResourceByType(
+    XID /*id*/,
+    RESTYPE /*type*/,
+    Bool /*skipFree*/);
+
+extern _X_EXPORT Bool ChangeResourceValue(
+    XID /*id*/,
+    RESTYPE /*rtype*/,
+    pointer /*value*/);
+
+extern _X_EXPORT void FindClientResourcesByType(
+    ClientPtr /*client*/,
+    RESTYPE /*type*/,
+    FindResType /*func*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT void FindAllClientResources(
+    ClientPtr /*client*/,
+    FindAllRes /*func*/,
+    pointer /*cdata*/);
+
+extern _X_EXPORT void FreeClientNeverRetainResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT void FreeClientResources(
+    ClientPtr /*client*/);
+
+extern _X_EXPORT void FreeAllResources(void);
+
+extern _X_EXPORT Bool LegalNewID(
+    XID /*id*/,
+    ClientPtr /*client*/);
+
+extern _X_EXPORT pointer LookupClientResourceComplex(
+    ClientPtr client,
+    RESTYPE type,
+    FindComplexResType func,
+    pointer cdata);
+
+extern _X_EXPORT int dixLookupResourceByType(
+    pointer *result,
+    XID id,
+    RESTYPE rtype,
+    ClientPtr client,
+    Mask access_mode);
+
+extern _X_EXPORT int dixLookupResourceByClass(
+    pointer *result,
+    XID id,
+    RESTYPE rclass,
+    ClientPtr client,
+    Mask access_mode);
+
+extern _X_EXPORT void GetXIDRange(
+    int /*client*/,
+    Bool /*server*/,
+    XID * /*minp*/,
+    XID * /*maxp*/);
+
+extern _X_EXPORT unsigned int GetXIDList(
+    ClientPtr /*client*/,
+    unsigned int /*count*/,
+    XID * /*pids*/);
+
+extern _X_EXPORT RESTYPE lastResourceType;
+extern _X_EXPORT RESTYPE TypeMask;
+
+#endif /* RESOURCE_H */
+
diff --git a/xorg-server/os/access.c b/xorg-server/os/access.c
index c7ff245d8..0ec8ebdf7 100644
--- a/xorg-server/os/access.c
+++ b/xorg-server/os/access.c
@@ -176,12 +176,10 @@ SOFTWARE.
 
 Bool defeatAccessControl = FALSE;
 
-#define acmp(a1, a2, len) memcmp((char *)(a1), (char *)(a2), len)
-#define acopy(a1, a2, len) memmove((char *)(a2), (char *)(a1), len)
 #define addrEqual(fam, address, length, host) \
 			 ((fam) == (host)->family &&\
 			  (length) == (host)->len &&\
-			  !acmp (address, (host)->addr, length))
+			  !memcmp (address, (host)->addr, length))
 
 static int ConvertAddr(struct sockaddr * /*saddr*/,
 		       int * /*len*/,
@@ -478,7 +476,7 @@ DefineSelf (int fd, const int protocol)
 	    ErrorF(" %s", ad);
 	    saddr.sa.sa_family = AF_INET6;
 	    inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
-	    acopy (ha.addr, &(inet6addr->sin6_addr), ha.len);
+	    memcpy (&(inet6addr->sin6_addr), ha.addr, ha.len);
 	    len = sizeof(saddr.in6);
 	    family = ConvertAddr (&(saddr.sa), &len, (pointer *)&addr);
 	    if ( family != -1 && family != FamilyLocal ) {
@@ -491,7 +489,7 @@ DefineSelf (int fd, const int protocol)
 		    if (host) {
 			host->family = family;
 			host->len = len;
-			acopy (addr, host->addr, len);
+			memcpy (host->addr, addr, len);
 			host->next = selfhosts;
 			selfhosts = host;
 		    }
@@ -538,7 +536,7 @@ CarryOnTheOldWay:
 #if 0 /* We never used to get here and AF_INET6 is now processed by getaddrinfo() */
 	    case AF_INET6:
 		inet6addr = (struct sockaddr_in6 *) (&(saddr.sa));
-		acopy ( hp_addr, &(inet6addr->sin6_addr), hp->h_length);
+	        memcpy ( &(inet6addr->sin6_addr), hp->h_addr, hp->h_length);
 		len = sizeof(saddr.in6);
 		break;
 #endif
@@ -548,9 +546,9 @@ CarryOnTheOldWay:
 
       for (i = -1; i < 0 || hp->h_addr_list[i]; i++)
       {
-	if (i < 0) acopy ( hp->h_addr_list[j], &(inetaddr->sin_addr), hp->h_length);
+	if (i < 0) memcpy ( &(inetaddr->sin_addr), hp->h_addr_list[j], hp->h_length);
 	else if (i == j) continue;
-	else acopy ( hp->h_addr_list[i], &(inetaddr->sin_addr), hp->h_length);
+	else memcpy ( &(inetaddr->sin_addr), hp->h_addr_list[i], hp->h_length);
 	len = sizeof(saddr.sa);
 	    family = ConvertAddr ( &(saddr.sa), &len, (pointer *)&addr);
 	    if ( family != -1 && family != FamilyLocal )
@@ -566,7 +564,7 @@ CarryOnTheOldWay:
 		    {
 			host->family = family;
 			host->len = len;
-			acopy ( addr, host->addr, len);
+			memcpy ( host->addr, addr, len);
 			host->next = selfhosts;
 			selfhosts = host;
 		    }
@@ -618,7 +616,7 @@ DefineLocalHost:
 	{
 	    host->family = FamilyLocalHost;
 	    host->len = 0;
-	    acopy("", host->addr, 0);
+	    /* Nothing to store in host->addr */
 	    host->next = selfhosts;
 	    selfhosts = host;
 	}
@@ -755,7 +753,7 @@ DefineSelf (int fd)
 	{
 	    host->family = family;
 	    host->len = len;
-	    acopy(addr, host->addr, len);
+	    memcpy(host->addr, addr, len);
 	    host->next = selfhosts;
 	    selfhosts = host;
 	}
@@ -887,7 +885,7 @@ DefineSelf (int fd)
 	if (host != NULL) {
 	    host->family = family;
 	    host->len = len;
-	    acopy(addr, host->addr, len);
+	    memcpy(host->addr, addr, len);
 	    host->next = selfhosts;
 	    selfhosts = host;
 	}
@@ -962,7 +960,7 @@ DefineSelf (int fd)
 	{
 	    host->family = FamilyLocalHost;
 	    host->len = 0;
-	    acopy("", host->addr, 0);
+	    /* Nothing to store in host->addr */
 	    host->next = selfhosts;
 	    selfhosts = host;
 	}
@@ -991,7 +989,7 @@ AugmentSelf(pointer from, int len)
 	return;
     host->family = family;
     host->len = len;
-    acopy(addr, host->addr, len);
+    memcpy(host->addr, addr, len);
     host->next = selfhosts;
     selfhosts = host;
 }
@@ -1483,7 +1481,7 @@ NewHost (int		family,
 	return FALSE;
     host->family = family;
     host->len = len;
-    acopy(addr, host->addr, len);
+    memcpy(host->addr, addr, len);
     host->next = validhosts;
     validhosts = host;
     return TRUE;
@@ -1577,7 +1575,7 @@ GetHosts (
 	    ((xHostEntry *)ptr)->family = host->family;
 	    ((xHostEntry *)ptr)->length = len;
 	    ptr += sizeof(xHostEntry);
-	    acopy (host->addr, ptr, len);
+	    memcpy (ptr, host->addr, len);
 	    ptr += pad_to_int32(len);
         }
     } else {
@@ -1944,7 +1942,7 @@ siHostnameAddrMatch(int family, pointer addr, int len,
 		hostaddrlen = a->ai_addrlen;
 		f = ConvertAddr(a->ai_addr,&hostaddrlen,&hostaddr);
 		if ((f == family) && (len == hostaddrlen) &&
-		  (acmp (addr, hostaddr, len) == 0) ) {
+		  (memcmp (addr, hostaddr, len) == 0) ) {
 		    res = TRUE;
 		    break;
 		}
@@ -1979,12 +1977,12 @@ siHostnameAddrMatch(int family, pointer addr, int len,
 		struct  sockaddr_in  sin;
 
     		sin.sin_family = hp->h_addrtype;
-		acopy ( *addrlist, &(sin.sin_addr), hp->h_length);
+		memcpy ( &(sin.sin_addr), *addrlist, hp->h_length);
 		hostaddrlen = sizeof(sin);
     		f = ConvertAddr ((struct sockaddr *)&sin, 
 		  &hostaddrlen, &hostaddr);
 		if ((f == family) && (len == hostaddrlen) &&
-		  (acmp (addr, hostaddr, len) == 0) ) {
+		  (memcmp (addr, hostaddr, len) == 0) ) {
 		    res = TRUE;
 		    break;
 		}
diff --git a/xorg-server/os/auth.c b/xorg-server/os/auth.c
index f80e53155..12a44b4d6 100644
--- a/xorg-server/os/auth.c
+++ b/xorg-server/os/auth.c
@@ -1,340 +1,340 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/*

- * authorization hooks for the server

- * Author:  Keith Packard, MIT X Consortium

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-# include   <X11/X.h>

-# include   <X11/Xauth.h>

-# include   "misc.h"

-# include   "osdep.h"

-# include   "dixstruct.h"

-# include   <sys/types.h>

-# include   <sys/stat.h>

-#ifdef WIN32

-#include    <X11/Xw32defs.h>

-#endif

-

-struct protocol {

-    unsigned short   name_length;

-    char    *name;

-    AuthAddCFunc	Add;	/* new authorization data */

-    AuthCheckFunc	Check;	/* verify client authorization data */

-    AuthRstCFunc	Reset;	/* delete all authorization data entries */

-    AuthToIDFunc	ToID;	/* convert cookie to ID */

-    AuthFromIDFunc	FromID;	/* convert ID to cookie */

-    AuthRemCFunc	Remove;	/* remove a specific cookie */

-#ifdef XCSECURITY

-    AuthGenCFunc	Generate;

-#endif

-};

-

-static struct protocol   protocols[] = {

-{   (unsigned short) 18,    "MIT-MAGIC-COOKIE-1",

-		MitAddCookie,	MitCheckCookie,	MitResetCookie,

-		MitToID,	MitFromID,	MitRemoveCookie,

-#ifdef XCSECURITY

-		MitGenerateCookie

-#endif

-},

-#ifdef HASXDMAUTH

-{   (unsigned short) 19,    "XDM-AUTHORIZATION-1",

-		XdmAddCookie,	XdmCheckCookie,	XdmResetCookie,

-		XdmToID,	XdmFromID,	XdmRemoveCookie,

-#ifdef XCSECURITY

-		NULL

-#endif

-},

-#endif

-#ifdef SECURE_RPC

-{   (unsigned short) 9,    "SUN-DES-1",

-		SecureRPCAdd,	SecureRPCCheck,	SecureRPCReset,

-		SecureRPCToID,	SecureRPCFromID,SecureRPCRemove,

-#ifdef XCSECURITY

-		NULL

-#endif

-},

-#endif

-};

-

-# define NUM_AUTHORIZATION  (sizeof (protocols) /\

-			     sizeof (struct protocol))

-

-/*

- * Initialize all classes of authorization by reading the

- * specified authorization file

- */

-

-static char *authorization_file = (char *)NULL;

-

-static Bool ShouldLoadAuth = TRUE;

-

-void

-InitAuthorization (char *file_name)

-{

-    authorization_file = file_name;

-}

-

-static int

-LoadAuthorization (void)

-{

-    FILE    *f;

-    Xauth   *auth;

-    int	    i;

-    int	    count = 0;

-

-    ShouldLoadAuth = FALSE;

-    if (!authorization_file)

-	return 0;

-

-    f = Fopen (authorization_file, "r");

-    if (!f)

-	return -1;

-

-    while ((auth = XauReadAuth (f)) != 0) {

-	for (i = 0; i < NUM_AUTHORIZATION; i++) {

-	    if (protocols[i].name_length == auth->name_length &&

-		memcmp (protocols[i].name, auth->name, (int) auth->name_length) == 0 &&

-		protocols[i].Add)

-	    {

-		++count;

-		(*protocols[i].Add) (auth->data_length, auth->data,

-					 FakeClientID(0));

-	    }

-	}

-	XauDisposeAuth (auth);

-    }

-

-    Fclose (f);

-    return count;

-}

-

-#ifdef XDMCP

-/*

- * XdmcpInit calls this function to discover all authorization

- * schemes supported by the display

- */

-void

-RegisterAuthorizations (void)

-{

-    int	    i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++)

-	XdmcpRegisterAuthorization (protocols[i].name,

-				    (int)protocols[i].name_length);

-}

-#endif

-

-XID

-CheckAuthorization (

-    unsigned int name_length,

-    const char	*name,

-    unsigned int data_length,

-    const char	*data,

-    ClientPtr client,

-    char	**reason)	/* failure message.  NULL for default msg */

-{

-    int	i;

-    struct stat buf;

-    static time_t lastmod = 0;

-    static Bool loaded = FALSE;

-

-    if (!authorization_file || stat(authorization_file, &buf))

-    {

-	if (lastmod != 0) {

-	    lastmod = 0;

-	    ShouldLoadAuth = TRUE;	/* stat lost, so force reload */

-	}

-    }

-    else if (buf.st_mtime > lastmod)

-    {

-	lastmod = buf.st_mtime;

-	ShouldLoadAuth = TRUE;

-    }

-    if (ShouldLoadAuth)

-    {

-	int loadauth = LoadAuthorization();

-

-	/*

-	 * If the authorization file has at least one entry for this server,

-	 * disable local host access. (loadauth > 0)

-	 *

-	 * If there are zero entries (either initially or when the

-	 * authorization file is later reloaded), or if a valid

-	 * authorization file was never loaded, enable local host access.

-	 * (loadauth == 0 || !loaded)

-	 *

-	 * If the authorization file was loaded initially (with valid

-	 * entries for this server), and reloading it later fails, don't

-	 * change anything. (loadauth == -1 && loaded)

-	 */

-	

-	if (loadauth > 0)

-	{

-	    DisableLocalHost(); /* got at least one */

-	    loaded = TRUE;

-	}

-	else if (loadauth == 0 || !loaded)

-	    EnableLocalHost ();

-    }

-    if (name_length) {

-	for (i = 0; i < NUM_AUTHORIZATION; i++) {

-	    if (protocols[i].name_length == name_length &&

-		memcmp (protocols[i].name, name, (int) name_length) == 0)

-	    {

-		return (*protocols[i].Check) (data_length, data, client, reason);

-	    }

-	    *reason = "Protocol not supported by server\n";

-	}

-    } else *reason = "No protocol specified\n";

-    return (XID) ~0L;

-}

-

-void

-ResetAuthorization (void)

-{

-    int	i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++)

-	if (protocols[i].Reset)

-	    (*protocols[i].Reset)();

-    ShouldLoadAuth = TRUE;

-}

-

-int

-AuthorizationFromID (

-	XID 		id,

-	unsigned short	*name_lenp,

-	char		**namep,

-	unsigned short	*data_lenp,

-	char		**datap)

-{

-    int	i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++) {

-	if (protocols[i].FromID &&

-	    (*protocols[i].FromID) (id, data_lenp, datap)) {

-	    *name_lenp = protocols[i].name_length;

-	    *namep = protocols[i].name;

-	    return 1;

-	}

-    }

-    return 0;

-}

-

-int

-RemoveAuthorization (

-	unsigned short	name_length,

-	const char	*name,

-	unsigned short	data_length,

-	const char	*data)

-{

-    int	i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++) {

-    	if (protocols[i].name_length == name_length &&

-	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&

-	    protocols[i].Remove)

-    	{

-	    return (*protocols[i].Remove) (data_length, data);

-    	}

-    }

-    return 0;

-}

-

-int

-AddAuthorization (unsigned name_length, const char *name,

-		  unsigned data_length, char *data)

-{

-    int	i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++) {

-    	if (protocols[i].name_length == name_length &&

-	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&

-	    protocols[i].Add)

-    	{

-	    return (*protocols[i].Add) (data_length, data, FakeClientID(0));

-    	}

-    }

-    return 0;

-}

-

-#ifdef XCSECURITY

-

-XID

-GenerateAuthorization(

-	unsigned name_length,

-	const char	*name,

-	unsigned data_length,

-	const char	*data,

-	unsigned *data_length_return,

-	char	**data_return)

-{

-    int	i;

-

-    for (i = 0; i < NUM_AUTHORIZATION; i++) {

-    	if (protocols[i].name_length == name_length &&

-	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&

-	    protocols[i].Generate)

-    	{

-	    return (*protocols[i].Generate) (data_length, data,

-			FakeClientID(0), data_length_return, data_return);

-    	}

-    }

-    return -1;

-}

-

-void

-GenerateRandomData (int len, char *buf)

-{

-#ifdef _MSC_VER

-    static HANDLE hAdvApi32;

-    static BOOLEAN (_stdcall * RtlGenRandom)(void *,unsigned long);

-

-    if (!hAdvApi32)

-    {

-      hAdvApi32=LoadLibrary("advapi32.dll");

-      RtlGenRandom=(BOOLEAN (_stdcall *)(void*,unsigned long))GetProcAddress(hAdvApi32,"SystemFunction036");

-    }

-    RtlGenRandom(buf, len);

-#else

-    int fd;

-

-    fd = open("/dev/urandom", O_RDONLY);

-    read(fd, buf, len);

-    close(fd);

-#endif

-}

-

-#endif /* XCSECURITY */

+/*
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/*
+ * authorization hooks for the server
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+# include   <X11/X.h>
+# include   <X11/Xauth.h>
+# include   "misc.h"
+# include   "osdep.h"
+# include   "dixstruct.h"
+# include   <sys/types.h>
+# include   <sys/stat.h>
+#ifdef WIN32
+#include    <X11/Xw32defs.h>
+#endif
+
+struct protocol {
+    unsigned short   name_length;
+    const char         *name;
+    AuthAddCFunc	Add;	/* new authorization data */
+    AuthCheckFunc	Check;	/* verify client authorization data */
+    AuthRstCFunc	Reset;	/* delete all authorization data entries */
+    AuthToIDFunc	ToID;	/* convert cookie to ID */
+    AuthFromIDFunc	FromID;	/* convert ID to cookie */
+    AuthRemCFunc	Remove;	/* remove a specific cookie */
+#ifdef XCSECURITY
+    AuthGenCFunc	Generate;
+#endif
+};
+
+static struct protocol   protocols[] = {
+{   (unsigned short) 18,    "MIT-MAGIC-COOKIE-1",
+		MitAddCookie,	MitCheckCookie,	MitResetCookie,
+		MitToID,	MitFromID,	MitRemoveCookie,
+#ifdef XCSECURITY
+		MitGenerateCookie
+#endif
+},
+#ifdef HASXDMAUTH
+{   (unsigned short) 19,    "XDM-AUTHORIZATION-1",
+		XdmAddCookie,	XdmCheckCookie,	XdmResetCookie,
+		XdmToID,	XdmFromID,	XdmRemoveCookie,
+#ifdef XCSECURITY
+		NULL
+#endif
+},
+#endif
+#ifdef SECURE_RPC
+{   (unsigned short) 9,    "SUN-DES-1",
+		SecureRPCAdd,	SecureRPCCheck,	SecureRPCReset,
+		SecureRPCToID,	SecureRPCFromID,SecureRPCRemove,
+#ifdef XCSECURITY
+		NULL
+#endif
+},
+#endif
+};
+
+# define NUM_AUTHORIZATION  (sizeof (protocols) /\
+			     sizeof (struct protocol))
+
+/*
+ * Initialize all classes of authorization by reading the
+ * specified authorization file
+ */
+
+static char *authorization_file = (char *)NULL;
+
+static Bool ShouldLoadAuth = TRUE;
+
+void
+InitAuthorization (char *file_name)
+{
+    authorization_file = file_name;
+}
+
+static int
+LoadAuthorization (void)
+{
+    FILE    *f;
+    Xauth   *auth;
+    int	    i;
+    int	    count = 0;
+
+    ShouldLoadAuth = FALSE;
+    if (!authorization_file)
+	return 0;
+
+    f = Fopen (authorization_file, "r");
+    if (!f)
+	return -1;
+
+    while ((auth = XauReadAuth (f)) != 0) {
+	for (i = 0; i < NUM_AUTHORIZATION; i++) {
+	    if (protocols[i].name_length == auth->name_length &&
+		memcmp (protocols[i].name, auth->name, (int) auth->name_length) == 0 &&
+		protocols[i].Add)
+	    {
+		++count;
+		(*protocols[i].Add) (auth->data_length, auth->data,
+					 FakeClientID(0));
+	    }
+	}
+	XauDisposeAuth (auth);
+    }
+
+    Fclose (f);
+    return count;
+}
+
+#ifdef XDMCP
+/*
+ * XdmcpInit calls this function to discover all authorization
+ * schemes supported by the display
+ */
+void
+RegisterAuthorizations (void)
+{
+    int	    i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++)
+	XdmcpRegisterAuthorization (protocols[i].name,
+				    (int)protocols[i].name_length);
+}
+#endif
+
+XID
+CheckAuthorization (
+    unsigned int name_length,
+    const char	*name,
+    unsigned int data_length,
+    const char	*data,
+    ClientPtr client,
+    const char	**reason)	/* failure message.  NULL for default msg */
+{
+    int	i;
+    struct stat buf;
+    static time_t lastmod = 0;
+    static Bool loaded = FALSE;
+
+    if (!authorization_file || stat(authorization_file, &buf))
+    {
+	if (lastmod != 0) {
+	    lastmod = 0;
+	    ShouldLoadAuth = TRUE;	/* stat lost, so force reload */
+	}
+    }
+    else if (buf.st_mtime > lastmod)
+    {
+	lastmod = buf.st_mtime;
+	ShouldLoadAuth = TRUE;
+    }
+    if (ShouldLoadAuth)
+    {
+	int loadauth = LoadAuthorization();
+
+	/*
+	 * If the authorization file has at least one entry for this server,
+	 * disable local host access. (loadauth > 0)
+	 *
+	 * If there are zero entries (either initially or when the
+	 * authorization file is later reloaded), or if a valid
+	 * authorization file was never loaded, enable local host access.
+	 * (loadauth == 0 || !loaded)
+	 *
+	 * If the authorization file was loaded initially (with valid
+	 * entries for this server), and reloading it later fails, don't
+	 * change anything. (loadauth == -1 && loaded)
+	 */
+	
+	if (loadauth > 0)
+	{
+	    DisableLocalHost(); /* got at least one */
+	    loaded = TRUE;
+	}
+	else if (loadauth == 0 || !loaded)
+	    EnableLocalHost ();
+    }
+    if (name_length) {
+	for (i = 0; i < NUM_AUTHORIZATION; i++) {
+	    if (protocols[i].name_length == name_length &&
+		memcmp (protocols[i].name, name, (int) name_length) == 0)
+	    {
+		return (*protocols[i].Check) (data_length, data, client, reason);
+	    }
+	    *reason = "Protocol not supported by server\n";
+	}
+    } else *reason = "No protocol specified\n";
+    return (XID) ~0L;
+}
+
+void
+ResetAuthorization (void)
+{
+    int	i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++)
+	if (protocols[i].Reset)
+	    (*protocols[i].Reset)();
+    ShouldLoadAuth = TRUE;
+}
+
+int
+AuthorizationFromID (
+	XID 		id,
+	unsigned short	*name_lenp,
+	const char	**namep,
+	unsigned short	*data_lenp,
+	char		**datap)
+{
+    int	i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++) {
+	if (protocols[i].FromID &&
+	    (*protocols[i].FromID) (id, data_lenp, datap)) {
+	    *name_lenp = protocols[i].name_length;
+	    *namep = protocols[i].name;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+int
+RemoveAuthorization (
+	unsigned short	name_length,
+	const char	*name,
+	unsigned short	data_length,
+	const char	*data)
+{
+    int	i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++) {
+    	if (protocols[i].name_length == name_length &&
+	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&
+	    protocols[i].Remove)
+    	{
+	    return (*protocols[i].Remove) (data_length, data);
+    	}
+    }
+    return 0;
+}
+
+int
+AddAuthorization (unsigned name_length, const char *name,
+		  unsigned data_length, char *data)
+{
+    int	i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++) {
+    	if (protocols[i].name_length == name_length &&
+	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&
+	    protocols[i].Add)
+    	{
+	    return (*protocols[i].Add) (data_length, data, FakeClientID(0));
+    	}
+    }
+    return 0;
+}
+
+#ifdef XCSECURITY
+
+XID
+GenerateAuthorization(
+	unsigned name_length,
+	const char	*name,
+	unsigned data_length,
+	const char	*data,
+	unsigned *data_length_return,
+	char	**data_return)
+{
+    int	i;
+
+    for (i = 0; i < NUM_AUTHORIZATION; i++) {
+    	if (protocols[i].name_length == name_length &&
+	    memcmp (protocols[i].name, name, (int) name_length) == 0 &&
+	    protocols[i].Generate)
+    	{
+	    return (*protocols[i].Generate) (data_length, data,
+			FakeClientID(0), data_length_return, data_return);
+    	}
+    }
+    return -1;
+}
+
+void
+GenerateRandomData (int len, char *buf)
+{
+#ifdef _MSC_VER
+    static HANDLE hAdvApi32;
+    static BOOLEAN (_stdcall * RtlGenRandom)(void *,unsigned long);
+
+    if (!hAdvApi32)
+    {
+      hAdvApi32=LoadLibrary("advapi32.dll");
+      RtlGenRandom=(BOOLEAN (_stdcall *)(void*,unsigned long))GetProcAddress(hAdvApi32,"SystemFunction036");
+    }
+    RtlGenRandom(buf, len);
+#else
+    int fd;
+
+    fd = open("/dev/urandom", O_RDONLY);
+    read(fd, buf, len);
+    close(fd);
+#endif
+}
+
+#endif /* XCSECURITY */
diff --git a/xorg-server/os/connection.c b/xorg-server/os/connection.c
index 8da74d1ef..237bda811 100644
--- a/xorg-server/os/connection.c
+++ b/xorg-server/os/connection.c
@@ -658,7 +658,7 @@ AuthorizationIDOfClient(ClientPtr client)
  *
  *****************************************************************/
 
-char *
+const char *
 ClientAuthorized(ClientPtr client, 
     unsigned int proto_n, char *auth_proto, 
     unsigned int string_n, char *auth_string)
@@ -668,7 +668,7 @@ ClientAuthorized(ClientPtr client,
     int 		family;
     int			fromlen;
     XID	 		auth_id;
-    char	 	*reason = NULL;
+    const char	 	*reason = NULL;
     XtransConnInfo	trans_conn;
 
     priv = (OsCommPtr)client->osPrivate;
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c
index f8354a6af..8a2207081 100644
--- a/xorg-server/os/io.c
+++ b/xorg-server/os/io.c
@@ -823,7 +823,7 @@ WriteToClient (ClientPtr who, int count, const void *__buf)
 	    CARD32 replylen;
 	    unsigned long bytesleft;
 
-	    replylen = ((xGenericReply *)buf)->length;
+	    replylen = ((const xGenericReply *)buf)->length;
 	    if (who->swapped)
 		swapl(&replylen);
 	    bytesleft = (replylen * 4) + SIZEOF(xReply) - count - padBytes;
diff --git a/xorg-server/os/mitauth.c b/xorg-server/os/mitauth.c
index 8dfb42be6..477736ee8 100644
--- a/xorg-server/os/mitauth.c
+++ b/xorg-server/os/mitauth.c
@@ -1,197 +1,197 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/*

- * MIT-MAGIC-COOKIE-1 authorization scheme

- * Author:  Keith Packard, MIT X Consortium

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include "os.h"

-#include "osdep.h"

-#include "dixstruct.h"

-

-static struct auth {

-    struct auth	*next;

-    unsigned short	len;

-    char	*data;

-    XID		id;

-} *mit_auth;

-

-int

-MitAddCookie (

-    unsigned short	data_length,

-    const char		*data,

-    XID			id)

-{

-    struct auth	*new;

-

-    new = malloc(sizeof (struct auth));

-    if (!new)

-	return 0;

-    new->data = malloc((unsigned) data_length);

-    if (!new->data) {

-	free(new);

-	return 0;

-    }

-    new->next = mit_auth;

-    mit_auth = new;

-    memmove(new->data, data, (int) data_length);

-    new->len = data_length;

-    new->id = id;

-    return 1;

-}

-

-XID

-MitCheckCookie (

-    unsigned short	data_length,

-    const char		*data,

-    ClientPtr		client,

-    char		**reason)

-{

-    struct auth	*auth;

-

-    for (auth = mit_auth; auth; auth=auth->next) {

-        if (data_length == auth->len &&

-	   memcmp (data, auth->data, (int) data_length) == 0)

-	    return auth->id;

-    }

-    *reason = "Invalid MIT-MAGIC-COOKIE-1 key";

-    return (XID) -1;

-}

-

-int

-MitResetCookie (void)

-{

-    struct auth	*auth, *next;

-

-    for (auth = mit_auth; auth; auth=next) {

-	next = auth->next;

-	free(auth->data);

-	free(auth);

-    }

-    mit_auth = 0;

-    return 0;

-}

-

-XID

-MitToID (

-	unsigned short	data_length,

-	char		*data)

-{

-    struct auth	*auth;

-

-    for (auth = mit_auth; auth; auth=auth->next) {

-	if (data_length == auth->len &&

-	    memcmp (data, auth->data, data_length) == 0)

-	    return auth->id;

-    }

-    return (XID) -1;

-}

-

-int

-MitFromID (

-	XID		id,

-	unsigned short	*data_lenp,

-	char		**datap)

-{

-    struct auth	*auth;

-

-    for (auth = mit_auth; auth; auth=auth->next) {

-	if (id == auth->id) {

-	    *data_lenp = auth->len;

-	    *datap = auth->data;

-	    return 1;

-	}

-    }

-    return 0;

-}

-

-int

-MitRemoveCookie (

-	unsigned short	data_length,

-	const char	*data)

-{

-    struct auth	*auth, *prev;

-

-    prev = 0;

-    for (auth = mit_auth; auth; prev = auth, auth=auth->next) {

-	if (data_length == auth->len &&

-	    memcmp (data, auth->data, data_length) == 0)

- 	{

-	    if (prev)

-		prev->next = auth->next;

-	    else

-		mit_auth = auth->next;

-	    free(auth->data);

-	    free(auth);

-	    return 1;

-	}

-    }

-    return 0;

-}

-

-#ifdef XCSECURITY

-

-static char cookie[16]; /* 128 bits */

-

-XID

-MitGenerateCookie (

-    unsigned	data_length,

-    const char	*data,

-    XID		id,

-    unsigned	*data_length_return,

-    char	**data_return)

-{

-    int i = 0;

-    int status;

-

-    while (data_length--)

-    {

-	cookie[i++] += *data++;

-	if (i >= sizeof (cookie)) i = 0;

-    }

-    GenerateRandomData(sizeof (cookie), cookie);

-    status = MitAddCookie(sizeof (cookie), cookie, id);

-    if (!status)

-    {

-	id = -1;

-    }

-    else

-    {

-	*data_return = cookie;

-	*data_length_return = sizeof (cookie);

-    }

-    return id;

-}

-

-#endif /* XCSECURITY */

+/*
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/*
+ * MIT-MAGIC-COOKIE-1 authorization scheme
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include "os.h"
+#include "osdep.h"
+#include "dixstruct.h"
+
+static struct auth {
+    struct auth	*next;
+    unsigned short	len;
+    char	*data;
+    XID		id;
+} *mit_auth;
+
+int
+MitAddCookie (
+    unsigned short	data_length,
+    const char		*data,
+    XID			id)
+{
+    struct auth	*new;
+
+    new = malloc(sizeof (struct auth));
+    if (!new)
+	return 0;
+    new->data = malloc((unsigned) data_length);
+    if (!new->data) {
+	free(new);
+	return 0;
+    }
+    new->next = mit_auth;
+    mit_auth = new;
+    memmove(new->data, data, (int) data_length);
+    new->len = data_length;
+    new->id = id;
+    return 1;
+}
+
+XID
+MitCheckCookie (
+    unsigned short	data_length,
+    const char		*data,
+    ClientPtr		client,
+    const char		**reason)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+        if (data_length == auth->len &&
+	   memcmp (data, auth->data, (int) data_length) == 0)
+	    return auth->id;
+    }
+    *reason = "Invalid MIT-MAGIC-COOKIE-1 key";
+    return (XID) -1;
+}
+
+int
+MitResetCookie (void)
+{
+    struct auth	*auth, *next;
+
+    for (auth = mit_auth; auth; auth=next) {
+	next = auth->next;
+	free(auth->data);
+	free(auth);
+    }
+    mit_auth = 0;
+    return 0;
+}
+
+XID
+MitToID (
+	unsigned short	data_length,
+	char		*data)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+	if (data_length == auth->len &&
+	    memcmp (data, auth->data, data_length) == 0)
+	    return auth->id;
+    }
+    return (XID) -1;
+}
+
+int
+MitFromID (
+	XID		id,
+	unsigned short	*data_lenp,
+	char		**datap)
+{
+    struct auth	*auth;
+
+    for (auth = mit_auth; auth; auth=auth->next) {
+	if (id == auth->id) {
+	    *data_lenp = auth->len;
+	    *datap = auth->data;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+int
+MitRemoveCookie (
+	unsigned short	data_length,
+	const char	*data)
+{
+    struct auth	*auth, *prev;
+
+    prev = 0;
+    for (auth = mit_auth; auth; prev = auth, auth=auth->next) {
+	if (data_length == auth->len &&
+	    memcmp (data, auth->data, data_length) == 0)
+ 	{
+	    if (prev)
+		prev->next = auth->next;
+	    else
+		mit_auth = auth->next;
+	    free(auth->data);
+	    free(auth);
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+#ifdef XCSECURITY
+
+static char cookie[16]; /* 128 bits */
+
+XID
+MitGenerateCookie (
+    unsigned	data_length,
+    const char	*data,
+    XID		id,
+    unsigned	*data_length_return,
+    char	**data_return)
+{
+    int i = 0;
+    int status;
+
+    while (data_length--)
+    {
+	cookie[i++] += *data++;
+	if (i >= sizeof (cookie)) i = 0;
+    }
+    GenerateRandomData(sizeof (cookie), cookie);
+    status = MitAddCookie(sizeof (cookie), cookie, id);
+    if (!status)
+    {
+	id = -1;
+    }
+    else
+    {
+	*data_return = cookie;
+	*data_length_return = sizeof (cookie);
+    }
+    return id;
+}
+
+#endif /* XCSECURITY */
diff --git a/xorg-server/os/osdep.h b/xorg-server/os/osdep.h
index 72bd7d762..71a7e44e3 100644
--- a/xorg-server/os/osdep.h
+++ b/xorg-server/os/osdep.h
@@ -137,7 +137,7 @@ typedef void (*AuthInitFunc) (AuthInitArgs);
 #define AuthAddCArgs unsigned short data_length, const char *data, XID id
 typedef int (*AuthAddCFunc) (AuthAddCArgs);
 
-#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, char **reason
+#define AuthCheckArgs unsigned short data_length, const char *data, ClientPtr client, const char **reason
 typedef XID (*AuthCheckFunc) (AuthCheckArgs);
 
 #define AuthFromIDArgs XID id, unsigned short *data_lenp, char **datap
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c
index f7b2ca443..cd9c7641e 100644
--- a/xorg-server/os/osinit.c
+++ b/xorg-server/os/osinit.c
@@ -151,7 +151,7 @@ void
 OsInit(void)
 {
     static Bool been_here = FALSE;
-    static char* devnull = "/dev/null";
+    static const char* devnull = "/dev/null";
     char fname[PATH_MAX];
 
     if (!been_here) {
diff --git a/xorg-server/os/rpcauth.c b/xorg-server/os/rpcauth.c
index 989a49a06..63b97b675 100644
--- a/xorg-server/os/rpcauth.c
+++ b/xorg-server/os/rpcauth.c
@@ -128,7 +128,7 @@ static char rpc_error[MAXNETNAMELEN+50];
 
 _X_HIDDEN XID
 SecureRPCCheck (unsigned short data_length, const char *data,
-    ClientPtr client, char **reason)
+    ClientPtr client, const char **reason)
 {
     char *fullname;
     
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 27275248d..d7e88c708 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -269,7 +269,7 @@ LockServer(void)
 #else
   char tmp[PATH_MAX], pid_str[12];
   int lfd, i, haslock, l_pid, t;
-  char *tmppath = NULL;
+  const char *tmppath = LOCK_DIR;
   int len;
   char port[20];
 
@@ -277,8 +277,6 @@ LockServer(void)
   /*
    * Path names
    */
-  tmppath = LOCK_DIR;
-
   snprintf(port, sizeof(port), "%d", atoi(display));
   len = strlen(LOCK_PREFIX) > strlen(LOCK_TMP_PREFIX) ? strlen(LOCK_PREFIX) :
 						strlen(LOCK_TMP_PREFIX);
diff --git a/xorg-server/os/xdmauth.c b/xorg-server/os/xdmauth.c
index 13da77a37..733fda504 100644
--- a/xorg-server/os/xdmauth.c
+++ b/xorg-server/os/xdmauth.c
@@ -1,499 +1,499 @@
-/*

-

-Copyright 1988, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-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 OPEN GROUP 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 Open Group 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 Open Group.

-

-*/

-

-/*

- * XDM-AUTHENTICATION-1 (XDMCP authentication) and

- * XDM-AUTHORIZATION-1 (client authorization) protocols

- *

- * Author:  Keith Packard, MIT X Consortium

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdio.h>

-#include <X11/X.h>

-#define XSERV_t

-#define TRANS_SERVER

-#define TRANS_REOPEN

-#include <X11/Xtrans/Xtrans.h>

-#include "os.h"

-#include "osdep.h"

-#include "dixstruct.h"

-

-#ifdef HASXDMAUTH

-

-static Bool authFromXDMCP;

-

-#ifdef XDMCP

-#include <X11/Xmd.h>

-#undef REQUEST

-#include <X11/Xdmcp.h>

-

-/* XDM-AUTHENTICATION-1 */

-

-static XdmAuthKeyRec	privateKey;

-static char XdmAuthenticationName[] = "XDM-AUTHENTICATION-1";

-#define XdmAuthenticationNameLen (sizeof XdmAuthenticationName - 1)

-static XdmAuthKeyRec	rho;

-

-static Bool 

-XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, 

-    xdmOpCode packet_type)

-{

-    XdmAuthKeyPtr	incoming;

-

-    XdmcpUnwrap (incomingData->data, (unsigned char *)&privateKey,

-			      incomingData->data,incomingData->length);

-    if (packet_type == ACCEPT) {

-    	if (incomingData->length != 8)

-	    return FALSE;

-    	incoming = (XdmAuthKeyPtr) incomingData->data;

-    	XdmcpDecrementKey (incoming);

-    	return XdmcpCompareKeys (incoming, &rho);

-    }

-    return FALSE;

-}

-

-static Bool

-XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData, 

-    xdmOpCode packet_type)

-{

-    outgoingData->length = 0;

-    outgoingData->data = 0;

-    if (packet_type == REQUEST) {

-	if (XdmcpAllocARRAY8 (outgoingData, 8))

-	    XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,

-		       outgoingData->data, 8);

-    }

-    return TRUE;

-}

-

-static Bool

-XdmAuthenticationAddAuth (int name_len, const char *name,

-    int data_len, char *data)

-{

-    Bool    ret;

-    XdmcpUnwrap ((unsigned char *)data, (unsigned char *)&privateKey,

-		 (unsigned char *)data, data_len);

-    authFromXDMCP = TRUE;

-    ret = AddAuthorization (name_len, name, data_len, data);

-    authFromXDMCP = FALSE;

-    return ret;

-}

-

-

-#define atox(c)	('0' <= c && c <= '9' ? c - '0' : \

-		 'a' <= c && c <= 'f' ? c - 'a' + 10 : \

-		 'A' <= c && c <= 'F' ? c - 'A' + 10 : -1)

-

-static int

-HexToBinary (const char *in, char *out, int len)

-{

-    int	    top, bottom;

-

-    while (len > 0)

-    {

-	top = atox(in[0]);

-	if (top == -1)

-	    return 0;

-	bottom = atox(in[1]);

-	if (bottom == -1)

-	    return 0;

-	*out++ = (top << 4) | bottom;

-	in += 2;

-	len -= 2;

-    }

-    if (len)

-	return 0;

-    *out++ = '\0';

-    return 1;

-}

-

-void

-XdmAuthenticationInit (const char *cookie, int cookie_len)

-{

-    memset(privateKey.data, 0, 8);

-    if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2))

-    {

-	if (cookie_len > 2 + 2 * 8)

-	    cookie_len = 2 + 2 * 8;

-	HexToBinary (cookie + 2, (char *)privateKey.data, cookie_len - 2);

-    }

-    else

-    {

-    	if (cookie_len > 7)

-	    cookie_len = 7;

-    	memmove (privateKey.data + 1, cookie, cookie_len);

-    }

-    XdmcpGenerateKey (&rho);

-    XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,

-				 (char *)&rho,

-				 sizeof (rho),

-				 (ValidatorFunc)XdmAuthenticationValidator,

-				 (GeneratorFunc)XdmAuthenticationGenerator,

-				 (AddAuthorFunc)XdmAuthenticationAddAuth);

-}

-

-#endif /* XDMCP */

-

-/* XDM-AUTHORIZATION-1 */

-typedef struct _XdmAuthorization {

-    struct _XdmAuthorization	*next;

-    XdmAuthKeyRec		rho;

-    XdmAuthKeyRec		key;

-    XID				id;

-} XdmAuthorizationRec, *XdmAuthorizationPtr;

-

-static XdmAuthorizationPtr xdmAuth;

-

-typedef struct _XdmClientAuth {

-    struct _XdmClientAuth   *next;

-    XdmAuthKeyRec	    rho;

-    char		    client[6];

-    long		    time;

-} XdmClientAuthRec, *XdmClientAuthPtr;

-

-static XdmClientAuthPtr    xdmClients;

-static long	    clockOffset;

-static Bool	    gotClock;

-

-#define TwentyMinutes	(20 * 60)

-#define TwentyFiveMinutes (25 * 60)

-

-static Bool

-XdmClientAuthCompare (const XdmClientAuthPtr a, const XdmClientAuthPtr b)

-{

-    int	i;

-

-    if (!XdmcpCompareKeys (&a->rho, &b->rho))

-	return FALSE;

-    for (i = 0; i < 6; i++)

-	if (a->client[i] != b->client[i])

-	    return FALSE;

-    return a->time == b->time;

-}

-

-static void

-XdmClientAuthDecode (const unsigned char *plain, XdmClientAuthPtr auth)

-{

-    int	    i, j;

-

-    j = 0;

-    for (i = 0; i < 8; i++)

-    {

-	auth->rho.data[i] = plain[j];

-	++j;

-    }

-    for (i = 0; i < 6; i++)

-    {

-	auth->client[i] = plain[j];

-	++j;

-    }

-    auth->time = 0;

-    for (i = 0; i < 4; i++)

-    {

-	auth->time |= plain[j] << ((3 - i) << 3);

-	j++;

-    }

-}

-

-static void

-XdmClientAuthTimeout (long now)

-{

-    XdmClientAuthPtr	client, next, prev;

-

-    prev = 0;

-    for (client = xdmClients; client; client=next)

-    {

-	next = client->next;

-	if (abs (now - client->time) > TwentyFiveMinutes)

-	{

-	    if (prev)

-		prev->next = next;

-	    else

-		xdmClients = next;

-	    free(client);

-	}

-	else

-	    prev = client;

-    }

-}

-

-static XdmClientAuthPtr

-XdmAuthorizationValidate (unsigned char *plain, int length, 

-    XdmAuthKeyPtr rho, ClientPtr xclient, char **reason)

-{

-    XdmClientAuthPtr	client, existing;

-    long		now;

-    int			i;

-

-    if (length != (192 / 8)) {

-	if (reason)

-	    *reason = "Bad XDM authorization key length";

-	return NULL;

-    }

-    client = malloc(sizeof (XdmClientAuthRec));

-    if (!client)

-	return NULL;

-    XdmClientAuthDecode (plain, client);

-    if (!XdmcpCompareKeys (&client->rho, rho))

-    {

-	free(client);

-	if (reason)

-	    *reason = "Invalid XDM-AUTHORIZATION-1 key (failed key comparison)";

-	return NULL;

-    }

-    for (i = 18; i < 24; i++)

-	if (plain[i] != 0) {

-	    free(client);

-	    if (reason)

-		*reason = "Invalid XDM-AUTHORIZATION-1 key (failed NULL check)";

-	    return NULL;

-	}

-    if (xclient) {

-	int family, addr_len;

-	Xtransaddr *addr;

-

-	if (_XSERVTransGetPeerAddr(((OsCommPtr)xclient->osPrivate)->trans_conn,

-				   &family, &addr_len, &addr) == 0

-	    && _XSERVTransConvertAddress(&family, &addr_len, &addr) == 0) {

-#if defined(TCPCONN) || defined(STREAMSCONN)

-	    if (family == FamilyInternet &&

-		memcmp((char *)addr, client->client, 4) != 0) {

-		free(client);

-		free(addr);

-		if (reason)

-		    *reason = "Invalid XDM-AUTHORIZATION-1 key (failed address comparison)";

-		return NULL;

-

-	    }

-#endif

-	    free(addr);

-	}

-    }

-    now = time(0);

-    if (!gotClock)

-    {

-	clockOffset = client->time - now;

-	gotClock = TRUE;

-    }

-    now += clockOffset;

-    XdmClientAuthTimeout (now);

-    if (abs (client->time - now) > TwentyMinutes)

-    {

-	free(client);

-	if (reason)

-	    *reason = "Excessive XDM-AUTHORIZATION-1 time offset";

-	return NULL;

-    }

-    for (existing = xdmClients; existing; existing=existing->next)

-    {

-	if (XdmClientAuthCompare (existing, client))

-	{

-	    free(client);

-	    if (reason)

-		*reason = "XDM authorization key matches an existing client!";

-	    return NULL;

-	}

-    }

-    return client;

-}

-

-int

-XdmAddCookie (unsigned short data_length, const char *data, XID id)

-{

-    XdmAuthorizationPtr	new;

-    unsigned char	*rho_bits, *key_bits;

-

-    switch (data_length)

-    {

-    case 16:		    /* auth from files is 16 bytes long */

-#ifdef XDMCP

-	if (authFromXDMCP)

-	{

-	    /* R5 xdm sent bogus authorization data in the accept packet,

-	     * but we can recover */

-	    rho_bits = rho.data;

-	    key_bits = (unsigned char *) data;

-	    key_bits[0] = '\0';

-	}

-	else

-#endif

-	{

-	    rho_bits = (unsigned char *) data;

-	    key_bits = (unsigned char *) (data + 8);

-	}

-	break;

-#ifdef XDMCP

-    case 8:		    /* auth from XDMCP is 8 bytes long */

-	rho_bits = rho.data;

-	key_bits = (unsigned char *) data;

-	break;

-#endif

-    default:

-	return 0;

-    }

-    /* the first octet of the key must be zero */

-    if (key_bits[0] != '\0')

-	return 0;

-    new = malloc(sizeof (XdmAuthorizationRec));

-    if (!new)

-	return 0;

-    new->next = xdmAuth;

-    xdmAuth = new;

-    memmove (new->key.data, key_bits, (int) 8);

-    memmove (new->rho.data, rho_bits, (int) 8);

-    new->id = id;

-    return 1;

-}

-

-XID

-XdmCheckCookie (unsigned short cookie_length, const char *cookie,

-    ClientPtr xclient, char **reason)

-{

-    XdmAuthorizationPtr	auth;

-    XdmClientAuthPtr	client;

-    unsigned char	*plain;

-

-    /* Auth packets must be a multiple of 8 bytes long */

-    if (cookie_length & 7)

-	return (XID) -1;

-    plain = malloc(cookie_length);

-    if (!plain)

-	return (XID) -1;

-    for (auth = xdmAuth; auth; auth=auth->next) {

-	XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);

-	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL)

-	{

-	    client->next = xdmClients;

-	    xdmClients = client;

-	    free(plain);

-	    return auth->id;

-	}

-    }

-    free(plain);

-    return (XID) -1;

-}

-

-int

-XdmResetCookie (void)

-{

-    XdmAuthorizationPtr	auth, next_auth;

-    XdmClientAuthPtr	client, next_client;

-

-    for (auth = xdmAuth; auth; auth=next_auth)

-    {

-	next_auth = auth->next;

-	free(auth);

-    }

-    xdmAuth = 0;

-    for (client = xdmClients; client; client=next_client)

-    {

-	next_client = client->next;

-	free(client);

-    }

-    xdmClients = (XdmClientAuthPtr) 0;

-    return 1;

-}

-

-XID

-XdmToID (unsigned short cookie_length, char *cookie)

-{

-    XdmAuthorizationPtr	auth;

-    XdmClientAuthPtr	client;

-    unsigned char	*plain;

-

-    plain = malloc(cookie_length);

-    if (!plain)

-	return (XID) -1;

-    for (auth = xdmAuth; auth; auth=auth->next) {

-	XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);

-	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)

-	{

-	    free(client);

-	    free(cookie);

-	    free(plain);

-	    return auth->id;

-	}

-    }

-    free(cookie);

-    free(plain);

-    return (XID) -1;

-}

-

-int

-XdmFromID (XID id, unsigned short *data_lenp, char **datap)

-{

-    XdmAuthorizationPtr	auth;

-

-    for (auth = xdmAuth; auth; auth=auth->next) {

-	if (id == auth->id) {

-	    *data_lenp = 16;

-	    *datap = (char *) &auth->rho;

-	    return 1;

-	}

-    }

-    return 0;

-}

-

-int

-XdmRemoveCookie (unsigned short data_length, const char *data)

-{

-    XdmAuthorizationPtr	auth;

-    XdmAuthKeyPtr	key_bits, rho_bits;

-

-    switch (data_length)

-    {

-    case 16:

-	rho_bits = (XdmAuthKeyPtr) data;

-	key_bits = (XdmAuthKeyPtr) (data + 8);

-	break;

-#ifdef XDMCP

-    case 8:

-	rho_bits = &rho;

-	key_bits = (XdmAuthKeyPtr) data;

-	break;

-#endif

-    default:

-	return 0;

-    }

-    for (auth = xdmAuth; auth; auth=auth->next) {

-	if (XdmcpCompareKeys (rho_bits, &auth->rho) &&

-	    XdmcpCompareKeys (key_bits, &auth->key))

- 	{

-	    xdmAuth = auth->next;

-	    free(auth);

-	    return 1;

-	}

-    }

-    return 0;

-}

-

-#endif

+/*
+
+Copyright 1988, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+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 OPEN GROUP 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 Open Group 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 Open Group.
+
+*/
+
+/*
+ * XDM-AUTHENTICATION-1 (XDMCP authentication) and
+ * XDM-AUTHORIZATION-1 (client authorization) protocols
+ *
+ * Author:  Keith Packard, MIT X Consortium
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdio.h>
+#include <X11/X.h>
+#define XSERV_t
+#define TRANS_SERVER
+#define TRANS_REOPEN
+#include <X11/Xtrans/Xtrans.h>
+#include "os.h"
+#include "osdep.h"
+#include "dixstruct.h"
+
+#ifdef HASXDMAUTH
+
+static Bool authFromXDMCP;
+
+#ifdef XDMCP
+#include <X11/Xmd.h>
+#undef REQUEST
+#include <X11/Xdmcp.h>
+
+/* XDM-AUTHENTICATION-1 */
+
+static XdmAuthKeyRec	privateKey;
+static char XdmAuthenticationName[] = "XDM-AUTHENTICATION-1";
+#define XdmAuthenticationNameLen (sizeof XdmAuthenticationName - 1)
+static XdmAuthKeyRec	rho;
+
+static Bool 
+XdmAuthenticationValidator (ARRAY8Ptr privateData, ARRAY8Ptr incomingData, 
+    xdmOpCode packet_type)
+{
+    XdmAuthKeyPtr	incoming;
+
+    XdmcpUnwrap (incomingData->data, (unsigned char *)&privateKey,
+			      incomingData->data,incomingData->length);
+    if (packet_type == ACCEPT) {
+    	if (incomingData->length != 8)
+	    return FALSE;
+    	incoming = (XdmAuthKeyPtr) incomingData->data;
+    	XdmcpDecrementKey (incoming);
+    	return XdmcpCompareKeys (incoming, &rho);
+    }
+    return FALSE;
+}
+
+static Bool
+XdmAuthenticationGenerator (ARRAY8Ptr privateData, ARRAY8Ptr outgoingData, 
+    xdmOpCode packet_type)
+{
+    outgoingData->length = 0;
+    outgoingData->data = 0;
+    if (packet_type == REQUEST) {
+	if (XdmcpAllocARRAY8 (outgoingData, 8))
+	    XdmcpWrap ((unsigned char *)&rho, (unsigned char *)&privateKey,
+		       outgoingData->data, 8);
+    }
+    return TRUE;
+}
+
+static Bool
+XdmAuthenticationAddAuth (int name_len, const char *name,
+    int data_len, char *data)
+{
+    Bool    ret;
+    XdmcpUnwrap ((unsigned char *)data, (unsigned char *)&privateKey,
+		 (unsigned char *)data, data_len);
+    authFromXDMCP = TRUE;
+    ret = AddAuthorization (name_len, name, data_len, data);
+    authFromXDMCP = FALSE;
+    return ret;
+}
+
+
+#define atox(c)	('0' <= c && c <= '9' ? c - '0' : \
+		 'a' <= c && c <= 'f' ? c - 'a' + 10 : \
+		 'A' <= c && c <= 'F' ? c - 'A' + 10 : -1)
+
+static int
+HexToBinary (const char *in, char *out, int len)
+{
+    int	    top, bottom;
+
+    while (len > 0)
+    {
+	top = atox(in[0]);
+	if (top == -1)
+	    return 0;
+	bottom = atox(in[1]);
+	if (bottom == -1)
+	    return 0;
+	*out++ = (top << 4) | bottom;
+	in += 2;
+	len -= 2;
+    }
+    if (len)
+	return 0;
+    *out++ = '\0';
+    return 1;
+}
+
+void
+XdmAuthenticationInit (const char *cookie, int cookie_len)
+{
+    memset(privateKey.data, 0, 8);
+    if (!strncmp (cookie, "0x", 2) || !strncmp (cookie, "0X", 2))
+    {
+	if (cookie_len > 2 + 2 * 8)
+	    cookie_len = 2 + 2 * 8;
+	HexToBinary (cookie + 2, (char *)privateKey.data, cookie_len - 2);
+    }
+    else
+    {
+    	if (cookie_len > 7)
+	    cookie_len = 7;
+    	memmove (privateKey.data + 1, cookie, cookie_len);
+    }
+    XdmcpGenerateKey (&rho);
+    XdmcpRegisterAuthentication (XdmAuthenticationName, XdmAuthenticationNameLen,
+				 (char *)&rho,
+				 sizeof (rho),
+				 (ValidatorFunc)XdmAuthenticationValidator,
+				 (GeneratorFunc)XdmAuthenticationGenerator,
+				 (AddAuthorFunc)XdmAuthenticationAddAuth);
+}
+
+#endif /* XDMCP */
+
+/* XDM-AUTHORIZATION-1 */
+typedef struct _XdmAuthorization {
+    struct _XdmAuthorization	*next;
+    XdmAuthKeyRec		rho;
+    XdmAuthKeyRec		key;
+    XID				id;
+} XdmAuthorizationRec, *XdmAuthorizationPtr;
+
+static XdmAuthorizationPtr xdmAuth;
+
+typedef struct _XdmClientAuth {
+    struct _XdmClientAuth   *next;
+    XdmAuthKeyRec	    rho;
+    char		    client[6];
+    long		    time;
+} XdmClientAuthRec, *XdmClientAuthPtr;
+
+static XdmClientAuthPtr    xdmClients;
+static long	    clockOffset;
+static Bool	    gotClock;
+
+#define TwentyMinutes	(20 * 60)
+#define TwentyFiveMinutes (25 * 60)
+
+static Bool
+XdmClientAuthCompare (const XdmClientAuthPtr a, const XdmClientAuthPtr b)
+{
+    int	i;
+
+    if (!XdmcpCompareKeys (&a->rho, &b->rho))
+	return FALSE;
+    for (i = 0; i < 6; i++)
+	if (a->client[i] != b->client[i])
+	    return FALSE;
+    return a->time == b->time;
+}
+
+static void
+XdmClientAuthDecode (const unsigned char *plain, XdmClientAuthPtr auth)
+{
+    int	    i, j;
+
+    j = 0;
+    for (i = 0; i < 8; i++)
+    {
+	auth->rho.data[i] = plain[j];
+	++j;
+    }
+    for (i = 0; i < 6; i++)
+    {
+	auth->client[i] = plain[j];
+	++j;
+    }
+    auth->time = 0;
+    for (i = 0; i < 4; i++)
+    {
+	auth->time |= plain[j] << ((3 - i) << 3);
+	j++;
+    }
+}
+
+static void
+XdmClientAuthTimeout (long now)
+{
+    XdmClientAuthPtr	client, next, prev;
+
+    prev = 0;
+    for (client = xdmClients; client; client=next)
+    {
+	next = client->next;
+	if (abs (now - client->time) > TwentyFiveMinutes)
+	{
+	    if (prev)
+		prev->next = next;
+	    else
+		xdmClients = next;
+	    free(client);
+	}
+	else
+	    prev = client;
+    }
+}
+
+static XdmClientAuthPtr
+XdmAuthorizationValidate (unsigned char *plain, int length, 
+    XdmAuthKeyPtr rho, ClientPtr xclient, const char **reason)
+{
+    XdmClientAuthPtr	client, existing;
+    long		now;
+    int			i;
+
+    if (length != (192 / 8)) {
+	if (reason)
+	    *reason = "Bad XDM authorization key length";
+	return NULL;
+    }
+    client = malloc(sizeof (XdmClientAuthRec));
+    if (!client)
+	return NULL;
+    XdmClientAuthDecode (plain, client);
+    if (!XdmcpCompareKeys (&client->rho, rho))
+    {
+	free(client);
+	if (reason)
+	    *reason = "Invalid XDM-AUTHORIZATION-1 key (failed key comparison)";
+	return NULL;
+    }
+    for (i = 18; i < 24; i++)
+	if (plain[i] != 0) {
+	    free(client);
+	    if (reason)
+		*reason = "Invalid XDM-AUTHORIZATION-1 key (failed NULL check)";
+	    return NULL;
+	}
+    if (xclient) {
+	int family, addr_len;
+	Xtransaddr *addr;
+
+	if (_XSERVTransGetPeerAddr(((OsCommPtr)xclient->osPrivate)->trans_conn,
+				   &family, &addr_len, &addr) == 0
+	    && _XSERVTransConvertAddress(&family, &addr_len, &addr) == 0) {
+#if defined(TCPCONN) || defined(STREAMSCONN)
+	    if (family == FamilyInternet &&
+		memcmp((char *)addr, client->client, 4) != 0) {
+		free(client);
+		free(addr);
+		if (reason)
+		    *reason = "Invalid XDM-AUTHORIZATION-1 key (failed address comparison)";
+		return NULL;
+
+	    }
+#endif
+	    free(addr);
+	}
+    }
+    now = time(0);
+    if (!gotClock)
+    {
+	clockOffset = client->time - now;
+	gotClock = TRUE;
+    }
+    now += clockOffset;
+    XdmClientAuthTimeout (now);
+    if (abs (client->time - now) > TwentyMinutes)
+    {
+	free(client);
+	if (reason)
+	    *reason = "Excessive XDM-AUTHORIZATION-1 time offset";
+	return NULL;
+    }
+    for (existing = xdmClients; existing; existing=existing->next)
+    {
+	if (XdmClientAuthCompare (existing, client))
+	{
+	    free(client);
+	    if (reason)
+		*reason = "XDM authorization key matches an existing client!";
+	    return NULL;
+	}
+    }
+    return client;
+}
+
+int
+XdmAddCookie (unsigned short data_length, const char *data, XID id)
+{
+    XdmAuthorizationPtr	new;
+    unsigned char	*rho_bits, *key_bits;
+
+    switch (data_length)
+    {
+    case 16:		    /* auth from files is 16 bytes long */
+#ifdef XDMCP
+	if (authFromXDMCP)
+	{
+	    /* R5 xdm sent bogus authorization data in the accept packet,
+	     * but we can recover */
+	    rho_bits = rho.data;
+	    key_bits = (unsigned char *) data;
+	    key_bits[0] = '\0';
+	}
+	else
+#endif
+	{
+	    rho_bits = (unsigned char *) data;
+	    key_bits = (unsigned char *) (data + 8);
+	}
+	break;
+#ifdef XDMCP
+    case 8:		    /* auth from XDMCP is 8 bytes long */
+	rho_bits = rho.data;
+	key_bits = (unsigned char *) data;
+	break;
+#endif
+    default:
+	return 0;
+    }
+    /* the first octet of the key must be zero */
+    if (key_bits[0] != '\0')
+	return 0;
+    new = malloc(sizeof (XdmAuthorizationRec));
+    if (!new)
+	return 0;
+    new->next = xdmAuth;
+    xdmAuth = new;
+    memmove (new->key.data, key_bits, (int) 8);
+    memmove (new->rho.data, rho_bits, (int) 8);
+    new->id = id;
+    return 1;
+}
+
+XID
+XdmCheckCookie (unsigned short cookie_length, const char *cookie,
+    ClientPtr xclient, const char **reason)
+{
+    XdmAuthorizationPtr	auth;
+    XdmClientAuthPtr	client;
+    unsigned char	*plain;
+
+    /* Auth packets must be a multiple of 8 bytes long */
+    if (cookie_length & 7)
+	return (XID) -1;
+    plain = malloc(cookie_length);
+    if (!plain)
+	return (XID) -1;
+    for (auth = xdmAuth; auth; auth=auth->next) {
+	XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
+	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, xclient, reason)) != NULL)
+	{
+	    client->next = xdmClients;
+	    xdmClients = client;
+	    free(plain);
+	    return auth->id;
+	}
+    }
+    free(plain);
+    return (XID) -1;
+}
+
+int
+XdmResetCookie (void)
+{
+    XdmAuthorizationPtr	auth, next_auth;
+    XdmClientAuthPtr	client, next_client;
+
+    for (auth = xdmAuth; auth; auth=next_auth)
+    {
+	next_auth = auth->next;
+	free(auth);
+    }
+    xdmAuth = 0;
+    for (client = xdmClients; client; client=next_client)
+    {
+	next_client = client->next;
+	free(client);
+    }
+    xdmClients = (XdmClientAuthPtr) 0;
+    return 1;
+}
+
+XID
+XdmToID (unsigned short cookie_length, char *cookie)
+{
+    XdmAuthorizationPtr	auth;
+    XdmClientAuthPtr	client;
+    unsigned char	*plain;
+
+    plain = malloc(cookie_length);
+    if (!plain)
+	return (XID) -1;
+    for (auth = xdmAuth; auth; auth=auth->next) {
+	XdmcpUnwrap ((unsigned char *)cookie, (unsigned char *)&auth->key, plain, cookie_length);
+	if ((client = XdmAuthorizationValidate (plain, cookie_length, &auth->rho, NULL, NULL)) != NULL)
+	{
+	    free(client);
+	    free(cookie);
+	    free(plain);
+	    return auth->id;
+	}
+    }
+    free(cookie);
+    free(plain);
+    return (XID) -1;
+}
+
+int
+XdmFromID (XID id, unsigned short *data_lenp, char **datap)
+{
+    XdmAuthorizationPtr	auth;
+
+    for (auth = xdmAuth; auth; auth=auth->next) {
+	if (id == auth->id) {
+	    *data_lenp = 16;
+	    *datap = (char *) &auth->rho;
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+int
+XdmRemoveCookie (unsigned short data_length, const char *data)
+{
+    XdmAuthorizationPtr	auth;
+    XdmAuthKeyPtr	key_bits, rho_bits;
+
+    switch (data_length)
+    {
+    case 16:
+	rho_bits = (XdmAuthKeyPtr) data;
+	key_bits = (XdmAuthKeyPtr) (data + 8);
+	break;
+#ifdef XDMCP
+    case 8:
+	rho_bits = &rho;
+	key_bits = (XdmAuthKeyPtr) data;
+	break;
+#endif
+    default:
+	return 0;
+    }
+    for (auth = xdmAuth; auth; auth=auth->next) {
+	if (XdmcpCompareKeys (rho_bits, &auth->rho) &&
+	    XdmcpCompareKeys (key_bits, &auth->key))
+ 	{
+	    xdmAuth = auth->next;
+	    free(auth);
+	    return 1;
+	}
+    }
+    return 0;
+}
+
+#endif
diff --git a/xorg-server/os/xdmcp.c b/xorg-server/os/xdmcp.c
index 9e79ea702..37b51f6b2 100644
--- a/xorg-server/os/xdmcp.c
+++ b/xorg-server/os/xdmcp.c
@@ -60,7 +60,7 @@
 #define X_INCLUDE_NETDB_H
 #include <X11/Xos_r.h>
 
-static char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
+static const char *defaultDisplayClass = COMPILEDDISPLAYCLASS;
 
 extern void match_interface(u_long u_lQuery);
 
@@ -486,7 +486,7 @@ XdmcpRegisterConnection (
 	    if (SOCKADDR_FAMILY(FromAddress) == AF_INET6) {
 		fromAddr = &((struct sockaddr_in6 *)&FromAddress)->sin6_addr;
 	    } else if ((SOCKADDR_FAMILY(FromAddress) == AF_INET) &&
-	      IN6_IS_ADDR_V4MAPPED((struct in6_addr *) address)) {
+	      IN6_IS_ADDR_V4MAPPED((const struct in6_addr *) address)) {
 		fromAddr = &((struct sockaddr_in *)&FromAddress)->sin_addr;
 		regAddr = &((struct sockaddr_in6 *)&address)->sin6_addr.s6_addr[12];
 		regAddrlen = sizeof(struct in_addr);
@@ -1689,7 +1689,7 @@ get_fromaddr_by_name(
 static int
 get_mcast_options(int argc, char **argv, int i)
 {
-    char *address = XDM_DEFAULT_MCAST_ADDR6;
+    const char *address = XDM_DEFAULT_MCAST_ADDR6;
     int hopcount = 1;
     struct addrinfo hints;
     char portstr[6];
diff --git a/xorg-server/render/filter.c b/xorg-server/render/filter.c
index 0cbd47bd2..c513ee8f9 100644
--- a/xorg-server/render/filter.c
+++ b/xorg-server/render/filter.c
@@ -56,7 +56,8 @@ PictureGetFilterId (const char *filter, int len, Bool makeit)
     if (len < 0)
 	len = strlen (filter);
     for (i = 0; i < nfilterNames; i++)
-	if (!CompareISOLatin1Lowered ((unsigned char *) filterNames[i], -1, (unsigned char *) filter, len))
+	if (!CompareISOLatin1Lowered ((const unsigned char *) filterNames[i], -1,
+				      (const unsigned char *) filter, len))
 	    return i;
     if (!makeit)
 	return -1;
diff --git a/xorg-server/test/input.c b/xorg-server/test/input.c
index c44e5f613..d27b3f0c0 100644
--- a/xorg-server/test/input.c
+++ b/xorg-server/test/input.c
@@ -148,7 +148,7 @@ static void dix_check_grab_values(void)
 
     memset(&client, 0, sizeof(client));
 
-    param.grabtype = GRABTYPE_CORE;
+    param.grabtype = CORE;
     param.this_device_mode = GrabModeSync;
     param.other_devices_mode = GrabModeSync;
     param.modifiers = AnyModifier;
@@ -531,22 +531,22 @@ static void dix_grab_matching(void)
     memset(&b, 0, sizeof(b));
 
     /* different grabtypes must fail */
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = CORE;
+    b.grabtype = XI2;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI;
+    b.grabtype = XI2;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = XI;
+    b.grabtype = CORE;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
@@ -568,8 +568,8 @@ static void dix_grab_matching(void)
 
     inputInfo.all_devices = &xi_all_devices;
     inputInfo.all_master_devices = &xi_all_master_devices;
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.device = &dev1;
     b.device = &dev2;
 
@@ -598,8 +598,8 @@ static void dix_grab_matching(void)
     assert(rc == FALSE);
 
     /* ignoreDevice FALSE must fail for different devices for CORE and XI */
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.device = &dev1;
     b.device = &dev2;
     a.modifierDevice = &dev1;
@@ -607,8 +607,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.device = &dev1;
     b.device = &dev2;
     a.modifierDevice = &dev1;
@@ -618,8 +618,8 @@ static void dix_grab_matching(void)
 
     /* ignoreDevice FALSE must fail for different modifier devices for CORE
      * and XI */
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -627,8 +627,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -637,8 +637,8 @@ static void dix_grab_matching(void)
     assert(rc == FALSE);
 
     /* different event type must fail */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -650,8 +650,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&a, &b, TRUE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -663,8 +663,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&a, &b, TRUE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -677,8 +677,8 @@ static void dix_grab_matching(void)
     assert(rc == FALSE);
 
     /* different modifiers must fail */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.device = &dev1;
     b.device = &dev1;
     a.modifierDevice = &dev1;
@@ -692,23 +692,23 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
     /* AnyModifier must fail for XI2 */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.modifiersDetail.exact = AnyModifier;
     b.modifiersDetail.exact = 1;
     rc = GrabMatchesSecond(&a, &b, FALSE);
@@ -717,8 +717,8 @@ static void dix_grab_matching(void)
     assert(rc == FALSE);
 
     /* XIAnyModifier must fail for CORE and XI */
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.modifiersDetail.exact = XIAnyModifier;
     b.modifiersDetail.exact = 1;
     rc = GrabMatchesSecond(&a, &b, FALSE);
@@ -726,8 +726,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.modifiersDetail.exact = XIAnyModifier;
     b.modifiersDetail.exact = 1;
     rc = GrabMatchesSecond(&a, &b, FALSE);
@@ -736,8 +736,8 @@ static void dix_grab_matching(void)
     assert(rc == FALSE);
 
     /* different detail must fail */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.detail.exact = 1;
     b.detail.exact = 2;
     a.modifiersDetail.exact = 1;
@@ -747,23 +747,23 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
     /* detail of AnyModifier must fail */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.detail.exact = AnyModifier;
     b.detail.exact = 1;
     a.modifiersDetail.exact = 1;
@@ -773,23 +773,23 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
     /* detail of XIAnyModifier must fail */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.detail.exact = XIAnyModifier;
     b.detail.exact = 1;
     a.modifiersDetail.exact = 1;
@@ -799,23 +799,23 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     rc = GrabMatchesSecond(&a, &b, FALSE);
     assert(rc == FALSE);
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == FALSE);
 
     /* XIAnyModifier or AnyModifer must succeed */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.detail.exact = 1;
     b.detail.exact = 1;
     a.modifiersDetail.exact = XIAnyModifier;
@@ -825,8 +825,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == TRUE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.detail.exact = 1;
     b.detail.exact = 1;
     a.modifiersDetail.exact = AnyModifier;
@@ -836,8 +836,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == TRUE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.detail.exact = 1;
     b.detail.exact = 1;
     a.modifiersDetail.exact = AnyModifier;
@@ -848,8 +848,8 @@ static void dix_grab_matching(void)
     assert(rc == TRUE);
 
     /* AnyKey or XIAnyKeycode must succeed */
-    a.grabtype = GRABTYPE_XI2;
-    b.grabtype = GRABTYPE_XI2;
+    a.grabtype = XI2;
+    b.grabtype = XI2;
     a.detail.exact = XIAnyKeycode;
     b.detail.exact = 1;
     a.modifiersDetail.exact = 1;
@@ -859,8 +859,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == TRUE);
 
-    a.grabtype = GRABTYPE_CORE;
-    b.grabtype = GRABTYPE_CORE;
+    a.grabtype = CORE;
+    b.grabtype = CORE;
     a.detail.exact = AnyKey;
     b.detail.exact = 1;
     a.modifiersDetail.exact = 1;
@@ -870,8 +870,8 @@ static void dix_grab_matching(void)
     rc = GrabMatchesSecond(&b, &a, FALSE);
     assert(rc == TRUE);
 
-    a.grabtype = GRABTYPE_XI;
-    b.grabtype = GRABTYPE_XI;
+    a.grabtype = XI;
+    b.grabtype = XI;
     a.detail.exact = AnyKey;
     b.detail.exact = 1;
     a.modifiersDetail.exact = 1;
diff --git a/xorg-server/test/xi2/protocol-eventconvert.c b/xorg-server/test/xi2/protocol-eventconvert.c
index dce1c50c4..e2037f911 100644
--- a/xorg-server/test/xi2/protocol-eventconvert.c
+++ b/xorg-server/test/xi2/protocol-eventconvert.c
@@ -59,7 +59,7 @@ static void test_values_XIRawEvent(RawDeviceEvent *in, xXIRawEvent *out,
 
     assert(out->type == GenericEvent);
     assert(out->extension == 0); /* IReqCode defaults to 0 */
-    assert(out->evtype == GetXI2Type((InternalEvent*)in));
+    assert(out->evtype == GetXI2Type(in->type));
     assert(out->time == in->time);
     assert(out->detail == in->detail.button);
     assert(out->deviceid == in->deviceid);
@@ -305,7 +305,7 @@ static void test_values_XIDeviceEvent(DeviceEvent *in, xXIDeviceEvent *out,
     }
 
     assert(out->extension == 0); /* IReqCode defaults to 0 */
-    assert(out->evtype == GetXI2Type((InternalEvent*)in));
+    assert(out->evtype == GetXI2Type(in->type));
     assert(out->time == in->time);
     assert(out->detail == in->detail.button);
     assert(out->length >= 12);
@@ -662,7 +662,7 @@ static void test_values_XIDeviceChangedEvent(DeviceChangedEvent *in,
 
     assert(out->type == GenericEvent);
     assert(out->extension == 0); /* IReqCode defaults to 0 */
-    assert(out->evtype == GetXI2Type((InternalEvent*)in));
+    assert(out->evtype == GetXI2Type(in->type));
     assert(out->time == in->time);
     assert(out->deviceid == in->deviceid);
     assert(out->sourceid == in->sourceid);
diff --git a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
index 1ffcdee97..89ffc3d29 100644
--- a/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
+++ b/xorg-server/test/xi2/protocol-xipassivegrabdevice.c
@@ -49,7 +49,7 @@ struct test_data {
 } testdata;
 
 int __wrap_GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-                      int button, GrabParameters *param, GrabType grabtype,
+                      int button, GrabParameters *param, enum InputLevel grabtype,
                       GrabMask *mask);
 static void reply_XIPassiveGrabDevice_data(ClientPtr client, int len, char *data, void *userdata);
 
@@ -69,7 +69,7 @@ int __wrap_dixLookupWindow(WindowPtr *win, XID id, ClientPtr client, Mask access
 }
 
 int __wrap_GrabButton(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
-                      int button, GrabParameters *param, GrabType grabtype,
+                      int button, GrabParameters *param, enum InputLevel grabtype,
                       GrabMask *mask)
 {
     /* Fail every odd modifier */
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c
index fc8026c87..10575c509 100644
--- a/xorg-server/xkb/xkbActions.c
+++ b/xorg-server/xkb/xkbActions.c
@@ -951,13 +951,13 @@ _XkbFilterDeviceBtn(	XkbSrvInfoPtr	xkbi,
 			unsigned	keycode,
 			XkbAction *	pAction)
 {
-DeviceIntPtr	dev;
-int		button;
-
     if (xkbi->device == inputInfo.keyboard)
         return 0;
 
     if (filter->keycode==0) {		/* initial press */
+	DeviceIntPtr	dev;
+	int		button;
+
 	_XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient,
 			       DixUnknownAccess, &button);
 	if (!dev || !dev->public.on)
@@ -996,7 +996,8 @@ int		button;
 	}
     }
     else if (filter->keycode==keycode) {
-	int	button;
+	DeviceIntPtr	dev;
+	int		button;
 
 	filter->active= 0;
 	_XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device,
diff --git a/xorg-server/xkb/xkbLEDs.c b/xorg-server/xkb/xkbLEDs.c
index 14767157b..24fcd3b48 100644
--- a/xorg-server/xkb/xkbLEDs.c
+++ b/xorg-server/xkb/xkbLEDs.c
@@ -1,982 +1,980 @@
-/************************************************************

-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.

-

-Permission to use, copy, modify, and distribute this

-software and its documentation for any purpose and without

-fee is hereby granted, provided that the above copyright

-notice appear in all copies and that both that copyright

-notice and this permission notice appear in supporting

-documentation, and that the name of Silicon Graphics not be 

-used in advertising or publicity pertaining to distribution 

-of the software without specific prior written permission.

-Silicon Graphics makes no representation about the suitability 

-of this software for any purpose. It is provided "as is"

-without any express or implied warranty.

-

-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 

-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 

-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON

-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 

-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 

-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 

-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH

-THE USE OR PERFORMANCE OF THIS SOFTWARE.

-

-********************************************************/

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <stdio.h>

-#include <ctype.h>

-#include <math.h>

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "misc.h"

-#include "inputstr.h"

-

-#include <X11/extensions/XI.h>

-#include <xkbsrv.h>

-#include "xkb.h"

-

-/***====================================================================***/

-

-	/*

-	 * unsigned

-	 * XkbIndicatorsToUpdate(dev,changed,check_devs_rtrn)

-	 *

-	 * Given a keyboard and a set of state components that have changed,

-	 * this function returns the indicators on the default keyboard 

-	 * feedback that might be affected.   It also reports whether or not 

-	 * any extension devices might be affected in check_devs_rtrn.

-	 */

-

-unsigned

-XkbIndicatorsToUpdate(	DeviceIntPtr	dev,

-			unsigned long 	state_changes,

-			Bool		enable_changes)

-{

-register unsigned	update=	0;

-XkbSrvLedInfoPtr	sli;

-

-    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);

-

-    if (!sli)

-        return update;

-

-    if (state_changes&(XkbModifierStateMask|XkbGroupStateMask))

-	update|= sli->usesEffective;

-    if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask))

-	update|= sli->usesBase;

-    if (state_changes&(XkbModifierLatchMask|XkbGroupLatchMask))

-	update|= sli->usesLatched;

-    if (state_changes&(XkbModifierLockMask|XkbGroupLockMask))

-	update|= sli->usesLocked;

-    if (state_changes&XkbCompatStateMask)

-	update|= sli->usesCompat;

-    if (enable_changes)

-	update|= sli->usesControls;

-    return update;

-}

-

-/***====================================================================***/

-

-	/*

-	 * Bool

-	 *XkbApplyLEDChangeToKeyboard(xkbi,map,on,change)

-	 *

-	 * Some indicators "drive" the keyboard when their state is explicitly 

-	 * changed, as described in section 9.2.1 of the XKB protocol spec.

-	 * This function updates the state and controls for the keyboard 

-	 * specified by 'xkbi' to reflect any changes that are required 

-	 * when the indicator described by 'map' is turned on or off.  The

-	 * extent of the changes is reported in change, which must be defined.

-	 */

-static Bool

-XkbApplyLEDChangeToKeyboard(	XkbSrvInfoPtr		xkbi,

-				XkbIndicatorMapPtr	map,

-				Bool			on,

-				XkbChangesPtr		change)

-{

-Bool		ctrlChange,stateChange;

-XkbStatePtr	state;

-

-    if ((map->flags&XkbIM_NoExplicit)||((map->flags&XkbIM_LEDDrivesKB)==0))

-	return FALSE;

-    ctrlChange= stateChange= FALSE;

-    if (map->ctrls) {

-	XkbControlsPtr	ctrls= xkbi->desc->ctrls;

-	unsigned 	old;

-

-	old= ctrls->enabled_ctrls;

-	if (on)	ctrls->enabled_ctrls|= map->ctrls;

-	else	ctrls->enabled_ctrls&= ~map->ctrls;

-	if (old!=ctrls->enabled_ctrls) {

-	    change->ctrls.changed_ctrls= XkbControlsEnabledMask;

-	    change->ctrls.enabled_ctrls_changes= old^ctrls->enabled_ctrls;

-	    ctrlChange= TRUE;

-	}

-    }

-    state= &xkbi->state;

-    if ((map->groups)&&((map->which_groups&(~XkbIM_UseBase))!=0)) {

-	register int i;

-	register unsigned bit,match;

-

-	if (on)	match= (map->groups)&XkbAllGroupsMask;

-	else 	match= (~map->groups)&XkbAllGroupsMask;

-	if (map->which_groups&(XkbIM_UseLocked|XkbIM_UseEffective)) {

-	    for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {

-		if (bit&match)

-		    break;

-	    }

-	    if (map->which_groups&XkbIM_UseLatched)

-		XkbLatchGroup(xkbi->device,0); /* unlatch group */

-	    state->locked_group= i;

-	    stateChange= TRUE;

-	}

-	else if (map->which_groups&(XkbIM_UseLatched|XkbIM_UseEffective)) {

-	    for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {

-		if (bit&match)

-		    break;

-	    }

-	    state->locked_group= 0;

-	    XkbLatchGroup(xkbi->device,i);

-	    stateChange= TRUE;

-	}

-    }

-    if ((map->mods.mask)&&((map->which_mods&(~XkbIM_UseBase))!=0)) {

-	if (map->which_mods&(XkbIM_UseLocked|XkbIM_UseEffective)) {

-	    register unsigned long old;

-	    old= state->locked_mods;

-	    if (on)	state->locked_mods|= map->mods.mask;

-	    else	state->locked_mods&= ~map->mods.mask;

-	    if (state->locked_mods!=old)

-		stateChange= TRUE;

-	}

-	if (map->which_mods&(XkbIM_UseLatched|XkbIM_UseEffective)) {

-	    register unsigned long newmods;

-	    newmods= state->latched_mods;

-	    if (on)	newmods|=  map->mods.mask;

-	    else	newmods&= ~map->mods.mask;

-	    if (newmods!=state->locked_mods) {

-		newmods&= map->mods.mask;

-		XkbLatchModifiers(xkbi->device,map->mods.mask,newmods);

-		stateChange= TRUE;

-	    }

-	}

-    }

-    return stateChange || ctrlChange;

-}

-	

-	/*

-	 * Bool

-	 * ComputeAutoState(map,state,ctrls)

-	 *

-	 * This function reports the effect of applying the specified

-	 * indicator map given the specified state and controls, as

-	 * described in section 9.2 of the XKB protocol specification.

-	 */

-

-static Bool

-ComputeAutoState(	XkbIndicatorMapPtr	map,

-			XkbStatePtr 		state,

-			XkbControlsPtr 		ctrls)

-{

-Bool 			on;

-CARD8 			mods,group;

-

-    on= FALSE;

-    mods= group= 0;

-    if (map->which_mods&XkbIM_UseAnyMods) {

-	if (map->which_mods&XkbIM_UseBase)

-	    mods|= state->base_mods;

-	if (map->which_mods&XkbIM_UseLatched)

-	    mods|= state->latched_mods;

-	if (map->which_mods&XkbIM_UseLocked)

-	    mods|= state->locked_mods;

-	if (map->which_mods&XkbIM_UseEffective)

-	    mods|= state->mods;

-	if (map->which_mods&XkbIM_UseCompat)

-	    mods|= state->compat_state;

-	on = ((map->mods.mask&mods)!=0);

-	on = on||((mods==0)&&(map->mods.mask==0)&&(map->mods.vmods==0));

-    }

-    if (map->which_groups&XkbIM_UseAnyGroup) {

-	if (map->which_groups&XkbIM_UseBase)

-	    group|= (1L << state->base_group);

-	if (map->which_groups&XkbIM_UseLatched)

-	    group|= (1L << state->latched_group);

-	if (map->which_groups&XkbIM_UseLocked)

-	    group|= (1L << state->locked_group);

-	if (map->which_groups&XkbIM_UseEffective)

-	    group|= (1L << state->group);

-	on = on||(((map->groups&group)!=0)||(map->groups==0));

-    }

-    if (map->ctrls)

-	on = on||(ctrls->enabled_ctrls&map->ctrls);

-    return on;

-}

-

-

-static void

-XkbUpdateLedAutoState(	DeviceIntPtr			dev,

-			XkbSrvLedInfoPtr		sli,

-			unsigned			maps_to_check,

-			xkbExtensionDeviceNotify *	ed,

-			XkbChangesPtr			changes,

-			XkbEventCausePtr		cause)

-{

-DeviceIntPtr			kbd;

-XkbStatePtr			state;

-XkbControlsPtr			ctrls;

-XkbChangesRec			my_changes;

-xkbExtensionDeviceNotify	my_ed;

-register unsigned		i,bit,affected;

-register XkbIndicatorMapPtr	map;

-unsigned			oldState;

-

-    if ((maps_to_check==0)||(sli->maps==NULL)||(sli->mapsPresent==0))

-	return;

-

-    if (dev->key && dev->key->xkbInfo)

-	 kbd= dev;

-    else kbd= inputInfo.keyboard;

-

-    state= &kbd->key->xkbInfo->state;

-    ctrls= kbd->key->xkbInfo->desc->ctrls;

-    affected= maps_to_check;

-    oldState= sli->effectiveState;

-    sli->autoState&= ~affected;

-    for (i=0,bit=1;(i<XkbNumIndicators)&&(affected);i++,bit<<=1) {

-	if ((affected&bit)==0)

-	    continue;

-	affected&= ~bit;

-	map= &sli->maps[i];

-	if((!(map->flags&XkbIM_NoAutomatic))&&ComputeAutoState(map,state,ctrls))

-	    sli->autoState|= bit;

-    }

-    sli->effectiveState= (sli->autoState|sli->explicitState);

-    affected= sli->effectiveState^oldState;

-    if (affected==0)

-	return;

-

-    if (ed==NULL) {

-	ed= &my_ed;

-	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));

-    }

-    else if ((ed->reason&XkbXI_IndicatorsMask)&&

-	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    }

-

-    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {

-	if (changes==NULL) {

-	    changes= &my_changes;

-	    memset((char *)changes, 0, sizeof(XkbChangesRec));

-	}

-	changes->indicators.state_changes|= affected;

-    }

-

-    ed->reason|=	XkbXI_IndicatorStateMask;

-    ed->ledClass= 	sli->class;

-    ed->ledID=		sli->id;

-    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;

-    ed->ledState=	sli->effectiveState;

-    ed->unsupported=	0;

-    ed->supported=	XkbXI_AllFeaturesMask;

-

-    if (changes!=&my_changes)	changes= NULL;

-    if (ed!=&my_ed)		ed= NULL;

-    if (changes || ed)

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    return;

-}

-

-static void

-XkbUpdateAllDeviceIndicators(XkbChangesPtr changes,XkbEventCausePtr cause)

-{

-DeviceIntPtr		edev;

-XkbSrvLedInfoPtr	sli;

-

-    for (edev=inputInfo.devices;edev!=NULL;edev=edev->next) {

-	if (edev->kbdfeed) {

-	    KbdFeedbackPtr	kf;

-	    for (kf=edev->kbdfeed;kf!=NULL;kf=kf->next) {

-		if ((kf->xkb_sli==NULL)||(kf->xkb_sli->maps==NULL))

-		    continue;

-		sli= kf->xkb_sli;

-		XkbUpdateLedAutoState(edev,sli,sli->mapsPresent,NULL,

-								changes,cause);

-			

-	    }

-	}

-	if (edev->leds) {

-	    LedFeedbackPtr	lf;

-	    for (lf=edev->leds;lf!=NULL;lf=lf->next) {

-		if ((lf->xkb_sli==NULL)||(lf->xkb_sli->maps==NULL))

-		    continue;

-		sli= lf->xkb_sli;

-		XkbUpdateLedAutoState(edev,sli,sli->mapsPresent,NULL,

-								changes,cause);

-			

-	    }

-	}

-    }

-    return;

-}

-

-

-/***====================================================================***/

-

-	/*

-	 * void

-	 * XkbSetIndicators(dev,affect,values,cause)

-	 *

-	 * Attempts to change the indicators specified in 'affect' to the

-	 * states specified in 'values' for the default keyboard feedback

-	 * on the keyboard specified by 'dev.'   Attempts to change indicator

-	 * state might be ignored or have no affect, depending on the XKB

-	 * indicator map for any affected indicators, as described in section

-	 * 9.2 of the XKB protocol specification.

-	 *

-	 * If 'changes' is non-NULL, this function notes any changes to the

-	 * keyboard state, controls, or indicator state that result from this

-	 * attempted change.   If 'changes' is NULL, this function generates

-	 * XKB events to report any such changes to interested clients.

-	 *

-	 * If 'cause' is non-NULL, it specifies the reason for the change, 

-	 * as reported in some XKB events.   If it is NULL, this function 

-	 * assumes that the change is the result of a core protocol 

-	 * ChangeKeyboardMapping request.

-	 */

-

-void

-XkbSetIndicators(	DeviceIntPtr		dev,

-			CARD32			affect,

-			CARD32			values,

-			XkbEventCausePtr	cause)

-{

-XkbSrvLedInfoPtr		sli;

-XkbChangesRec			changes;

-xkbExtensionDeviceNotify	ed;

-unsigned 			side_affected;

-

-    memset((char *)&changes, 0, sizeof(XkbChangesRec));

-    memset((char *)&ed, 0, sizeof(xkbExtensionDeviceNotify));

-    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);

-    sli->explicitState&= ~affect;

-    sli->explicitState|= (affect&values);

-    XkbApplyLedStateChanges(dev,sli,affect,&ed,&changes,cause);

-

-    side_affected= 0;

-    if (changes.state_changes!=0)

-	side_affected|= XkbIndicatorsToUpdate(dev,changes.state_changes,FALSE);

-    if (changes.ctrls.enabled_ctrls_changes)

-	side_affected|= sli->usesControls;

-

-    if (side_affected) {

-	XkbUpdateLedAutoState(dev,sli,side_affected,&ed,&changes,cause);

-	affect|= side_affected;

-    }

-    if (changes.state_changes || changes.ctrls.enabled_ctrls_changes)

-	XkbUpdateAllDeviceIndicators(NULL,cause);

-

-    XkbFlushLedEvents(dev,dev,sli,&ed,&changes,cause);

-    return;

-}

-

-/***====================================================================***/

-

-/***====================================================================***/

-

-	/*

-	 * void

-	 * XkbUpdateIndicators(dev,update,check_edevs,changes,cause)

-	 *

-	 * Applies the indicator maps for any indicators specified in

-	 * 'update' from the default keyboard feedback on the device

-	 * specified by 'dev.' 

-	 *

-	 * If 'changes' is NULL, this function generates and XKB events

-	 * required to report the necessary changes, otherwise it simply

-	 * notes the indicators with changed state.

-	 *

-	 * If 'check_edevs' is TRUE, this function also checks the indicator

-	 * maps for any open extension devices that have them, and updates

-	 * the state of any extension device indicators as necessary.

-	 */

-

-void

-XkbUpdateIndicators(	DeviceIntPtr		dev,

-			register CARD32		update,

-			Bool			check_edevs,

-			XkbChangesPtr		changes,

-			XkbEventCausePtr	cause)

-{

-XkbSrvLedInfoPtr	sli;

-

-    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);

-    XkbUpdateLedAutoState(dev,sli,update,NULL,changes,cause);

-    if (check_edevs)

-	XkbUpdateAllDeviceIndicators(changes,cause);

-    return;

-}

-

-/***====================================================================***/

-

-/***====================================================================***/

-

-	/*

-	 * void

-	 * XkbCheckIndicatorMaps(dev,sli,which)

-	 *

-	 * Updates the 'indicator accelerators' for the indicators specified

-	 * by 'which' in the feedback specified by 'sli.' The indicator 

-	 * accelerators are internal to the server and are used to simplify 

-	 * and speed up the process of figuring out which indicators might 

-	 * be affected by a particular change in keyboard state or controls.

-	 */

-

-void

-XkbCheckIndicatorMaps(DeviceIntPtr dev,XkbSrvLedInfoPtr sli,unsigned which)

-{

-register unsigned	i,bit;

-XkbIndicatorMapPtr	map;

-XkbDescPtr		xkb;

-

-    if ((sli->flags&XkbSLI_HasOwnState)==0)

-        return;

-

-    sli->usesBase&=	 ~which;

-    sli->usesLatched&=	 ~which;

-    sli->usesLocked&=	 ~which;

-    sli->usesEffective&= ~which;

-    sli->usesCompat&=	 ~which;

-    sli->usesControls&=	 ~which;

-    sli->mapsPresent&=	 ~which;

-

-    xkb= dev->key->xkbInfo->desc;

-    for (i=0,bit=1,map=sli->maps;i<XkbNumIndicators;i++,bit<<=1,map++) {

-	if (which&bit) {

-	    CARD8		what;

-

-	    if (!map || !XkbIM_InUse(map))

-		continue;

-	    sli->mapsPresent|= bit;

-

-	    what= (map->which_mods|map->which_groups);

-	    if (what&XkbIM_UseBase)

-		 sli->usesBase|= bit;

-	    if (what&XkbIM_UseLatched)

-		 sli->usesLatched|= bit;

-	    if (what&XkbIM_UseLocked)

-		 sli->usesLocked|= bit;

-	    if (what&XkbIM_UseEffective)

-		 sli->usesEffective|= bit;

-	    if (what&XkbIM_UseCompat)

-		 sli->usesCompat|= bit;

-	    if (map->ctrls)

-		 sli->usesControls|= bit;

-

-	    map->mods.mask= map->mods.real_mods;

-	    if (map->mods.vmods!=0) {

-		map->mods.mask|= XkbMaskForVMask(xkb,map->mods.vmods);

-	    }

-	}

-    }

-    sli->usedComponents= 0;

-    if (sli->usesBase)

-	sli->usedComponents|= XkbModifierBaseMask|XkbGroupBaseMask;

-    if (sli->usesLatched)

-	sli->usedComponents|= XkbModifierLatchMask|XkbGroupLatchMask;

-    if (sli->usesLocked)

-	sli->usedComponents|= XkbModifierLockMask|XkbGroupLockMask;

-    if (sli->usesEffective)

-	sli->usedComponents|= XkbModifierStateMask|XkbGroupStateMask;

-    if (sli->usesCompat)

-	sli->usedComponents|= XkbCompatStateMask;

-    return;

-}

-

-/***====================================================================***/

-

-	/*

-	 * XkbSrvLedInfoPtr

-	 * XkbAllocSrvLedInfo(dev,kf,lf,needed_parts)

-	 *

-	 * Allocates an XkbSrvLedInfoPtr for the feedback specified by either

-	 * 'kf' or 'lf' on the keyboard specified by 'dev.'

-	 *

-	 * If 'needed_parts' is non-zero, this function makes sure that any

-	 * of the parts speicified therein are allocated.

-	 */

-XkbSrvLedInfoPtr

-XkbAllocSrvLedInfo(	DeviceIntPtr		dev,

-			KbdFeedbackPtr		kf,

-			LedFeedbackPtr		lf,

-			unsigned		needed_parts)

-{

-XkbSrvLedInfoPtr	sli;

-Bool			checkAccel;

-Bool			checkNames;

-

-    sli= NULL;

-    checkAccel= checkNames= FALSE;

-    if ((kf!=NULL)&&(kf->xkb_sli==NULL)) {

-	kf->xkb_sli= sli= calloc(1, sizeof(XkbSrvLedInfoRec));

-	if (sli==NULL)

-	    return NULL; /* ALLOCATION ERROR */

-	if (dev->key && dev->key->xkbInfo)

-	     sli->flags= XkbSLI_HasOwnState;

-	else sli->flags= 0;	

-	sli->class=	KbdFeedbackClass;

-	sli->id=	kf->ctrl.id;

-	sli->fb.kf=	kf;

-

-	sli->autoState=		0;

-	sli->explicitState=	kf->ctrl.leds;

-	sli->effectiveState=	kf->ctrl.leds;

-

-	if ((kf==dev->kbdfeed) && (dev->key) && (dev->key->xkbInfo)) {

-	    XkbDescPtr	xkb;

-	    xkb= dev->key->xkbInfo->desc;

-	    sli->flags|= 		XkbSLI_IsDefault;

-	    sli->physIndicators=	xkb->indicators->phys_indicators;

-	    sli->names=			xkb->names->indicators;

-	    sli->maps=			xkb->indicators->maps;

-	    checkNames= checkAccel=	TRUE;

-	}

-	else {

-	    sli->physIndicators=	XkbAllIndicatorsMask;

-	    sli->names=			NULL;

-	    sli->maps=			NULL;

-	}

-    }

-    else if ((kf!=NULL)&&((kf->xkb_sli->flags&XkbSLI_IsDefault)!=0)) {

-	XkbDescPtr	xkb;

-	xkb= dev->key->xkbInfo->desc;

-	sli= kf->xkb_sli;

-	sli->physIndicators=	xkb->indicators->phys_indicators;

-	if (xkb->names->indicators!=sli->names) {

-	    checkNames= TRUE;

-	    sli->names= xkb->names->indicators;

-	}

-	if (xkb->indicators->maps!=sli->maps) {

-	    checkAccel= TRUE;

-	    sli->maps= xkb->indicators->maps;

-	}

-    }

-    else if ((lf!=NULL)&&(lf->xkb_sli==NULL)) {

-	lf->xkb_sli= sli= calloc(1, sizeof(XkbSrvLedInfoRec));

-	if (sli==NULL)

-	    return NULL; /* ALLOCATION ERROR */

-	if (dev->key && dev->key->xkbInfo)

-	     sli->flags= XkbSLI_HasOwnState;

-	else sli->flags= 0;	

-	sli->class=	LedFeedbackClass;

-	sli->id=	lf->ctrl.id;

-	sli->fb.lf=	lf;

-

-	sli->physIndicators=	lf->ctrl.led_mask;

-	sli->autoState=		0;

-	sli->explicitState=	lf->ctrl.led_values;

-	sli->effectiveState=	lf->ctrl.led_values;

-	sli->maps=		NULL;

-	sli->names=		NULL;

-    }

-    else

-	return NULL;

-    if ((sli->names==NULL)&&(needed_parts&XkbXI_IndicatorNamesMask))

-	sli->names= calloc(XkbNumIndicators, sizeof(Atom));

-    if ((sli->maps==NULL)&&(needed_parts&XkbXI_IndicatorMapsMask))

-	sli->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));

-    if (checkNames) {

-	register unsigned i,bit;

-	sli->namesPresent=	0;

-	for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {

-	    if (sli->names[i]!=None)

-		sli->namesPresent|= bit;

-	}

-    }

-    if (checkAccel)

-	 XkbCheckIndicatorMaps(dev,sli,XkbAllIndicatorsMask);

-    return sli;

-}

-

-void

-XkbFreeSrvLedInfo(XkbSrvLedInfoPtr sli)

-{

-    if ((sli->flags&XkbSLI_IsDefault)==0) {

-	free(sli->maps);

-	free(sli->names);

-    }

-    sli->maps= NULL;

-    sli->names= NULL;

-    free(sli);

-    return;

-}

-

-/*

- * XkbSrvLedInfoPtr

- * XkbCopySrvLedInfo(dev,src,kf,lf)

- *

- * Takes the given XkbSrvLedInfoPtr and duplicates it. A deep copy is made,

- * thus the new copy behaves like the original one and can be freed with

- * XkbFreeSrvLedInfo.

- */

-XkbSrvLedInfoPtr

-XkbCopySrvLedInfo(	DeviceIntPtr		from,

-			XkbSrvLedInfoPtr	src,

-			KbdFeedbackPtr		kf,

-			LedFeedbackPtr		lf)

-{

-    XkbSrvLedInfoPtr sli_new = NULL;

-

-    if (!src)

-	goto finish;

-

-    sli_new = calloc(1, sizeof( XkbSrvLedInfoRec));

-    if (!sli_new)

-	goto finish;

-

-    memcpy(sli_new, src, sizeof(XkbSrvLedInfoRec));

-    if (sli_new->class == KbdFeedbackClass)

-	sli_new->fb.kf = kf;

-    else

-	sli_new->fb.lf = lf;

-

-    if (!(sli_new->flags & XkbSLI_IsDefault)) {

-	sli_new->names= calloc(XkbNumIndicators, sizeof(Atom));

-	sli_new->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));

-    } /* else sli_new->names/maps is pointing to

-	dev->key->xkbInfo->desc->names->indicators;

-	dev->key->xkbInfo->desc->names->indicators; */

-

-finish:

-    return sli_new;

-}

-

-/***====================================================================***/

-

-	/*

-	 * XkbSrvLedInfoPtr

-	 * XkbFindSrvLedInfo(dev,class,id,needed_parts)

-	 *

-	 * Finds the XkbSrvLedInfoPtr for the specified 'class' and 'id'

-	 * on the device specified by 'dev.'   If the class and id specify

-	 * a valid device feedback, this function returns the existing 

-	 * feedback or allocates a new one.

-	 *

-	 */

-

-XkbSrvLedInfoPtr

-XkbFindSrvLedInfo(	DeviceIntPtr		dev,

-			unsigned		class,

-			unsigned		id,

-			unsigned		needed_parts)

-{

-XkbSrvLedInfoPtr	sli;

-

-    /* optimization to check for most common case */

-    if (((class==XkbDfltXIClass)&&(id==XkbDfltXIId))&&(dev->kbdfeed)) {

-	XkbSrvLedInfoPtr	sli;

-	sli= dev->kbdfeed->xkb_sli;

-	if (dev->kbdfeed->xkb_sli==NULL) {

-	    sli= XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts);

-	    dev->kbdfeed->xkb_sli= sli;

-	}

-	return dev->kbdfeed->xkb_sli;

-    }

-

-    sli= NULL;

-    if (class==XkbDfltXIClass) {

-	if (dev->kbdfeed)	class= KbdFeedbackClass;

-	else if (dev->leds)	class= LedFeedbackClass;

-	else 			return NULL;

-    }

-    if (class==KbdFeedbackClass) {

-	KbdFeedbackPtr	kf;

-	for (kf=dev->kbdfeed;kf!=NULL;kf=kf->next) {

-	    if ((id==XkbDfltXIId)||(id==kf->ctrl.id)) {

-		if (kf->xkb_sli==NULL)

-		    kf->xkb_sli= XkbAllocSrvLedInfo(dev,kf,NULL,needed_parts);

-		sli= kf->xkb_sli;

-		break;

-	    }	

-	}

-    }

-    else if (class==LedFeedbackClass) {

-	LedFeedbackPtr	lf;

-	for (lf=dev->leds;lf!=NULL;lf=lf->next) {

-	    if ((id==XkbDfltXIId)||(id==lf->ctrl.id)) {

-		if (lf->xkb_sli==NULL)

-		    lf->xkb_sli= XkbAllocSrvLedInfo(dev,NULL,lf,needed_parts);

-		sli= lf->xkb_sli;

-		break;

-	    }	

-	}

-    }

-    if (sli) {

-	if ((sli->names==NULL)&&(needed_parts&XkbXI_IndicatorNamesMask))

-	    sli->names= calloc(XkbNumIndicators, sizeof(Atom));

-	if ((sli->maps==NULL)&&(needed_parts&XkbXI_IndicatorMapsMask))

-	    sli->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));

-    }

-    return sli;

-}

-

-/***====================================================================***/

-

-void

-XkbFlushLedEvents(	DeviceIntPtr			dev,

-			DeviceIntPtr			kbd,

-			XkbSrvLedInfoPtr		sli,

-			xkbExtensionDeviceNotify *	ed,

-			XkbChangesPtr			changes,

-			XkbEventCausePtr		cause)

-{

-    if (changes) {

-	if (changes->indicators.state_changes)

-	    XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);

-	XkbSendNotification(kbd,changes,cause);

-	memset((char *)changes, 0, sizeof(XkbChangesRec));

-

-	if (XkbAX_NeedFeedback(kbd->key->xkbInfo->desc->ctrls, XkbAX_IndicatorFBMask)) {

-		if (sli->effectiveState)

-			/* it appears that the which parameter is not used */

-			XkbDDXAccessXBeep(dev, _BEEP_LED_ON, XkbAccessXFeedbackMask);

-		else

-			XkbDDXAccessXBeep(dev, _BEEP_LED_OFF, XkbAccessXFeedbackMask);

-	}

-    }

-    if (ed) {

-	if (ed->reason) {

-	    if ((dev!=kbd)&&(ed->reason&XkbXI_IndicatorStateMask))

-		XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);

-	    XkbSendExtensionDeviceNotify(dev,cause->client,ed);

-	}

-	memset((char *)ed, 0, sizeof(XkbExtensionDeviceNotify));

-    }

-    return;

-}

-

-/***====================================================================***/

-

-void

-XkbApplyLedNameChanges(	DeviceIntPtr 			dev,

-			XkbSrvLedInfoPtr		sli,

-			unsigned			changed_names,

-			xkbExtensionDeviceNotify *	ed,

-			XkbChangesPtr			changes,

-			XkbEventCausePtr		cause)

-{

-DeviceIntPtr			kbd;

-XkbChangesRec			my_changes;

-xkbExtensionDeviceNotify	my_ed;

-

-    if (changed_names==0)

-	return;

-    if (dev->key && dev->key->xkbInfo)

-	 kbd= dev;

-    else kbd= inputInfo.keyboard;

-

-    if (ed==NULL) {

-	ed= &my_ed;

-	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));

-    }

-    else if ((ed->reason&XkbXI_IndicatorsMask)&&

-	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    }

-

-    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) { 

-	if (changes==NULL) {

-	   changes= &my_changes;

-	   memset((char *)changes, 0, sizeof(XkbChangesRec));

-	}

-	changes->names.changed|= XkbIndicatorNamesMask;

-	changes->names.changed_indicators|= changed_names;

-    }

-

-    ed->reason|=	XkbXI_IndicatorNamesMask;

-    ed->ledClass= 	sli->class;

-    ed->ledID=		sli->id;

-    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;

-    ed->ledState=	sli->effectiveState;

-    ed->unsupported=	0;

-    ed->supported=	XkbXI_AllFeaturesMask;

-

-    if (changes!=&my_changes)	changes= NULL;

-    if (ed!=&my_ed)		ed= NULL;

-    if (changes || ed)

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    return;

-}

-/***====================================================================***/

-

-	/*

-	 * void

-	 * XkbApplyLedMapChanges(dev,sli,changed_maps,changes,cause)

-	 *

-	 * Handles all of the secondary effects of the changes to the

-	 * feedback specified by 'sli' on the device specified by 'dev.'

-	 * 

-	 * If 'changed_maps' specifies any indicators, this function generates

-	 * XkbExtensionDeviceNotify events and possibly IndicatorMapNotify

-	 * events to report the changes, and recalculates the effective

-	 * state of each indicator with a changed map.  If any indicators

-	 * change state, the server generates XkbExtensionDeviceNotify and

-	 * XkbIndicatorStateNotify events as appropriate.

-	 *

-	 * If 'changes' is non-NULL, this function updates it to reflect

-	 * any changes to the keyboard state or controls or to the 'core'

-	 * indicator names, maps, or state.   If 'changes' is NULL, this

-	 * function generates XKB events as needed to report the changes.

-	 * If 'dev' is not a keyboard device, any changes are reported

-	 * for the core keyboard.

-	 *

-	 * The 'cause' specifies the reason for the event (key event or

-	 * request) for the change, as reported in some XKB events.

-	 */

-

-void

-XkbApplyLedMapChanges(	DeviceIntPtr 			dev,

-			XkbSrvLedInfoPtr		sli,

-			unsigned			changed_maps,

-			xkbExtensionDeviceNotify *	ed,

-			XkbChangesPtr			changes,

-			XkbEventCausePtr		cause)

-{

-DeviceIntPtr			kbd;

-XkbChangesRec			my_changes;

-xkbExtensionDeviceNotify	my_ed;

-

-    if (changed_maps==0)

-	return;

-    if (dev->key && dev->key->xkbInfo)

-	 kbd= dev;

-    else kbd= inputInfo.keyboard;

-

-    if (ed==NULL) {

-	ed= &my_ed;

-	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));

-    }

-    else if ((ed->reason&XkbXI_IndicatorsMask)&&

-	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    }

-

-    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {

-	if (changes==NULL) {

-	    changes= &my_changes;

-	    memset((char *)changes, 0, sizeof(XkbChangesRec));

-	}

-	changes->indicators.map_changes|= changed_maps;

-    }

-

-    XkbCheckIndicatorMaps(dev,sli,changed_maps);

-

-    ed->reason|=	XkbXI_IndicatorMapsMask;

-    ed->ledClass= 	sli->class;

-    ed->ledID=		sli->id;

-    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;

-    ed->ledState=	sli->effectiveState;

-    ed->unsupported=	0;

-    ed->supported=	XkbXI_AllFeaturesMask;

-

-    XkbUpdateLedAutoState(dev,sli,changed_maps,ed,changes,cause);

-

-    if (changes!=&my_changes)	changes= NULL;

-    if (ed!=&my_ed)		ed= NULL;

-    if (changes || ed)

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    return;

-}

-

-/***====================================================================***/

-

-void

-XkbApplyLedStateChanges(DeviceIntPtr 			dev,

-			XkbSrvLedInfoPtr		sli,

-			unsigned			changed_leds,

-			xkbExtensionDeviceNotify *	ed,

-			XkbChangesPtr			changes,

-			XkbEventCausePtr		cause)

-{

-XkbSrvInfoPtr			xkbi;

-DeviceIntPtr			kbd;

-XkbChangesRec			my_changes;

-xkbExtensionDeviceNotify	my_ed;

-register unsigned		i,bit,affected;

-XkbIndicatorMapPtr		map;

-unsigned			oldState;

-Bool				kb_changed;

-

-    if (changed_leds==0)

-	return;

-    if (dev->key && dev->key->xkbInfo)

-	 kbd= dev;

-    else kbd= inputInfo.keyboard;

-    xkbi= kbd->key->xkbInfo;

-

-    if (changes==NULL) {

-	changes= &my_changes;

-	memset((char *)changes, 0, sizeof(XkbChangesRec));

-    }

-

-    kb_changed= FALSE;

-    affected= changed_leds;

-    oldState= sli->effectiveState;

-    for (i=0,bit=1;(i<XkbNumIndicators)&&(affected);i++,bit<<=1) {

-	if ((affected&bit)==0)

-	    continue;

-	affected&= ~bit;

-	map= &sli->maps[i];

-	if (map->flags&XkbIM_NoExplicit) {

-	    sli->explicitState&= ~bit;

-	    continue;

-	}

-	if (map->flags&XkbIM_LEDDrivesKB) {

-	    Bool on= ((sli->explicitState&bit)!=0);

-	    if (XkbApplyLEDChangeToKeyboard(xkbi,map,on,changes))

-		kb_changed= TRUE;

-	}

-    }

-    sli->effectiveState= (sli->autoState|sli->explicitState);

-    affected= sli->effectiveState^oldState;

-

-    if (ed==NULL) {

-	ed= &my_ed;

-	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));

-    }

-    else if (affected&&(ed->reason&XkbXI_IndicatorsMask)&&

-	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    }

-

-    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault))

-	changes->indicators.state_changes|= affected;

-    if (affected) {

-	ed->reason|=		XkbXI_IndicatorStateMask;

-	ed->ledClass= 		sli->class;

-	ed->ledID=		sli->id;

-	ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;

-	ed->ledState=		sli->effectiveState;

-	ed->unsupported=	0;

-	ed->supported=		XkbXI_AllFeaturesMask;

-    }

-

-    if (kb_changed) {

-	XkbComputeDerivedState(kbd->key->xkbInfo);

-	XkbUpdateLedAutoState(dev,sli,sli->mapsPresent,ed,changes,cause);

-    }

-

-    if (changes!=&my_changes)	changes= NULL;

-    if (ed!=&my_ed)		ed= NULL;

-    if (changes || ed)

-	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);

-    if (kb_changed)

-	XkbUpdateAllDeviceIndicators(NULL,cause);

-    return;

-}

+/************************************************************
+Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc.
+
+Permission to use, copy, modify, and distribute this
+software and its documentation for any purpose and without
+fee is hereby granted, provided that the above copyright
+notice appear in all copies and that both that copyright
+notice and this permission notice appear in supporting
+documentation, and that the name of Silicon Graphics not be 
+used in advertising or publicity pertaining to distribution 
+of the software without specific prior written permission.
+Silicon Graphics makes no representation about the suitability 
+of this software for any purpose. It is provided "as is"
+without any express or implied warranty.
+
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS 
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY 
+AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL 
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, 
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE 
+OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
+THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+********************************************************/
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <stdio.h>
+#include <ctype.h>
+#include <math.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "misc.h"
+#include "inputstr.h"
+
+#include <X11/extensions/XI.h>
+#include <xkbsrv.h>
+#include "xkb.h"
+
+/***====================================================================***/
+
+	/*
+	 * unsigned
+	 * XkbIndicatorsToUpdate(dev,changed,check_devs_rtrn)
+	 *
+	 * Given a keyboard and a set of state components that have changed,
+	 * this function returns the indicators on the default keyboard 
+	 * feedback that might be affected.   It also reports whether or not 
+	 * any extension devices might be affected in check_devs_rtrn.
+	 */
+
+unsigned
+XkbIndicatorsToUpdate(	DeviceIntPtr	dev,
+			unsigned long 	state_changes,
+			Bool		enable_changes)
+{
+register unsigned	update=	0;
+XkbSrvLedInfoPtr	sli;
+
+    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
+
+    if (!sli)
+        return update;
+
+    if (state_changes&(XkbModifierStateMask|XkbGroupStateMask))
+	update|= sli->usesEffective;
+    if (state_changes&(XkbModifierBaseMask|XkbGroupBaseMask))
+	update|= sli->usesBase;
+    if (state_changes&(XkbModifierLatchMask|XkbGroupLatchMask))
+	update|= sli->usesLatched;
+    if (state_changes&(XkbModifierLockMask|XkbGroupLockMask))
+	update|= sli->usesLocked;
+    if (state_changes&XkbCompatStateMask)
+	update|= sli->usesCompat;
+    if (enable_changes)
+	update|= sli->usesControls;
+    return update;
+}
+
+/***====================================================================***/
+
+	/*
+	 * Bool
+	 *XkbApplyLEDChangeToKeyboard(xkbi,map,on,change)
+	 *
+	 * Some indicators "drive" the keyboard when their state is explicitly 
+	 * changed, as described in section 9.2.1 of the XKB protocol spec.
+	 * This function updates the state and controls for the keyboard 
+	 * specified by 'xkbi' to reflect any changes that are required 
+	 * when the indicator described by 'map' is turned on or off.  The
+	 * extent of the changes is reported in change, which must be defined.
+	 */
+static Bool
+XkbApplyLEDChangeToKeyboard(	XkbSrvInfoPtr		xkbi,
+				XkbIndicatorMapPtr	map,
+				Bool			on,
+				XkbChangesPtr		change)
+{
+Bool		ctrlChange,stateChange;
+XkbStatePtr	state;
+
+    if ((map->flags&XkbIM_NoExplicit)||((map->flags&XkbIM_LEDDrivesKB)==0))
+	return FALSE;
+    ctrlChange= stateChange= FALSE;
+    if (map->ctrls) {
+	XkbControlsPtr	ctrls= xkbi->desc->ctrls;
+	unsigned 	old;
+
+	old= ctrls->enabled_ctrls;
+	if (on)	ctrls->enabled_ctrls|= map->ctrls;
+	else	ctrls->enabled_ctrls&= ~map->ctrls;
+	if (old!=ctrls->enabled_ctrls) {
+	    change->ctrls.changed_ctrls= XkbControlsEnabledMask;
+	    change->ctrls.enabled_ctrls_changes= old^ctrls->enabled_ctrls;
+	    ctrlChange= TRUE;
+	}
+    }
+    state= &xkbi->state;
+    if ((map->groups)&&((map->which_groups&(~XkbIM_UseBase))!=0)) {
+	register int i;
+	register unsigned bit,match;
+
+	if (on)	match= (map->groups)&XkbAllGroupsMask;
+	else 	match= (~map->groups)&XkbAllGroupsMask;
+	if (map->which_groups&(XkbIM_UseLocked|XkbIM_UseEffective)) {
+	    for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
+		if (bit&match)
+		    break;
+	    }
+	    if (map->which_groups&XkbIM_UseLatched)
+		XkbLatchGroup(xkbi->device,0); /* unlatch group */
+	    state->locked_group= i;
+	    stateChange= TRUE;
+	}
+	else if (map->which_groups&(XkbIM_UseLatched|XkbIM_UseEffective)) {
+	    for (i=0,bit=1;i<XkbNumKbdGroups;i++,bit<<=1) {
+		if (bit&match)
+		    break;
+	    }
+	    state->locked_group= 0;
+	    XkbLatchGroup(xkbi->device,i);
+	    stateChange= TRUE;
+	}
+    }
+    if ((map->mods.mask)&&((map->which_mods&(~XkbIM_UseBase))!=0)) {
+	if (map->which_mods&(XkbIM_UseLocked|XkbIM_UseEffective)) {
+	    register unsigned long old;
+	    old= state->locked_mods;
+	    if (on)	state->locked_mods|= map->mods.mask;
+	    else	state->locked_mods&= ~map->mods.mask;
+	    if (state->locked_mods!=old)
+		stateChange= TRUE;
+	}
+	if (map->which_mods&(XkbIM_UseLatched|XkbIM_UseEffective)) {
+	    register unsigned long newmods;
+	    newmods= state->latched_mods;
+	    if (on)	newmods|=  map->mods.mask;
+	    else	newmods&= ~map->mods.mask;
+	    if (newmods!=state->locked_mods) {
+		newmods&= map->mods.mask;
+		XkbLatchModifiers(xkbi->device,map->mods.mask,newmods);
+		stateChange= TRUE;
+	    }
+	}
+    }
+    return stateChange || ctrlChange;
+}
+	
+	/*
+	 * Bool
+	 * ComputeAutoState(map,state,ctrls)
+	 *
+	 * This function reports the effect of applying the specified
+	 * indicator map given the specified state and controls, as
+	 * described in section 9.2 of the XKB protocol specification.
+	 */
+
+static Bool
+ComputeAutoState(	XkbIndicatorMapPtr	map,
+			XkbStatePtr 		state,
+			XkbControlsPtr 		ctrls)
+{
+Bool 			on;
+CARD8 			mods,group;
+
+    on= FALSE;
+    mods= group= 0;
+    if (map->which_mods&XkbIM_UseAnyMods) {
+	if (map->which_mods&XkbIM_UseBase)
+	    mods|= state->base_mods;
+	if (map->which_mods&XkbIM_UseLatched)
+	    mods|= state->latched_mods;
+	if (map->which_mods&XkbIM_UseLocked)
+	    mods|= state->locked_mods;
+	if (map->which_mods&XkbIM_UseEffective)
+	    mods|= state->mods;
+	if (map->which_mods&XkbIM_UseCompat)
+	    mods|= state->compat_state;
+	on = ((map->mods.mask&mods)!=0);
+	on = on||((mods==0)&&(map->mods.mask==0)&&(map->mods.vmods==0));
+    }
+    if (map->which_groups&XkbIM_UseAnyGroup) {
+	if (map->which_groups&XkbIM_UseBase)
+	    group|= (1L << state->base_group);
+	if (map->which_groups&XkbIM_UseLatched)
+	    group|= (1L << state->latched_group);
+	if (map->which_groups&XkbIM_UseLocked)
+	    group|= (1L << state->locked_group);
+	if (map->which_groups&XkbIM_UseEffective)
+	    group|= (1L << state->group);
+	on = on||(((map->groups&group)!=0)||(map->groups==0));
+    }
+    if (map->ctrls)
+	on = on||(ctrls->enabled_ctrls&map->ctrls);
+    return on;
+}
+
+
+static void
+XkbUpdateLedAutoState(	DeviceIntPtr			dev,
+			XkbSrvLedInfoPtr		sli,
+			unsigned			maps_to_check,
+			xkbExtensionDeviceNotify *	ed,
+			XkbChangesPtr			changes,
+			XkbEventCausePtr		cause)
+{
+DeviceIntPtr			kbd;
+XkbStatePtr			state;
+XkbControlsPtr			ctrls;
+XkbChangesRec			my_changes;
+xkbExtensionDeviceNotify	my_ed;
+register unsigned		i,bit,affected;
+register XkbIndicatorMapPtr	map;
+unsigned			oldState;
+
+    if ((maps_to_check==0)||(sli->maps==NULL)||(sli->mapsPresent==0))
+	return;
+
+    if (dev->key && dev->key->xkbInfo)
+	 kbd= dev;
+    else kbd= inputInfo.keyboard;
+
+    state= &kbd->key->xkbInfo->state;
+    ctrls= kbd->key->xkbInfo->desc->ctrls;
+    affected= maps_to_check;
+    oldState= sli->effectiveState;
+    sli->autoState&= ~affected;
+    for (i=0,bit=1;(i<XkbNumIndicators)&&(affected);i++,bit<<=1) {
+	if ((affected&bit)==0)
+	    continue;
+	affected&= ~bit;
+	map= &sli->maps[i];
+	if((!(map->flags&XkbIM_NoAutomatic))&&ComputeAutoState(map,state,ctrls))
+	    sli->autoState|= bit;
+    }
+    sli->effectiveState= (sli->autoState|sli->explicitState);
+    affected= sli->effectiveState^oldState;
+    if (affected==0)
+	return;
+
+    if (ed==NULL) {
+	ed= &my_ed;
+	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
+    }
+    else if ((ed->reason&XkbXI_IndicatorsMask)&&
+	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    }
+
+    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {
+	if (changes==NULL) {
+	    changes= &my_changes;
+	    memset((char *)changes, 0, sizeof(XkbChangesRec));
+	}
+	changes->indicators.state_changes|= affected;
+    }
+
+    ed->reason|=	XkbXI_IndicatorStateMask;
+    ed->ledClass= 	sli->class;
+    ed->ledID=		sli->id;
+    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;
+    ed->ledState=	sli->effectiveState;
+    ed->unsupported=	0;
+    ed->supported=	XkbXI_AllFeaturesMask;
+
+    if (changes!=&my_changes)	changes= NULL;
+    if (ed!=&my_ed)		ed= NULL;
+    if (changes || ed)
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    return;
+}
+
+static void
+XkbUpdateAllDeviceIndicators(XkbChangesPtr changes,XkbEventCausePtr cause)
+{
+DeviceIntPtr		edev;
+XkbSrvLedInfoPtr	sli;
+
+    for (edev=inputInfo.devices;edev!=NULL;edev=edev->next) {
+	if (edev->kbdfeed) {
+	    KbdFeedbackPtr	kf;
+	    for (kf=edev->kbdfeed;kf!=NULL;kf=kf->next) {
+		if ((kf->xkb_sli==NULL)||(kf->xkb_sli->maps==NULL))
+		    continue;
+		sli= kf->xkb_sli;
+		XkbUpdateLedAutoState(edev,sli,sli->mapsPresent,NULL,
+								changes,cause);
+			
+	    }
+	}
+	if (edev->leds) {
+	    LedFeedbackPtr	lf;
+	    for (lf=edev->leds;lf!=NULL;lf=lf->next) {
+		if ((lf->xkb_sli==NULL)||(lf->xkb_sli->maps==NULL))
+		    continue;
+		sli= lf->xkb_sli;
+		XkbUpdateLedAutoState(edev,sli,sli->mapsPresent,NULL,
+								changes,cause);
+			
+	    }
+	}
+    }
+    return;
+}
+
+
+/***====================================================================***/
+
+	/*
+	 * void
+	 * XkbSetIndicators(dev,affect,values,cause)
+	 *
+	 * Attempts to change the indicators specified in 'affect' to the
+	 * states specified in 'values' for the default keyboard feedback
+	 * on the keyboard specified by 'dev.'   Attempts to change indicator
+	 * state might be ignored or have no affect, depending on the XKB
+	 * indicator map for any affected indicators, as described in section
+	 * 9.2 of the XKB protocol specification.
+	 *
+	 * If 'changes' is non-NULL, this function notes any changes to the
+	 * keyboard state, controls, or indicator state that result from this
+	 * attempted change.   If 'changes' is NULL, this function generates
+	 * XKB events to report any such changes to interested clients.
+	 *
+	 * If 'cause' is non-NULL, it specifies the reason for the change, 
+	 * as reported in some XKB events.   If it is NULL, this function 
+	 * assumes that the change is the result of a core protocol 
+	 * ChangeKeyboardMapping request.
+	 */
+
+void
+XkbSetIndicators(	DeviceIntPtr		dev,
+			CARD32			affect,
+			CARD32			values,
+			XkbEventCausePtr	cause)
+{
+XkbSrvLedInfoPtr		sli;
+XkbChangesRec			changes;
+xkbExtensionDeviceNotify	ed;
+unsigned 			side_affected;
+
+    memset((char *)&changes, 0, sizeof(XkbChangesRec));
+    memset((char *)&ed, 0, sizeof(xkbExtensionDeviceNotify));
+    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
+    sli->explicitState&= ~affect;
+    sli->explicitState|= (affect&values);
+    XkbApplyLedStateChanges(dev,sli,affect,&ed,&changes,cause);
+
+    side_affected= 0;
+    if (changes.state_changes!=0)
+	side_affected|= XkbIndicatorsToUpdate(dev,changes.state_changes,FALSE);
+    if (changes.ctrls.enabled_ctrls_changes)
+	side_affected|= sli->usesControls;
+
+    if (side_affected) {
+	XkbUpdateLedAutoState(dev,sli,side_affected,&ed,&changes,cause);
+	affect|= side_affected;
+    }
+    if (changes.state_changes || changes.ctrls.enabled_ctrls_changes)
+	XkbUpdateAllDeviceIndicators(NULL,cause);
+
+    XkbFlushLedEvents(dev,dev,sli,&ed,&changes,cause);
+    return;
+}
+
+/***====================================================================***/
+
+/***====================================================================***/
+
+	/*
+	 * void
+	 * XkbUpdateIndicators(dev,update,check_edevs,changes,cause)
+	 *
+	 * Applies the indicator maps for any indicators specified in
+	 * 'update' from the default keyboard feedback on the device
+	 * specified by 'dev.' 
+	 *
+	 * If 'changes' is NULL, this function generates and XKB events
+	 * required to report the necessary changes, otherwise it simply
+	 * notes the indicators with changed state.
+	 *
+	 * If 'check_edevs' is TRUE, this function also checks the indicator
+	 * maps for any open extension devices that have them, and updates
+	 * the state of any extension device indicators as necessary.
+	 */
+
+void
+XkbUpdateIndicators(	DeviceIntPtr		dev,
+			register CARD32		update,
+			Bool			check_edevs,
+			XkbChangesPtr		changes,
+			XkbEventCausePtr	cause)
+{
+XkbSrvLedInfoPtr	sli;
+
+    sli= XkbFindSrvLedInfo(dev,XkbDfltXIClass,XkbDfltXIId,0);
+    XkbUpdateLedAutoState(dev,sli,update,NULL,changes,cause);
+    if (check_edevs)
+	XkbUpdateAllDeviceIndicators(changes,cause);
+    return;
+}
+
+/***====================================================================***/
+
+/***====================================================================***/
+
+	/*
+	 * void
+	 * XkbCheckIndicatorMaps(dev,sli,which)
+	 *
+	 * Updates the 'indicator accelerators' for the indicators specified
+	 * by 'which' in the feedback specified by 'sli.' The indicator 
+	 * accelerators are internal to the server and are used to simplify 
+	 * and speed up the process of figuring out which indicators might 
+	 * be affected by a particular change in keyboard state or controls.
+	 */
+
+void
+XkbCheckIndicatorMaps(DeviceIntPtr dev,XkbSrvLedInfoPtr sli,unsigned which)
+{
+register unsigned	i,bit;
+XkbIndicatorMapPtr	map;
+XkbDescPtr		xkb;
+
+    if ((sli->flags&XkbSLI_HasOwnState)==0)
+        return;
+
+    sli->usesBase&=	 ~which;
+    sli->usesLatched&=	 ~which;
+    sli->usesLocked&=	 ~which;
+    sli->usesEffective&= ~which;
+    sli->usesCompat&=	 ~which;
+    sli->usesControls&=	 ~which;
+    sli->mapsPresent&=	 ~which;
+
+    xkb= dev->key->xkbInfo->desc;
+    for (i=0,bit=1,map=sli->maps;i<XkbNumIndicators;i++,bit<<=1,map++) {
+	if (which&bit) {
+	    CARD8		what;
+
+	    if (!map || !XkbIM_InUse(map))
+		continue;
+	    sli->mapsPresent|= bit;
+
+	    what= (map->which_mods|map->which_groups);
+	    if (what&XkbIM_UseBase)
+		 sli->usesBase|= bit;
+	    if (what&XkbIM_UseLatched)
+		 sli->usesLatched|= bit;
+	    if (what&XkbIM_UseLocked)
+		 sli->usesLocked|= bit;
+	    if (what&XkbIM_UseEffective)
+		 sli->usesEffective|= bit;
+	    if (what&XkbIM_UseCompat)
+		 sli->usesCompat|= bit;
+	    if (map->ctrls)
+		 sli->usesControls|= bit;
+
+	    map->mods.mask= map->mods.real_mods;
+	    if (map->mods.vmods!=0) {
+		map->mods.mask|= XkbMaskForVMask(xkb,map->mods.vmods);
+	    }
+	}
+    }
+    sli->usedComponents= 0;
+    if (sli->usesBase)
+	sli->usedComponents|= XkbModifierBaseMask|XkbGroupBaseMask;
+    if (sli->usesLatched)
+	sli->usedComponents|= XkbModifierLatchMask|XkbGroupLatchMask;
+    if (sli->usesLocked)
+	sli->usedComponents|= XkbModifierLockMask|XkbGroupLockMask;
+    if (sli->usesEffective)
+	sli->usedComponents|= XkbModifierStateMask|XkbGroupStateMask;
+    if (sli->usesCompat)
+	sli->usedComponents|= XkbCompatStateMask;
+    return;
+}
+
+/***====================================================================***/
+
+	/*
+	 * XkbSrvLedInfoPtr
+	 * XkbAllocSrvLedInfo(dev,kf,lf,needed_parts)
+	 *
+	 * Allocates an XkbSrvLedInfoPtr for the feedback specified by either
+	 * 'kf' or 'lf' on the keyboard specified by 'dev.'
+	 *
+	 * If 'needed_parts' is non-zero, this function makes sure that any
+	 * of the parts speicified therein are allocated.
+	 */
+XkbSrvLedInfoPtr
+XkbAllocSrvLedInfo(	DeviceIntPtr		dev,
+			KbdFeedbackPtr		kf,
+			LedFeedbackPtr		lf,
+			unsigned		needed_parts)
+{
+XkbSrvLedInfoPtr	sli;
+Bool			checkAccel;
+Bool			checkNames;
+
+    sli= NULL;
+    checkAccel= checkNames= FALSE;
+    if ((kf!=NULL)&&(kf->xkb_sli==NULL)) {
+	kf->xkb_sli= sli= calloc(1, sizeof(XkbSrvLedInfoRec));
+	if (sli==NULL)
+	    return NULL; /* ALLOCATION ERROR */
+	if (dev->key && dev->key->xkbInfo)
+	     sli->flags= XkbSLI_HasOwnState;
+	else sli->flags= 0;	
+	sli->class=	KbdFeedbackClass;
+	sli->id=	kf->ctrl.id;
+	sli->fb.kf=	kf;
+
+	sli->autoState=		0;
+	sli->explicitState=	kf->ctrl.leds;
+	sli->effectiveState=	kf->ctrl.leds;
+
+	if ((kf==dev->kbdfeed) && (dev->key) && (dev->key->xkbInfo)) {
+	    XkbDescPtr	xkb;
+	    xkb= dev->key->xkbInfo->desc;
+	    sli->flags|= 		XkbSLI_IsDefault;
+	    sli->physIndicators=	xkb->indicators->phys_indicators;
+	    sli->names=			xkb->names->indicators;
+	    sli->maps=			xkb->indicators->maps;
+	    checkNames= checkAccel=	TRUE;
+	}
+	else {
+	    sli->physIndicators=	XkbAllIndicatorsMask;
+	    sli->names=			NULL;
+	    sli->maps=			NULL;
+	}
+    }
+    else if ((kf!=NULL)&&((kf->xkb_sli->flags&XkbSLI_IsDefault)!=0)) {
+	XkbDescPtr	xkb;
+	xkb= dev->key->xkbInfo->desc;
+	sli= kf->xkb_sli;
+	sli->physIndicators=	xkb->indicators->phys_indicators;
+	if (xkb->names->indicators!=sli->names) {
+	    checkNames= TRUE;
+	    sli->names= xkb->names->indicators;
+	}
+	if (xkb->indicators->maps!=sli->maps) {
+	    checkAccel= TRUE;
+	    sli->maps= xkb->indicators->maps;
+	}
+    }
+    else if ((lf!=NULL)&&(lf->xkb_sli==NULL)) {
+	lf->xkb_sli= sli= calloc(1, sizeof(XkbSrvLedInfoRec));
+	if (sli==NULL)
+	    return NULL; /* ALLOCATION ERROR */
+	if (dev->key && dev->key->xkbInfo)
+	     sli->flags= XkbSLI_HasOwnState;
+	else sli->flags= 0;	
+	sli->class=	LedFeedbackClass;
+	sli->id=	lf->ctrl.id;
+	sli->fb.lf=	lf;
+
+	sli->physIndicators=	lf->ctrl.led_mask;
+	sli->autoState=		0;
+	sli->explicitState=	lf->ctrl.led_values;
+	sli->effectiveState=	lf->ctrl.led_values;
+	sli->maps=		NULL;
+	sli->names=		NULL;
+    }
+    else
+	return NULL;
+    if ((sli->names==NULL)&&(needed_parts&XkbXI_IndicatorNamesMask))
+	sli->names= calloc(XkbNumIndicators, sizeof(Atom));
+    if ((sli->maps==NULL)&&(needed_parts&XkbXI_IndicatorMapsMask))
+	sli->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));
+    if (checkNames) {
+	register unsigned i,bit;
+	sli->namesPresent=	0;
+	for (i=0,bit=1;i<XkbNumIndicators;i++,bit<<=1) {
+	    if (sli->names[i]!=None)
+		sli->namesPresent|= bit;
+	}
+    }
+    if (checkAccel)
+	 XkbCheckIndicatorMaps(dev,sli,XkbAllIndicatorsMask);
+    return sli;
+}
+
+void
+XkbFreeSrvLedInfo(XkbSrvLedInfoPtr sli)
+{
+    if ((sli->flags&XkbSLI_IsDefault)==0) {
+	free(sli->maps);
+	free(sli->names);
+    }
+    sli->maps= NULL;
+    sli->names= NULL;
+    free(sli);
+    return;
+}
+
+/*
+ * XkbSrvLedInfoPtr
+ * XkbCopySrvLedInfo(dev,src,kf,lf)
+ *
+ * Takes the given XkbSrvLedInfoPtr and duplicates it. A deep copy is made,
+ * thus the new copy behaves like the original one and can be freed with
+ * XkbFreeSrvLedInfo.
+ */
+XkbSrvLedInfoPtr
+XkbCopySrvLedInfo(	DeviceIntPtr		from,
+			XkbSrvLedInfoPtr	src,
+			KbdFeedbackPtr		kf,
+			LedFeedbackPtr		lf)
+{
+    XkbSrvLedInfoPtr sli_new = NULL;
+
+    if (!src)
+	goto finish;
+
+    sli_new = calloc(1, sizeof( XkbSrvLedInfoRec));
+    if (!sli_new)
+	goto finish;
+
+    memcpy(sli_new, src, sizeof(XkbSrvLedInfoRec));
+    if (sli_new->class == KbdFeedbackClass)
+	sli_new->fb.kf = kf;
+    else
+	sli_new->fb.lf = lf;
+
+    if (!(sli_new->flags & XkbSLI_IsDefault)) {
+	sli_new->names= calloc(XkbNumIndicators, sizeof(Atom));
+	sli_new->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));
+    } /* else sli_new->names/maps is pointing to
+	dev->key->xkbInfo->desc->names->indicators;
+	dev->key->xkbInfo->desc->names->indicators; */
+
+finish:
+    return sli_new;
+}
+
+/***====================================================================***/
+
+	/*
+	 * XkbSrvLedInfoPtr
+	 * XkbFindSrvLedInfo(dev,class,id,needed_parts)
+	 *
+	 * Finds the XkbSrvLedInfoPtr for the specified 'class' and 'id'
+	 * on the device specified by 'dev.'   If the class and id specify
+	 * a valid device feedback, this function returns the existing 
+	 * feedback or allocates a new one.
+	 *
+	 */
+
+XkbSrvLedInfoPtr
+XkbFindSrvLedInfo(	DeviceIntPtr		dev,
+			unsigned		class,
+			unsigned		id,
+			unsigned		needed_parts)
+{
+XkbSrvLedInfoPtr	sli;
+
+    /* optimization to check for most common case */
+    if (((class==XkbDfltXIClass)&&(id==XkbDfltXIId))&&(dev->kbdfeed)) {
+	if (dev->kbdfeed->xkb_sli==NULL) {
+	    dev->kbdfeed->xkb_sli=
+		XkbAllocSrvLedInfo(dev,dev->kbdfeed,NULL,needed_parts);
+	}
+	return dev->kbdfeed->xkb_sli;
+    }
+
+    sli= NULL;
+    if (class==XkbDfltXIClass) {
+	if (dev->kbdfeed)	class= KbdFeedbackClass;
+	else if (dev->leds)	class= LedFeedbackClass;
+	else 			return NULL;
+    }
+    if (class==KbdFeedbackClass) {
+	KbdFeedbackPtr	kf;
+	for (kf=dev->kbdfeed;kf!=NULL;kf=kf->next) {
+	    if ((id==XkbDfltXIId)||(id==kf->ctrl.id)) {
+		if (kf->xkb_sli==NULL)
+		    kf->xkb_sli= XkbAllocSrvLedInfo(dev,kf,NULL,needed_parts);
+		sli= kf->xkb_sli;
+		break;
+	    }	
+	}
+    }
+    else if (class==LedFeedbackClass) {
+	LedFeedbackPtr	lf;
+	for (lf=dev->leds;lf!=NULL;lf=lf->next) {
+	    if ((id==XkbDfltXIId)||(id==lf->ctrl.id)) {
+		if (lf->xkb_sli==NULL)
+		    lf->xkb_sli= XkbAllocSrvLedInfo(dev,NULL,lf,needed_parts);
+		sli= lf->xkb_sli;
+		break;
+	    }	
+	}
+    }
+    if (sli) {
+	if ((sli->names==NULL)&&(needed_parts&XkbXI_IndicatorNamesMask))
+	    sli->names= calloc(XkbNumIndicators, sizeof(Atom));
+	if ((sli->maps==NULL)&&(needed_parts&XkbXI_IndicatorMapsMask))
+	    sli->maps= calloc(XkbNumIndicators, sizeof(XkbIndicatorMapRec));
+    }
+    return sli;
+}
+
+/***====================================================================***/
+
+void
+XkbFlushLedEvents(	DeviceIntPtr			dev,
+			DeviceIntPtr			kbd,
+			XkbSrvLedInfoPtr		sli,
+			xkbExtensionDeviceNotify *	ed,
+			XkbChangesPtr			changes,
+			XkbEventCausePtr		cause)
+{
+    if (changes) {
+	if (changes->indicators.state_changes)
+	    XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);
+	XkbSendNotification(kbd,changes,cause);
+	memset((char *)changes, 0, sizeof(XkbChangesRec));
+
+	if (XkbAX_NeedFeedback(kbd->key->xkbInfo->desc->ctrls, XkbAX_IndicatorFBMask)) {
+		if (sli->effectiveState)
+			/* it appears that the which parameter is not used */
+			XkbDDXAccessXBeep(dev, _BEEP_LED_ON, XkbAccessXFeedbackMask);
+		else
+			XkbDDXAccessXBeep(dev, _BEEP_LED_OFF, XkbAccessXFeedbackMask);
+	}
+    }
+    if (ed) {
+	if (ed->reason) {
+	    if ((dev!=kbd)&&(ed->reason&XkbXI_IndicatorStateMask))
+		XkbDDXUpdateDeviceIndicators(dev,sli,sli->effectiveState);
+	    XkbSendExtensionDeviceNotify(dev,cause->client,ed);
+	}
+	memset((char *)ed, 0, sizeof(XkbExtensionDeviceNotify));
+    }
+    return;
+}
+
+/***====================================================================***/
+
+void
+XkbApplyLedNameChanges(	DeviceIntPtr 			dev,
+			XkbSrvLedInfoPtr		sli,
+			unsigned			changed_names,
+			xkbExtensionDeviceNotify *	ed,
+			XkbChangesPtr			changes,
+			XkbEventCausePtr		cause)
+{
+DeviceIntPtr			kbd;
+XkbChangesRec			my_changes;
+xkbExtensionDeviceNotify	my_ed;
+
+    if (changed_names==0)
+	return;
+    if (dev->key && dev->key->xkbInfo)
+	 kbd= dev;
+    else kbd= inputInfo.keyboard;
+
+    if (ed==NULL) {
+	ed= &my_ed;
+	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
+    }
+    else if ((ed->reason&XkbXI_IndicatorsMask)&&
+	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    }
+
+    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) { 
+	if (changes==NULL) {
+	   changes= &my_changes;
+	   memset((char *)changes, 0, sizeof(XkbChangesRec));
+	}
+	changes->names.changed|= XkbIndicatorNamesMask;
+	changes->names.changed_indicators|= changed_names;
+    }
+
+    ed->reason|=	XkbXI_IndicatorNamesMask;
+    ed->ledClass= 	sli->class;
+    ed->ledID=		sli->id;
+    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;
+    ed->ledState=	sli->effectiveState;
+    ed->unsupported=	0;
+    ed->supported=	XkbXI_AllFeaturesMask;
+
+    if (changes!=&my_changes)	changes= NULL;
+    if (ed!=&my_ed)		ed= NULL;
+    if (changes || ed)
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    return;
+}
+/***====================================================================***/
+
+	/*
+	 * void
+	 * XkbApplyLedMapChanges(dev,sli,changed_maps,changes,cause)
+	 *
+	 * Handles all of the secondary effects of the changes to the
+	 * feedback specified by 'sli' on the device specified by 'dev.'
+	 * 
+	 * If 'changed_maps' specifies any indicators, this function generates
+	 * XkbExtensionDeviceNotify events and possibly IndicatorMapNotify
+	 * events to report the changes, and recalculates the effective
+	 * state of each indicator with a changed map.  If any indicators
+	 * change state, the server generates XkbExtensionDeviceNotify and
+	 * XkbIndicatorStateNotify events as appropriate.
+	 *
+	 * If 'changes' is non-NULL, this function updates it to reflect
+	 * any changes to the keyboard state or controls or to the 'core'
+	 * indicator names, maps, or state.   If 'changes' is NULL, this
+	 * function generates XKB events as needed to report the changes.
+	 * If 'dev' is not a keyboard device, any changes are reported
+	 * for the core keyboard.
+	 *
+	 * The 'cause' specifies the reason for the event (key event or
+	 * request) for the change, as reported in some XKB events.
+	 */
+
+void
+XkbApplyLedMapChanges(	DeviceIntPtr 			dev,
+			XkbSrvLedInfoPtr		sli,
+			unsigned			changed_maps,
+			xkbExtensionDeviceNotify *	ed,
+			XkbChangesPtr			changes,
+			XkbEventCausePtr		cause)
+{
+DeviceIntPtr			kbd;
+XkbChangesRec			my_changes;
+xkbExtensionDeviceNotify	my_ed;
+
+    if (changed_maps==0)
+	return;
+    if (dev->key && dev->key->xkbInfo)
+	 kbd= dev;
+    else kbd= inputInfo.keyboard;
+
+    if (ed==NULL) {
+	ed= &my_ed;
+	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
+    }
+    else if ((ed->reason&XkbXI_IndicatorsMask)&&
+	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    }
+
+    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault)) {
+	if (changes==NULL) {
+	    changes= &my_changes;
+	    memset((char *)changes, 0, sizeof(XkbChangesRec));
+	}
+	changes->indicators.map_changes|= changed_maps;
+    }
+
+    XkbCheckIndicatorMaps(dev,sli,changed_maps);
+
+    ed->reason|=	XkbXI_IndicatorMapsMask;
+    ed->ledClass= 	sli->class;
+    ed->ledID=		sli->id;
+    ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;
+    ed->ledState=	sli->effectiveState;
+    ed->unsupported=	0;
+    ed->supported=	XkbXI_AllFeaturesMask;
+
+    XkbUpdateLedAutoState(dev,sli,changed_maps,ed,changes,cause);
+
+    if (changes!=&my_changes)	changes= NULL;
+    if (ed!=&my_ed)		ed= NULL;
+    if (changes || ed)
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    return;
+}
+
+/***====================================================================***/
+
+void
+XkbApplyLedStateChanges(DeviceIntPtr 			dev,
+			XkbSrvLedInfoPtr		sli,
+			unsigned			changed_leds,
+			xkbExtensionDeviceNotify *	ed,
+			XkbChangesPtr			changes,
+			XkbEventCausePtr		cause)
+{
+XkbSrvInfoPtr			xkbi;
+DeviceIntPtr			kbd;
+XkbChangesRec			my_changes;
+xkbExtensionDeviceNotify	my_ed;
+register unsigned		i,bit,affected;
+XkbIndicatorMapPtr		map;
+unsigned			oldState;
+Bool				kb_changed;
+
+    if (changed_leds==0)
+	return;
+    if (dev->key && dev->key->xkbInfo)
+	 kbd= dev;
+    else kbd= inputInfo.keyboard;
+    xkbi= kbd->key->xkbInfo;
+
+    if (changes==NULL) {
+	changes= &my_changes;
+	memset((char *)changes, 0, sizeof(XkbChangesRec));
+    }
+
+    kb_changed= FALSE;
+    affected= changed_leds;
+    oldState= sli->effectiveState;
+    for (i=0,bit=1;(i<XkbNumIndicators)&&(affected);i++,bit<<=1) {
+	if ((affected&bit)==0)
+	    continue;
+	affected&= ~bit;
+	map= &sli->maps[i];
+	if (map->flags&XkbIM_NoExplicit) {
+	    sli->explicitState&= ~bit;
+	    continue;
+	}
+	if (map->flags&XkbIM_LEDDrivesKB) {
+	    Bool on= ((sli->explicitState&bit)!=0);
+	    if (XkbApplyLEDChangeToKeyboard(xkbi,map,on,changes))
+		kb_changed= TRUE;
+	}
+    }
+    sli->effectiveState= (sli->autoState|sli->explicitState);
+    affected= sli->effectiveState^oldState;
+
+    if (ed==NULL) {
+	ed= &my_ed;
+	memset((char *)ed, 0, sizeof(xkbExtensionDeviceNotify));
+    }
+    else if (affected&&(ed->reason&XkbXI_IndicatorsMask)&&
+	     ((ed->ledClass!=sli->class)||(ed->ledID!=sli->id))) {
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    }
+
+    if ((kbd==dev)&&(sli->flags&XkbSLI_IsDefault))
+	changes->indicators.state_changes|= affected;
+    if (affected) {
+	ed->reason|=		XkbXI_IndicatorStateMask;
+	ed->ledClass= 		sli->class;
+	ed->ledID=		sli->id;
+	ed->ledsDefined=	sli->namesPresent|sli->mapsPresent;
+	ed->ledState=		sli->effectiveState;
+	ed->unsupported=	0;
+	ed->supported=		XkbXI_AllFeaturesMask;
+    }
+
+    if (kb_changed) {
+	XkbComputeDerivedState(kbd->key->xkbInfo);
+	XkbUpdateLedAutoState(dev,sli,sli->mapsPresent,ed,changes,cause);
+    }
+
+    if (changes!=&my_changes)	changes= NULL;
+    if (ed!=&my_ed)		ed= NULL;
+    if (changes || ed)
+	XkbFlushLedEvents(dev,kbd,sli,ed,changes,cause);
+    if (kb_changed)
+	XkbUpdateAllDeviceIndicators(NULL,cause);
+    return;
+}