xserver xkeyboard-config mesa git update 28 Mar 2011

36 files changed, 16892 insertions, 17326 deletions

diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c
index 901a0e419..4c4aebac6 100644
--- a/xorg-server/Xi/chgdctl.c
+++ b/xorg-server/Xi/chgdctl.c
@@ -76,8 +76,6 @@ SProcXChangeDeviceControl(ClientPtr client)
 {
     char n;
     xDeviceCtl *ctl;
-    xDeviceAbsCalibCtl *calib;
-    xDeviceAbsAreaCtl *area;
 
     REQUEST(xChangeDeviceControlReq);
     swaps(&stuff->length, n);
@@ -88,26 +86,7 @@ SProcXChangeDeviceControl(ClientPtr client)
     swaps(&ctl->length, n);
     switch(stuff->control) {
         case DEVICE_ABS_CALIB:
-            calib = (xDeviceAbsCalibCtl*)ctl;
-            swaps(&calib->length, n);
-            swapl(&calib->min_x, n);
-            swapl(&calib->max_x, n);
-            swapl(&calib->min_y, n);
-            swapl(&calib->max_y, n);
-            swapl(&calib->flip_x, n);
-            swapl(&calib->flip_y, n);
-            swapl(&calib->rotation, n);
-            swapl(&calib->button_threshold, n);
-            break;
         case DEVICE_ABS_AREA:
-            area = (xDeviceAbsAreaCtl*)ctl;
-            swapl(&area->offset_x, n);
-            swapl(&area->offset_y, n);
-            swapl(&area->width, n);
-            swapl(&area->height, n);
-            swapl(&area->screen, n);
-            swapl(&area->following, n);
-            break;
         case DEVICE_CORE:
         case DEVICE_ENABLE:
         case DEVICE_RESOLUTION:
@@ -134,8 +113,6 @@ ProcXChangeDeviceControl(ClientPtr client)
     xChangeDeviceControlReply rep;
     AxisInfoPtr a;
     CARD32 *resolution;
-    xDeviceAbsCalibCtl *calib;
-    xDeviceAbsAreaCtl *area;
     xDeviceEnableCtl *e;
     devicePresenceNotify dpn;
 
@@ -193,53 +170,10 @@ ProcXChangeDeviceControl(ClientPtr client)
 	}
 	break;
     case DEVICE_ABS_CALIB:
-        calib = (xDeviceAbsCalibCtl *)&stuff[1];
-
-        if (calib->button_threshold < 0 || calib->button_threshold > 255) {
-            ret = BadValue;
-            goto out;
-        }
-
-        status = ChangeDeviceControl(client, dev, (xDeviceCtl *) calib);
-
-        if (status == Success) {
-            dev->absolute->min_x = calib->min_x;
-            dev->absolute->max_x = calib->max_x;
-            dev->absolute->min_y = calib->min_y;
-            dev->absolute->max_y = calib->max_y;
-            dev->absolute->flip_x = calib->flip_x;
-            dev->absolute->flip_y = calib->flip_y;
-            dev->absolute->rotation = calib->rotation;
-            dev->absolute->button_threshold = calib->button_threshold;
-            ret = Success;
-        } else if (status == DeviceBusy || status == BadValue) {
-            rep.status = status;
-            ret = Success;
-        } else {
-            ret = BadMatch;
-        }
-
-        break;
     case DEVICE_ABS_AREA:
-        area = (xDeviceAbsAreaCtl *)&stuff[1];
-
-        status = ChangeDeviceControl(client, dev, (xDeviceCtl *) area);
-
-        if (status == Success) {
-            dev->absolute->offset_x = area->offset_x;
-            dev->absolute->offset_y = area->offset_y;
-            dev->absolute->width = area->width;
-            dev->absolute->height = area->height;
-            dev->absolute->screen = area->screen;
-            dev->absolute->following = area->following;
-            ret = Success;
-        } else if (status == DeviceBusy || status == BadValue) {
-            rep.status = status;
-            ret = Success;
-        } else {
-            ret = Success;
-        }
-
+        /* Calibration is now done through properties, and never had any effect
+         * on anything (in the open-source world). Thus, be honest. */
+        ret = BadMatch;
         break;
     case DEVICE_CORE:
         /* Sorry, no device core switching no more. If you want a device to
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index c7089bb69..5b207bc4b 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -626,30 +626,6 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to)
         classes->proximity = to->proximity;
         to->proximity      = NULL;
     }
-
-    if (from->absolute)
-    {
-        if (!to->absolute)
-        {
-            classes = to->unused_classes;
-            to->absolute = classes->absolute;
-            if (!to->absolute)
-            {
-                to->absolute = calloc(1, sizeof(AbsoluteClassRec));
-                if (!to->absolute)
-                    FatalError("[Xi] no memory for class shift.\n");
-            } else
-                classes->absolute = NULL;
-        }
-        memcpy(to->absolute, from->absolute, sizeof(AbsoluteClassRec));
-        to->absolute->sourceid = from->id;
-    } else if (to->absolute)
-    {
-        ClassesPtr classes;
-        classes = to->unused_classes;
-        classes->absolute = to->absolute;
-        to->absolute      = NULL;
-    }
 }
 
 /**
diff --git a/xorg-server/Xi/getdctl.c b/xorg-server/Xi/getdctl.c
index 35ddd3f8e..4e04b8b06 100644
--- a/xorg-server/Xi/getdctl.c
+++ b/xorg-server/Xi/getdctl.c
@@ -1,314 +1,241 @@
-/************************************************************

-

-Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.

-

-			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 Hewlett-Packard not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

-HEWLETT-PACKARD 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.

-

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

-

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

- *

- *  Get Device control attributes for an extension device.

- *

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "inputstr.h"	/* DeviceIntPtr      */

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

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

-#include "exglobals.h"

-

-#include "getdctl.h"

-

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

- *

- * This procedure gets the control attributes for an extension device,

- * for clients on machines with a different byte ordering than the server.

- *

- */

-

-int

-SProcXGetDeviceControl(ClientPtr client)

-{

-    char n;

-

-    REQUEST(xGetDeviceControlReq);

-    swaps(&stuff->length, n);

-    REQUEST_SIZE_MATCH(xGetDeviceControlReq);

-    swaps(&stuff->control, n);

-    return (ProcXGetDeviceControl(client));

-}

-

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

- *

- * This procedure copies DeviceResolution data, swapping if necessary.

- *

- */

-

-static void

-CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf,

-			 int length)

-{

-    char n;

-    AxisInfoPtr a;

-    xDeviceResolutionState *r;

-    int i, *iptr;

-

-    r = (xDeviceResolutionState *) buf;

-    r->control = DEVICE_RESOLUTION;

-    r->length = length;

-    r->num_valuators = v->numAxes;

-    buf += sizeof(xDeviceResolutionState);

-    iptr = (int *)buf;

-    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)

-	*iptr++ = a->resolution;

-    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)

-	*iptr++ = a->min_resolution;

-    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)

-	*iptr++ = a->max_resolution;

-    if (client->swapped) {

-	swaps(&r->control, n);

-	swaps(&r->length, n);

-	swapl(&r->num_valuators, n);

-	iptr = (int *)buf;

-	for (i = 0; i < (3 * v->numAxes); i++, iptr++) {

-	    swapl(iptr, n);

-	}

-    }

-}

-

-static void CopySwapDeviceAbsCalib (ClientPtr client, AbsoluteClassPtr dts,

-                                char *buf)

-{

-    char n;

-    xDeviceAbsCalibState *calib = (xDeviceAbsCalibState *) buf;

-

-    calib->control = DEVICE_ABS_CALIB;

-    calib->length = sizeof(xDeviceAbsCalibState);

-    calib->min_x = dts->min_x;

-    calib->max_x = dts->max_x;

-    calib->min_y = dts->min_y;

-    calib->max_y = dts->max_y;

-    calib->flip_x = dts->flip_x;

-    calib->flip_y = dts->flip_y;

-    calib->rotation = dts->rotation;

-    calib->button_threshold = dts->button_threshold;

-

-    if (client->swapped) {

-        swaps(&calib->control, n);

-        swaps(&calib->length, n);

-        swapl(&calib->min_x, n);

-        swapl(&calib->max_x, n);

-        swapl(&calib->min_y, n);

-        swapl(&calib->max_y, n);

-        swapl(&calib->flip_x, n);

-        swapl(&calib->flip_y, n);

-        swapl(&calib->rotation, n);

-        swapl(&calib->button_threshold, n);

-    }

-}

-

-static void CopySwapDeviceAbsArea (ClientPtr client, AbsoluteClassPtr dts,

-                                char *buf)

-{

-    char n;

-    xDeviceAbsAreaState *area = (xDeviceAbsAreaState *) buf;

-

-    area->control = DEVICE_ABS_AREA;

-    area->length = sizeof(xDeviceAbsAreaState);

-    area->offset_x = dts->offset_x;

-    area->offset_y = dts->offset_y;

-    area->width = dts->width;

-    area->height = dts->height;

-    area->screen = dts->screen;

-    area->following = dts->following;

-

-    if (client->swapped) {

-        swaps(&area->control, n);

-        swaps(&area->length, n);

-        swapl(&area->offset_x, n);

-        swapl(&area->offset_y, n);

-        swapl(&area->width, n);

-        swapl(&area->height, n);

-        swapl(&area->screen, n);

-        swapl(&area->following, n);

-    }

-}

-

-static void CopySwapDeviceCore (ClientPtr client, DeviceIntPtr dev, char *buf)

-{

-    char n;

-    xDeviceCoreState *c = (xDeviceCoreState *) buf;

-

-    c->control = DEVICE_CORE;

-    c->length = sizeof(xDeviceCoreState);

-    c->status = dev->coreEvents;

-    c->iscore = (dev == inputInfo.keyboard || dev == inputInfo.pointer);

-

-    if (client->swapped) {

-        swaps(&c->control, n);

-        swaps(&c->length, n);

-        swaps(&c->status, n);

-    }

-}

-

-static void CopySwapDeviceEnable (ClientPtr client, DeviceIntPtr dev, char *buf)

-{

-    char n;

-    xDeviceEnableState *e = (xDeviceEnableState *) buf;

-

-    e->control = DEVICE_ENABLE;

-    e->length = sizeof(xDeviceEnableState);

-    e->enable = dev->enabled;

-

-    if (client->swapped) {

-        swaps(&e->control, n);

-        swaps(&e->length, n);

-        swaps(&e->enable, n);

-    }

-}

-

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

- *

- * This procedure writes the reply for the xGetDeviceControl function,

- * if the client and server have a different byte ordering.

- *

- */

-

-void

-SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)

-{

-    char n;

-

-    swaps(&rep->sequenceNumber, n);

-    swapl(&rep->length, n);

-    WriteToClient(client, size, (char *)rep);

-}

-

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

- *

- * Get the state of the specified device control.

- *

- */

-

-int

-ProcXGetDeviceControl(ClientPtr client)

-{

-    int rc, total_length = 0;

-    char *buf, *savbuf;

-    DeviceIntPtr dev;

-    xGetDeviceControlReply rep;

-

-    REQUEST(xGetDeviceControlReq);

-    REQUEST_SIZE_MATCH(xGetDeviceControlReq);

-

-    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.repType = X_Reply;

-    rep.RepType = X_GetDeviceControl;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    switch (stuff->control) {

-    case DEVICE_RESOLUTION:

-	if (!dev->valuator)

-	    return BadMatch;

-	total_length = sizeof(xDeviceResolutionState) +

-	    (3 * sizeof(int) * dev->valuator->numAxes);

-	break;

-    case DEVICE_ABS_CALIB:

-        if (!dev->absolute)

-	    return BadMatch;

-

-        total_length = sizeof(xDeviceAbsCalibState);

-        break;

-    case DEVICE_ABS_AREA:

-        if (!dev->absolute)

-	    return BadMatch;

-

-        total_length = sizeof(xDeviceAbsAreaState);

-        break;

-    case DEVICE_CORE:

-        total_length = sizeof(xDeviceCoreState);

-        break;

-    case DEVICE_ENABLE:

-        total_length = sizeof(xDeviceEnableState);

-        break;

-    default:

-	return BadValue;

-    }

-

-    buf = (char *)malloc(total_length);

-    if (!buf)

-	return BadAlloc;

-    savbuf = buf;

-

-    switch (stuff->control) {

-    case DEVICE_RESOLUTION:

-	CopySwapDeviceResolution(client, dev->valuator, buf, total_length);

-	break;

-    case DEVICE_ABS_CALIB:

-        CopySwapDeviceAbsCalib(client, dev->absolute, buf);

-        break;

-    case DEVICE_ABS_AREA:

-        CopySwapDeviceAbsArea(client, dev->absolute, buf);

-        break;

-    case DEVICE_CORE:

-        CopySwapDeviceCore(client, dev, buf);

-        break;

-    case DEVICE_ENABLE:

-        CopySwapDeviceEnable(client, dev, buf);

-        break;

-    default:

-	break;

-    }

-

-    rep.length = bytes_to_int32(total_length);

-    WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep);

-    WriteToClient(client, total_length, savbuf);

-    free(savbuf);

-    return Success;

-}

+/************************************************************
+
+Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+			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 Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD 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.
+
+********************************************************/
+
+/********************************************************************
+ *
+ *  Get Device control attributes for an extension device.
+ *
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "inputstr.h"	/* DeviceIntPtr      */
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exglobals.h"
+
+#include "getdctl.h"
+
+/***********************************************************************
+ *
+ * This procedure gets the control attributes for an extension device,
+ * for clients on machines with a different byte ordering than the server.
+ *
+ */
+
+int
+SProcXGetDeviceControl(ClientPtr client)
+{
+    char n;
+
+    REQUEST(xGetDeviceControlReq);
+    swaps(&stuff->length, n);
+    REQUEST_SIZE_MATCH(xGetDeviceControlReq);
+    swaps(&stuff->control, n);
+    return (ProcXGetDeviceControl(client));
+}
+
+/***********************************************************************
+ *
+ * This procedure copies DeviceResolution data, swapping if necessary.
+ *
+ */
+
+static void
+CopySwapDeviceResolution(ClientPtr client, ValuatorClassPtr v, char *buf,
+			 int length)
+{
+    char n;
+    AxisInfoPtr a;
+    xDeviceResolutionState *r;
+    int i, *iptr;
+
+    r = (xDeviceResolutionState *) buf;
+    r->control = DEVICE_RESOLUTION;
+    r->length = length;
+    r->num_valuators = v->numAxes;
+    buf += sizeof(xDeviceResolutionState);
+    iptr = (int *)buf;
+    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
+	*iptr++ = a->resolution;
+    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
+	*iptr++ = a->min_resolution;
+    for (i = 0, a = v->axes; i < v->numAxes; i++, a++)
+	*iptr++ = a->max_resolution;
+    if (client->swapped) {
+	swaps(&r->control, n);
+	swaps(&r->length, n);
+	swapl(&r->num_valuators, n);
+	iptr = (int *)buf;
+	for (i = 0; i < (3 * v->numAxes); i++, iptr++) {
+	    swapl(iptr, n);
+	}
+    }
+}
+
+static void CopySwapDeviceCore (ClientPtr client, DeviceIntPtr dev, char *buf)
+{
+    char n;
+    xDeviceCoreState *c = (xDeviceCoreState *) buf;
+
+    c->control = DEVICE_CORE;
+    c->length = sizeof(xDeviceCoreState);
+    c->status = dev->coreEvents;
+    c->iscore = (dev == inputInfo.keyboard || dev == inputInfo.pointer);
+
+    if (client->swapped) {
+        swaps(&c->control, n);
+        swaps(&c->length, n);
+        swaps(&c->status, n);
+    }
+}
+
+static void CopySwapDeviceEnable (ClientPtr client, DeviceIntPtr dev, char *buf)
+{
+    char n;
+    xDeviceEnableState *e = (xDeviceEnableState *) buf;
+
+    e->control = DEVICE_ENABLE;
+    e->length = sizeof(xDeviceEnableState);
+    e->enable = dev->enabled;
+
+    if (client->swapped) {
+        swaps(&e->control, n);
+        swaps(&e->length, n);
+        swaps(&e->enable, n);
+    }
+}
+
+/***********************************************************************
+ *
+ * This procedure writes the reply for the xGetDeviceControl function,
+ * if the client and server have a different byte ordering.
+ *
+ */
+
+void
+SRepXGetDeviceControl(ClientPtr client, int size, xGetDeviceControlReply * rep)
+{
+    char n;
+
+    swaps(&rep->sequenceNumber, n);
+    swapl(&rep->length, n);
+    WriteToClient(client, size, (char *)rep);
+}
+
+/***********************************************************************
+ *
+ * Get the state of the specified device control.
+ *
+ */
+
+int
+ProcXGetDeviceControl(ClientPtr client)
+{
+    int rc, total_length = 0;
+    char *buf, *savbuf;
+    DeviceIntPtr dev;
+    xGetDeviceControlReply rep;
+
+    REQUEST(xGetDeviceControlReq);
+    REQUEST_SIZE_MATCH(xGetDeviceControlReq);
+
+    rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.repType = X_Reply;
+    rep.RepType = X_GetDeviceControl;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    switch (stuff->control) {
+    case DEVICE_RESOLUTION:
+	if (!dev->valuator)
+	    return BadMatch;
+	total_length = sizeof(xDeviceResolutionState) +
+	    (3 * sizeof(int) * dev->valuator->numAxes);
+	break;
+    case DEVICE_ABS_CALIB:
+    case DEVICE_ABS_AREA:
+        return BadMatch;
+    case DEVICE_CORE:
+        total_length = sizeof(xDeviceCoreState);
+        break;
+    case DEVICE_ENABLE:
+        total_length = sizeof(xDeviceEnableState);
+        break;
+    default:
+	return BadValue;
+    }
+
+    buf = (char *)malloc(total_length);
+    if (!buf)
+	return BadAlloc;
+    savbuf = buf;
+
+    switch (stuff->control) {
+    case DEVICE_RESOLUTION:
+	CopySwapDeviceResolution(client, dev->valuator, buf, total_length);
+	break;
+    case DEVICE_CORE:
+        CopySwapDeviceCore(client, dev, buf);
+        break;
+    case DEVICE_ENABLE:
+        CopySwapDeviceEnable(client, dev, buf);
+        break;
+    default:
+	break;
+    }
+
+    rep.length = bytes_to_int32(total_length);
+    WriteReplyToClient(client, sizeof(xGetDeviceControlReply), &rep);
+    WriteToClient(client, total_length, savbuf);
+    free(savbuf);
+    return Success;
+}
diff --git a/xorg-server/Xi/stubs.c b/xorg-server/Xi/stubs.c
index f69b34b2e..6a4c18158 100644
--- a/xorg-server/Xi/stubs.c
+++ b/xorg-server/Xi/stubs.c
@@ -1,156 +1,146 @@
-/************************************************************

-

-Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.

-

-			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 Hewlett-Packard not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

-HEWLETT-PACKARD 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.

-

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

-

-/*

- * stubs.c -- stub routines for the X server side of the XINPUT

- * extension.  This file is mainly to be used only as documentation.

- * There is not much code here, and you can't get a working XINPUT

- * server just using this.

- * The Xvfb server uses this file so it will compile with the same

- * object files as the real X server for a platform that has XINPUT.

- * Xnest could do the same thing.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "inputstr.h"

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

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

-#include "XIstubs.h"

-#include "xace.h"

-

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

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)

-{

-    return BadMatch;

-}

-

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

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,

-		   int *valuators, int first_valuator, int num_valuators)

-{

-    return BadMatch;

-}

-

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

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- */

-

-int

-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,

-		    xDeviceCtl * control)

-{

-    switch (control->control) {

-    case DEVICE_RESOLUTION:

-	return BadMatch;

-    case DEVICE_ABS_CALIB:

-    case DEVICE_ABS_AREA:

-        return BadMatch;

-    case DEVICE_CORE:

-        return BadMatch;

-    default:

-	return BadMatch;

-    }

-}

-

-

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

- *

- * Caller: configAddDevice (and others)

- *

- * Add a new device with the specified options.

- *

- */

-int

-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,

-                      DeviceIntPtr *pdev)

-{

-    return BadValue;

-}

-

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

- *

- * Caller: configRemoveDevice (and others)

- *

- * Remove the specified device previously added.

- *

- */

-void

-DeleteInputDeviceRequest(DeviceIntPtr dev)

-{

-}

+/************************************************************
+
+Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+			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 Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD 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.
+
+********************************************************/
+
+/*
+ * stubs.c -- stub routines for the X server side of the XINPUT
+ * extension.  This file is mainly to be used only as documentation.
+ * There is not much code here, and you can't get a working XINPUT
+ * server just using this.
+ * The Xvfb server uses this file so it will compile with the same
+ * object files as the real X server for a platform that has XINPUT.
+ * Xnest could do the same thing.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+#include "xace.h"
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
+{
+    return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
+		   int *valuators, int first_valuator, int num_valuators)
+{
+    return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ */
+
+int
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
+		    xDeviceCtl * control)
+{
+    return BadMatch;
+}
+
+
+/****************************************************************************
+ *
+ * Caller: configAddDevice (and others)
+ *
+ * Add a new device with the specified options.
+ *
+ */
+int
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+                      DeviceIntPtr *pdev)
+{
+    return BadValue;
+}
+
+/****************************************************************************
+ *
+ * Caller: configRemoveDevice (and others)
+ *
+ * Remove the specified device previously added.
+ *
+ */
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+}
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index 44319e4db..9ac34ee50 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -1,321 +1,325 @@
-/*

- * Copyright © 2009 Julien Cristau

- *

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

- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Author: Julien Cristau <jcristau@debian.org>

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <libudev.h>

-#include <ctype.h>

-

-#include "input.h"

-#include "inputstr.h"

-#include "hotplug.h"

-#include "config-backends.h"

-#include "os.h"

-

-#define UDEV_XKB_PROP_KEY "xkb"

-

-#define LOG_PROPERTY(path, prop, val)                                   \

-    LogMessageVerb(X_INFO, 10,                                          \

-                   "config/udev: getting property %s on %s "            \

-                   "returned \"%s\"\n",                                 \

-                   (prop), (path), (val) ? (val) : "(null)")

-#define LOG_SYSATTR(path, attr, val)                                    \

-    LogMessageVerb(X_INFO, 10,                                          \

-                   "config/udev: getting attribute %s on %s "           \

-                   "returned \"%s\"\n",                                 \

-                   (attr), (path), (val) ? (val) : "(null)")

-

-static struct udev_monitor *udev_monitor;

-

-static void

-device_added(struct udev_device *udev_device)

-{

-    const char *path, *name = NULL;

-    char *config_info = NULL;

-    const char *syspath;

-    const char *tags_prop;

-    const char *key, *value, *tmp;

-    InputOption *options = NULL, *tmpo;

-    InputAttributes attrs = {};

-    DeviceIntPtr dev = NULL;

-    struct udev_list_entry *set, *entry;

-    struct udev_device *parent;

-    int rc;

-

-    path = udev_device_get_devnode(udev_device);

-

-    syspath = udev_device_get_syspath(udev_device);

-

-    if (!path || !syspath)

-        return;

-

-    if (!udev_device_get_property_value(udev_device, "ID_INPUT")) {

-        LogMessageVerb(X_INFO, 10,

-                       "config/udev: ignoring device %s without "

-                       "property ID_INPUT set\n",

-                       path);

-        return;

-    }

-

-    options = calloc(sizeof(*options), 1);

-    if (!options)

-        return;

-

-    options->key = strdup("_source");

-    options->value = strdup("server/udev");

-    if (!options->key || !options->value)

-        goto unwind;

-

-    parent = udev_device_get_parent(udev_device);

-    if (parent) {

-        const char *ppath = udev_device_get_devnode(parent);

-        const char *product = udev_device_get_property_value(parent, "PRODUCT");

-        const char *pnp_id = udev_device_get_sysattr_value(parent, "id");

-        unsigned int usb_vendor, usb_model;

-

-        name = udev_device_get_sysattr_value(parent, "name");

-        LOG_SYSATTR(ppath, "name", name);

-        if (!name) {

-            name = udev_device_get_property_value(parent, "NAME");

-            LOG_PROPERTY(ppath, "NAME", name);

-        }

-

-        if (pnp_id)

-            attrs.pnp_id = strdup(pnp_id);

-        LOG_SYSATTR(ppath, "id", pnp_id);

-

-        /* construct USB ID in lowercase hex - "0000:ffff" */

-        if (product && sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) {

-            if (asprintf(&attrs.usb_id, "%04x:%04x", usb_vendor, usb_model)

-                == -1)

-                attrs.usb_id = NULL;

-            else

-                LOG_PROPERTY(path, "PRODUCT", product);

-        }

-    }

-    if (!name)

-        name = "(unnamed)";

-    else

-        attrs.product = strdup(name);

-    add_option(&options, "name", name);

-

-    add_option(&options, "path", path);

-    add_option(&options, "device", path);

-    if (path)

-        attrs.device = strdup(path);

-

-    tags_prop = udev_device_get_property_value(udev_device, "ID_INPUT.tags");

-    LOG_PROPERTY(path, "ID_INPUT.tags", tags_prop);

-    attrs.tags = xstrtokenize(tags_prop, ",");

-

-    if (asprintf(&config_info, "udev:%s", syspath) == -1) {

-        config_info = NULL;

-        goto unwind;

-    }

-

-    if (device_is_duplicate(config_info)) {

-        LogMessage(X_WARNING, "config/udev: device %s already added. "

-                              "Ignoring.\n", name);

-        goto unwind;

-    }

-

-    set = udev_device_get_properties_list_entry(udev_device);

-    udev_list_entry_foreach(entry, set) {

-        key = udev_list_entry_get_name(entry);

-        if (!key)

-            continue;

-        value = udev_list_entry_get_value(entry);

-        if (!strncasecmp(key, UDEV_XKB_PROP_KEY,

-                                sizeof(UDEV_XKB_PROP_KEY) - 1)) {

-            LOG_PROPERTY(path, key, value);

-            tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1;

-            if (!strcasecmp(tmp, "rules"))

-                add_option(&options, "xkb_rules", value);

-            else if (!strcasecmp(tmp, "layout"))

-                add_option(&options, "xkb_layout", value);

-            else if (!strcasecmp(tmp, "variant"))

-                add_option(&options, "xkb_variant", value);

-            else if (!strcasecmp(tmp, "model"))

-                add_option(&options, "xkb_model", value);

-            else if (!strcasecmp(tmp, "options"))

-                add_option(&options, "xkb_options", value);

-        } else if (!strcmp(key, "ID_VENDOR")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.vendor = strdup(value);

-        } else if (!strcmp(key, "ID_INPUT_KEY")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_KEYBOARD;

-        } else if (!strcmp(key, "ID_INPUT_MOUSE")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_POINTER;

-        } else if (!strcmp(key, "ID_INPUT_JOYSTICK")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_JOYSTICK;

-        } else if (!strcmp(key, "ID_INPUT_TABLET")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_TABLET;

-        } else if (!strcmp(key, "ID_INPUT_TOUCHPAD")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_TOUCHPAD;

-        } else if (!strcmp(key, "ID_INPUT_TOUCHSCREEN")) {

-            LOG_PROPERTY(path, key, value);

-            attrs.flags |= ATTR_TOUCHSCREEN;

-        }

-    }

-

-    add_option(&options, "config_info", config_info);

-

-    LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n",

-               name, path);

-    rc = NewInputDeviceRequest(options, &attrs, &dev);

-    if (rc != Success)

-        goto unwind;

-

- unwind:

-    free(config_info);

-    while ((tmpo = options)) {

-        options = tmpo->next;

-        free(tmpo->key);        /* NULL if dev != NULL */

-        free(tmpo->value);      /* NULL if dev != NULL */

-        free(tmpo);

-    }

-

-    free(attrs.usb_id);

-    free(attrs.pnp_id);

-    free(attrs.product);

-    free(attrs.device);

-    free(attrs.vendor);

-    if (attrs.tags) {

-        char **tag = attrs.tags;

-        while (*tag) {

-            free(*tag);

-            tag++;

-        }

-        free(attrs.tags);

-    }

-

-    return;

-}

-

-static void

-device_removed(struct udev_device *device)

-{

-    char *value;

-    const char *syspath = udev_device_get_syspath(device);

-

-    if (asprintf(&value, "udev:%s", syspath) == -1)

-        return;

-

-    remove_devices("udev", value);

-

-    free(value);

-}

-

-static void

-wakeup_handler(pointer data, int err, pointer read_mask)

-{

-    int udev_fd = udev_monitor_get_fd(udev_monitor);

-    struct udev_device *udev_device;

-    const char *action;

-

-    if (err < 0)

-        return;

-

-    if (FD_ISSET(udev_fd, (fd_set *)read_mask)) {

-        udev_device = udev_monitor_receive_device(udev_monitor);

-        if (!udev_device)

-            return;

-        action = udev_device_get_action(udev_device);

-        if (action) {

-            if (!strcmp(action, "add"))

-                device_added(udev_device);

-            else if (!strcmp(action, "remove"))

-                device_removed(udev_device);

-        }

-        udev_device_unref(udev_device);

-    }

-}

-

-static void

-block_handler(pointer data, struct timeval **tv, pointer read_mask)

-{

-}

-

-int

-config_udev_init(void)

-{

-    struct udev *udev;

-    struct udev_enumerate *enumerate;

-    struct udev_list_entry *devices, *device;

-

-    udev = udev_new();

-    if (!udev)

-        return 0;

-    udev_monitor = udev_monitor_new_from_netlink(udev, "udev");

-    if (!udev_monitor)

-        return 0;

-

-    if (udev_monitor_enable_receiving(udev_monitor)) {

-        ErrorF("config/udev: failed to bind the udev monitor\n");

-        return 0;

-    }

-

-    enumerate = udev_enumerate_new(udev);

-    if (!enumerate)

-        return 0;

-    udev_enumerate_scan_devices(enumerate);

-    devices = udev_enumerate_get_list_entry(enumerate);

-    udev_list_entry_foreach(device, devices) {

-        const char *syspath = udev_list_entry_get_name(device);

-        struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath);

-        device_added(udev_device);

-        udev_device_unref(udev_device);

-    }

-    udev_enumerate_unref(enumerate);

-

-    RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);

-    AddGeneralSocket(udev_monitor_get_fd(udev_monitor));

-

-    return 1;

-}

-

-void

-config_udev_fini(void)

-{

-    struct udev *udev;

-

-    if (!udev_monitor)

-        return;

-

-    udev = udev_monitor_get_udev(udev_monitor);

-

-    RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor));

-    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);

-    udev_monitor_unref(udev_monitor);

-    udev_monitor = NULL;

-    udev_unref(udev);

-}

+/*
+ * Copyright © 2009 Julien Cristau
+ *
+ * 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
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Julien Cristau <jcristau@debian.org>
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <libudev.h>
+#include <ctype.h>
+
+#include "input.h"
+#include "inputstr.h"
+#include "hotplug.h"
+#include "config-backends.h"
+#include "os.h"
+
+#define UDEV_XKB_PROP_KEY "xkb"
+
+#define LOG_PROPERTY(path, prop, val)                                   \
+    LogMessageVerb(X_INFO, 10,                                          \
+                   "config/udev: getting property %s on %s "            \
+                   "returned \"%s\"\n",                                 \
+                   (prop), (path), (val) ? (val) : "(null)")
+#define LOG_SYSATTR(path, attr, val)                                    \
+    LogMessageVerb(X_INFO, 10,                                          \
+                   "config/udev: getting attribute %s on %s "           \
+                   "returned \"%s\"\n",                                 \
+                   (attr), (path), (val) ? (val) : "(null)")
+
+static struct udev_monitor *udev_monitor;
+
+static void
+device_added(struct udev_device *udev_device)
+{
+    const char *path, *name = NULL;
+    char *config_info = NULL;
+    const char *syspath;
+    const char *tags_prop;
+    const char *key, *value, *tmp;
+    InputOption *options = NULL, *tmpo;
+    InputAttributes attrs = {};
+    DeviceIntPtr dev = NULL;
+    struct udev_list_entry *set, *entry;
+    struct udev_device *parent;
+    int rc;
+
+    path = udev_device_get_devnode(udev_device);
+
+    syspath = udev_device_get_syspath(udev_device);
+
+    if (!path || !syspath)
+        return;
+
+    if (!udev_device_get_property_value(udev_device, "ID_INPUT")) {
+        LogMessageVerb(X_INFO, 10,
+                       "config/udev: ignoring device %s without "
+                       "property ID_INPUT set\n",
+                       path);
+        return;
+    }
+
+    options = calloc(sizeof(*options), 1);
+    if (!options)
+        return;
+
+    options->key = strdup("_source");
+    options->value = strdup("server/udev");
+    if (!options->key || !options->value)
+        goto unwind;
+
+    parent = udev_device_get_parent(udev_device);
+    if (parent) {
+        const char *ppath = udev_device_get_devnode(parent);
+        const char *product = udev_device_get_property_value(parent, "PRODUCT");
+        const char *pnp_id = udev_device_get_sysattr_value(parent, "id");
+        unsigned int usb_vendor, usb_model;
+
+        name = udev_device_get_sysattr_value(parent, "name");
+        LOG_SYSATTR(ppath, "name", name);
+        if (!name) {
+            name = udev_device_get_property_value(parent, "NAME");
+            LOG_PROPERTY(ppath, "NAME", name);
+        }
+
+        if (pnp_id)
+            attrs.pnp_id = strdup(pnp_id);
+        LOG_SYSATTR(ppath, "id", pnp_id);
+
+        /* construct USB ID in lowercase hex - "0000:ffff" */
+        if (product && sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) {
+            if (asprintf(&attrs.usb_id, "%04x:%04x", usb_vendor, usb_model)
+                == -1)
+                attrs.usb_id = NULL;
+            else
+                LOG_PROPERTY(path, "PRODUCT", product);
+        }
+    }
+    if (!name)
+        name = "(unnamed)";
+    else
+        attrs.product = strdup(name);
+    add_option(&options, "name", name);
+
+    add_option(&options, "path", path);
+    add_option(&options, "device", path);
+    if (path)
+        attrs.device = strdup(path);
+
+    tags_prop = udev_device_get_property_value(udev_device, "ID_INPUT.tags");
+    LOG_PROPERTY(path, "ID_INPUT.tags", tags_prop);
+    attrs.tags = xstrtokenize(tags_prop, ",");
+
+    if (asprintf(&config_info, "udev:%s", syspath) == -1) {
+        config_info = NULL;
+        goto unwind;
+    }
+
+    if (device_is_duplicate(config_info)) {
+        LogMessage(X_WARNING, "config/udev: device %s already added. "
+                              "Ignoring.\n", name);
+        goto unwind;
+    }
+
+    set = udev_device_get_properties_list_entry(udev_device);
+    udev_list_entry_foreach(entry, set) {
+        key = udev_list_entry_get_name(entry);
+        if (!key)
+            continue;
+        value = udev_list_entry_get_value(entry);
+        if (!strncasecmp(key, UDEV_XKB_PROP_KEY,
+                                sizeof(UDEV_XKB_PROP_KEY) - 1)) {
+            LOG_PROPERTY(path, key, value);
+            tmp = key + sizeof(UDEV_XKB_PROP_KEY) - 1;
+            if (!strcasecmp(tmp, "rules"))
+                add_option(&options, "xkb_rules", value);
+            else if (!strcasecmp(tmp, "layout"))
+                add_option(&options, "xkb_layout", value);
+            else if (!strcasecmp(tmp, "variant"))
+                add_option(&options, "xkb_variant", value);
+            else if (!strcasecmp(tmp, "model"))
+                add_option(&options, "xkb_model", value);
+            else if (!strcasecmp(tmp, "options"))
+                add_option(&options, "xkb_options", value);
+        } else if (!strcmp(key, "ID_VENDOR")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.vendor = strdup(value);
+        } else if (!strcmp(key, "ID_INPUT_KEY")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_KEYBOARD;
+        } else if (!strcmp(key, "ID_INPUT_MOUSE")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_POINTER;
+        } else if (!strcmp(key, "ID_INPUT_JOYSTICK")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_JOYSTICK;
+        } else if (!strcmp(key, "ID_INPUT_TABLET")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_TABLET;
+        } else if (!strcmp(key, "ID_INPUT_TOUCHPAD")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_TOUCHPAD;
+        } else if (!strcmp(key, "ID_INPUT_TOUCHSCREEN")) {
+            LOG_PROPERTY(path, key, value);
+            attrs.flags |= ATTR_TOUCHSCREEN;
+        }
+    }
+
+    add_option(&options, "config_info", config_info);
+
+    LogMessage(X_INFO, "config/udev: Adding input device %s (%s)\n",
+               name, path);
+    rc = NewInputDeviceRequest(options, &attrs, &dev);
+    if (rc != Success)
+        goto unwind;
+
+ unwind:
+    free(config_info);
+    while ((tmpo = options)) {
+        options = tmpo->next;
+        free(tmpo->key);        /* NULL if dev != NULL */
+        free(tmpo->value);      /* NULL if dev != NULL */
+        free(tmpo);
+    }
+
+    free(attrs.usb_id);
+    free(attrs.pnp_id);
+    free(attrs.product);
+    free(attrs.device);
+    free(attrs.vendor);
+    if (attrs.tags) {
+        char **tag = attrs.tags;
+        while (*tag) {
+            free(*tag);
+            tag++;
+        }
+        free(attrs.tags);
+    }
+
+    return;
+}
+
+static void
+device_removed(struct udev_device *device)
+{
+    char *value;
+    const char *syspath = udev_device_get_syspath(device);
+
+    if (asprintf(&value, "udev:%s", syspath) == -1)
+        return;
+
+    remove_devices("udev", value);
+
+    free(value);
+}
+
+static void
+wakeup_handler(pointer data, int err, pointer read_mask)
+{
+    int udev_fd = udev_monitor_get_fd(udev_monitor);
+    struct udev_device *udev_device;
+    const char *action;
+
+    if (err < 0)
+        return;
+
+    if (FD_ISSET(udev_fd, (fd_set *)read_mask)) {
+        udev_device = udev_monitor_receive_device(udev_monitor);
+        if (!udev_device)
+            return;
+        action = udev_device_get_action(udev_device);
+        if (action) {
+            if (!strcmp(action, "add"))
+                device_added(udev_device);
+            else if (!strcmp(action, "remove"))
+                device_removed(udev_device);
+            else if (!strcmp(action, "change")) {
+                device_removed(udev_device);
+                device_added(udev_device);
+            }
+        }
+        udev_device_unref(udev_device);
+    }
+}
+
+static void
+block_handler(pointer data, struct timeval **tv, pointer read_mask)
+{
+}
+
+int
+config_udev_init(void)
+{
+    struct udev *udev;
+    struct udev_enumerate *enumerate;
+    struct udev_list_entry *devices, *device;
+
+    udev = udev_new();
+    if (!udev)
+        return 0;
+    udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
+    if (!udev_monitor)
+        return 0;
+
+    if (udev_monitor_enable_receiving(udev_monitor)) {
+        ErrorF("config/udev: failed to bind the udev monitor\n");
+        return 0;
+    }
+
+    enumerate = udev_enumerate_new(udev);
+    if (!enumerate)
+        return 0;
+    udev_enumerate_scan_devices(enumerate);
+    devices = udev_enumerate_get_list_entry(enumerate);
+    udev_list_entry_foreach(device, devices) {
+        const char *syspath = udev_list_entry_get_name(device);
+        struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath);
+        device_added(udev_device);
+        udev_device_unref(udev_device);
+    }
+    udev_enumerate_unref(enumerate);
+
+    RegisterBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
+    AddGeneralSocket(udev_monitor_get_fd(udev_monitor));
+
+    return 1;
+}
+
+void
+config_udev_fini(void)
+{
+    struct udev *udev;
+
+    if (!udev_monitor)
+        return;
+
+    udev = udev_monitor_get_udev(udev_monitor);
+
+    RemoveGeneralSocket(udev_monitor_get_fd(udev_monitor));
+    RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, NULL);
+    udev_monitor_unref(udev_monitor);
+    udev_monitor = NULL;
+    udev_unref(udev);
+}
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 6e12f3555..9e04ff015 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -1,2226 +1,2229 @@
-dnl Copyright © 2003-2007 Keith Packard, Daniel Stone

-dnl

-dnl Permission is hereby granted, free of charge, to any person obtaining a

-dnl copy of this software and associated documentation files (the "Software"),

-dnl to deal in the Software without restriction, including without limitation

-dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,

-dnl and/or sell copies of the Software, and to permit persons to whom the

-dnl Software is furnished to do so, subject to the following conditions:

-dnl

-dnl The above copyright notice and this permission notice (including the next

-dnl paragraph) shall be included in all copies or substantial portions of the

-dnl Software.

-dnl

-dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

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

-dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

-dnl DEALINGS IN THE SOFTWARE.

-dnl

-dnl Authors: Keith Packard <keithp@keithp.com>

-dnl          Daniel Stone <daniel@fooishbar.org>

-dnl          an unwitting cast of miscellaneous others

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ(2.57)

-AC_INIT([xorg-server], 1.10.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)

-RELEASE_DATE="unreleased"

-AC_CONFIG_SRCDIR([Makefile.am])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-# Require xorg-macros minimum of 1.13 for XORG_ENABLE_UNIT_TESTS

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.10)

-XORG_DEFAULT_OPTIONS

-XORG_WITH_DOXYGEN(1.6.1)

-XORG_CHECK_SGML_DOCTOOLS(1.5)

-XORG_ENABLE_DOCS

-XORG_ENABLE_DEVEL_DOCS

-XORG_WITH_XMLTO(0.0.20)

-XORG_WITH_FOP

-XORG_ENABLE_UNIT_TESTS

-XORG_WITH_GLIB

-XORG_LD_WRAP

-

-m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])

-XORG_FONT_MACROS_VERSION(1.1)

-

-dnl this gets generated by autoheader, and thus contains all the defines.  we

-dnl don't ever actually use it, internally.

-AC_CONFIG_HEADERS(include/do-not-use-config.h)

-dnl xorg-server.h is an external header, designed to be included by loadable

-dnl drivers.

-AC_CONFIG_HEADERS(include/xorg-server.h)

-dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just

-dnl dix/).

-AC_CONFIG_HEADERS(include/dix-config.h)

-dnl xorg-config.h covers the Xorg DDX.

-AC_CONFIG_HEADERS(include/xorg-config.h)

-dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.

-AC_CONFIG_HEADERS(include/xkb-config.h)

-dnl xwin-config.h covers the XWin DDX.

-AC_CONFIG_HEADERS(include/xwin-config.h)

-dnl kdrive-config.h covers the kdrive DDX

-AC_CONFIG_HEADERS(include/kdrive-config.h)

-dnl version-config.h covers the version numbers so they can be bumped without

-dnl forcing an entire recompile.x

-AC_CONFIG_HEADERS(include/version-config.h)

-

-AM_PROG_AS

-AC_PROG_LN_S

-AC_LIBTOOL_WIN32_DLL

-AC_DISABLE_STATIC

-AC_PROG_LIBTOOL

-AC_PROG_MAKE_SET

-PKG_PROG_PKG_CONFIG

-AC_PROG_LEX

-AC_PROG_YACC

-AC_SYS_LARGEFILE

-XORG_PROG_RAWCPP

-

-# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow

-# easier overrides at build time.

-XSERVER_CFLAGS='$(CWARNFLAGS)'

-

-dnl Check for dtrace program (needed to build Xserver dtrace probes)

-dnl Also checks for <sys/sdt.h>, since some Linux distros have an 

-dnl ISDN trace program named dtrace

-AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],

-	     [Enable dtrace probes (default: enabled if dtrace found)]),

-	     [WDTRACE=$withval], [WDTRACE=auto])

-if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then

-	AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])

-	if test "x$DTRACE" = "xnot_found" ; then

-		if test "x$WDTRACE" = "xyes" ; then

-			AC_MSG_FAILURE([dtrace requested but not found])

-		fi

-		WDTRACE="no"

-	else

-		AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])

-		if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then

-			WDTRACE="no"

-		fi

-	fi

-fi

-if test "x$WDTRACE" != "xno" ; then

-  AC_DEFINE(XSERVER_DTRACE, 1, 

-      [Define to 1 if the DTrace Xserver provider probes should be built in.])

-

-# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into

-# object files, and require linking with those as relocatable objects, not .a

-# archives. MacOS X handles all this in the normal compiler toolchain, and on

-# some releases (like Tiger), will error out on dtrace -G.  For now, other

-# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux

-# ports appear to, based on my web searches, but have not yet been tested).

-	case $host_os in

-		darwin*)	SPECIAL_DTRACE_OBJECTS=no ;;

-		*)		SPECIAL_DTRACE_OBJECTS=yes ;;

-	esac

-fi

-AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])

-AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"])

-

-AC_HEADER_DIRENT

-AC_HEADER_STDC

-AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h fnmatch.h sys/utsname.h])

-

-dnl Checks for typedefs, structures, and compiler characteristics.

-AC_C_CONST

-AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])

-

-AC_CHECK_SIZEOF([unsigned long])

-if test "$ac_cv_sizeof_unsigned_long" = 8; then

-	AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.])

-fi

-

-AC_TYPE_PID_T

-

-# Checks for headers/macros for byte swapping

-# Known variants:

-#	<byteswap.h> bswap_16, bswap_32, bswap_64  (glibc)

-#	<sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)

-#	<sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)

-#	and a fallback to local macros if none of the above are found

-

-# if <byteswap.h> is found, assume it's the correct version

-AC_CHECK_HEADERS([byteswap.h])

-

-# if <sys/endian.h> is found, have to check which version

-AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"], [HAVE_SYS_ENDIAN_H="no"])

-

-if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then

-	AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping macros])

-	AC_LINK_IFELSE([AC_LANG_PROGRAM([

-#include <sys/types.h>

-#include <sys/endian.h>

- ], [

-int a = 1, b;

-b = __swap16(a);

- ])

-], [SYS_ENDIAN__SWAP='yes'], [SYS_ENDIAN__SWAP='no'])

-	AC_MSG_RESULT([$SYS_ENDIAN__SWAP])

-

-	AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])

-	AC_LINK_IFELSE([AC_LANG_PROGRAM([

-#include <sys/types.h>

-#include <sys/endian.h>

- ], [

-int a = 1, b;

-b = bswap16(a);

- ])

-], [SYS_ENDIAN_BSWAP='yes'], [SYS_ENDIAN_BSWAP='no'])

-	AC_MSG_RESULT([$SYS_ENDIAN_BSWAP])

-

-    	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then

-		USE_SYS_ENDIAN_H=yes

-		BSWAP=bswap

-	else	

-	    	if test "$SYS_ENDIAN__SWAP" = "yes" ; then

-			USE_SYS_ENDIAN_H=yes

-			BSWAP=__swap

-		else

-			USE_SYS_ENDIAN_H=no

-		fi

-	fi

-

-	if test "$USE_SYS_ENDIAN_H" = "yes" ; then

-	    AC_DEFINE([USE_SYS_ENDIAN_H], 1, 

-		[Define to use byteswap macros from <sys/endian.h>])

-	    AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, 

-			[Define to 16-bit byteswap macro])

-	    AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, 

-			[Define to 32-bit byteswap macro])

-	    AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, 

-			[Define to 64-bit byteswap macro])

-	fi

-fi

-

-dnl Check to see if dlopen is in default libraries (like Solaris, which

-dnl has it in libc), or if libdl is needed to get it.

-AC_CHECK_FUNC([dlopen], [],

-	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))

-AC_SUBST(DLOPEN_LIBS)

-

-dnl Checks for library functions.

-AC_FUNC_VPRINTF

-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \

-		strtol getopt getopt_long vsnprintf walkcontext backtrace \

-		getisax getzoneid shmctl64 strcasestr ffs vasprintf])

-AC_FUNC_ALLOCA

-dnl Old HAS_* names used in os/*.c.

-AC_CHECK_FUNC([getdtablesize],

-	AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))

-AC_CHECK_FUNC([getifaddrs],

-	AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))

-AC_CHECK_FUNC([getpeereid],

-	AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))

-AC_CHECK_FUNC([getpeerucred],

-	AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))

-AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)

-AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])	

-AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))

-

-AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])

-

-dnl Check for mmap support for Xvfb

-AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))

-

-dnl Find the math libary

-AC_CHECK_LIB(m, sqrt)

-AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))

-

-AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])

-

-dnl AGPGART headers

-AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)

-AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])

-

-dnl APM header

-AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)

-AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])

-

-dnl fbdev header

-AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)

-AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])

-

-dnl MTRR header

-AC_CHECK_HEADERS([asm/mtrr.h], ac_cv_asm_mtrr_h=yes)

-if test "x$ac_cv_asm_mtrr_h" = xyes; then

-	HAVE_MTRR=yes

-fi

-

-dnl BSD MTRR header

-AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes)

-if test "x$ac_cv_memrange_h" = xyes; then

-	HAVE_MTRR=yes

-fi

-

-if test "x$HAVE_MTRR" = xyes; then

-	AC_DEFINE(HAS_MTRR_SUPPORT, 1, [MTRR support available])

-fi

-

-dnl A NetBSD MTRR header

-AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_machine_mtrr_h=yes)

-if test "x$ac_cv_machine_mtrr_h" = xyes; then

-	AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR

-		support is available])

-fi

-

-dnl FreeBSD kldload support (sys/linker.h)

-AC_CHECK_HEADERS([sys/linker.h],

-	[ac_cv_sys_linker_h=yes],

-	[ac_cv_sys_linker_h=no],

-	[#include <sys/param.h>])

-AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes])

-

-AC_CACHE_CHECK([for SYSV IPC],

-		ac_cv_sysv_ipc,

-		[AC_TRY_LINK([

-#include <sys/types.h>

-#include <sys/ipc.h>

-#include <sys/shm.h>

-],[

-{ 

-    int id;

-    id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);

-    if (id < 0) return -1;

-    return shmctl(id, IPC_RMID, 0);

-}],

-	[ac_cv_sysv_ipc=yes],

-	[ac_cv_sysv_ipc=no])])

-if test "x$ac_cv_sysv_ipc" = xyes; then

-	AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available])

-fi

-

-dnl OpenBSD /dev/xf86 aperture driver 

-if test -c /dev/xf86 ; then

-	AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])

-fi

-

-dnl BSD APM support 

-AC_CHECK_HEADER([machine/apmvar.h],[

-	AC_CHECK_HEADER([sys/event.h],

-		ac_cv_BSD_KQUEUE_APM=yes,

-		ac_cv_BSD_APM=yes)])

-

-AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])

-AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])

-	

-dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)

-AC_CHECK_HEADER([execinfo.h],[

-    AC_CHECK_LIB(c, backtrace, [

-        AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])

-        AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h])

-    ])]

-)

-

-dnl ---------------------------------------------------------------------------

-dnl Bus options and CPU capabilities.  Replaces logic in

-dnl hw/xfree86/os-support/bus/Makefile.am, among others.

-dnl ---------------------------------------------------------------------------

-DEFAULT_INT10="x86emu"

-

-dnl Override defaults as needed for specific platforms:

-

-case $host_cpu in

-  alpha*)

-	ALPHA_VIDEO=yes

-	case $host_os in

-	        *freebsd*)	SYS_LIBS=-lio ;;

-		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;

-	esac

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"

-	;;

-  arm*)

-	ARM_VIDEO=yes

-	;;

-  i*86)

-	I386_VIDEO=yes

-	case $host_os in

-		*freebsd*)	AC_DEFINE(USE_DEV_IO) ;;

-		*dragonfly*)	AC_DEFINE(USE_DEV_IO) ;;

-		*netbsd*)	AC_DEFINE(USE_I386_IOPL)

-				SYS_LIBS=-li386

-				;;

-		*openbsd*)	AC_DEFINE(USE_I386_IOPL) 

-				SYS_LIBS=-li386

-				;;

-	esac

-        ;;

-  powerpc*)

-	PPC_VIDEO=yes

-	case $host_os in

-		*freebsd*)	DEFAULT_INT10=stub ;;

-	esac

-	;;

-  sparc*)

-	SPARC64_VIDEO=yes

-	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  x86_64*|amd64*)

-	I386_VIDEO=yes

-	case $host_os in

-		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;

-		*dragonfly*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;

-		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])

-				SYS_LIBS=-lx86_64

-				;;

-		*openbsd*)	AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])

-				SYS_LIBS=-lamd64

-				;;

-	esac

-	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  ia64*)

-  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-  s390*)

-  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"

-	;;

-esac

-AC_SUBST(GLX_ARCH_DEFINES)

-

-dnl BSD *_video.c selection

-AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])

-AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])

-AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])

-AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])

-AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])

-

-DRI=no

-USE_SIGIO_BY_DEFAULT="yes"

-dnl it would be nice to autodetect these *CONS_SUPPORTs

-case $host_os in

-  *freebsd* | *dragonfly*)

-	case $host_os in

-		kfreebsd*-gnu) ;;

-		*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;

-	esac

-	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])

-	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])

-	DRI=yes

-	;;

-  *netbsd*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])

-	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])

-	DRI=yes

-	;;

-  *openbsd*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])

-	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])

-	;;

-  *linux*)

-	DRI=yes

-	;;

-  *solaris*)

-	PKG_CHECK_EXISTS(libdrm, DRI=yes, DRI=no)

-	# Disable use of SIGIO by default until some system bugs are

-	# fixed - see Sun/OpenSolaris bug id 6879897

-	USE_SIGIO_BY_DEFAULT="no"

-	;;

-  darwin*)

-	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])

-	;;

-  cygwin*)

-	CFLAGS="$CFLAGS -DFD_SETSIZE=256"

-	;;

-esac

-

-dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the

-dnl major number

-PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`

-PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`

-if test "x$PVS" = "x"; then

-	PVS="0"

-fi

-

-VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)"

-VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}"

-

-VENDOR_NAME="The X.Org Foundation"

-VENDOR_NAME_SHORT="X.Org"

-VENDOR_WEB="http://wiki.x.org"

-

-m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])

-

-dnl Build options.

-AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],

-		  [Obsolete - use --enable-strict-compilation instead]),

-  AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))

-

-AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],

-				  [Enable debugging (default: disabled)]),

-			        [DEBUGGING=$enableval], [DEBUGGING=no])

-AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]

-  [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),

-                                [USE_SIGIO_BY_DEFAULT=$enableval], [])

-AC_ARG_WITH(int10,           AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),

-				[INT10="$withval"],

-				[INT10="$DEFAULT_INT10"])

-AC_ARG_WITH(vendor-name,     AS_HELP_STRING([--with-vendor-name=VENDOR],

-				  [Vendor string reported by the server]),

-				[ VENDOR_NAME="$withval" ], [])

-AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR],

-				  [Short version of vendor string reported by the server]),

-				[ VENDOR_NAME_SHORT="$withval" ], [])

-AC_ARG_WITH(vendor-web,      AS_HELP_STRING([--with-vendor-web=URL],

-				  [Vendor web address reported by the server]),

-				[ VENDOR_WEB="$withval" ], [])

-AC_ARG_WITH(module-dir,      AS_HELP_STRING([--with-module-dir=DIR],

-				  [Directory where modules are installed (default: $libdir/xorg/modules)]),

-				[ moduledir="$withval" ],

-				[ moduledir="${libdir}/xorg/modules" ])

-AC_ARG_WITH(log-dir,         AS_HELP_STRING([--with-log-dir=DIR],

-				  [Directory where log files are kept (default: $localstatedir/log)]),

-				[ logdir="$withval" ],

-				[ logdir="$localstatedir/log" ])

-AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],

-				  [Builder address (default: xorg@lists.freedesktop.org)]),

-				[ BUILDERADDR="$withval" ],

-				[ BUILDERADDR="xorg@lists.freedesktop.org" ])

-AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),

-				[ OSNAME="$withval" ],

-				[ OSNAME=`uname -srm` ])

-AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),

-				[ OSVENDOR="$withval" ],

-				[ OSVENDOR="" ])

-AC_ARG_WITH(builderstring,   AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),

-				[ BUILDERSTRING="$withval" ]

-				[ ])

-

-dnl Determine font path

-XORG_FONTROOTDIR

-XORG_FONTSUBDIR(FONTMISCDIR, fontmiscdir, misc)

-XORG_FONTSUBDIR(FONTOTFDIR, fontotfdir, OTF)

-XORG_FONTSUBDIR(FONTTTFDIR, fontttfdir, TTF)

-XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)

-XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)

-XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)

-

-dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,

-dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross

-dnl compiling, assume default font path uses standard FONTROOTDIR directories.

-DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"

-if test "$cross_compiling" != yes; then

-	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],

-		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],

-		[case $host_os in

-			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;

-		esac])

-fi

-AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),

-				[ FONTPATH="$withval" ],

-				[ FONTPATH="${DEFAULT_FONT_PATH}" ])

-

-AC_MSG_CHECKING([for default font path])

-AC_MSG_RESULT([$FONTPATH])

-

-AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),

-				[ XKBPATH="$withval" ],

-				[ XKBPATH="${datadir}/X11/xkb" ])

-AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),

-				[ XKBOUTPUT="$withval" ],

-				[ XKBOUTPUT="compiled" ])

-AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],

-                                   [Keyboard ruleset (default: base/evdev)]),

-                                [ XKB_DFLT_RULES="$withval" ],

-                                [ XKB_DFLT_RULES="" ])

-AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL],

-                                   [Keyboard model (default: pc105)]),

-                                [ XKB_DFLT_MODEL="$withval" ],

-                                [ XKB_DFLT_MODEL="pc105" ])

-AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT],

-                                   [Keyboard layout (default: us)]),

-                                [ XKB_DFLT_LAYOUT="$withval" ],

-                                [ XKB_DFLT_LAYOUT="us" ])

-AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT],

-                                   [Keyboard variant (default: (none))]),

-                                [ XKB_DFLT_VARIANT="$withval" ],

-                                [ XKB_DFLT_VARIANT="" ])

-AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS],

-                                   [Keyboard layout options (default: (none))]),

-                                [ XKB_DFLT_OPTIONS="$withval" ],

-                                [ XKB_DFLT_OPTIONS="" ])

-AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],

-				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),

-				[ SERVERCONFIG="$withval" ],

-				[ SERVERCONFIG="${libdir}/xorg" ])

-AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),

-				[ APPLE_APPLICATIONS_DIR="${withval}" ],

-				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])

-AC_SUBST([APPLE_APPLICATIONS_DIR])

-AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]),

-				[ APPLE_APPLICATION_NAME="${withval}" ],

-				[ APPLE_APPLICATION_NAME="X11" ])

-AC_SUBST([APPLE_APPLICATION_NAME])

-AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),

-                                [ LAUNCHD_ID_PREFIX="${withval}" ],

-                                [ LAUNCHD_ID_PREFIX="org.x" ])

-AC_SUBST([LAUNCHD_ID_PREFIX])

-AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$LAUNCHD_ID_PREFIX", [Prefix to use for launchd identifiers])

-AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),

-				[ XQUARTZ_SPARKLE="${enableval}" ],

-				[ XQUARTZ_SPARKLE="no" ])

-AC_SUBST([XQUARTZ_SPARKLE])

-AC_ARG_ENABLE(install-libxf86config,

-				AS_HELP_STRING([--enable-install-libxf86config],

-				[Install libxf86config (default: disabled)]),

-				[INSTALL_LIBXF86CONFIG=$enableval],

-				[INSTALL_LIBXF86CONFIG=no])

-AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),

-				[SYMBOL_VISIBILITY=$enableval],

-				[SYMBOL_VISIBILITY=auto])

-AC_ARG_ENABLE(pc98,     	AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]),

-				[SUPPORT_PC98=$enableval],

-				[SUPPORT_PC98=auto])

-

-dnl GLX build options

-AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),

-                                [AIGLX=$enableval],

-                                [AIGLX=yes])

-AX_TLS

-AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: auto)]),

-                                [GLX_USE_TLS=$enableval],

-                                [GLX_USE_TLS=no

-                                 if test "${ac_cv_tls}" != "none" ; then

-                                   GLX_USE_TLS=yes

-                                 fi])

-AC_SUBST(GLX_TLS, ${GLX_USE_TLS})

-

-dnl Extensions.

-AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])

-AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])

-AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])

-AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])

-AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])

-AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])

-AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])

-AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto])

-AC_ARG_ENABLE(screensaver,    AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes])

-AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])

-AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])

-AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])

-AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])

-AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])

-AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])

-AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])

-AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])

-AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])

-AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])

-AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])

-AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])

-AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])

-AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])

-AC_ARG_ENABLE(config-udev,    AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])

-AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])

-AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])

-AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])

-AC_ARG_ENABLE(xaa,               AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])

-AC_ARG_ENABLE(vgahw,          AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])

-AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])

-AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])

-AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])

-AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])

-AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])

-

-dnl DDXes.

-AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])

-AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])

-AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])

-AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])

-AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])

-AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])

-AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])

-dnl kdrive and its subsystems

-AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])

-AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])

-AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])

-AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])

-dnl kdrive options

-AC_ARG_ENABLE(kdrive-kbd,     AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto])

-AC_ARG_ENABLE(kdrive-mouse,   AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto])

-AC_ARG_ENABLE(kdrive-evdev,   AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto])

-

-

-dnl chown/chmod to be setuid root as part of build

-dnl Replaces InstallXserverSetUID in imake

-AC_ARG_ENABLE(install-setuid, 

-    AS_HELP_STRING([--enable-install-setuid],

-       [Install Xorg server as owned by root with setuid bit (default: auto)]),

-    [SETUID=$enableval], [SETUID=auto])

-AC_MSG_CHECKING([to see if we can install the Xorg server as root])

-if test "x$SETUID" = "xauto" ; then

-	case $host_os in

-	    cygwin*)		SETUID="no"  ;;

-	    darwin*)		SETUID="no"  ;;

-	    *)

-	   	case $host_cpu in

-		    sparc)	SETUID="no"  ;;

-		    *)		SETUID="yes" ;;

-		esac

-	esac

-	if test "x$SETUID" = xyes; then

-		touch testfile

-		chown root testfile > /dev/null 2>&1 || SETUID="no"

-		rm -f testfile

-	fi

-fi

-AC_MSG_RESULT([$SETUID])

-AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])

-

-dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro

-dnl was not expanded, since xorg-server with no transport types is rather useless.

-dnl

-dnl If you're seeing an error here, be sure you installed the lib/xtrans module

-dnl first and if it's not in the default location, that you set the ACLOCAL

-dnl environment variable to find it, such as:

-dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"

-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])

-

-# Transport selection macro from xtrans.m4

-XTRANS_CONNECTION_FLAGS

-

-# Secure RPC detection macro from xtrans.m4

-XTRANS_SECURE_RPC_FLAGS

-AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])

-

-AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])

-AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])

-AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])

-if test "x$INT10" = xyes; then

-	dnl VM86 headers

-	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])

-fi

-

-dnl Handle installing libxf86config

-AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])

-

-dnl DDX Detection... Yes, it's ugly to have it here... but we need to

-dnl handle this early on so that we don't require unsupported extensions

-case $host_os in

-	cygwin*)

-		DGA=no

-		DRI2=no

-		XF86VIDMODE=no

-		XSELINUX=no

-		XV=no

-		;;

-	darwin*)

-		DRI2=no

-

-		if test x$XQUARTZ = xauto; then

-			AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[

-		 		save_LDFLAGS=$LDFLAGS

-				LDFLAGS="$LDFLAGS -framework Carbon"

-				AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],

-				[xorg_cv_Carbon_framework=yes],

-				[xorg_cv_Carbon_framework=no])

-			LDFLAGS=$save_LDFLAGS])

-                

-			if test "X$xorg_cv_Carbon_framework" = Xyes; then

-				XQUARTZ=yes

-			else

-				XQUARTZ=no

-			fi

-		fi

-

-		if test "x$XQUARTZ" = xyes ; then

-			XQUARTZ=yes

-			XVFB=no

-			XNEST=no

-

-			COMPOSITE=no

-			DGA=no

-			DPMSExtension=no

-			XF86VIDMODE=no

-		fi

-		;;

-	*) XQUARTZ=no ;;

-esac

-

-dnl ---------------------------------------------------------------------------

-dnl Extension section

-dnl ---------------------------------------------------------------------------

-XEXT_INC='-I$(top_srcdir)/Xext'

-XEXT_LIB='$(top_builddir)/Xext/libXext.la'

-XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'

-

-dnl Optional modules

-VIDEOPROTO="videoproto"

-COMPOSITEPROTO="compositeproto >= 0.4"

-RECORDPROTO="recordproto >= 1.13.99.1"

-SCRNSAVERPROTO="scrnsaverproto >= 1.1"

-RESOURCEPROTO="resourceproto"

-DRIPROTO="xf86driproto >= 2.1.0"

-DRI2PROTO="dri2proto >= 2.3"

-XINERAMAPROTO="xineramaproto"

-BIGFONTPROTO="xf86bigfontproto >= 1.2.0"

-DGAPROTO="xf86dgaproto >= 2.0.99.1"

-GLPROTO="glproto >= 1.4.10"

-DMXPROTO="dmxproto >= 2.2.99.1"

-VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"

-WINDOWSWMPROTO="windowswmproto"

-APPLEWMPROTO="applewmproto >= 1.4"

-

-dnl Core modules for most extensions, et al.

-SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"

-# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc

-AC_SUBST(SDK_REQUIRED_MODULES)

-

-dnl List of libraries that require a specific version

-LIBAPPLEWM="applewm >= 1.4"

-LIBDMX="dmx >= 1.0.99.1"

-LIBDRI="dri >= 7.8.0"

-LIBDRM="libdrm >= 2.3.0"

-LIBGL="gl >= 7.1.0"

-LIBXEXT="xext >= 1.0.99.4"

-LIBXFONT="xfont >= 1.4.2"

-LIBXI="xi >= 1.2.99.1"

-LIBXTST="xtst >= 1.0.99.2"

-LIBPCIACCESS="pciaccess >= 0.8.0"

-LIBGLIB="glib-2.0 >= 2.16"

-LIBUDEV="libudev >= 143"

-LIBSELINUX="libselinux >= 2.0.86"

-LIBDBUS="dbus-1 >= 1.0"

-LIBPIXMAN="pixman-1 >= 0.21.6"

-

-dnl Pixman is always required, but we separate it out so we can link

-dnl specific modules against it

-PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)

-REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"

-

-REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"

-

-if test "x$CONFIG_UDEV" = xyes &&

- { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then

-	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])

-fi

-

-PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])

-if test "x$CONFIG_UDEV" = xauto; then

-	CONFIG_UDEV="$HAVE_LIBUDEV"

-fi

-AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])

-if test "x$CONFIG_UDEV" = xyes; then

-	CONFIG_DBUS_API=no

-	CONFIG_HAL=no

-	if ! test "x$HAVE_LIBUDEV" = xyes; then

-		AC_MSG_ERROR([udev configuration API requested, but libudev is not installed])

-	fi

-	AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])

-fi

-

-dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas

-dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config

-dnl API.

-PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])

-if test "x$HAVE_DBUS" = xyes; then

-	AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])

-fi

-AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])

-

-if test "x$CONFIG_DBUS_API" = xauto; then

-	CONFIG_DBUS_API="$HAVE_DBUS"

-fi

-if test "x$CONFIG_DBUS_API" = xyes; then

-	if ! test "x$HAVE_DBUS" = xyes; then

-		AC_MSG_ERROR([D-Bus configuration API requested, but D-Bus is not installed.])

-	fi

-

-	AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API])

-	CONFIG_NEED_DBUS="yes"

-fi

-AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])

-

-PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])

-if test "x$CONFIG_HAL" = xauto; then

-	CONFIG_HAL="$HAVE_HAL"

-fi

-if test "x$CONFIG_HAL" = xyes; then

-	if ! test "x$HAVE_HAL" = xyes; then

-		AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.])

-	fi

-

-	AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])

-	CONFIG_NEED_DBUS="yes"

-fi

-AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])

-

-if test "x$CONFIG_NEED_DBUS" = xyes; then

-        AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])

-fi

-AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])

-

-if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then

-	USE_SIGIO_BY_DEFAULT_VALUE=TRUE

-else

-	USE_SIGIO_BY_DEFAULT_VALUE=FALSE

-fi

-AC_DEFINE_UNQUOTED([USE_SIGIO_BY_DEFAULT], [$USE_SIGIO_BY_DEFAULT_VALUE],

-		   [Use SIGIO handlers for input device events by default])

-

-AC_MSG_CHECKING([for glibc...])

-AC_PREPROC_IFELSE([

-#include <features.h>

-#ifndef __GLIBC__

-#error

-#endif

-], glibc=yes, glibc=no)

-AC_MSG_RESULT([$glibc])

-

-AC_CHECK_FUNCS([clock_gettime], [have_clock_gettime=yes],

-               [AC_CHECK_LIB([rt], [clock_gettime], [have_clock_gettime=-lrt],

-                             [have_clock_gettime=no])])

-

-AC_MSG_CHECKING([for a useful monotonic clock ...])

-

-if ! test "x$have_clock_gettime" = xno; then

-    if ! test "x$have_clock_gettime" = xyes; then

-        CLOCK_LIBS="$have_clock_gettime"

-    else

-        CLOCK_LIBS=""

-    fi

-

-    LIBS_SAVE="$LIBS"

-    LIBS="$CLOCK_LIBS"

-    CPPFLAGS_SAVE="$CPPFLAGS"

-

-    if test x"$glibc" = xyes; then

-        CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"

-    fi

-

-    AC_RUN_IFELSE([

-#include <time.h>

-

-int main(int argc, char *argv[[]]) {

-    struct timespec tp;

-

-    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)

-        return 0;

-    else

-        return 1;

-}

-    ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],

-       [MONOTONIC_CLOCK="cross compiling"])

-

-    LIBS="$LIBS_SAVE"

-    CPPFLAGS="$CPPFLAGS_SAVE"

-else

-    MONOTONIC_CLOCK=no

-fi

-

-AC_MSG_RESULT([$MONOTONIC_CLOCK])

-

-if test "x$MONOTONIC_CLOCK" = xyes; then

-    AC_DEFINE(MONOTONIC_CLOCK, 1, [Have monotonic clock from clock_gettime()])

-    LIBS="$LIBS $CLOCK_LIBS"

-fi

-

-AM_CONDITIONAL(XV, [test "x$XV" = xyes])

-if test "x$XV" = xyes; then

-	AC_DEFINE(XV, 1, [Support Xv extension])

-	AC_DEFINE(XvExtension, 1, [Build Xv extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO"

-	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO"

-else

-	XVMC=no

-fi

-

-AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])

-if test "x$XVMC" = xyes; then

-	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])

-fi

-

-AM_CONDITIONAL(XREGISTRY, [test "x$XREGISTRY" = xyes])

-if test "x$XREGISTRY" = xyes; then

-	AC_DEFINE(XREGISTRY, 1, [Build registry module])

-fi

-

-AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])

-if test "x$COMPOSITE" = xyes; then

-	AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO"

-	COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'

-	COMPOSITE_INC='-I$(top_srcdir)/composite'

-fi

-

-AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])

-if test "x$MITSHM" = xyes; then

-	AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])

-	AC_DEFINE(HAS_SHM, 1, [Support SHM])

-fi

-

-AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes])

-if test "x$RECORD" = xyes; then

-	AC_DEFINE(XRECORD, 1, [Support Record extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO"

-	RECORD_LIB='$(top_builddir)/record/librecord.la'

-fi

-

-AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes])

-if test "x$SCREENSAVER" = xyes; then

-	AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO"

-fi

-

-AM_CONDITIONAL(RES, [test "x$RES" = xyes])

-if test "x$RES" = xyes; then

-	AC_DEFINE(RES, 1, [Support X resource extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"

-fi

-

-# The XRes extension may support client ID tracking only if it has

-# been specifically enabled. Client ID tracking is implicitly not

-# supported if XRes extension is disabled.

-AC_MSG_CHECKING([whether to track client ids])

-if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then

-	AC_DEFINE(CLIENTIDS, 1, [Support client ID tracking])

-else

-	CLIENTIDS=no

-fi

-AC_MSG_RESULT([$CLIENTIDS])

-AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])

-

-if test "x$GLX" = xyes; then

-	PKG_CHECK_MODULES([XLIB], [x11])

-	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)

-	AC_SUBST(XLIB_CFLAGS)

-	AC_DEFINE(GLXEXT, 1, [Build GLX extension])

-	GLX_LIBS='$(top_builddir)/glx/libglx.la'

-	GLX_SYS_LIBS="$GLX_SYS_LIBS"

-else

-        GLX=no

-fi

-AM_CONDITIONAL(GLX, test "x$GLX" = xyes)

-

-if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then

-	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])

-else

-	AIGLX=no

-fi

-AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)

-

-if test "x$GLX_USE_TLS" = xyes ; then

-	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"

-	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"

-fi

-AC_SUBST([GLX_DEFINES])

-

-AM_CONDITIONAL(DRI, test "x$DRI" = xyes)

-if test "x$DRI" = xyes; then

-	AC_DEFINE(XF86DRI, 1, [Build DRI extension])

-	PKG_CHECK_MODULES([DRIPROTO], [$DRIPROTO])

-	PKG_CHECK_MODULES([DRI], $GLPROTO $LIBDRI)

-	AC_SUBST(DRIPROTO_CFLAGS)

-fi

-

-PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO,

-                  [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])

-case "$DRI2,$HAVE_DRI2PROTO" in

-	yes,no)

-		AC_MSG_ERROR([DRI2 requested, but dri2proto not found.])

-		;;

-	yes,yes | auto,yes)

-		AC_DEFINE(DRI2, 1, [Build DRI2 extension])

-		DRI2=yes

-		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"

-		;;

-esac

-AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)

-

-if test "x$DRI" = xyes || test "x$DRI2" = xyes; then

-	if test "x$DRM" = xyes; then

-		AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])

-		PKG_CHECK_MODULES([LIBDRM], $LIBDRM)

-	fi

-fi

-

-if test "x$DRI2" = xyes; then

-	save_CFLAGS=$CFLAGS

-	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"

-	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>

-#include <GL/internal/dri_interface.h>

-#ifndef __DRI_DRI2

-#error DRI2 extension not available.

-#endif]])],

-			  [HAVE_DRI2EXTENSION=yes],

-			  [HAVE_DRI2EXTENSION=no])

-	CFLAGS=$save_CFLAGS

-	if test "x$HAVE_DRI2EXTENSION" = xyes; then

-		AC_DEFINE(DRI2_AIGLX, 1, [Build DRI2 AIGLX loader])

-		DRI2_AIGLX=yes

-	else

-		AC_MSG_NOTICE([DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h.])

-		DRI2_AIGLX=no

-	fi

-fi

-AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)

-

-

-AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])

-if test "x$XINERAMA" = xyes; then

-	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])

-	AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])

-	REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO"

-	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"

-fi

-

-AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])

-if test "x$XACE" = xyes; then

-	AC_DEFINE(XACE, 1, [Build X-ACE extension])

-fi

-

-AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])

-if test "x$XSELINUX" = xyes; then

-	if test "x$XACE" != xyes; then

-		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])

-	fi

-	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))

-	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))

-	PKG_CHECK_MODULES([SELINUX], $LIBSELINUX)

-	SELINUX_LIBS="$SELINUX_LIBS -laudit"

-	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])

-fi

-

-AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])

-if test "x$XCSECURITY" = xyes; then

-	if test "x$XACE" != xyes; then

-		AC_MSG_ERROR([cannot build Security extension without X-ACE])

-	fi

-	AC_DEFINE(XCSECURITY, 1, [Build Security extension])

-fi

-

-AM_CONDITIONAL(DBE, [test "x$DBE" = xyes])

-if test "x$DBE" = xyes; then

-	AC_DEFINE(DBE, 1, [Support DBE extension])

-	DBE_LIB='$(top_builddir)/dbe/libdbe.la'

-fi

-

-AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])

-if test "x$XF86BIGFONT" = xyes; then

-	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])

-	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"

-fi

-

-AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])

-if test "x$DPMSExtension" = xyes; then

-	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])

-fi

-

-AC_DEFINE(RENDER, 1, [Support RENDER extension])

-RENDER_LIB='$(top_builddir)/render/librender.la'

-RENDER_INC='-I$(top_srcdir)/render'

-

-AC_DEFINE(RANDR, 1, [Support RANDR extension])

-RANDR_LIB='$(top_builddir)/randr/librandr.la'

-RANDR_INC='-I$(top_srcdir)/randr'

-

-AC_DEFINE(XFIXES,1,[Support XFixes extension])

-FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'

-FIXES_INC='-I$(top_srcdir)/xfixes'

-

-AC_DEFINE(DAMAGE,1,[Support Damage extension])

-DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la'

-DAMAGE_INC='-I$(top_srcdir)/damageext'

-MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'

-MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'

-

-# XINPUT extension is integral part of the server

-AC_DEFINE(XINPUT, 1, [Support X Input extension])

-XI_LIB='$(top_builddir)/Xi/libXi.la'

-XI_INC='-I$(top_srcdir)/Xi'

-

-AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)

-AM_CONDITIONAL(XAA, test "x$XAA" = xyes)

-AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)

-AM_CONDITIONAL(VBE, test "x$VBE" = xyes)

-AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)

-

-AC_DEFINE(SHAPE, 1, [Support SHAPE extension])

-

-AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])

-AC_ARG_WITH(xkb-bin-directory,

-				AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),

-				[XKB_BIN_DIRECTORY="$withval"],

-				[XKB_BIN_DIRECTORY="$bindir"])

-

-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])

-

-dnl Make sure XKM_OUTPUT_DIR is an absolute path

-XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`

-if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then

-   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"

-fi

-

-dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed

-dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused

-

-XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`

-XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`

-AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])

-AC_SUBST(XKB_COMPILED_DIR)

-

-if test "x$XKB_DFLT_RULES" = x; then

-    case $host_os in

-    linux*)

-        dnl doesn't take AutoAddDevices into account, but whatever.

-        if test "x$CONFIG_HAL" = xyes; then

-            XKB_DFLT_RULES="evdev"

-        else

-            XKB_DFLT_RULES="base"

-        fi

-        ;;

-    *)

-        XKB_DFLT_RULES="base"

-        ;;

-    esac

-fi

-AC_DEFINE_UNQUOTED(XKB_DFLT_RULES, ["$XKB_DFLT_RULES"], [Default XKB ruleset])

-AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])

-AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])

-AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])

-AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])

-

-XKB_LIB='$(top_builddir)/xkb/libxkb.la'

-XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'

-REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"

-

-AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,

-                                        [Do not have 'strcasecmp'.]))

-AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,

-                                        [Do not have 'strncasecmp'.]))

-AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,

-                                       [Do not have 'strcasestr'.]))

-

-PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])

-if test "x$have_libxdmcp" = xyes; then

-	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])

-fi

-if test "x$XDMCP" = xauto; then

-	if test "x$have_libxdmcp" = xyes; then

-		XDMCP=yes

-	else

-		XDMCP=no

-	fi

-fi

-if test "x$XDMAUTH" = xauto; then

-	if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then

-		XDMAUTH=yes

-	else

-		XDMAUTH=no

-	fi

-fi

-

-AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])

-if test "x$XDMCP" = xyes; then

-	AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])

-	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"

-	XDMCP_MODULES="xdmcp"

-fi

-

-AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes])

-if test "x$XDMAUTH" = xyes; then

-	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])

-	if ! test "x$XDMCP" = xyes; then

-		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"

-		XDMCP_MODULES="xdmcp"

-	fi

-fi

-

-AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])

-AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])

-AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])

-AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])

-dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`

-AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])

-AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])

-AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])

-AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])

-AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])

-AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])

-

-if test -z "$OSNAME"; then

-    OSNAME="UNKNOWN"

-fi

-

-AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])

-AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])

-AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])

-

-AC_SUBST([VENDOR_NAME_SHORT])

-AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name])

-AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name])

-AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])

-AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])

-

-AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])

-

-if test "x$DEBUGGING" = xyes; then

-       AC_DEFINE(DEBUG, 1, [Enable debugging code])

-fi

-AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])

-

-AC_DEFINE(XTEST, 1, [Support XTest extension])

-AC_DEFINE(XSYNC, 1, [Support XSync extension])

-AC_DEFINE(XCMISC, 1, [Support XCMisc extension])

-AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])

-

-if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then

-  DIX_LIB='$(top_builddir)/dix/dix.O'

-  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'

-else

-  DIX_LIB='$(top_builddir)/dix/libdix.la'

-  OS_LIB='$(top_builddir)/os/libos.la'

-fi

-AC_SUBST([DIX_LIB])

-AC_SUBST([OS_LIB])

-

-MAIN_LIB='$(top_builddir)/dix/libmain.la'

-AC_SUBST([MAIN_LIB])

-

-MI_LIB='$(top_builddir)/mi/libmi.la'

-MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'

-MI_INC='-I$(top_srcdir)/mi'

-FB_LIB='$(top_builddir)/fb/libfb.la'

-FB_INC='-I$(top_srcdir)/fb'

-MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'

-MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'

-MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'

-MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'

-CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'

-

-# SHA1 hashing

-AC_ARG_WITH([sha1],

-            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],

-                            [choose SHA1 implementation])])

-AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])

-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then

-	with_sha1=libc

-fi

-if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then

-	AC_MSG_ERROR([libc requested but not found])

-fi

-if test "x$with_sha1" = xlibc; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBC], [1],

-		[Use libc SHA1 functions])

-	SHA1_LIBS=""

-fi

-AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes])

-if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then

-	with_sha1=CommonCrypto

-fi

-if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then

-	AC_MSG_ERROR([CommonCrypto requested but not found])

-fi

-if test "x$with_sha1" = xCommonCrypto; then

-	AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1],

-		[Use CommonCrypto SHA1 functions])

-	SHA1_LIBS=""

-fi

-AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])

-if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then

-	with_sha1=libmd

-fi

-if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then

-	AC_MSG_ERROR([libmd requested but not found])

-fi

-if test "x$with_sha1" = xlibmd; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],

-	          [Use libmd SHA1 functions])

-	SHA1_LIBS=-lmd

-fi

-PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])

-if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then

-   with_sha1=libsha1

-fi

-if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then

-	AC_MSG_ERROR([libsha1 requested but not found])

-fi

-if test "x$with_sha1" = xlibsha1; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],

-	          [Use libsha1 for SHA1])

-	SHA1_LIBS=-lsha1

-fi

-AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])

-if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then

-	with_sha1=libgcrypt

-fi

-if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then

-	AC_MSG_ERROR([libgcrypt requested but not found])

-fi

-if test "x$with_sha1" = xlibgcrypt; then

-	AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],

-	          [Use libgcrypt SHA1 functions])

-	SHA1_LIBS=-lgcrypt

-fi

-# We don't need all of the OpenSSL libraries, just libcrypto

-AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])

-PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],

-                  [HAVE_OPENSSL_PKC=no])

-if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then

-	if test "x$with_sha1" = x; then

-		with_sha1=libcrypto

-	fi

-else

-	if test "x$with_sha1" = xlibcrypto; then

-		AC_MSG_ERROR([OpenSSL libcrypto requested but not found])

-	fi

-fi

-if test "x$with_sha1" = xlibcrypto; then

-	if test "x$HAVE_LIBCRYPTO" = xyes; then

-		SHA1_LIBS=-lcrypto

-	else

-		SHA1_LIBS="$OPENSSL_LIBS"

-		SHA1_CFLAGS="$OPENSSL_CFLAGS"

-	fi

-fi

-AC_MSG_CHECKING([for SHA1 implementation])

-if test "x$with_sha1" = x; then

-	AC_MSG_ERROR([No suitable SHA1 implementation found])

-fi

-AC_MSG_RESULT([$with_sha1])

-AC_SUBST(SHA1_LIBS)

-AC_SUBST(SHA1_CFLAGS)

-

-PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])

-PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])

-

-# Autotools has some unfortunate issues with library handling.  In order to

-# get a server to rebuild when a dependency in the tree is changed, it must

-# be listed in SERVERNAME_DEPENDENCIES.  However, no system libraries may be

-# listed there, or some versions of autotools will break (especially if a -L

-# is required to find the library).  So, we keep two sets of libraries

-# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which

-# will go into the _DEPENDENCIES and _LDADD of the server, and

-# NAMESPACE_SYS_LIBS which will go into only the _LDADD.  The

-# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in

-# NAMESPACE_SYS_LIBS.

-#

-# XSERVER_LIBS is the set of in-tree libraries which all servers require.

-# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers

-# require.

-#

-XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"

-XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"

-XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"

-AC_SUBST([XSERVER_LIBS])

-AC_SUBST([XSERVER_SYS_LIBS])

-

-UTILS_SYS_LIBS="${SYS_LIBS}"

-AC_SUBST([UTILS_SYS_LIBS])

-

-# The Xorg binary needs to export symbols so that they can be used from modules

-# Some platforms require extra flags to do this.   libtool should set the

-# necessary flags for each platform when -export-dynamic is passed to it.

-LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"

-AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])

-

-dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so

-dnl we need to replicate that here until those can all be fixed

-AC_MSG_CHECKING([if SVR4 needs to be defined])

-AC_EGREP_CPP([I_AM_SVR4],[

-#if defined(SVR4) || defined(__svr4__) || defined(__SVR4)

- I_AM_SVR4

-#endif

-],[

-AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])

-AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))

-

-XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"

-

-dnl ---------------------------------------------------------------------------

-dnl DDX section.

-dnl ---------------------------------------------------------------------------

-

-dnl Xvfb DDX

-

-AC_MSG_CHECKING([whether to build Xvfb DDX])

-AC_MSG_RESULT([$XVFB])

-AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])

-

-if test "x$XVFB" = xyes; then

-	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"

-	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"

-	AC_SUBST([XVFB_LIBS])

-	AC_SUBST([XVFB_SYS_LIBS])

-fi

-

-

-dnl Xnest DDX

-

-PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])

-AC_MSG_CHECKING([whether to build Xnest DDX])

-if test "x$XNEST" = xauto; then

-	XNEST="$have_xnest"

-fi

-AC_MSG_RESULT([$XNEST])

-AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])

-

-if test "x$XNEST" = xyes; then

-	if test "x$have_xnest" = xno; then

-		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])

-	fi

-	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"

-	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"

-	AC_SUBST([XNEST_LIBS])

-	AC_SUBST([XNEST_SYS_LIBS])

-fi

-

-

-dnl Xorg DDX

-

-AC_MSG_CHECKING([whether to build Xorg DDX])

-if test "x$XORG" = xauto; then

-	XORG="yes"

-	case $host_os in

-		cygwin*) XORG="no" ;;

-		darwin*) XORG="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$XORG])

-

-xorg_bus_linuxpci=no

-xorg_bus_bsdpci=no

-xorg_bus_sparc=no

-

-if test "x$XORG" = xyes; then

-	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'

-	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'

-	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"

-	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"

-	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"

-

-	dnl ==================================================================

-	dnl symbol visibility

-	symbol_visibility=

-	have_visibility=disabled

-	if test x$SYMBOL_VISIBILITY != xno; then

-	    AC_MSG_CHECKING(for symbol visibility support)

-	    if test x$GCC = xyes; then

-		VISIBILITY_CFLAGS="-fvisibility=hidden"

-	    else

-		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

-		if test x$SUNCC = xyes; then

-		    VISIBILITY_CFLAGS="-xldscope=hidden"

-		else

-		    have_visibility=no

-		fi

-	    fi

-	    if test x$have_visibility != xno; then

-		save_CFLAGS="$CFLAGS"

-		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"

-		AC_TRY_COMPILE(

-		    [#include <X11/Xfuncproto.h>

-		     extern _X_HIDDEN int hidden_int;

-		     extern _X_EXPORT int public_int;

-		     extern _X_HIDDEN int hidden_int_func(void);

-		     extern _X_EXPORT int public_int_func(void);],

-		    [],

-		    have_visibility=yes,

-		    have_visibility=no)

-		CFLAGS=$save_CFLAGS

-	    fi

-	    AC_MSG_RESULT([$have_visibility])

-	    if test x$have_visibility != xno; then

-		symbol_visibility=$VISIBILITY_CFLAGS

-		XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS"

-		XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS"

-	    fi

-	fi

-	dnl added to xorg-server.pc

-	AC_SUBST([symbol_visibility])

-	dnl ===================================================================

-

-	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)

-	SAVE_LIBS=$LIBS

-	SAVE_CFLAGS=$CFLAGS

-	CFLAGS=$PCIACCESS_CFLAGS

-	LIBS=$PCIACCESS_LIBS

-	AC_CHECK_FUNCS([pci_system_init_dev_mem])

-	AC_CHECK_FUNCS([pci_device_enable])

-	AC_CHECK_FUNCS([pci_device_is_boot_vga])

-	AC_CHECK_FUNCS([pci_device_vgaarb_init])

-	LIBS=$SAVE_LIBS

-	CFLAGS=$SAVE_CFLAGS

-	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"

-	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"

-

-	case $host_os in

-	  linux*)

-		if test "x$LNXAPM" = xyes; then

-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		fi

-	  	XORG_OS="linux"

-		XORG_OS_SUBDIR="linux"

-		xorg_bus_linuxpci="yes"

-		linux_acpi="no"

-		case $host_cpu in

-		  ia64*)

-			linux_ia64=yes

-			linux_acpi="yes"

-			;;

-		  alpha*)

-		  	linux_alpha=yes

-			;;

-		  i*86|amd64*|x86_64*)

-			linux_acpi="yes"

-			;;

-		  *)

-			;;

-		esac

-		;;

-	  freebsd* | kfreebsd*-gnu | dragonfly*)

-	  	XORG_OS="freebsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  netbsd*)

-	  	XORG_OS="netbsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  openbsd*)

-		if test "x$ac_cv_BSD_APM" = xyes \

-			-o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then

-			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		fi

-	  	XORG_OS="openbsd"

-		XORG_OS_SUBDIR="bsd"

-		xorg_bus_bsdpci="yes"

-		;;

-	  solaris*)

-	  	XORG_OS="solaris"

-		XORG_OS_SUBDIR="solaris"

-		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"

-		# Use the same stubs as BSD for old functions, since we now

-		# use libpciaccess for PCI

-		xorg_bus_bsdpci="yes"

-		AC_CHECK_HEADERS([sys/kd.h])

-		AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])

-		# Check for minimum supported release

-		AC_MSG_CHECKING([Solaris version])

-	        OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'`

-		if test "${OS_MINOR}" -ge 7 ; then

-	        	AC_MSG_RESULT(Solaris ${OS_MINOR})

-		else

-			AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`)

-		fi

-		if test "${OS_MINOR}" -lt 8 ; then

-			AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])

-		fi

-		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])

-		if test "x$SUNCC" = "xyes"; then

-			solaris_asm_inline="yes"

-		fi

-		AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"])

-			

-		case $host_cpu in

-		  sparc*)	

-			SOLARIS_INOUT_ARCH="sparcv8plus"

-			;;

-		  i*86)	

-			if test x$SOLARIS_64 = xyes ; then

-				SOLARIS_INOUT_ARCH="amd64"

-			else

-				SOLARIS_INOUT_ARCH="ia32"

-			fi

-			;;

-		  *)

-			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \

-			are supported on Solaris in this release.   If you are \

-			interested in porting Xorg to your platform, please email \

-			xorg@lists.freedesktop.org.]) ;;

-		esac

-		AC_SUBST([SOLARIS_INOUT_ARCH])

-		if test x$solaris_asm_inline = xyes ; then

-			SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'

-			XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'

-		fi

-		AC_SUBST([SOLARIS_ASM_CFLAGS])

-		if test "x$SUPPORT_PC98" = xauto; then

-			SUPPORT_PC98="no"

-		fi

-		;;

-	  gnu*)

-	  	XORG_OS="gnu"

-		XORG_OS_SUBDIR="hurd"

-		# Use the same stubs as BSD for old functions, since we now

-		# use libpciaccess for PCI

-		xorg_bus_bsdpci="yes"

-		;;

-	  *)

-	  	XORG_OS="unknown"

-		XORG_OS_SUBDIR="unknown"

-		AC_MSG_ERROR([m4_text_wrap(m4_join([ ],

-		[Your OS is unknown. Xorg currently only supports Linux,],

-		[Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.],

-		[If you are interested in porting Xorg to your platform,],

-		[please email xorg@lists.freedesktop.org.]))])

-		;;

-	esac

-

-	case $host_cpu in

-	  sparc*)

-		xorg_bus_sparc="yes"

-		;;

-	  i*86)

-		if test "x$SUPPORT_PC98" = xauto; then

-			SUPPORT_PC98="yes"

-		fi

-		;;

-	esac

-

-	if test "x$SUPPORT_PC98" = xauto; then

-		SUPPORT_PC98="no"

-	fi

-	if test "x$SUPPORT_PC98" = xyes; then

-		AC_DEFINE(SUPPORT_PC98, 1, [Support PC98])

-	fi

-	if test "x$XORG_OS_PCI" = x ; then

-		XORG_OS_PCI=$XORG_OS

-	fi

-	if test "x$DGA" = xauto; then

-		PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no])

-	fi

-	if test "x$DGA" = xyes; then

-		XORG_MODULES="$XORG_MODULES $DGAPROTO"

-		PKG_CHECK_MODULES(DGA, $DGAPROTO)

-		AC_DEFINE(DGA, 1, [Support DGA extension])

-		AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])

-	fi

-

-	if test "x$XF86VIDMODE" = xauto; then

-		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO, [XF86VIDMODE=yes], [XF86VIDMODE=no])

-	fi

-	if test "x$XF86VIDMODE" = xyes; then

-		XORG_MODULES="$XORG_MODULES $VIDMODEPROTO"

-		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO)

-		AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])

-	fi

-

-	if test -n "$XORG_MODULES"; then

-	        PKG_CHECK_MODULES(XORG_MODULES, [$XORG_MODULES])

-	        XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS"

-	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"

-	fi

-

-	AC_SUBST([XORG_LIBS])

-	AC_SUBST([XORG_SYS_LIBS])

-	AC_SUBST([XORG_INCS])

-	AC_SUBST([XORG_OS])

-	AC_SUBST([XORG_OS_SUBDIR])

-

-	AC_PATH_PROG(PERL, perl, no)

-	dnl unlikely as this may be ...

-	if test "x$PERL" = xno; then

-		AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])

-	fi

-	AC_SUBST(PERL)

-

-	AC_SUBST([XORG_CFLAGS])

-

-	dnl these only go in xorg-config.h

-	XF86CONFIGFILE="xorg.conf"

-	XF86CONFIGDIR="xorg.conf.d"

-	AC_SUBST(XF86CONFIGDIR)

-	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"

-	LOGPREFIX="$logdir/Xorg."

-	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])

-	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])

-	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])

-	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])

-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

-	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])

-	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])

-	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])

-	AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])

-	AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])

-	AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])

-	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])

-	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])

-	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])

-	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

-	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])

-	if test "x$VGAHW" = xyes; then

-		AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])

-	fi

-

-	driverdir="$moduledir/drivers"

-	AC_SUBST([moduledir])

-	AC_SUBST([driverdir])

-	sdkdir="$includedir/xorg"

-	extdir="$includedir/X11/extensions"

-	sysconfigdir="$datadir/X11/$XF86CONFIGDIR"

-	AC_SUBST([sdkdir])

-	AC_SUBST([extdir])

-	AC_SUBST([sysconfigdir])

-	AC_SUBST([logdir])

-

-	# stuff the ABI versions into the pc file too

-	extract_abi() {

-	    grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' '  .' | awk '{ print $4$5 }'

-	}

-	abi_ansic=`extract_abi ANSIC`

-	abi_videodrv=`extract_abi VIDEODRV`

-	abi_xinput=`extract_abi XINPUT`

-	abi_extension=`extract_abi EXTENSION`

-	AC_SUBST([abi_ansic])

-	AC_SUBST([abi_videodrv])

-	AC_SUBST([abi_xinput])

-	AC_SUBST([abi_extension])

-fi

-AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])

-AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])

-AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])

-AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])

-AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])

-AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])

-AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])

-AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])

-AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])

-AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])

-AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])

-

-dnl XWin DDX

-

-AC_MSG_CHECKING([whether to build XWin DDX])

-if test "x$XWIN" = xauto; then

-	case $host_os in

-		cygwin*) XWIN="yes" ;;

-		mingw*) XWIN="yes" ;;

-		*) XWIN="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$XWIN])

-

-if test "x$XWIN" = xyes; then

-	AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])

-	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])

-	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])

-	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])

-	AC_CHECK_TOOL(WINDRES, windres)

-

-	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])

-

-	if test "x$WINDOWSWM" = xauto; then

-		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])

-	fi

-	if test "x$WINDOWSWM" = xyes ; then

-		PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)

-		XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"

-		AC_DEFINE(ROOTLESS,1,[Build Rootless code])

-	fi

-

-	case $host_os in

-		cygwin*)

-			XWIN_SERVER_NAME=XWin

-			AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])

-			;;

-		mingw*)

-			XWIN_SERVER_NAME=Xming

-			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])

-			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])

-			XWIN_SYS_LIBS=-lwinsock2

-			;;

-	esac

-	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"

-	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"

-	AC_SUBST(XWIN_LIBS)

-	AC_SUBST(XWIN_SERVER_NAME)

-	AC_SUBST(XWIN_SYS_LIBS)

-

-	if test "x$DEBUGGING" = xyes; then

-		AC_DEFINE(CYGDEBUG, 1, [Simple debug messages])

-		AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling])

-		AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager])

-	fi

-

-	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])

-	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])

-fi

-AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])

-AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])

-AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])

-AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])

-

-dnl Darwin / OS X DDX

-if test "x$XQUARTZ" = xyes; then

-	AC_DEFINE(XQUARTZ,1,[Have Quartz])

-	AC_DEFINE(ROOTLESS,1,[Build Rootless code])

-

-	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"

-	AC_SUBST([DARWIN_LIBS])

-

-	AC_CHECK_LIB([Xplugin],[xp_init],[:])

-

-	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"

-

-	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)

-

-        if test "x$XQUARTZ_SPARKLE" = xyes ; then

-                AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.])

-        fi

-

-	if test "x$STANDALONE_XPBPROXY" = xyes ; then

-		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])

-	fi

-fi

-

-# Support for objc in autotools is minimal and not documented.

-OBJC='$(CC)'

-OBJCLD='$(CCLD)'

-OBJCLINK='$(LINK)'

-OBJCFLAGS='$(CFLAGS)'

-AC_SUBST([OBJC])

-AC_SUBST([OBJCCLD])

-AC_SUBST([OBJCLINK])

-AC_SUBST([OBJCFLAGS])

-# internal, undocumented automake func follows :(

-_AM_DEPENDENCIES([OBJC])

-AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])

-AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])

-AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])

-

-dnl DMX DDX

-PKG_CHECK_MODULES(

-	[DMXMODULES],

-	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],

-	[PKG_CHECK_MODULES(

-		[XDMXCONFIG_DEP],

-		[xaw7 xmu xt xpm x11],

-		[have_dmx=yes],

-		[have_dmx=no])],

-	[have_dmx=no])

-AC_MSG_CHECKING([whether to build Xdmx DDX])

-if test "x$DMX" = xauto; then

-	DMX="$have_dmx"

-	case $host_os in

-		cygwin*) DMX="no" ;;

-		darwin*) DMX="no" ;;

-	esac

-fi

-AC_MSG_RESULT([$DMX])

-AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])

-

-if test "x$DMX" = xyes; then

-	if test "x$have_dmx" = xno; then

-		AC_MSG_ERROR([Xdmx build explicitly requested, but required

-		              modules not found.])

-	fi

-	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"

-	XDMX_CFLAGS="$DMXMODULES_CFLAGS"

-	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"

-	XDMX_SYS_LIBS="$DMXMODULES_LIBS"

-	AC_SUBST([XDMX_CFLAGS])

-	AC_SUBST([XDMX_LIBS])

-	AC_SUBST([XDMX_SYS_LIBS])

-

-dnl USB sources in DMX require <linux/input.h>

-	AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",

-			DMX_BUILD_USB="no")

-dnl Linux sources in DMX require <linux/keyboard.h>

-	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",

-			DMX_BUILD_LNX="no")

-	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)

-	AC_SUBST(XDMXCONFIG_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])

-	AC_SUBST(DMXEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11])

-	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11])

-	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11])

-	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11])

-	AC_SUBST(XRESEXAMPLES_DEP_LIBS)

-	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])

-	AC_SUBST(X11EXAMPLES_DEP_LIBS)

-

-fi

-AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])

-AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])

-

-dnl kdrive DDX

-

-XEPHYR_LIBS=

-XEPHYR_INCS=

-

-AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])

-

-if test "$KDRIVE" = yes; then

-    AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])

-    AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])

-

-    AC_CHECK_HEADERS([linux/fb.h])

-    if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then

-        XFBDEV=yes

-    fi

-

-    if test "x$XFBDEV" = xyes; then

-        KDRIVEFBDEVLIB=yes

-        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])

-    fi

-

-

-    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])

-    if test "x$HAVE_TSLIB" = xno; then

-        AC_CHECK_LIB(ts, ts_open, [

-			HAVE_TSLIB="yes"

-			TSLIB_LIBS="-lts"

-		])

-    fi

-

-    if test "xTSLIB" = xauto; then

-        TSLIB="$HAVE_TSLIB"

-    fi

-

-    if test "x$TSLIB" = xyes; then

-        if ! test "x$HAVE_TSLIB" = xyes; then

-            AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])

-        else

-            AC_DEFINE(TSLIB, 1, [Have tslib support])

-        fi

-    fi

-

-    if test "x$KDRIVE_KBD" = xyes; then

-       AC_DEFINE(KDRIVE_KBD, 1, [Enable KDrive kbd driver])

-    fi

-    if test "x$KDRIVE_EVDEV" = xyes; then

-       AC_DEFINE(KDRIVE_EVDEV, 1, [Enable KDrive evdev driver])

-    fi

-    if test "x$KDRIVE_MOUSE" = xyes; then

-       AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])

-    fi

-

-    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"

-    if test "x$XV" = xyes; then

-        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"

-    fi

-    if test "x$DRI" = xyes && test "x$GLX" = xyes; then

-        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"

-    fi

-

-    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])

-    if test "x$XEPHYR" = xauto; then

-        XEPHYR=$xephyr

-    fi

-    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	

-        AC_MSG_ERROR([Xephyr dependencies missing])

-    fi

-

-    # Xephyr needs nanosleep() which is in librt on Solaris

-    AC_CHECK_FUNC([nanosleep], [],

-        AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))

-    

-    # damage shadow extension glx (NOTYET) fb mi

-    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'

-    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"

-    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'

-    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"

-    

-    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"

-

-    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"

-    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

-    case $host_os in

-	*linux*)

-	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'

-            KDRIVELINUX=yes

-	    if test "x$KDRIVE_EVDEV" = xauto; then

-		KDRIVE_EVDEV=yes

-	    fi

-	    if test "x$KDRIVE_KBD" = xauto; then

-		KDRIVE_KBD=yes

-	    fi

-	    if test "x$KDRIVE_MOUSE" = xauto; then

-		KDRIVE_MOUSE=yes

-	    fi

-	    ;;

-	*)

-	    if test "x$KDRIVE_EVDEV" = xauto; then

-		KDRIVE_EVDEV=no

-	    fi

-	    if test "x$KDRIVE_KBD" = xauto; then

-		KDRIVE_KBD=no

-	    fi

-	    if test "x$KDRIVE_MOUSE" = xauto; then

-		KDRIVE_MOUSE=no

-	    fi

-	    ;;

-    esac

-    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'

-    KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"

-    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"

-

-    AC_SUBST([XEPHYR_LIBS])

-    AC_SUBST([XEPHYR_INCS])

-fi

-AC_SUBST([KDRIVE_INCS])

-AC_SUBST([KDRIVE_PURE_INCS])

-AC_SUBST([KDRIVE_CFLAGS])

-AC_SUBST([KDRIVE_PURE_LIBS])

-AC_SUBST([KDRIVE_LOCAL_LIBS])

-AC_SUBST([KDRIVE_LIBS])

-AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])

-AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])

-AM_CONDITIONAL(KDRIVE_KBD,   [test "x$KDRIVE_KBD" = xyes])

-AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes])

-AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])

-AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])

-AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])

-AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])

-AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])

-

-dnl and the rest of these are generic, so they're in config.h

-dnl 

-dnl though, thanks to the passing of some significant amount of time, the

-dnl above is probably a complete fallacy, and you should not rely on it.

-dnl but this is still actually better than imake, honest. -daniels

-

-AC_TRY_COMPILE([

-#include <features.h>

-#ifndef __GLIBC__

-#error not glibc

-#endif

-], [], [AC_DEFINE(_GNU_SOURCE, 1,

-	[ Enable GNU and other extensions to the C environment for glibc])])

-

-AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])

-

-AC_SUBST([RELEASE_DATE])

-BUILD_DATE="`date +'%Y%m%d'`"

-AC_SUBST([BUILD_DATE])

-BUILD_TIME="`date +'1%H%M%S'`"

-AC_SUBST([BUILD_TIME])

-

-DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"

-

-AC_SUBST([DIX_CFLAGS])

-

-AC_SUBST([libdir])

-AC_SUBST([exec_prefix])

-AC_SUBST([prefix])

-

-AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])

-

-AC_OUTPUT([

-Makefile

-glx/Makefile

-include/Makefile

-composite/Makefile

-damageext/Makefile

-dbe/Makefile

-dix/Makefile

-doc/Makefile

-doc/man/Makefile

-doc/xml/Makefile

-doc/xml/dtrace/Makefile

-doc/xml/xserver.ent

-fb/Makefile

-record/Makefile

-config/Makefile

-mi/Makefile

-miext/Makefile

-miext/sync/Makefile

-miext/damage/Makefile

-miext/shadow/Makefile

-miext/cw/Makefile

-miext/rootless/Makefile

-os/Makefile

-randr/Makefile

-render/Makefile

-xkb/Makefile

-Xext/Makefile

-Xi/Makefile

-xfixes/Makefile

-exa/Makefile

-hw/Makefile

-hw/xfree86/Makefile

-hw/xfree86/common/Makefile

-hw/xfree86/common/xf86Build.h

-hw/xfree86/ddc/Makefile

-hw/xfree86/dixmods/Makefile

-hw/xfree86/dixmods/extmod/Makefile

-hw/xfree86/doc/Makefile

-hw/xfree86/doc/devel/Makefile

-hw/xfree86/doc/sgml/Makefile

-hw/xfree86/dri/Makefile

-hw/xfree86/dri2/Makefile

-hw/xfree86/exa/Makefile

-hw/xfree86/exa/man/Makefile

-hw/xfree86/fbdevhw/Makefile

-hw/xfree86/fbdevhw/man/Makefile

-hw/xfree86/i2c/Makefile

-hw/xfree86/int10/Makefile

-hw/xfree86/loader/Makefile

-hw/xfree86/man/Makefile

-hw/xfree86/modes/Makefile

-hw/xfree86/os-support/Makefile

-hw/xfree86/os-support/bsd/Makefile

-hw/xfree86/os-support/bus/Makefile

-hw/xfree86/os-support/hurd/Makefile

-hw/xfree86/os-support/misc/Makefile

-hw/xfree86/os-support/linux/Makefile

-hw/xfree86/os-support/solaris/Makefile

-hw/xfree86/parser/Makefile

-hw/xfree86/ramdac/Makefile

-hw/xfree86/shadowfb/Makefile

-hw/xfree86/vbe/Makefile

-hw/xfree86/vgahw/Makefile

-hw/xfree86/x86emu/Makefile

-hw/xfree86/xaa/Makefile

-hw/xfree86/utils/Makefile

-hw/xfree86/utils/man/Makefile

-hw/xfree86/utils/cvt/Makefile

-hw/xfree86/utils/gtf/Makefile

-hw/dmx/config/Makefile

-hw/dmx/config/man/Makefile

-hw/dmx/doc/Makefile

-hw/dmx/doc/doxygen.conf

-hw/dmx/examples/Makefile

-hw/dmx/input/Makefile

-hw/dmx/glxProxy/Makefile

-hw/dmx/Makefile

-hw/dmx/man/Makefile

-hw/vfb/Makefile

-hw/vfb/man/Makefile

-hw/xnest/Makefile

-hw/xnest/man/Makefile

-hw/xwin/Makefile

-hw/xwin/glx/Makefile

-hw/xwin/man/Makefile

-hw/xquartz/Makefile

-hw/xquartz/GL/Makefile

-hw/xquartz/bundle/Makefile

-hw/xquartz/man/Makefile

-hw/xquartz/mach-startup/Makefile

-hw/xquartz/pbproxy/Makefile

-hw/xquartz/xpr/Makefile

-hw/kdrive/Makefile

-hw/kdrive/ephyr/Makefile

-hw/kdrive/ephyr/man/Makefile

-hw/kdrive/fake/Makefile

-hw/kdrive/fbdev/Makefile

-hw/kdrive/linux/Makefile

-hw/kdrive/src/Makefile

-test/Makefile

-test/xi2/Makefile

-xorg-server.pc

-])

+dnl Copyright © 2003-2007 Keith Packard, Daniel Stone
+dnl
+dnl Permission is hereby granted, free of charge, to any person obtaining a
+dnl copy of this software and associated documentation files (the "Software"),
+dnl to deal in the Software without restriction, including without limitation
+dnl the rights to use, copy, modify, merge, publish, distribute, sublicense,
+dnl and/or sell copies of the Software, and to permit persons to whom the
+dnl Software is furnished to do so, subject to the following conditions:
+dnl
+dnl The above copyright notice and this permission notice (including the next
+dnl paragraph) shall be included in all copies or substantial portions of the
+dnl Software.
+dnl
+dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+dnl IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+dnl FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+dnl THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+dnl LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+dnl FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+dnl DEALINGS IN THE SOFTWARE.
+dnl
+dnl Authors: Keith Packard <keithp@keithp.com>
+dnl          Daniel Stone <daniel@fooishbar.org>
+dnl          an unwitting cast of miscellaneous others
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ(2.57)
+AC_INIT([xorg-server], 1.10.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="unreleased"
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Require xorg-macros minimum of 1.13 for XORG_ENABLE_UNIT_TESTS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_WITH_DOXYGEN(1.6.1)
+XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_ENABLE_DOCS
+XORG_ENABLE_DEVEL_DOCS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_ENABLE_UNIT_TESTS
+XORG_WITH_GLIB
+XORG_LD_WRAP
+
+m4_ifndef([XORG_FONT_MACROS_VERSION], [m4_fatal([must install fontutil 1.1 or later before running autoconf/autogen])])
+XORG_FONT_MACROS_VERSION(1.1)
+
+dnl this gets generated by autoheader, and thus contains all the defines.  we
+dnl don't ever actually use it, internally.
+AC_CONFIG_HEADERS(include/do-not-use-config.h)
+dnl xorg-server.h is an external header, designed to be included by loadable
+dnl drivers.
+AC_CONFIG_HEADERS(include/xorg-server.h)
+dnl dix-config.h covers most of the DIX (i.e. everything but the DDX, not just
+dnl dix/).
+AC_CONFIG_HEADERS(include/dix-config.h)
+dnl xorg-config.h covers the Xorg DDX.
+AC_CONFIG_HEADERS(include/xorg-config.h)
+dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
+AC_CONFIG_HEADERS(include/xkb-config.h)
+dnl xwin-config.h covers the XWin DDX.
+AC_CONFIG_HEADERS(include/xwin-config.h)
+dnl kdrive-config.h covers the kdrive DDX
+AC_CONFIG_HEADERS(include/kdrive-config.h)
+dnl version-config.h covers the version numbers so they can be bumped without
+dnl forcing an entire recompile.x
+AC_CONFIG_HEADERS(include/version-config.h)
+
+AM_PROG_AS
+AC_PROG_LN_S
+AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
+AC_PROG_LEX
+AC_PROG_YACC
+AC_SYS_LARGEFILE
+XORG_PROG_RAWCPP
+
+# Quoted so that make will expand $(CWARNFLAGS) in makefiles to allow
+# easier overrides at build time.
+XSERVER_CFLAGS='$(CWARNFLAGS)'
+
+dnl Check for dtrace program (needed to build Xserver dtrace probes)
+dnl Also checks for <sys/sdt.h>, since some Linux distros have an 
+dnl ISDN trace program named dtrace
+AC_ARG_WITH(dtrace, AS_HELP_STRING([--with-dtrace=PATH],
+	     [Enable dtrace probes (default: enabled if dtrace found)]),
+	     [WDTRACE=$withval], [WDTRACE=auto])
+if test "x$WDTRACE" = "xyes" -o "x$WDTRACE" = "xauto" ; then
+	AC_PATH_PROG(DTRACE, [dtrace], [not_found], [$PATH:/usr/sbin])
+	if test "x$DTRACE" = "xnot_found" ; then
+		if test "x$WDTRACE" = "xyes" ; then
+			AC_MSG_FAILURE([dtrace requested but not found])
+		fi
+		WDTRACE="no"
+	else
+		AC_CHECK_HEADER(sys/sdt.h, [HAS_SDT_H="yes"], [HAS_SDT_H="no"])
+		if test "x$WDTRACE" = "xauto" -a "x$HAS_SDT_H" = "xno" ; then
+			WDTRACE="no"
+		fi
+	fi
+fi
+if test "x$WDTRACE" != "xno" ; then
+  AC_DEFINE(XSERVER_DTRACE, 1, 
+      [Define to 1 if the DTrace Xserver provider probes should be built in.])
+
+# Solaris/OpenSolaris require dtrace -G to build dtrace probe information into
+# object files, and require linking with those as relocatable objects, not .a
+# archives. MacOS X handles all this in the normal compiler toolchain, and on
+# some releases (like Tiger), will error out on dtrace -G.  For now, other
+# platforms with Dtrace ports are assumed to support -G (the FreeBSD and Linux
+# ports appear to, based on my web searches, but have not yet been tested).
+	case $host_os in
+		darwin*)	SPECIAL_DTRACE_OBJECTS=no ;;
+		*)		SPECIAL_DTRACE_OBJECTS=yes ;;
+	esac
+fi
+AM_CONDITIONAL(XSERVER_DTRACE, [test "x$WDTRACE" != "xno"])
+AM_CONDITIONAL(SPECIAL_DTRACE_OBJECTS, [test "x$SPECIAL_DTRACE_OBJECTS" = "xyes"])
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h dlfcn.h stropts.h fnmatch.h sys/utsname.h])
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])
+
+AC_CHECK_SIZEOF([unsigned long])
+if test "$ac_cv_sizeof_unsigned_long" = 8; then
+	AC_DEFINE(_XSERVER64, 1, [Define to 1 if unsigned long is 64 bits.])
+fi
+
+AC_TYPE_PID_T
+
+# Checks for headers/macros for byte swapping
+# Known variants:
+#	<byteswap.h> bswap_16, bswap_32, bswap_64  (glibc)
+#	<sys/endian.h> __swap16, __swap32, __swap64 (OpenBSD)
+#	<sys/endian.h> bswap16, bswap32, bswap64 (other BSD's)
+#	and a fallback to local macros if none of the above are found
+
+# if <byteswap.h> is found, assume it's the correct version
+AC_CHECK_HEADERS([byteswap.h])
+
+# if <sys/endian.h> is found, have to check which version
+AC_CHECK_HEADER([sys/endian.h], [HAVE_SYS_ENDIAN_H="yes"], [HAVE_SYS_ENDIAN_H="no"])
+
+if test "x$HAVE_SYS_ENDIAN_H" = "xyes" ; then
+	AC_MSG_CHECKING([for __swap16 variant of <sys/endian.h> byteswapping macros])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
+#include <sys/endian.h>
+ ], [
+int a = 1, b;
+b = __swap16(a);
+ ])
+], [SYS_ENDIAN__SWAP='yes'], [SYS_ENDIAN__SWAP='no'])
+	AC_MSG_RESULT([$SYS_ENDIAN__SWAP])
+
+	AC_MSG_CHECKING([for bswap16 variant of <sys/endian.h> byteswapping macros])
+	AC_LINK_IFELSE([AC_LANG_PROGRAM([
+#include <sys/types.h>
+#include <sys/endian.h>
+ ], [
+int a = 1, b;
+b = bswap16(a);
+ ])
+], [SYS_ENDIAN_BSWAP='yes'], [SYS_ENDIAN_BSWAP='no'])
+	AC_MSG_RESULT([$SYS_ENDIAN_BSWAP])
+
+    	if test "$SYS_ENDIAN_BSWAP" = "yes" ; then
+		USE_SYS_ENDIAN_H=yes
+		BSWAP=bswap
+	else	
+	    	if test "$SYS_ENDIAN__SWAP" = "yes" ; then
+			USE_SYS_ENDIAN_H=yes
+			BSWAP=__swap
+		else
+			USE_SYS_ENDIAN_H=no
+		fi
+	fi
+
+	if test "$USE_SYS_ENDIAN_H" = "yes" ; then
+	    AC_DEFINE([USE_SYS_ENDIAN_H], 1, 
+		[Define to use byteswap macros from <sys/endian.h>])
+	    AC_DEFINE_UNQUOTED([bswap_16], ${BSWAP}16, 
+			[Define to 16-bit byteswap macro])
+	    AC_DEFINE_UNQUOTED([bswap_32], ${BSWAP}32, 
+			[Define to 32-bit byteswap macro])
+	    AC_DEFINE_UNQUOTED([bswap_64], ${BSWAP}64, 
+			[Define to 64-bit byteswap macro])
+	fi
+fi
+
+dnl Check to see if dlopen is in default libraries (like Solaris, which
+dnl has it in libc), or if libdl is needed to get it.
+AC_CHECK_FUNC([dlopen], [],
+	AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl"))
+AC_SUBST(DLOPEN_LIBS)
+
+dnl Checks for library functions.
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr \
+		strtol getopt getopt_long vsnprintf walkcontext backtrace \
+		getisax getzoneid shmctl64 strcasestr ffs vasprintf])
+AC_FUNC_ALLOCA
+dnl Old HAS_* names used in os/*.c.
+AC_CHECK_FUNC([getdtablesize],
+	AC_DEFINE(HAS_GETDTABLESIZE, 1, [Have the 'getdtablesize' function.]))
+AC_CHECK_FUNC([getifaddrs],
+	AC_DEFINE(HAS_GETIFADDRS, 1, [Have the 'getifaddrs' function.]))
+AC_CHECK_FUNC([getpeereid],
+	AC_DEFINE(HAS_GETPEEREID, 1, [Have the 'getpeereid' function.]))
+AC_CHECK_FUNC([getpeerucred],
+	AC_DEFINE(HAS_GETPEERUCRED, 1, [Have the 'getpeerucred' function.]))
+AC_CHECK_FUNC([strlcat], HAVE_STRLCAT=yes, HAVE_STRLCAT=no)
+AM_CONDITIONAL(NEED_STRLCAT, [test x$HAVE_STRLCAT = xno])	
+AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_STRLCPY, 1, [Have the 'strlcpy' function]))
+
+AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])
+
+dnl Check for mmap support for Xvfb
+AC_CHECK_FUNC([mmap], AC_DEFINE(HAS_MMAP, 1, [Have the 'mmap' function.]))
+
+dnl Find the math libary
+AC_CHECK_LIB(m, sqrt)
+AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
+
+AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
+
+dnl AGPGART headers
+AC_CHECK_HEADERS([linux/agpgart.h sys/agpio.h sys/agpgart.h], AGP=yes)
+AM_CONDITIONAL(AGP, [test "x$AGP" = xyes])
+
+dnl APM header
+AC_CHECK_HEADERS([linux/apm_bios.h], LNXAPM=yes)
+AM_CONDITIONAL(LNXAPM, [test "x$LNXAPM" = xyes])
+
+dnl fbdev header
+AC_CHECK_HEADERS([linux/fb.h], FBDEV=yes)
+AM_CONDITIONAL(FBDEVHW, [test "x$FBDEV" = xyes])
+
+dnl MTRR header
+AC_CHECK_HEADERS([asm/mtrr.h], ac_cv_asm_mtrr_h=yes)
+if test "x$ac_cv_asm_mtrr_h" = xyes; then
+	HAVE_MTRR=yes
+fi
+
+dnl BSD MTRR header
+AC_CHECK_HEADERS([sys/memrange.h], ac_cv_memrange_h=yes)
+if test "x$ac_cv_memrange_h" = xyes; then
+	HAVE_MTRR=yes
+fi
+
+if test "x$HAVE_MTRR" = xyes; then
+	AC_DEFINE(HAS_MTRR_SUPPORT, 1, [MTRR support available])
+fi
+
+dnl A NetBSD MTRR header
+AC_CHECK_HEADERS([machine/mtrr.h], ac_cv_machine_mtrr_h=yes)
+if test "x$ac_cv_machine_mtrr_h" = xyes; then
+	AC_DEFINE(HAS_MTRR_BUILTIN, 1, [Define to 1 if NetBSD built-in MTRR
+		support is available])
+fi
+
+dnl FreeBSD kldload support (sys/linker.h)
+AC_CHECK_HEADERS([sys/linker.h],
+	[ac_cv_sys_linker_h=yes],
+	[ac_cv_sys_linker_h=no],
+	[#include <sys/param.h>])
+AM_CONDITIONAL(FREEBSD_KLDLOAD, [test "x$ac_cv_sys_linker_h" = xyes])
+
+AC_CACHE_CHECK([for SYSV IPC],
+		ac_cv_sysv_ipc,
+		[AC_TRY_LINK([
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+],[
+{ 
+    int id;
+    id = shmget(IPC_PRIVATE, 512, SHM_W | SHM_R);
+    if (id < 0) return -1;
+    return shmctl(id, IPC_RMID, 0);
+}],
+	[ac_cv_sysv_ipc=yes],
+	[ac_cv_sysv_ipc=no])])
+if test "x$ac_cv_sysv_ipc" = xyes; then
+	AC_DEFINE(HAVE_SYSV_IPC, 1, [Define to 1 if SYSV IPC is available])
+fi
+
+dnl OpenBSD /dev/xf86 aperture driver 
+if test -c /dev/xf86 ; then
+	AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])
+fi
+
+dnl BSD APM support 
+AC_CHECK_HEADER([machine/apmvar.h],[
+	AC_CHECK_HEADER([sys/event.h],
+		ac_cv_BSD_KQUEUE_APM=yes,
+		ac_cv_BSD_APM=yes)])
+
+AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])
+AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])
+	
+dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)
+AC_CHECK_HEADER([execinfo.h],[
+    AC_CHECK_LIB(c, backtrace, [
+        AC_DEFINE(HAVE_BACKTRACE, 1, [Has backtrace support])
+        AC_DEFINE(HAVE_EXECINFO_H, 1, [Have execinfo.h])
+    ])]
+)
+
+dnl ---------------------------------------------------------------------------
+dnl Bus options and CPU capabilities.  Replaces logic in
+dnl hw/xfree86/os-support/bus/Makefile.am, among others.
+dnl ---------------------------------------------------------------------------
+DEFAULT_INT10="x86emu"
+
+dnl Override defaults as needed for specific platforms:
+
+case $host_cpu in
+  alpha*)
+	ALPHA_VIDEO=yes
+	case $host_os in
+	        *freebsd*)	SYS_LIBS=-lio ;;
+		*netbsd*)	AC_DEFINE(USE_ALPHA_PIO, 1, [NetBSD PIO alpha IO]) ;;
+	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64 -mieee"
+	;;
+  arm*)
+	ARM_VIDEO=yes
+	;;
+  i*86)
+	I386_VIDEO=yes
+	case $host_os in
+		*freebsd*)	AC_DEFINE(USE_DEV_IO) ;;
+		*dragonfly*)	AC_DEFINE(USE_DEV_IO) ;;
+		*netbsd*)	AC_DEFINE(USE_I386_IOPL)
+				SYS_LIBS=-li386
+				;;
+		*openbsd*)	AC_DEFINE(USE_I386_IOPL) 
+				SYS_LIBS=-li386
+				;;
+	esac
+        ;;
+  powerpc*)
+	PPC_VIDEO=yes
+	case $host_os in
+		*freebsd*)	DEFAULT_INT10=stub ;;
+	esac
+	;;
+  sparc*)
+	SPARC64_VIDEO=yes
+	BSD_ARCH_SOURCES="sparc64_video.c ioperm_noop.c"
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  x86_64*|amd64*)
+	I386_VIDEO=yes
+	case $host_os in
+		*freebsd*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
+		*dragonfly*)	AC_DEFINE(USE_DEV_IO, 1, [BSD /dev/io]) ;;
+		*netbsd*)	AC_DEFINE(USE_I386_IOPL, 1, [BSD i386 iopl])
+				SYS_LIBS=-lx86_64
+				;;
+		*openbsd*)	AC_DEFINE(USE_AMD64_IOPL, 1, [BSD AMD64 iopl])
+				SYS_LIBS=-lamd64
+				;;
+	esac
+	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  ia64*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+  s390*)
+  	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+	;;
+esac
+AC_SUBST(GLX_ARCH_DEFINES)
+
+dnl BSD *_video.c selection
+AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
+AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
+AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes])
+AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
+AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
+
+DRI=no
+USE_SIGIO_BY_DEFAULT="yes"
+dnl it would be nice to autodetect these *CONS_SUPPORTs
+case $host_os in
+  *freebsd* | *dragonfly*)
+	case $host_os in
+		kfreebsd*-gnu) ;;
+		*) AC_DEFINE(CSRG_BASED, 1, [System is BSD-like]) ;;
+	esac
+	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
+	AC_DEFINE(SYSCONS_SUPPORT, 1, [System has syscons console])
+	DRI=yes
+	;;
+  *netbsd*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	AC_DEFINE(PCCONS_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PCVT console])
+	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	DRI=yes
+	;;
+  *openbsd*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	AC_DEFINE(PCVT_SUPPORT, 1, [System has PC console])
+	AC_DEFINE(WSCONS_SUPPORT, 1, [System has wscons console])
+	;;
+  *linux*)
+	DRI=yes
+	;;
+  *solaris*)
+	PKG_CHECK_EXISTS(libdrm, DRI=yes, DRI=no)
+	# Disable use of SIGIO by default until some system bugs are
+	# fixed - see Sun/OpenSolaris bug id 6879897
+	USE_SIGIO_BY_DEFAULT="no"
+	;;
+  darwin*)
+	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
+	;;
+  cygwin*)
+	CFLAGS="$CFLAGS -DFD_SETSIZE=256"
+	;;
+esac
+
+dnl augment XORG_RELEASE_VERSION for our snapshot number and to expose the
+dnl major number
+PVMAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`
+PVS=`echo $PACKAGE_VERSION | cut -d . -f 4 | cut -d - -f 1`
+if test "x$PVS" = "x"; then
+	PVS="0"
+fi
+
+VENDOR_RELEASE="((($PVMAJOR) * 10000000) + (($PVM) * 100000) + (($PVP) * 1000) + $PVS)"
+VENDOR_MAN_VERSION="Version ${PACKAGE_VERSION}"
+
+VENDOR_NAME="The X.Org Foundation"
+VENDOR_NAME_SHORT="X.Org"
+VENDOR_WEB="http://wiki.x.org"
+
+m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
+
+dnl Build options.
+AC_ARG_ENABLE(werror,        AS_HELP_STRING([--enable-werror],
+		  [Obsolete - use --enable-strict-compilation instead]),
+  AC_MSG_ERROR([--enable-werror has been replaced by --enable-strict-compilation]))
+
+AC_ARG_ENABLE(debug,         AS_HELP_STRING([--enable-debug],
+				  [Enable debugging (default: disabled)]),
+			        [DEBUGGING=$enableval], [DEBUGGING=no])
+AC_ARG_ENABLE(use-sigio-by-default, AS_HELP_STRING([--enable-use-sigio-by-default]
+  [Enable SIGIO input handlers by default (default: $USE_SIGIO_BY_DEFAULT)]),
+                                [USE_SIGIO_BY_DEFAULT=$enableval], [])
+AC_ARG_WITH(int10,           AS_HELP_STRING([--with-int10=BACKEND], [int10 backend: vm86, x86emu or stub]),
+				[INT10="$withval"],
+				[INT10="$DEFAULT_INT10"])
+AC_ARG_WITH(vendor-name,     AS_HELP_STRING([--with-vendor-name=VENDOR],
+				  [Vendor string reported by the server]),
+				[ VENDOR_NAME="$withval" ], [])
+AC_ARG_WITH(vendor-name-short, AS_HELP_STRING([--with-vendor-name-short=VENDOR],
+				  [Short version of vendor string reported by the server]),
+				[ VENDOR_NAME_SHORT="$withval" ], [])
+AC_ARG_WITH(vendor-web,      AS_HELP_STRING([--with-vendor-web=URL],
+				  [Vendor web address reported by the server]),
+				[ VENDOR_WEB="$withval" ], [])
+AC_ARG_WITH(module-dir,      AS_HELP_STRING([--with-module-dir=DIR],
+				  [Directory where modules are installed (default: $libdir/xorg/modules)]),
+				[ moduledir="$withval" ],
+				[ moduledir="${libdir}/xorg/modules" ])
+AC_ARG_WITH(log-dir,         AS_HELP_STRING([--with-log-dir=DIR],
+				  [Directory where log files are kept (default: $localstatedir/log)]),
+				[ logdir="$withval" ],
+				[ logdir="$localstatedir/log" ])
+AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],
+				  [Builder address (default: xorg@lists.freedesktop.org)]),
+				[ BUILDERADDR="$withval" ],
+				[ BUILDERADDR="xorg@lists.freedesktop.org" ])
+AC_ARG_WITH(os-name,         AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),
+				[ OSNAME="$withval" ],
+				[ OSNAME=`uname -srm` ])
+AC_ARG_WITH(os-vendor,       AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
+				[ OSVENDOR="$withval" ],
+				[ OSVENDOR="" ])
+AC_ARG_WITH(builderstring,   AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),
+				[ BUILDERSTRING="$withval" ]
+				[ ])
+
+dnl Determine font path
+XORG_FONTROOTDIR
+XORG_FONTSUBDIR(FONTMISCDIR, fontmiscdir, misc)
+XORG_FONTSUBDIR(FONTOTFDIR, fontotfdir, OTF)
+XORG_FONTSUBDIR(FONTTTFDIR, fontttfdir, TTF)
+XORG_FONTSUBDIR(FONTTYPE1DIR, fonttype1dir, Type1)
+XORG_FONTSUBDIR(FONT75DPIDIR, font75dpidir, 75dpi)
+XORG_FONTSUBDIR(FONT100DPIDIR, font100dpidir, 100dpi)
+
+dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d,
+dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross
+dnl compiling, assume default font path uses standard FONTROOTDIR directories.
+DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/"
+if test "$cross_compiling" != yes; then
+	AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d],
+		[DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'],
+		[case $host_os in
+			darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
+		esac])
+fi
+AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
+				[ FONTPATH="$withval" ],
+				[ FONTPATH="${DEFAULT_FONT_PATH}" ])
+
+AC_MSG_CHECKING([for default font path])
+AC_MSG_RESULT([$FONTPATH])
+
+AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
+				[ XKBPATH="$withval" ],
+				[ XKBPATH="${datadir}/X11/xkb" ])
+AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
+				[ XKBOUTPUT="$withval" ],
+				[ XKBOUTPUT="compiled" ])
+AC_ARG_WITH(default-xkb-rules, AS_HELP_STRING([--with-default-xkb-rules=RULES],
+                                   [Keyboard ruleset (default: base/evdev)]),
+                                [ XKB_DFLT_RULES="$withval" ],
+                                [ XKB_DFLT_RULES="" ])
+AC_ARG_WITH(default-xkb-model, AS_HELP_STRING([--with-default-xkb-model=MODEL],
+                                   [Keyboard model (default: pc105)]),
+                                [ XKB_DFLT_MODEL="$withval" ],
+                                [ XKB_DFLT_MODEL="pc105" ])
+AC_ARG_WITH(default-xkb-layout, AS_HELP_STRING([--with-default-xkb-layout=LAYOUT],
+                                   [Keyboard layout (default: us)]),
+                                [ XKB_DFLT_LAYOUT="$withval" ],
+                                [ XKB_DFLT_LAYOUT="us" ])
+AC_ARG_WITH(default-xkb-variant, AS_HELP_STRING([--with-default-xkb-variant=VARIANT],
+                                   [Keyboard variant (default: (none))]),
+                                [ XKB_DFLT_VARIANT="$withval" ],
+                                [ XKB_DFLT_VARIANT="" ])
+AC_ARG_WITH(default-xkb-options, AS_HELP_STRING([--with-default-xkb-options=OPTIONS],
+                                   [Keyboard layout options (default: (none))]),
+                                [ XKB_DFLT_OPTIONS="$withval" ],
+                                [ XKB_DFLT_OPTIONS="" ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH],
+				   [Directory where ancillary server config files are installed (default: ${libdir}/xorg)]),
+				[ SERVERCONFIG="$withval" ],
+				[ SERVERCONFIG="${libdir}/xorg" ])
+AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: /Applications/Utilities)]),
+				[ APPLE_APPLICATIONS_DIR="${withval}" ],
+				[ APPLE_APPLICATIONS_DIR="/Applications/Utilities" ])
+AC_SUBST([APPLE_APPLICATIONS_DIR])
+AC_ARG_WITH(apple-application-name,AS_HELP_STRING([--with-apple-application-name=NAME], [Name for the .app (default: X11)]),
+				[ APPLE_APPLICATION_NAME="${withval}" ],
+				[ APPLE_APPLICATION_NAME="X11" ])
+AC_SUBST([APPLE_APPLICATION_NAME])
+AC_ARG_WITH(launchd-id-prefix,  AS_HELP_STRING([--with-launchd-id-prefix=PATH], [Prefix to use for launchd identifiers (default: org.x)]),
+                                [ LAUNCHD_ID_PREFIX="${withval}" ],
+                                [ LAUNCHD_ID_PREFIX="org.x" ])
+AC_SUBST([LAUNCHD_ID_PREFIX])
+AC_DEFINE_UNQUOTED(LAUNCHD_ID_PREFIX, "$LAUNCHD_ID_PREFIX", [Prefix to use for launchd identifiers])
+AC_ARG_ENABLE(sparkle,AS_HELP_STRING([--enable-sparkle], [Enable updating of X11.app using the Sparkle Framework (default: disabled)]),
+				[ XQUARTZ_SPARKLE="${enableval}" ],
+				[ XQUARTZ_SPARKLE="no" ])
+AC_SUBST([XQUARTZ_SPARKLE])
+AC_ARG_ENABLE(install-libxf86config,
+				AS_HELP_STRING([--enable-install-libxf86config],
+				[Install libxf86config (default: disabled)]),
+				[INSTALL_LIBXF86CONFIG=$enableval],
+				[INSTALL_LIBXF86CONFIG=no])
+AC_ARG_ENABLE(visibility,     AC_HELP_STRING([--enable-visibility], [Enable symbol visibility (default: auto)]),
+				[SYMBOL_VISIBILITY=$enableval],
+				[SYMBOL_VISIBILITY=auto])
+AC_ARG_ENABLE(pc98,     	AC_HELP_STRING([--enable-pc98], [Enable PC98 support in Xorg (default: auto)]),
+				[SUPPORT_PC98=$enableval],
+				[SUPPORT_PC98=auto])
+
+dnl GLX build options
+AC_ARG_ENABLE(aiglx,          AS_HELP_STRING([--enable-aiglx], [Build accelerated indirect GLX (default: enabled)]),
+                                [AIGLX=$enableval],
+                                [AIGLX=yes])
+AX_TLS
+AC_ARG_ENABLE(glx-tls,        AS_HELP_STRING([--enable-glx-tls], [Build GLX with TLS support (default: auto)]),
+                                [GLX_USE_TLS=$enableval
+                                 if test "x$GLX_USE_TLS" = "xyes" && test "${ac_cv_tls}" = "none" ; then
+                                   AC_MSG_ERROR([GLX with TLS support requested, but the compiler does not support it.])
+                                 fi],
+                                [GLX_USE_TLS=no
+                                 if test "${ac_cv_tls}" != "none" ; then
+                                   GLX_USE_TLS=yes
+                                 fi])
+AC_SUBST(GLX_TLS, ${GLX_USE_TLS})
+
+dnl Extensions.
+AC_ARG_ENABLE(registry,       AS_HELP_STRING([--disable-registry], [Build string registry module (default: enabled)]), [XREGISTRY=$enableval], [XREGISTRY=yes])
+AC_ARG_ENABLE(composite,      AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes])
+AC_ARG_ENABLE(mitshm,         AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes])
+AC_ARG_ENABLE(xres,           AS_HELP_STRING([--disable-xres], [Build XRes extension (default: enabled)]), [RES=$enableval], [RES=yes])
+AC_ARG_ENABLE(record,         AS_HELP_STRING([--disable-record], [Build Record extension (default: enabled)]), [RECORD=$enableval], [RECORD=yes])
+AC_ARG_ENABLE(xv,             AS_HELP_STRING([--disable-xv], [Build Xv extension (default: enabled)]), [XV=$enableval], [XV=yes])
+AC_ARG_ENABLE(xvmc,           AS_HELP_STRING([--disable-xvmc], [Build XvMC extension (default: enabled)]), [XVMC=$enableval], [XVMC=yes])
+AC_ARG_ENABLE(dga,            AS_HELP_STRING([--disable-dga], [Build DGA extension (default: auto)]), [DGA=$enableval], [DGA=auto])
+AC_ARG_ENABLE(screensaver,    AS_HELP_STRING([--disable-screensaver], [Build ScreenSaver extension (default: enabled)]), [SCREENSAVER=$enableval], [SCREENSAVER=yes])
+AC_ARG_ENABLE(xdmcp,          AS_HELP_STRING([--disable-xdmcp], [Build XDMCP extension (default: auto)]), [XDMCP=$enableval], [XDMCP=auto])
+AC_ARG_ENABLE(xdm-auth-1,     AS_HELP_STRING([--disable-xdm-auth-1], [Build XDM-Auth-1 extension (default: auto)]), [XDMAUTH=$enableval], [XDMAUTH=auto])
+AC_ARG_ENABLE(glx,            AS_HELP_STRING([--disable-glx], [Build GLX extension (default: enabled)]), [GLX=$enableval], [GLX=yes])
+AC_ARG_ENABLE(dri,            AS_HELP_STRING([--enable-dri], [Build DRI extension (default: auto)]), [DRI=$enableval])
+AC_ARG_ENABLE(dri2,           AS_HELP_STRING([--enable-dri2], [Build DRI2 extension (default: auto)]), [DRI2=$enableval], [DRI2=auto])
+AC_ARG_ENABLE(xinerama,	      AS_HELP_STRING([--disable-xinerama], [Build Xinerama extension (default: enabled)]), [XINERAMA=$enableval], [XINERAMA=yes])
+AC_ARG_ENABLE(xf86vidmode,    AS_HELP_STRING([--disable-xf86vidmode], [Build XF86VidMode extension (default: auto)]), [XF86VIDMODE=$enableval], [XF86VIDMODE=auto])
+AC_ARG_ENABLE(xace,           AS_HELP_STRING([--disable-xace], [Build X-ACE extension (default: enabled)]), [XACE=$enableval], [XACE=yes])
+AC_ARG_ENABLE(xselinux,       AS_HELP_STRING([--enable-xselinux], [Build SELinux extension (default: disabled)]), [XSELINUX=$enableval], [XSELINUX=no])
+AC_ARG_ENABLE(xcsecurity,     AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]), [XCSECURITY=$enableval], [XCSECURITY=no])
+AC_ARG_ENABLE(tslib,          AS_HELP_STRING([--enable-tslib], [Build kdrive tslib touchscreen support (default: disabled)]), [TSLIB=$enableval], [TSLIB=no])
+AC_ARG_ENABLE(dbe,            AS_HELP_STRING([--disable-dbe], [Build DBE extension (default: enabled)]), [DBE=$enableval], [DBE=yes])
+AC_ARG_ENABLE(xf86bigfont,    AS_HELP_STRING([--enable-xf86bigfont], [Build XF86 Big Font extension (default: disabled)]), [XF86BIGFONT=$enableval], [XF86BIGFONT=no])
+AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS extension (default: enabled)]), [DPMSExtension=$enableval], [DPMSExtension=yes])
+AC_ARG_ENABLE(config-udev,    AS_HELP_STRING([--enable-config-udev], [Build udev support (default: auto)]), [CONFIG_UDEV=$enableval], [CONFIG_UDEV=auto])
+AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
+AC_ARG_ENABLE(config-hal,     AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
+AC_ARG_ENABLE(xfree86-utils,     AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
+AC_ARG_ENABLE(xaa,               AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
+AC_ARG_ENABLE(vgahw,          AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
+AC_ARG_ENABLE(vbe,            AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
+AC_ARG_ENABLE(int10-module,     AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
+AC_ARG_ENABLE(windowswm,      AS_HELP_STRING([--enable-windowswm], [Build XWin with WindowsWM extension (default: no)]), [WINDOWSWM=$enableval], [WINDOWSWM=no])
+AC_ARG_ENABLE(libdrm,         AS_HELP_STRING([--enable-libdrm], [Build Xorg with libdrm support (default: enabled)]), [DRM=$enableval],[DRM=yes])
+AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg with client ID tracking (default: enabled)]), [CLIENTIDS=$enableval], [CLIENTIDS=yes])
+
+dnl DDXes.
+AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
+AC_ARG_ENABLE(dmx,    	      AS_HELP_STRING([--enable-dmx], [Build DMX server (default: auto)]), [DMX=$enableval], [DMX=auto])
+AC_ARG_ENABLE(xvfb,    	      AS_HELP_STRING([--enable-xvfb], [Build Xvfb server (default: yes)]), [XVFB=$enableval], [XVFB=yes])
+AC_ARG_ENABLE(xnest,   	      AS_HELP_STRING([--enable-xnest], [Build Xnest server (default: auto)]), [XNEST=$enableval], [XNEST=auto])
+AC_ARG_ENABLE(xquartz,        AS_HELP_STRING([--enable-xquartz], [Build Xquartz server for OS-X (default: auto)]), [XQUARTZ=$enableval], [XQUARTZ=auto])
+AC_ARG_ENABLE(standalone-xpbproxy, AS_HELP_STRING([--enable-standalone-xpbproxy], [Build a standalone xpbproxy (in addition to the one integrated into Xquartz as a separate thread) (default: no)]), [STANDALONE_XPBPROXY=$enableval], [STANDALONE_XPBPROXY=no])
+AC_ARG_ENABLE(xwin,    	      AS_HELP_STRING([--enable-xwin], [Build XWin server (default: auto)]), [XWIN=$enableval], [XWIN=auto])
+dnl kdrive and its subsystems
+AC_ARG_ENABLE(kdrive,         AS_HELP_STRING([--enable-kdrive], [Build kdrive servers (default: no)]), [KDRIVE=$enableval], [KDRIVE=no])
+AC_ARG_ENABLE(xephyr,         AS_HELP_STRING([--enable-xephyr], [Build the kdrive Xephyr server (default: auto)]), [XEPHYR=$enableval], [XEPHYR=auto])
+AC_ARG_ENABLE(xfake,          AS_HELP_STRING([--enable-xfake], [Build the kdrive 'fake' server (default: auto)]), [XFAKE=$enableval], [XFAKE=auto])
+AC_ARG_ENABLE(xfbdev,         AS_HELP_STRING([--enable-xfbdev], [Build the kdrive framebuffer device server (default: auto)]), [XFBDEV=$enableval], [XFBDEV=auto])
+dnl kdrive options
+AC_ARG_ENABLE(kdrive-kbd,     AS_HELP_STRING([--enable-kdrive-kbd], [Build kbd driver for kdrive (default: auto)]), [KDRIVE_KBD=$enableval], [KDRIVE_KBD=auto])
+AC_ARG_ENABLE(kdrive-mouse,   AC_HELP_STRING([--enable-kdrive-mouse], [Build mouse driver for kdrive (default: auto)]), [KDRIVE_MOUSE=$enableval], [KDRIVE_MOUSE=auto])
+AC_ARG_ENABLE(kdrive-evdev,   AC_HELP_STRING([--enable-kdrive-evdev], [Build evdev driver for kdrive (default: auto)]), [KDRIVE_EVDEV=$enableval], [KDRIVE_EVDEV=auto])
+
+
+dnl chown/chmod to be setuid root as part of build
+dnl Replaces InstallXserverSetUID in imake
+AC_ARG_ENABLE(install-setuid, 
+    AS_HELP_STRING([--enable-install-setuid],
+       [Install Xorg server as owned by root with setuid bit (default: auto)]),
+    [SETUID=$enableval], [SETUID=auto])
+AC_MSG_CHECKING([to see if we can install the Xorg server as root])
+if test "x$SETUID" = "xauto" ; then
+	case $host_os in
+	    cygwin*)		SETUID="no"  ;;
+	    darwin*)		SETUID="no"  ;;
+	    *)
+	   	case $host_cpu in
+		    sparc)	SETUID="no"  ;;
+		    *)		SETUID="yes" ;;
+		esac
+	esac
+	if test "x$SETUID" = xyes; then
+		touch testfile
+		chown root testfile > /dev/null 2>&1 || SETUID="no"
+		rm -f testfile
+	fi
+fi
+AC_MSG_RESULT([$SETUID])
+AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])
+
+dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
+dnl was not expanded, since xorg-server with no transport types is rather useless.
+dnl
+dnl If you're seeing an error here, be sure you installed the lib/xtrans module
+dnl first and if it's not in the default location, that you set the ACLOCAL
+dnl environment variable to find it, such as:
+dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
+m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
+
+# Transport selection macro from xtrans.m4
+XTRANS_CONNECTION_FLAGS
+
+# Secure RPC detection macro from xtrans.m4
+XTRANS_SECURE_RPC_FLAGS
+AM_CONDITIONAL(SECURE_RPC, [test "x$SECURE_RPC" = xyes])
+
+AM_CONDITIONAL(INT10_VM86, [test "x$INT10" = xvm86])
+AM_CONDITIONAL(INT10_X86EMU, [test "x$INT10" = xx86emu])
+AM_CONDITIONAL(INT10_STUB, [test "x$INT10" = xstub])
+if test "x$INT10" = xyes; then
+	dnl VM86 headers
+	AC_CHECK_HEADERS([sys/vm86.h sys/io.h])
+fi
+
+dnl Handle installing libxf86config
+AM_CONDITIONAL(INSTALL_LIBXF86CONFIG, [test "x$INSTALL_LIBXF86CONFIG" = xyes])
+
+dnl DDX Detection... Yes, it's ugly to have it here... but we need to
+dnl handle this early on so that we don't require unsupported extensions
+case $host_os in
+	cygwin*)
+		DGA=no
+		DRI2=no
+		XF86VIDMODE=no
+		XSELINUX=no
+		XV=no
+		;;
+	darwin*)
+		DRI2=no
+
+		if test x$XQUARTZ = xauto; then
+			AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[
+		 		save_LDFLAGS=$LDFLAGS
+				LDFLAGS="$LDFLAGS -framework Carbon"
+				AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],
+				[xorg_cv_Carbon_framework=yes],
+				[xorg_cv_Carbon_framework=no])
+			LDFLAGS=$save_LDFLAGS])
+                
+			if test "X$xorg_cv_Carbon_framework" = Xyes; then
+				XQUARTZ=yes
+			else
+				XQUARTZ=no
+			fi
+		fi
+
+		if test "x$XQUARTZ" = xyes ; then
+			XQUARTZ=yes
+			XVFB=no
+			XNEST=no
+
+			COMPOSITE=no
+			DGA=no
+			DPMSExtension=no
+			XF86VIDMODE=no
+		fi
+		;;
+	*) XQUARTZ=no ;;
+esac
+
+dnl ---------------------------------------------------------------------------
+dnl Extension section
+dnl ---------------------------------------------------------------------------
+XEXT_INC='-I$(top_srcdir)/Xext'
+XEXT_LIB='$(top_builddir)/Xext/libXext.la'
+XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+
+dnl Optional modules
+VIDEOPROTO="videoproto"
+COMPOSITEPROTO="compositeproto >= 0.4"
+RECORDPROTO="recordproto >= 1.13.99.1"
+SCRNSAVERPROTO="scrnsaverproto >= 1.1"
+RESOURCEPROTO="resourceproto"
+DRIPROTO="xf86driproto >= 2.1.0"
+DRI2PROTO="dri2proto >= 2.3"
+XINERAMAPROTO="xineramaproto"
+BIGFONTPROTO="xf86bigfontproto >= 1.2.0"
+DGAPROTO="xf86dgaproto >= 2.0.99.1"
+GLPROTO="glproto >= 1.4.10"
+DMXPROTO="dmxproto >= 2.2.99.1"
+VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
+WINDOWSWMPROTO="windowswmproto"
+APPLEWMPROTO="applewmproto >= 1.4"
+
+dnl Core modules for most extensions, et al.
+SDK_REQUIRED_MODULES="[xproto >= 7.0.17] [randrproto >= 1.2.99.3] [renderproto >= 0.11] [xextproto >= 7.1.99] [inputproto >= 1.9.99.902] [kbproto >= 1.0.3] fontsproto"
+# Make SDK_REQUIRED_MODULES available for inclusion in xorg-server.pc
+AC_SUBST(SDK_REQUIRED_MODULES)
+
+dnl List of libraries that require a specific version
+LIBAPPLEWM="applewm >= 1.4"
+LIBDMX="dmx >= 1.0.99.1"
+LIBDRI="dri >= 7.8.0"
+LIBDRM="libdrm >= 2.3.0"
+LIBGL="gl >= 7.1.0"
+LIBXEXT="xext >= 1.0.99.4"
+LIBXFONT="xfont >= 1.4.2"
+LIBXI="xi >= 1.2.99.1"
+LIBXTST="xtst >= 1.0.99.2"
+LIBPCIACCESS="pciaccess >= 0.8.0"
+LIBGLIB="glib-2.0 >= 2.16"
+LIBUDEV="libudev >= 143"
+LIBSELINUX="libselinux >= 2.0.86"
+LIBDBUS="dbus-1 >= 1.0"
+LIBPIXMAN="pixman-1 >= 0.21.6"
+
+dnl Pixman is always required, but we separate it out so we can link
+dnl specific modules against it
+PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
+REQUIRED_LIBS="$REQUIRED_LIBS $LIBPIXMAN $LIBXFONT xau"
+
+REQUIRED_MODULES="[fixesproto >= 4.1] [damageproto >= 1.1] [xcmiscproto >= 1.2.0] [xtrans >= 1.2.2] [bigreqsproto >= 1.1.0] $SDK_REQUIRED_MODULES"
+
+if test "x$CONFIG_UDEV" = xyes &&
+ { test "x$CONFIG_DBUS_API" = xyes || test "x$CONFIG_HAL" = xyes; }; then
+	AC_MSG_ERROR([Hotplugging through both libudev and dbus/hal not allowed])
+fi
+
+PKG_CHECK_MODULES(UDEV, $LIBUDEV, [HAVE_LIBUDEV=yes], [HAVE_LIBUDEV=no])
+if test "x$CONFIG_UDEV" = xauto; then
+	CONFIG_UDEV="$HAVE_LIBUDEV"
+fi
+AM_CONDITIONAL(CONFIG_UDEV, [test "x$CONFIG_UDEV" = xyes])
+if test "x$CONFIG_UDEV" = xyes; then
+	CONFIG_DBUS_API=no
+	CONFIG_HAL=no
+	if ! test "x$HAVE_LIBUDEV" = xyes; then
+		AC_MSG_ERROR([udev configuration API requested, but libudev is not installed])
+	fi
+	AC_DEFINE(CONFIG_UDEV, 1, [Use libudev for input hotplug])
+fi
+
+dnl HAVE_DBUS is true if we actually have the D-Bus library, whereas
+dnl CONFIG_DBUS_API is true if we want to enable the D-Bus config
+dnl API.
+PKG_CHECK_MODULES(DBUS, $LIBDBUS, [HAVE_DBUS=yes], [HAVE_DBUS=no])
+if test "x$HAVE_DBUS" = xyes; then
+	AC_DEFINE(HAVE_DBUS, 1, [Have D-Bus support])
+fi
+AM_CONDITIONAL(HAVE_DBUS, [test "x$HAVE_DBUS" = xyes])
+
+if test "x$CONFIG_DBUS_API" = xauto; then
+	CONFIG_DBUS_API="$HAVE_DBUS"
+fi
+if test "x$CONFIG_DBUS_API" = xyes; then
+	if ! test "x$HAVE_DBUS" = xyes; then
+		AC_MSG_ERROR([D-Bus configuration API requested, but D-Bus is not installed.])
+	fi
+
+	AC_DEFINE(CONFIG_DBUS_API, 1, [Use the D-Bus input configuration API])
+	CONFIG_NEED_DBUS="yes"
+fi
+AM_CONDITIONAL(CONFIG_DBUS_API, [test "x$CONFIG_DBUS_API" = xyes])
+
+PKG_CHECK_MODULES(HAL, hal, [HAVE_HAL=yes], [HAVE_HAL=no])
+if test "x$CONFIG_HAL" = xauto; then
+	CONFIG_HAL="$HAVE_HAL"
+fi
+if test "x$CONFIG_HAL" = xyes; then
+	if ! test "x$HAVE_HAL" = xyes; then
+		AC_MSG_ERROR([HAL hotplug API requested, but HAL is not installed.])
+	fi
+
+	AC_DEFINE(CONFIG_HAL, 1, [Use the HAL hotplug API])
+	CONFIG_NEED_DBUS="yes"
+fi
+AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])
+
+if test "x$CONFIG_NEED_DBUS" = xyes; then
+        AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])
+fi
+AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])
+
+if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
+	USE_SIGIO_BY_DEFAULT_VALUE=TRUE
+else
+	USE_SIGIO_BY_DEFAULT_VALUE=FALSE
+fi
+AC_DEFINE_UNQUOTED([USE_SIGIO_BY_DEFAULT], [$USE_SIGIO_BY_DEFAULT_VALUE],
+		   [Use SIGIO handlers for input device events by default])
+
+AC_MSG_CHECKING([for glibc...])
+AC_PREPROC_IFELSE([
+#include <features.h>
+#ifndef __GLIBC__
+#error
+#endif
+], glibc=yes, glibc=no)
+AC_MSG_RESULT([$glibc])
+
+AC_CHECK_FUNCS([clock_gettime], [have_clock_gettime=yes],
+               [AC_CHECK_LIB([rt], [clock_gettime], [have_clock_gettime=-lrt],
+                             [have_clock_gettime=no])])
+
+AC_MSG_CHECKING([for a useful monotonic clock ...])
+
+if ! test "x$have_clock_gettime" = xno; then
+    if ! test "x$have_clock_gettime" = xyes; then
+        CLOCK_LIBS="$have_clock_gettime"
+    else
+        CLOCK_LIBS=""
+    fi
+
+    LIBS_SAVE="$LIBS"
+    LIBS="$CLOCK_LIBS"
+    CPPFLAGS_SAVE="$CPPFLAGS"
+
+    if test x"$glibc" = xyes; then
+        CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L"
+    fi
+
+    AC_RUN_IFELSE([
+#include <time.h>
+
+int main(int argc, char *argv[[]]) {
+    struct timespec tp;
+
+    if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
+        return 0;
+    else
+        return 1;
+}
+    ], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
+       [MONOTONIC_CLOCK="cross compiling"])
+
+    LIBS="$LIBS_SAVE"
+    CPPFLAGS="$CPPFLAGS_SAVE"
+else
+    MONOTONIC_CLOCK=no
+fi
+
+AC_MSG_RESULT([$MONOTONIC_CLOCK])
+
+if test "x$MONOTONIC_CLOCK" = xyes; then
+    AC_DEFINE(MONOTONIC_CLOCK, 1, [Have monotonic clock from clock_gettime()])
+    LIBS="$LIBS $CLOCK_LIBS"
+fi
+
+AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+if test "x$XV" = xyes; then
+	AC_DEFINE(XV, 1, [Support Xv extension])
+	AC_DEFINE(XvExtension, 1, [Build Xv extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $VIDEOPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $VIDEOPROTO"
+else
+	XVMC=no
+fi
+
+AM_CONDITIONAL(XVMC, [test "x$XVMC" = xyes])
+if test "x$XVMC" = xyes; then
+	AC_DEFINE(XvMCExtension, 1, [Build XvMC extension])
+fi
+
+AM_CONDITIONAL(XREGISTRY, [test "x$XREGISTRY" = xyes])
+if test "x$XREGISTRY" = xyes; then
+	AC_DEFINE(XREGISTRY, 1, [Build registry module])
+fi
+
+AM_CONDITIONAL(COMPOSITE, [test "x$COMPOSITE" = xyes])
+if test "x$COMPOSITE" = xyes; then
+	AC_DEFINE(COMPOSITE, 1, [Support Composite Extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $COMPOSITEPROTO"
+	COMPOSITE_LIB='$(top_builddir)/composite/libcomposite.la'
+	COMPOSITE_INC='-I$(top_srcdir)/composite'
+fi
+
+AM_CONDITIONAL(MITSHM, [test "x$MITSHM" = xyes])
+if test "x$MITSHM" = xyes; then
+	AC_DEFINE(MITSHM, 1, [Support MIT-SHM extension])
+	AC_DEFINE(HAS_SHM, 1, [Support SHM])
+fi
+
+AM_CONDITIONAL(RECORD, [test "x$RECORD" = xyes])
+if test "x$RECORD" = xyes; then
+	AC_DEFINE(XRECORD, 1, [Support Record extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $RECORDPROTO"
+	RECORD_LIB='$(top_builddir)/record/librecord.la'
+fi
+
+AM_CONDITIONAL(SCREENSAVER, [test "x$SCREENSAVER" = xyes])
+if test "x$SCREENSAVER" = xyes; then
+	AC_DEFINE(SCREENSAVER, 1, [Support MIT-SCREEN-SAVER extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $SCRNSAVERPROTO"
+fi
+
+AM_CONDITIONAL(RES, [test "x$RES" = xyes])
+if test "x$RES" = xyes; then
+	AC_DEFINE(RES, 1, [Support X resource extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $RESOURCEPROTO"
+fi
+
+# The XRes extension may support client ID tracking only if it has
+# been specifically enabled. Client ID tracking is implicitly not
+# supported if XRes extension is disabled.
+AC_MSG_CHECKING([whether to track client ids])
+if test "x$RES" = xyes && test "x$CLIENTIDS" = xyes; then
+	AC_DEFINE(CLIENTIDS, 1, [Support client ID tracking])
+else
+	CLIENTIDS=no
+fi
+AC_MSG_RESULT([$CLIENTIDS])
+AM_CONDITIONAL(CLIENTIDS, [test "x$CLIENTIDS" = xyes])
+
+if test "x$GLX" = xyes; then
+	PKG_CHECK_MODULES([XLIB], [x11])
+	PKG_CHECK_MODULES([GL], $GLPROTO $LIBGL)
+	AC_SUBST(XLIB_CFLAGS)
+	AC_DEFINE(GLXEXT, 1, [Build GLX extension])
+	GLX_LIBS='$(top_builddir)/glx/libglx.la'
+	GLX_SYS_LIBS="$GLX_SYS_LIBS"
+else
+        GLX=no
+fi
+AM_CONDITIONAL(GLX, test "x$GLX" = xyes)
+
+if test "x$AIGLX" = xyes -a "x$GLX" = xyes -a "x$DRI" = xyes; then
+	AC_DEFINE(AIGLX, 1, [Build AIGLX loader])
+else
+	AIGLX=no
+fi
+AM_CONDITIONAL(AIGLX, test "x$AIGLX" = xyes)
+
+if test "x$GLX_USE_TLS" = xyes ; then
+	GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS"
+	GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread"
+fi
+AC_SUBST([GLX_DEFINES])
+
+AM_CONDITIONAL(DRI, test "x$DRI" = xyes)
+if test "x$DRI" = xyes; then
+	AC_DEFINE(XF86DRI, 1, [Build DRI extension])
+	PKG_CHECK_MODULES([DRIPROTO], [$DRIPROTO])
+	PKG_CHECK_MODULES([DRI], $GLPROTO $LIBDRI)
+	AC_SUBST(DRIPROTO_CFLAGS)
+fi
+
+PKG_CHECK_MODULES([DRI2PROTO], $DRI2PROTO,
+                  [HAVE_DRI2PROTO=yes], [HAVE_DRI2PROTO=no])
+case "$DRI2,$HAVE_DRI2PROTO" in
+	yes,no)
+		AC_MSG_ERROR([DRI2 requested, but dri2proto not found.])
+		;;
+	yes,yes | auto,yes)
+		AC_DEFINE(DRI2, 1, [Build DRI2 extension])
+		DRI2=yes
+		SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $DRI2PROTO"
+		;;
+esac
+AM_CONDITIONAL(DRI2, test "x$DRI2" = xyes)
+
+if test "x$DRI" = xyes || test "x$DRI2" = xyes; then
+	if test "x$DRM" = xyes; then
+		AC_DEFINE(WITH_LIBDRM, 1, [Building with libdrm support])
+		PKG_CHECK_MODULES([LIBDRM], $LIBDRM)
+	fi
+fi
+
+if test "x$DRI2" = xyes; then
+	save_CFLAGS=$CFLAGS
+	CFLAGS="$GL_CFLAGS $LIBDRM_CFLAGS"
+	AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <GL/gl.h>
+#include <GL/internal/dri_interface.h>
+#ifndef __DRI_DRI2
+#error DRI2 extension not available.
+#endif]])],
+			  [HAVE_DRI2EXTENSION=yes],
+			  [HAVE_DRI2EXTENSION=no])
+	CFLAGS=$save_CFLAGS
+	if test "x$HAVE_DRI2EXTENSION" = xyes; then
+		AC_DEFINE(DRI2_AIGLX, 1, [Build DRI2 AIGLX loader])
+		DRI2_AIGLX=yes
+	else
+		AC_MSG_NOTICE([DRI2 AIGLX disabled, __DRI_DRI2 not defined in dri_interface.h.])
+		DRI2_AIGLX=no
+	fi
+fi
+AM_CONDITIONAL(DRI2_AIGLX, test "x$DRI2_AIGLX" = xyes)
+
+
+AM_CONDITIONAL(XINERAMA, [test "x$XINERAMA" = xyes])
+if test "x$XINERAMA" = xyes; then
+	AC_DEFINE(XINERAMA, 1, [Support Xinerama extension])
+	AC_DEFINE(PANORAMIX, 1, [Internal define for Xinerama])
+	REQUIRED_MODULES="$REQUIRED_MODULES $XINERAMAPROTO"
+	SDK_REQUIRED_MODULES="$SDK_REQUIRED_MODULES $XINERAMAPROTO"
+fi
+
+AM_CONDITIONAL(XACE, [test "x$XACE" = xyes])
+if test "x$XACE" = xyes; then
+	AC_DEFINE(XACE, 1, [Build X-ACE extension])
+fi
+
+AM_CONDITIONAL(XSELINUX, [test "x$XSELINUX" = xyes])
+if test "x$XSELINUX" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build SELinux extension without X-ACE])
+	fi
+	AC_CHECK_HEADERS([libaudit.h], [], AC_MSG_ERROR([SELinux extension requires audit system headers]))
+	AC_CHECK_LIB(audit, audit_open, [], AC_MSG_ERROR([SELinux extension requires audit system library]))
+	PKG_CHECK_MODULES([SELINUX], $LIBSELINUX)
+	SELINUX_LIBS="$SELINUX_LIBS -laudit"
+	AC_DEFINE(XSELINUX, 1, [Build SELinux extension])
+fi
+
+AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])
+if test "x$XCSECURITY" = xyes; then
+	if test "x$XACE" != xyes; then
+		AC_MSG_ERROR([cannot build Security extension without X-ACE])
+	fi
+	AC_DEFINE(XCSECURITY, 1, [Build Security extension])
+fi
+
+AM_CONDITIONAL(DBE, [test "x$DBE" = xyes])
+if test "x$DBE" = xyes; then
+	AC_DEFINE(DBE, 1, [Support DBE extension])
+	DBE_LIB='$(top_builddir)/dbe/libdbe.la'
+fi
+
+AM_CONDITIONAL(XF86BIGFONT, [test "x$XF86BIGFONT" = xyes])
+if test "x$XF86BIGFONT" = xyes; then
+	AC_DEFINE(XF86BIGFONT, 1, [Support XF86 Big font extension])
+	REQUIRED_MODULES="$REQUIRED_MODULES $BIGFONTPROTO"
+fi
+
+AM_CONDITIONAL(DPMSExtension, [test "x$DPMSExtension" = xyes])
+if test "x$DPMSExtension" = xyes; then
+	AC_DEFINE(DPMSExtension, 1, [Support DPMS extension])
+fi
+
+AC_DEFINE(RENDER, 1, [Support RENDER extension])
+RENDER_LIB='$(top_builddir)/render/librender.la'
+RENDER_INC='-I$(top_srcdir)/render'
+
+AC_DEFINE(RANDR, 1, [Support RANDR extension])
+RANDR_LIB='$(top_builddir)/randr/librandr.la'
+RANDR_INC='-I$(top_srcdir)/randr'
+
+AC_DEFINE(XFIXES,1,[Support XFixes extension])
+FIXES_LIB='$(top_builddir)/xfixes/libxfixes.la'
+FIXES_INC='-I$(top_srcdir)/xfixes'
+
+AC_DEFINE(DAMAGE,1,[Support Damage extension])
+DAMAGE_LIB='$(top_builddir)/damageext/libdamageext.la'
+DAMAGE_INC='-I$(top_srcdir)/damageext'
+MIEXT_DAMAGE_LIB='$(top_builddir)/miext/damage/libdamage.la'
+MIEXT_DAMAGE_INC='-I$(top_srcdir)/miext/damage'
+
+# XINPUT extension is integral part of the server
+AC_DEFINE(XINPUT, 1, [Support X Input extension])
+XI_LIB='$(top_builddir)/Xi/libXi.la'
+XI_INC='-I$(top_srcdir)/Xi'
+
+AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
+AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
+AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
+
+AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
+
+AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
+AC_ARG_WITH(xkb-bin-directory,
+				AS_HELP_STRING([--with-xkb-bin-directory=DIR], [Directory containing xkbcomp program]),
+				[XKB_BIN_DIRECTORY="$withval"],
+				[XKB_BIN_DIRECTORY="$bindir"])
+
+AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKB_BIN_DIRECTORY, [Path to XKB bin dir])
+
+dnl Make sure XKM_OUTPUT_DIR is an absolute path
+XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
+if [[ x$XKBOUTPUT_FIRSTCHAR != x/ -a x$XKBOUTPUT_FIRSTCHAR != 'x$' ]] ; then
+   XKBOUTPUT="$XKB_BASE_DIRECTORY/$XKBOUTPUT"
+fi
+
+dnl XKM_OUTPUT_DIR (used in code) must end in / or file names get hosed
+dnl XKB_COMPILED_DIR (used in Makefiles) must not or install-sh gets confused
+
+XKBOUTPUT=`echo $XKBOUTPUT/ | $SED 's|/*$|/|'`
+XKB_COMPILED_DIR=`echo $XKBOUTPUT | $SED 's|/*$||'`
+AC_DEFINE_DIR(XKM_OUTPUT_DIR, XKBOUTPUT, [Path to XKB output dir])
+AC_SUBST(XKB_COMPILED_DIR)
+
+if test "x$XKB_DFLT_RULES" = x; then
+    case $host_os in
+    linux*)
+        dnl doesn't take AutoAddDevices into account, but whatever.
+        if test "x$CONFIG_HAL" = xyes; then
+            XKB_DFLT_RULES="evdev"
+        else
+            XKB_DFLT_RULES="base"
+        fi
+        ;;
+    *)
+        XKB_DFLT_RULES="base"
+        ;;
+    esac
+fi
+AC_DEFINE_UNQUOTED(XKB_DFLT_RULES, ["$XKB_DFLT_RULES"], [Default XKB ruleset])
+AC_DEFINE_UNQUOTED(XKB_DFLT_MODEL, ["$XKB_DFLT_MODEL"], [Default XKB model])
+AC_DEFINE_UNQUOTED(XKB_DFLT_LAYOUT, ["$XKB_DFLT_LAYOUT"], [Default XKB layout])
+AC_DEFINE_UNQUOTED(XKB_DFLT_VARIANT, ["$XKB_DFLT_VARIANT"], [Default XKB variant])
+AC_DEFINE_UNQUOTED(XKB_DFLT_OPTIONS, ["$XKB_DFLT_OPTIONS"], [Default XKB options])
+
+XKB_LIB='$(top_builddir)/xkb/libxkb.la'
+XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la'
+REQUIRED_MODULES="$REQUIRED_MODULES xkbfile"
+
+AC_CHECK_FUNC(strcasecmp, [], AC_DEFINE([NEED_STRCASECMP], 1,
+                                        [Do not have 'strcasecmp'.]))
+AC_CHECK_FUNC(strncasecmp, [], AC_DEFINE([NEED_STRNCASECMP], 1,
+                                        [Do not have 'strncasecmp'.]))
+AC_CHECK_FUNC(strcasestr, [], AC_DEFINE([NEED_STRCASESTR], 1,
+                                       [Do not have 'strcasestr'.]))
+
+PKG_CHECK_MODULES([XDMCP], [xdmcp], [have_libxdmcp="yes"], [have_libxdmcp="no"])
+if test "x$have_libxdmcp" = xyes; then
+	AC_CHECK_LIB(Xdmcp, XdmcpWrap, [have_xdmcpwrap="yes"], [have_xdmcpwrap="no"], [$XDMCP_LIBS])
+fi
+if test "x$XDMCP" = xauto; then
+	if test "x$have_libxdmcp" = xyes; then
+		XDMCP=yes
+	else
+		XDMCP=no
+	fi
+fi
+if test "x$XDMAUTH" = xauto; then
+	if test "x$have_libxdmcp" = xyes && test "x$have_xdmcpwrap" = xyes; then
+		XDMAUTH=yes
+	else
+		XDMAUTH=no
+	fi
+fi
+
+AM_CONDITIONAL(XDMCP, [test "x$XDMCP" = xyes])
+if test "x$XDMCP" = xyes; then
+	AC_DEFINE(XDMCP, 1, [Support XDM Control Protocol])
+	REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
+	XDMCP_MODULES="xdmcp"
+fi
+
+AM_CONDITIONAL(XDMAUTH, [test "x$XDMAUTH" = xyes])
+if test "x$XDMAUTH" = xyes; then
+	AC_DEFINE(HASXDMAUTH,1,[Support XDM-AUTH*-1])
+	if ! test "x$XDMCP" = xyes; then
+		REQUIRED_LIBS="$REQUIRED_LIBS xdmcp"
+		XDMCP_MODULES="xdmcp"
+	fi
+fi
+
+AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
+AC_DEFINE_DIR(PCI_TXT_IDS_PATH, PCI_TXT_IDS_DIR, [Default PCI text file ID path])
+AC_DEFINE_DIR(SERVER_MISC_CONFIG_PATH, SERVERCONFIG, [Server miscellaneous config path])
+AC_DEFINE_DIR(BASE_FONT_PATH, FONTROOTDIR, [Default base font path])
+dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri`
+AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI driver path])
+AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_NAME"], [Vendor name])
+AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name])
+AC_DEFINE_UNQUOTED(XORG_DATE, ["$RELEASE_DATE"], [Vendor release])
+AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
+AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
+
+if test -z "$OSNAME"; then
+    OSNAME="UNKNOWN"
+fi
+
+AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
+AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
+AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
+
+AC_SUBST([VENDOR_NAME_SHORT])
+AC_DEFINE_UNQUOTED(VENDOR_NAME, ["$VENDOR_NAME"], [Vendor name])
+AC_DEFINE_UNQUOTED(VENDOR_NAME_SHORT, ["$VENDOR_NAME_SHORT"], [Vendor name])
+AC_DEFINE_UNQUOTED(VENDOR_RELEASE, [$VENDOR_RELEASE], [Vendor release])
+AC_DEFINE_UNQUOTED(VENDOR_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
+
+AC_DEFINE(NO_LIBCWRAPPER, 1, [Define to 1 if modules should avoid the libcwrapper])
+
+if test "x$DEBUGGING" = xyes; then
+       AC_DEFINE(DEBUG, 1, [Enable debugging code])
+fi
+AM_CONDITIONAL(DEBUG, [test "x$DEBUGGING" = xyes])
+
+AC_DEFINE(XTEST, 1, [Support XTest extension])
+AC_DEFINE(XSYNC, 1, [Support XSync extension])
+AC_DEFINE(XCMISC, 1, [Support XCMisc extension])
+AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
+
+if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then
+  DIX_LIB='$(top_builddir)/dix/dix.O'
+  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'
+else
+  DIX_LIB='$(top_builddir)/dix/libdix.la'
+  OS_LIB='$(top_builddir)/os/libos.la'
+fi
+AC_SUBST([DIX_LIB])
+AC_SUBST([OS_LIB])
+
+MAIN_LIB='$(top_builddir)/dix/libmain.la'
+AC_SUBST([MAIN_LIB])
+
+MI_LIB='$(top_builddir)/mi/libmi.la'
+MI_EXT_LIB='$(top_builddir)/mi/libmiext.la'
+MI_INC='-I$(top_srcdir)/mi'
+FB_LIB='$(top_builddir)/fb/libfb.la'
+FB_INC='-I$(top_srcdir)/fb'
+MIEXT_SHADOW_INC='-I$(top_srcdir)/miext/shadow'
+MIEXT_SHADOW_LIB='$(top_builddir)/miext/shadow/libshadow.la'
+MIEXT_SYNC_INC='-I$(top_srcdir)/miext/sync'
+MIEXT_SYNC_LIB='$(top_builddir)/miext/sync/libsync.la'
+CORE_INCS='-I$(top_srcdir)/include -I$(top_builddir)/include'
+
+# SHA1 hashing
+AC_ARG_WITH([sha1],
+            [AS_HELP_STRING([--with-sha1=libc|libmd|libgcrypt|libcrypto|libsha1|CommonCrypto],
+                            [choose SHA1 implementation])])
+AC_CHECK_FUNC([SHA1Init], [HAVE_SHA1_IN_LIBC=yes])
+if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_LIBC" = xyes; then
+	with_sha1=libc
+fi
+if test "x$with_sha1" = xlibc && test "x$HAVE_SHA1_IN_LIBC" != xyes; then
+	AC_MSG_ERROR([libc requested but not found])
+fi
+if test "x$with_sha1" = xlibc; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBC], [1],
+		[Use libc SHA1 functions])
+	SHA1_LIBS=""
+fi
+AC_CHECK_FUNC([CC_SHA1_Init], [HAVE_SHA1_IN_COMMONCRYPTO=yes])
+if test "x$with_sha1" = x && test "x$HAVE_SHA1_IN_COMMONCRYPTO" = xyes; then
+	with_sha1=CommonCrypto
+fi
+if test "x$with_sha1" = xCommonCrypto && test "x$HAVE_SHA1_IN_COMMONCRYPTO" != xyes; then
+	AC_MSG_ERROR([CommonCrypto requested but not found])
+fi
+if test "x$with_sha1" = xCommonCrypto; then
+	AC_DEFINE([HAVE_SHA1_IN_COMMONCRYPTO], [1],
+		[Use CommonCrypto SHA1 functions])
+	SHA1_LIBS=""
+fi
+AC_CHECK_LIB([md], [SHA1Init], [HAVE_LIBMD=yes])
+if test "x$with_sha1" = x && test "x$HAVE_LIBMD" = xyes; then
+	with_sha1=libmd
+fi
+if test "x$with_sha1" = xlibmd && test "x$HAVE_LIBMD" != xyes; then
+	AC_MSG_ERROR([libmd requested but not found])
+fi
+if test "x$with_sha1" = xlibmd; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBMD], [1],
+	          [Use libmd SHA1 functions])
+	SHA1_LIBS=-lmd
+fi
+PKG_CHECK_MODULES([LIBSHA1], [libsha1], [HAVE_LIBSHA1=yes], [HAVE_LIBSHA1=no])
+if test "x$with_sha1" = x && test "x$HAVE_LIBSHA1" = xyes; then
+   with_sha1=libsha1
+fi
+if test "x$with_sha1" = xlibsha1 && test "x$HAVE_LIBSHA1" != xyes; then
+	AC_MSG_ERROR([libsha1 requested but not found])
+fi
+if test "x$with_sha1" = xlibsha1; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBSHA1], [1],
+	          [Use libsha1 for SHA1])
+	SHA1_LIBS=-lsha1
+fi
+AC_CHECK_LIB([gcrypt], [gcry_md_open], [HAVE_LIBGCRYPT=yes])
+if test "x$with_sha1" = x && test "x$HAVE_LIBGCRYPT" = xyes; then
+	with_sha1=libgcrypt
+fi
+if test "x$with_sha1" = xlibgcrypt && test "x$HAVE_LIBGCRYPT" != xyes; then
+	AC_MSG_ERROR([libgcrypt requested but not found])
+fi
+if test "x$with_sha1" = xlibgcrypt; then
+	AC_DEFINE([HAVE_SHA1_IN_LIBGCRYPT], [1],
+	          [Use libgcrypt SHA1 functions])
+	SHA1_LIBS=-lgcrypt
+fi
+# We don't need all of the OpenSSL libraries, just libcrypto
+AC_CHECK_LIB([crypto], [SHA1_Init], [HAVE_LIBCRYPTO=yes])
+PKG_CHECK_MODULES([OPENSSL], [openssl], [HAVE_OPENSSL_PKC=yes],
+                  [HAVE_OPENSSL_PKC=no])
+if test "x$HAVE_LIBCRYPTO" = xyes || test "x$HAVE_OPENSSL_PKC" = xyes; then
+	if test "x$with_sha1" = x; then
+		with_sha1=libcrypto
+	fi
+else
+	if test "x$with_sha1" = xlibcrypto; then
+		AC_MSG_ERROR([OpenSSL libcrypto requested but not found])
+	fi
+fi
+if test "x$with_sha1" = xlibcrypto; then
+	if test "x$HAVE_LIBCRYPTO" = xyes; then
+		SHA1_LIBS=-lcrypto
+	else
+		SHA1_LIBS="$OPENSSL_LIBS"
+		SHA1_CFLAGS="$OPENSSL_CFLAGS"
+	fi
+fi
+AC_MSG_CHECKING([for SHA1 implementation])
+if test "x$with_sha1" = x; then
+	AC_MSG_ERROR([No suitable SHA1 implementation found])
+fi
+AC_MSG_RESULT([$with_sha1])
+AC_SUBST(SHA1_LIBS)
+AC_SUBST(SHA1_CFLAGS)
+
+PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
+PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
+
+# Autotools has some unfortunate issues with library handling.  In order to
+# get a server to rebuild when a dependency in the tree is changed, it must
+# be listed in SERVERNAME_DEPENDENCIES.  However, no system libraries may be
+# listed there, or some versions of autotools will break (especially if a -L
+# is required to find the library).  So, we keep two sets of libraries
+# detected: NAMESPACE_LIBS for in-tree libraries to be linked against, which
+# will go into the _DEPENDENCIES and _LDADD of the server, and
+# NAMESPACE_SYS_LIBS which will go into only the _LDADD.  The
+# NAMESPACEMODULES_LIBS detected from pkgconfig should always go in
+# NAMESPACE_SYS_LIBS.
+#
+# XSERVER_LIBS is the set of in-tree libraries which all servers require.
+# XSERVER_SYS_LIBS is the set of out-of-tree libraries which all servers
+# require.
+#
+XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
+XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
+XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
+AC_SUBST([XSERVER_LIBS])
+AC_SUBST([XSERVER_SYS_LIBS])
+
+UTILS_SYS_LIBS="${SYS_LIBS}"
+AC_SUBST([UTILS_SYS_LIBS])
+
+# The Xorg binary needs to export symbols so that they can be used from modules
+# Some platforms require extra flags to do this.   libtool should set the
+# necessary flags for each platform when -export-dynamic is passed to it.
+LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
+AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
+
+dnl Imake defines SVR4 on SVR4 systems, and many files check for it, so
+dnl we need to replicate that here until those can all be fixed
+AC_MSG_CHECKING([if SVR4 needs to be defined])
+AC_EGREP_CPP([I_AM_SVR4],[
+#if defined(SVR4) || defined(__svr4__) || defined(__SVR4)
+ I_AM_SVR4
+#endif
+],[
+AC_DEFINE([SVR4],1,[Define to 1 on systems derived from System V Release 4])
+AC_MSG_RESULT([yes])], AC_MSG_RESULT([no]))
+
+XSERVER_CFLAGS="$XSERVER_CFLAGS $CORE_INCS $XEXT_INC $COMPOSITE_INC $DAMAGE_INC $FIXES_INC $XI_INC $MI_INC $MIEXT_SYNC_INC $MIEXT_SHADOW_INC $MIEXT_LAYER_INC $MIEXT_DAMAGE_INC $RENDER_INC $RANDR_INC $FB_INC"
+
+dnl ---------------------------------------------------------------------------
+dnl DDX section.
+dnl ---------------------------------------------------------------------------
+
+dnl Xvfb DDX
+
+AC_MSG_CHECKING([whether to build Xvfb DDX])
+AC_MSG_RESULT([$XVFB])
+AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
+
+if test "x$XVFB" = xyes; then
+	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
+	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
+	AC_SUBST([XVFB_LIBS])
+	AC_SUBST([XVFB_SYS_LIBS])
+fi
+
+
+dnl Xnest DDX
+
+PKG_CHECK_MODULES(XNESTMODULES, [$LIBXEXT x11 xau $XDMCP_MODULES], [have_xnest=yes], [have_xnest=no])
+AC_MSG_CHECKING([whether to build Xnest DDX])
+if test "x$XNEST" = xauto; then
+	XNEST="$have_xnest"
+fi
+AC_MSG_RESULT([$XNEST])
+AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
+
+if test "x$XNEST" = xyes; then
+	if test "x$have_xnest" = xno; then
+		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
+	fi
+	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
+	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
+	AC_SUBST([XNEST_LIBS])
+	AC_SUBST([XNEST_SYS_LIBS])
+fi
+
+
+dnl Xorg DDX
+
+AC_MSG_CHECKING([whether to build Xorg DDX])
+if test "x$XORG" = xauto; then
+	XORG="yes"
+	case $host_os in
+		cygwin*) XORG="no" ;;
+		darwin*) XORG="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$XORG])
+
+xorg_bus_linuxpci=no
+xorg_bus_bsdpci=no
+xorg_bus_sparc=no
+
+if test "x$XORG" = xyes; then
+	XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
+	XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+	XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
+	XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
+	XORG_LIBS="$COMPOSITE_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB"
+
+	dnl ==================================================================
+	dnl symbol visibility
+	symbol_visibility=
+	have_visibility=disabled
+	if test x$SYMBOL_VISIBILITY != xno; then
+	    AC_MSG_CHECKING(for symbol visibility support)
+	    if test x$GCC = xyes; then
+		VISIBILITY_CFLAGS="-fvisibility=hidden"
+	    else
+		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+		if test x$SUNCC = xyes; then
+		    VISIBILITY_CFLAGS="-xldscope=hidden"
+		else
+		    have_visibility=no
+		fi
+	    fi
+	    if test x$have_visibility != xno; then
+		save_CFLAGS="$CFLAGS"
+		CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
+		AC_TRY_COMPILE(
+		    [#include <X11/Xfuncproto.h>
+		     extern _X_HIDDEN int hidden_int;
+		     extern _X_EXPORT int public_int;
+		     extern _X_HIDDEN int hidden_int_func(void);
+		     extern _X_EXPORT int public_int_func(void);],
+		    [],
+		    have_visibility=yes,
+		    have_visibility=no)
+		CFLAGS=$save_CFLAGS
+	    fi
+	    AC_MSG_RESULT([$have_visibility])
+	    if test x$have_visibility != xno; then
+		symbol_visibility=$VISIBILITY_CFLAGS
+		XORG_CFLAGS="$XORG_CFLAGS $VISIBILITY_CFLAGS"
+		XSERVER_CFLAGS="$XSERVER_CFLAGS $VISIBILITY_CFLAGS"
+	    fi
+	fi
+	dnl added to xorg-server.pc
+	AC_SUBST([symbol_visibility])
+	dnl ===================================================================
+
+	PKG_CHECK_MODULES([PCIACCESS], $LIBPCIACCESS)
+	SAVE_LIBS=$LIBS
+	SAVE_CFLAGS=$CFLAGS
+	CFLAGS=$PCIACCESS_CFLAGS
+	LIBS=$PCIACCESS_LIBS
+	AC_CHECK_FUNCS([pci_system_init_dev_mem])
+	AC_CHECK_FUNCS([pci_device_enable])
+	AC_CHECK_FUNCS([pci_device_is_boot_vga])
+	AC_CHECK_FUNCS([pci_device_vgaarb_init])
+	LIBS=$SAVE_LIBS
+	CFLAGS=$SAVE_CFLAGS
+	XORG_SYS_LIBS="$XORG_SYS_LIBS $PCIACCESS_LIBS $GLX_SYS_LIBS"
+	XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+
+	case $host_os in
+	  linux*)
+		if test "x$LNXAPM" = xyes; then
+			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		fi
+	  	XORG_OS="linux"
+		XORG_OS_SUBDIR="linux"
+		xorg_bus_linuxpci="yes"
+		linux_acpi="no"
+		case $host_cpu in
+		  ia64*)
+			linux_ia64=yes
+			linux_acpi="yes"
+			;;
+		  alpha*)
+		  	linux_alpha=yes
+			;;
+		  i*86|amd64*|x86_64*)
+			linux_acpi="yes"
+			;;
+		  *)
+			;;
+		esac
+		;;
+	  freebsd* | kfreebsd*-gnu | dragonfly*)
+	  	XORG_OS="freebsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  netbsd*)
+	  	XORG_OS="netbsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  openbsd*)
+		if test "x$ac_cv_BSD_APM" = xyes \
+			-o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then
+			XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		fi
+	  	XORG_OS="openbsd"
+		XORG_OS_SUBDIR="bsd"
+		xorg_bus_bsdpci="yes"
+		;;
+	  solaris*)
+	  	XORG_OS="solaris"
+		XORG_OS_SUBDIR="solaris"
+		XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
+		# Use the same stubs as BSD for old functions, since we now
+		# use libpciaccess for PCI
+		xorg_bus_bsdpci="yes"
+		AC_CHECK_HEADERS([sys/kd.h])
+		AC_CHECK_HEADERS([sys/vt.h], [solaris_vt=yes], [solaris_vt=no])
+		# Check for minimum supported release
+		AC_MSG_CHECKING([Solaris version])
+	        OS_MINOR=`echo ${host_os}|$SED -e 's/^.*solaris2\.//' -e s'/\..*$//'`
+		if test "${OS_MINOR}" -ge 7 ; then
+	        	AC_MSG_RESULT(Solaris ${OS_MINOR})
+		else
+			AC_MSG_RESULT(Solaris `echo ${host_os}|$SED -e 's/^.*solaris//`)
+		fi
+		if test "${OS_MINOR}" -lt 8 ; then
+			AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
+		fi
+		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+		if test "x$SUNCC" = "xyes"; then
+			solaris_asm_inline="yes"
+		fi
+		AC_CHECK_DECL([_LP64], [SOLARIS_64="yes"], [SOLARIS_64="no"])
+			
+		case $host_cpu in
+		  sparc*)	
+			SOLARIS_INOUT_ARCH="sparcv8plus"
+			;;
+		  i*86)	
+			if test x$SOLARIS_64 = xyes ; then
+				SOLARIS_INOUT_ARCH="amd64"
+			else
+				SOLARIS_INOUT_ARCH="ia32"
+			fi
+			;;
+		  *)
+			AC_MSG_ERROR([Unsupported Solaris platform. Only SPARC & x86 \
+			are supported on Solaris in this release.   If you are \
+			interested in porting Xorg to your platform, please email \
+			xorg@lists.freedesktop.org.]) ;;
+		esac
+		AC_SUBST([SOLARIS_INOUT_ARCH])
+		if test x$solaris_asm_inline = xyes ; then
+			SOLARIS_ASM_CFLAGS='$(top_srcdir)/hw/xfree86/os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il'
+			XORG_CFLAGS="${XORG_CFLAGS} "'$(SOLARIS_ASM_CFLAGS)'
+		fi
+		AC_SUBST([SOLARIS_ASM_CFLAGS])
+		if test "x$SUPPORT_PC98" = xauto; then
+			SUPPORT_PC98="no"
+		fi
+		;;
+	  gnu*)
+	  	XORG_OS="gnu"
+		XORG_OS_SUBDIR="hurd"
+		# Use the same stubs as BSD for old functions, since we now
+		# use libpciaccess for PCI
+		xorg_bus_bsdpci="yes"
+		;;
+	  *)
+	  	XORG_OS="unknown"
+		XORG_OS_SUBDIR="unknown"
+		AC_MSG_ERROR([m4_text_wrap(m4_join([ ],
+		[Your OS is unknown. Xorg currently only supports Linux,],
+		[Free/Open/Net/DragonFlyBSD, Solaris/OpenSolaris, & GNU Hurd.],
+		[If you are interested in porting Xorg to your platform,],
+		[please email xorg@lists.freedesktop.org.]))])
+		;;
+	esac
+
+	case $host_cpu in
+	  sparc*)
+		xorg_bus_sparc="yes"
+		;;
+	  i*86)
+		if test "x$SUPPORT_PC98" = xauto; then
+			SUPPORT_PC98="yes"
+		fi
+		;;
+	esac
+
+	if test "x$SUPPORT_PC98" = xauto; then
+		SUPPORT_PC98="no"
+	fi
+	if test "x$SUPPORT_PC98" = xyes; then
+		AC_DEFINE(SUPPORT_PC98, 1, [Support PC98])
+	fi
+	if test "x$XORG_OS_PCI" = x ; then
+		XORG_OS_PCI=$XORG_OS
+	fi
+	if test "x$DGA" = xauto; then
+		PKG_CHECK_MODULES(DGA, $DGAPROTO, [DGA=yes], [DGA=no])
+	fi
+	if test "x$DGA" = xyes; then
+		XORG_MODULES="$XORG_MODULES $DGAPROTO"
+		PKG_CHECK_MODULES(DGA, $DGAPROTO)
+		AC_DEFINE(DGA, 1, [Support DGA extension])
+		AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
+	fi
+
+	if test "x$XF86VIDMODE" = xauto; then
+		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO, [XF86VIDMODE=yes], [XF86VIDMODE=no])
+	fi
+	if test "x$XF86VIDMODE" = xyes; then
+		XORG_MODULES="$XORG_MODULES $VIDMODEPROTO"
+		PKG_CHECK_MODULES(XF86VIDMODE, $VIDMODEPROTO)
+		AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
+	fi
+
+	if test -n "$XORG_MODULES"; then
+	        PKG_CHECK_MODULES(XORG_MODULES, [$XORG_MODULES])
+	        XORG_CFLAGS="$XORG_CFLAGS $XORG_MODULES_CFLAGS"
+	        XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS"
+	fi
+
+	AC_SUBST([XORG_LIBS])
+	AC_SUBST([XORG_SYS_LIBS])
+	AC_SUBST([XORG_INCS])
+	AC_SUBST([XORG_OS])
+	AC_SUBST([XORG_OS_SUBDIR])
+
+	AC_PATH_PROG(PERL, perl, no)
+	dnl unlikely as this may be ...
+	if test "x$PERL" = xno; then
+		AC_MSG_ERROR([Perl is required to build the XFree86/Xorg DDX.])
+	fi
+	AC_SUBST(PERL)
+
+	AC_SUBST([XORG_CFLAGS])
+
+	dnl these only go in xorg-config.h
+	XF86CONFIGFILE="xorg.conf"
+	XF86CONFIGDIR="xorg.conf.d"
+	AC_SUBST(XF86CONFIGDIR)
+	CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
+	LOGPREFIX="$logdir/Xorg."
+	AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
+	AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
+	AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
+	AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
+	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+	AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
+	AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
+	AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
+	AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
+	AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
+	AC_DEFINE_DIR(__XCONFIGDIR__, XF86CONFIGDIR, [Name of configuration directory])
+	AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
+	AC_DEFINE_DIR(DEFAULT_LIBRARY_PATH, libdir, [Default library install path])
+	AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
+	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+	AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
+	if test "x$VGAHW" = xyes; then
+		AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+	fi
+
+	driverdir="$moduledir/drivers"
+	AC_SUBST([moduledir])
+	AC_SUBST([driverdir])
+	sdkdir="$includedir/xorg"
+	extdir="$includedir/X11/extensions"
+	sysconfigdir="$datadir/X11/$XF86CONFIGDIR"
+	AC_SUBST([sdkdir])
+	AC_SUBST([extdir])
+	AC_SUBST([sysconfigdir])
+	AC_SUBST([logdir])
+
+	# stuff the ABI versions into the pc file too
+	extract_abi() {
+	    grep ^.define.*${1}_VERSION ${srcdir}/hw/xfree86/common/xf86Module.h | tr '(),' '  .' | awk '{ print $4$5 }'
+	}
+	abi_ansic=`extract_abi ANSIC`
+	abi_videodrv=`extract_abi VIDEODRV`
+	abi_xinput=`extract_abi XINPUT`
+	abi_extension=`extract_abi EXTENSION`
+	AC_SUBST([abi_ansic])
+	AC_SUBST([abi_videodrv])
+	AC_SUBST([abi_xinput])
+	AC_SUBST([abi_extension])
+fi
+AM_CONDITIONAL([XORG], [test "x$XORG" = xyes])
+AM_CONDITIONAL([XORG_BUS_LINUXPCI], [test "x$xorg_bus_linuxpci" = xyes])
+AM_CONDITIONAL([XORG_BUS_BSDPCI], [test "x$xorg_bus_bsdpci" = xyes])
+AM_CONDITIONAL([XORG_BUS_SPARC], [test "x$xorg_bus_sparc" = xyes])
+AM_CONDITIONAL([LINUX_IA64], [test "x$linux_ia64" = xyes])
+AM_CONDITIONAL([LINUX_ALPHA], [test "x$linux_alpha" = xyes])
+AM_CONDITIONAL([LNXACPI], [test "x$linux_acpi" = xyes])
+AM_CONDITIONAL([SOLARIS_ASM_INLINE], [test "x$solaris_asm_inline" = xyes])
+AM_CONDITIONAL([SOLARIS_VT], [test "x$solaris_vt" = xyes])
+AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
+AM_CONDITIONAL([XF86VIDMODE], [test "x$XF86VIDMODE" = xyes])
+
+dnl XWin DDX
+
+AC_MSG_CHECKING([whether to build XWin DDX])
+if test "x$XWIN" = xauto; then
+	case $host_os in
+		cygwin*) XWIN="yes" ;;
+		mingw*) XWIN="yes" ;;
+		*) XWIN="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$XWIN])
+
+if test "x$XWIN" = xyes; then
+	AC_DEFINE_DIR(SYSCONFDIR, sysconfdir, [Location of system.XWinrc])
+	AC_DEFINE_DIR(DEFAULT_LOGDIR, logdir, [Default log location])
+	AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
+	AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
+	AC_CHECK_TOOL(WINDRES, windres)
+
+	PKG_CHECK_MODULES([XWINMODULES],[x11 xdmcp xau])
+
+	if test "x$WINDOWSWM" = xauto; then
+		PKG_CHECK_EXISTS($WINDOWSWMPROTO, [WINDOWSWM=yes], [WINDOWSWM=no])
+	fi
+	if test "x$WINDOWSWM" = xyes ; then
+		PKG_CHECK_MODULES(WINDOWSWM, $WINDOWSWMPROTO)
+		XWINMODULES_CFLAGS="$XWINMODULES_CFLAGS $WINDOWSWM_CFLAGS"
+		AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+	fi
+
+	case $host_os in
+		cygwin*)
+			XWIN_SERVER_NAME=XWin
+			AC_DEFINE(HAS_DEVWINDOWS,1,[Cygwin has /dev/windows for signaling new win32 messages])
+			;;
+		mingw*)
+			XWIN_SERVER_NAME=Xming
+			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
+			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
+			XWIN_SYS_LIBS=-lwinsock2
+			;;
+	esac
+	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
+	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
+	AC_SUBST(XWIN_LIBS)
+	AC_SUBST(XWIN_SERVER_NAME)
+	AC_SUBST(XWIN_SYS_LIBS)
+
+	if test "x$DEBUGGING" = xyes; then
+		AC_DEFINE(CYGDEBUG, 1, [Simple debug messages])
+		AC_DEFINE(CYGWINDOWING_DEBUG, 1, [Debug messages for window handling])
+		AC_DEFINE(CYGMULTIWINDOW_DEBUG, 1, [Debug window manager])
+	fi
+
+	AC_DEFINE(DDXOSVERRORF, 1, [Use OsVendorVErrorF])
+	AC_DEFINE(DDXBEFORERESET, 1, [Use ddxBeforeReset ])
+fi
+AM_CONDITIONAL(XWIN, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_MULTIWINDOW, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_MULTIWINDOWEXTWM, [test "x$XWIN" = xyes && test "x$WINDOWSWM" = xyes])
+AM_CONDITIONAL(XWIN_CLIPBOARD, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_GLX_WINDOWS, [test "x$XWIN" = xyes && false])
+AM_CONDITIONAL(XWIN_NATIVEGDI, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_PRIMARYFB, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_RANDR, [test "x$XWIN" = xyes])
+AM_CONDITIONAL(XWIN_XV, [test "x$XWIN" = xyes && test "x$XV" = xyes])
+
+dnl Darwin / OS X DDX
+if test "x$XQUARTZ" = xyes; then
+	AC_DEFINE(XQUARTZ,1,[Have Quartz])
+	AC_DEFINE(ROOTLESS,1,[Build Rootless code])
+
+	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
+	AC_SUBST([DARWIN_LIBS])
+
+	AC_CHECK_LIB([Xplugin],[xp_init],[:])
+
+	CFLAGS="${CFLAGS} -DROOTLESS_WORKAROUND -DROOTLESS_SAFEALPHA -DNO_ALLOCA"
+
+	PKG_CHECK_MODULES(XPBPROXY, $APPLEWMPROTO $LIBAPPLEWM xfixes x11)
+
+        if test "x$XQUARTZ_SPARKLE" = xyes ; then
+                AC_DEFINE(XQUARTZ_SPARKLE,1,[Support application updating through sparkle.])
+        fi
+
+	if test "x$STANDALONE_XPBPROXY" = xyes ; then
+		AC_DEFINE(STANDALONE_XPBPROXY,1,[Build a standalone xpbproxy])
+	fi
+fi
+
+# Support for objc in autotools is minimal and not documented.
+OBJC='$(CC)'
+OBJCLD='$(CCLD)'
+OBJCLINK='$(LINK)'
+OBJCFLAGS='$(CFLAGS)'
+AC_SUBST([OBJC])
+AC_SUBST([OBJCCLD])
+AC_SUBST([OBJCLINK])
+AC_SUBST([OBJCFLAGS])
+# internal, undocumented automake func follows :(
+_AM_DEPENDENCIES([OBJC])
+AM_CONDITIONAL(XQUARTZ, [test "x$XQUARTZ" = xyes])
+AM_CONDITIONAL(XQUARTZ_SPARKLE, [test "x$XQUARTZ_SPARKLE" != "xno"])
+AM_CONDITIONAL(STANDALONE_XPBPROXY, [test "x$STANDALONE_XPBPROXY" = xyes])
+
+dnl DMX DDX
+PKG_CHECK_MODULES(
+	[DMXMODULES],
+	[xmuu $LIBXEXT x11 xrender xfixes $LIBXI $DMXPROTO xau $XDMCP_MODULES],
+	[PKG_CHECK_MODULES(
+		[XDMXCONFIG_DEP],
+		[xaw7 xmu xt xpm x11],
+		[have_dmx=yes],
+		[have_dmx=no])],
+	[have_dmx=no])
+AC_MSG_CHECKING([whether to build Xdmx DDX])
+if test "x$DMX" = xauto; then
+	DMX="$have_dmx"
+	case $host_os in
+		cygwin*) DMX="no" ;;
+		darwin*) DMX="no" ;;
+	esac
+fi
+AC_MSG_RESULT([$DMX])
+AM_CONDITIONAL(DMX, [test "x$DMX" = xyes])
+
+if test "x$DMX" = xyes; then
+	if test "x$have_dmx" = xno; then
+		AC_MSG_ERROR([Xdmx build explicitly requested, but required
+		              modules not found.])
+	fi
+	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
+	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
+	XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SYNC_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $COMPOSITE_LIB $DAMAGE_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
+	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
+	AC_SUBST([XDMX_CFLAGS])
+	AC_SUBST([XDMX_LIBS])
+	AC_SUBST([XDMX_SYS_LIBS])
+
+dnl USB sources in DMX require <linux/input.h>
+	AC_CHECK_HEADER([linux/input.h], DMX_BUILD_USB="yes",
+			DMX_BUILD_USB="no")
+dnl Linux sources in DMX require <linux/keyboard.h>
+	AC_CHECK_HEADER([linux/keyboard.h], DMX_BUILD_LNX="yes",
+			DMX_BUILD_LNX="no")
+	AC_SUBST(XDMXCONFIG_DEP_CFLAGS)
+	AC_SUBST(XDMXCONFIG_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXEXAMPLES_DEP], [$LIBDMX $LIBXEXT x11])
+	AC_SUBST(DMXEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXMUEXAMPLES_DEP], [$LIBDMX xmu $LIBXEXT x11])
+	AC_SUBST(DMXXMUEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([DMXXIEXAMPLES_DEP], [$LIBDMX $LIBXI $LIBXEXT x11])
+	AC_SUBST(DMXXIEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XTSTEXAMPLES_DEP], [$LIBXTST $LIBXEXT x11])
+	AC_SUBST(XTSTEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([XRESEXAMPLES_DEP], [xres $LIBXEXT x11])
+	AC_SUBST(XRESEXAMPLES_DEP_LIBS)
+	PKG_CHECK_MODULES([X11EXAMPLES_DEP], [$LIBXEXT x11])
+	AC_SUBST(X11EXAMPLES_DEP_LIBS)
+
+fi
+AM_CONDITIONAL([DMX_BUILD_LNX], [test "x$DMX_BUILD_LNX" = xyes])
+AM_CONDITIONAL([DMX_BUILD_USB], [test "x$DMX_BUILD_USB" = xyes])
+
+dnl kdrive DDX
+
+XEPHYR_LIBS=
+XEPHYR_INCS=
+
+AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
+
+if test "$KDRIVE" = yes; then
+    AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
+    AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
+
+    AC_CHECK_HEADERS([linux/fb.h])
+    if test "$ac_cv_header_linux_fb_h" = yes && test "x$XFBDEV" = xauto; then
+        XFBDEV=yes
+    fi
+
+    if test "x$XFBDEV" = xyes; then
+        KDRIVEFBDEVLIB=yes
+        AC_DEFINE(KDRIVEFBDEV, 1, [Build fbdev-based kdrive server])
+    fi
+
+
+    PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [HAVE_TSLIB="yes"], [HAVE_TSLIB="no"])
+    if test "x$HAVE_TSLIB" = xno; then
+        AC_CHECK_LIB(ts, ts_open, [
+			HAVE_TSLIB="yes"
+			TSLIB_LIBS="-lts"
+		])
+    fi
+
+    if test "xTSLIB" = xauto; then
+        TSLIB="$HAVE_TSLIB"
+    fi
+
+    if test "x$TSLIB" = xyes; then
+        if ! test "x$HAVE_TSLIB" = xyes; then
+            AC_MSG_ERROR([tslib must be installed to build the tslib driver. See http://tslib.berlios.de/])
+        else
+            AC_DEFINE(TSLIB, 1, [Have tslib support])
+        fi
+    fi
+
+    if test "x$KDRIVE_KBD" = xyes; then
+       AC_DEFINE(KDRIVE_KBD, 1, [Enable KDrive kbd driver])
+    fi
+    if test "x$KDRIVE_EVDEV" = xyes; then
+       AC_DEFINE(KDRIVE_EVDEV, 1, [Enable KDrive evdev driver])
+    fi
+    if test "x$KDRIVE_MOUSE" = xyes; then
+       AC_DEFINE(KDRIVE_MOUSE, 1, [Enable KDrive mouse driver])
+    fi
+
+    XEPHYR_REQUIRED_LIBS="x11 $LIBXEXT xau xdmcp"
+    if test "x$XV" = xyes; then
+        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xv"
+    fi
+    if test "x$DRI" = xyes && test "x$GLX" = xyes; then
+        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBGL libdrm"
+    fi
+
+    PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"])
+    if test "x$XEPHYR" = xauto; then
+        XEPHYR=$xephyr
+    fi
+    if test "x$XEPHYR" = xyes && test "x$xephyr" = xno; then	
+        AC_MSG_ERROR([Xephyr dependencies missing])
+    fi
+
+    # Xephyr needs nanosleep() which is in librt on Solaris
+    AC_CHECK_FUNC([nanosleep], [],
+        AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
+    
+    # damage shadow extension glx (NOTYET) fb mi
+    KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+    KDRIVE_PURE_INCS="$KDRIVE_INC $MIEXT_SYNC_INC $MIEXT_DAMAGE_INC $MIEXT_SHADOW_INC $XEXT_INC $FB_INC $MI_INC"
+    KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
+    KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
+    
+    KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
+
+    KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
+    KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
+    case $host_os in
+	*linux*)
+	    KDRIVE_OS_LIB='$(top_builddir)/hw/kdrive/linux/liblinux.la'
+            KDRIVELINUX=yes
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=yes
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=yes
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=yes
+	    fi
+	    ;;
+	*)
+	    if test "x$KDRIVE_EVDEV" = xauto; then
+		KDRIVE_EVDEV=no
+	    fi
+	    if test "x$KDRIVE_KBD" = xauto; then
+		KDRIVE_KBD=no
+	    fi
+	    if test "x$KDRIVE_MOUSE" = xauto; then
+		KDRIVE_MOUSE=no
+	    fi
+	    ;;
+    esac
+    KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
+    KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
+    KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
+
+    AC_SUBST([XEPHYR_LIBS])
+    AC_SUBST([XEPHYR_INCS])
+fi
+AC_SUBST([KDRIVE_INCS])
+AC_SUBST([KDRIVE_PURE_INCS])
+AC_SUBST([KDRIVE_CFLAGS])
+AC_SUBST([KDRIVE_PURE_LIBS])
+AC_SUBST([KDRIVE_LOCAL_LIBS])
+AC_SUBST([KDRIVE_LIBS])
+AM_CONDITIONAL(KDRIVELINUX, [test "x$KDRIVELINUX" = xyes])
+AM_CONDITIONAL(KDRIVE_EVDEV, [test "x$KDRIVE_EVDEV" = xyes])
+AM_CONDITIONAL(KDRIVE_KBD,   [test "x$KDRIVE_KBD" = xyes])
+AM_CONDITIONAL(KDRIVE_MOUSE, [test "x$KDRIVE_MOUSE" = xyes])
+AM_CONDITIONAL(TSLIB, [test "x$HAVE_TSLIB" = xyes])
+AM_CONDITIONAL(KDRIVEFBDEV, [test "x$XFBDEV" = xyes])
+AM_CONDITIONAL(XEPHYR, [test "x$KDRIVE" = xyes && test "x$XEPHYR" = xyes])
+AM_CONDITIONAL(BUILD_KDRIVEFBDEVLIB, [test "x$KDRIVE" = xyes && test "x$KDRIVEFBDEVLIB" = xyes])
+AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes])
+
+dnl and the rest of these are generic, so they're in config.h
+dnl 
+dnl though, thanks to the passing of some significant amount of time, the
+dnl above is probably a complete fallacy, and you should not rely on it.
+dnl but this is still actually better than imake, honest. -daniels
+
+AC_TRY_COMPILE([
+#include <features.h>
+#ifndef __GLIBC__
+#error not glibc
+#endif
+], [], [AC_DEFINE(_GNU_SOURCE, 1,
+	[ Enable GNU and other extensions to the C environment for glibc])])
+
+AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+
+AC_SUBST([RELEASE_DATE])
+BUILD_DATE="`date +'%Y%m%d'`"
+AC_SUBST([BUILD_DATE])
+BUILD_TIME="`date +'1%H%M%S'`"
+AC_SUBST([BUILD_TIME])
+
+DIX_CFLAGS="-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"
+
+AC_SUBST([DIX_CFLAGS])
+
+AC_SUBST([libdir])
+AC_SUBST([exec_prefix])
+AC_SUBST([prefix])
+
+AC_CONFIG_COMMANDS([sdksyms], [touch hw/xfree86/loader/sdksyms.dep])
+
+AC_OUTPUT([
+Makefile
+glx/Makefile
+include/Makefile
+composite/Makefile
+damageext/Makefile
+dbe/Makefile
+dix/Makefile
+doc/Makefile
+doc/man/Makefile
+doc/xml/Makefile
+doc/xml/dtrace/Makefile
+doc/xml/xserver.ent
+fb/Makefile
+record/Makefile
+config/Makefile
+mi/Makefile
+miext/Makefile
+miext/sync/Makefile
+miext/damage/Makefile
+miext/shadow/Makefile
+miext/cw/Makefile
+miext/rootless/Makefile
+os/Makefile
+randr/Makefile
+render/Makefile
+xkb/Makefile
+Xext/Makefile
+Xi/Makefile
+xfixes/Makefile
+exa/Makefile
+hw/Makefile
+hw/xfree86/Makefile
+hw/xfree86/common/Makefile
+hw/xfree86/common/xf86Build.h
+hw/xfree86/ddc/Makefile
+hw/xfree86/dixmods/Makefile
+hw/xfree86/dixmods/extmod/Makefile
+hw/xfree86/doc/Makefile
+hw/xfree86/doc/devel/Makefile
+hw/xfree86/doc/sgml/Makefile
+hw/xfree86/dri/Makefile
+hw/xfree86/dri2/Makefile
+hw/xfree86/exa/Makefile
+hw/xfree86/exa/man/Makefile
+hw/xfree86/fbdevhw/Makefile
+hw/xfree86/fbdevhw/man/Makefile
+hw/xfree86/i2c/Makefile
+hw/xfree86/int10/Makefile
+hw/xfree86/loader/Makefile
+hw/xfree86/man/Makefile
+hw/xfree86/modes/Makefile
+hw/xfree86/os-support/Makefile
+hw/xfree86/os-support/bsd/Makefile
+hw/xfree86/os-support/bus/Makefile
+hw/xfree86/os-support/hurd/Makefile
+hw/xfree86/os-support/misc/Makefile
+hw/xfree86/os-support/linux/Makefile
+hw/xfree86/os-support/solaris/Makefile
+hw/xfree86/parser/Makefile
+hw/xfree86/ramdac/Makefile
+hw/xfree86/shadowfb/Makefile
+hw/xfree86/vbe/Makefile
+hw/xfree86/vgahw/Makefile
+hw/xfree86/x86emu/Makefile
+hw/xfree86/xaa/Makefile
+hw/xfree86/utils/Makefile
+hw/xfree86/utils/man/Makefile
+hw/xfree86/utils/cvt/Makefile
+hw/xfree86/utils/gtf/Makefile
+hw/dmx/config/Makefile
+hw/dmx/config/man/Makefile
+hw/dmx/doc/Makefile
+hw/dmx/doc/doxygen.conf
+hw/dmx/examples/Makefile
+hw/dmx/input/Makefile
+hw/dmx/glxProxy/Makefile
+hw/dmx/Makefile
+hw/dmx/man/Makefile
+hw/vfb/Makefile
+hw/vfb/man/Makefile
+hw/xnest/Makefile
+hw/xnest/man/Makefile
+hw/xwin/Makefile
+hw/xwin/glx/Makefile
+hw/xwin/man/Makefile
+hw/xquartz/Makefile
+hw/xquartz/GL/Makefile
+hw/xquartz/bundle/Makefile
+hw/xquartz/man/Makefile
+hw/xquartz/mach-startup/Makefile
+hw/xquartz/pbproxy/Makefile
+hw/xquartz/xpr/Makefile
+hw/kdrive/Makefile
+hw/kdrive/ephyr/Makefile
+hw/kdrive/ephyr/man/Makefile
+hw/kdrive/fake/Makefile
+hw/kdrive/fbdev/Makefile
+hw/kdrive/linux/Makefile
+hw/kdrive/src/Makefile
+test/Makefile
+test/xi2/Makefile
+xorg-server.pc
+])
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c
index 7f500d63d..534931c3e 100644
--- a/xorg-server/dix/devices.c
+++ b/xorg-server/dix/devices.c
@@ -1,2630 +1,2606 @@
-/************************************************************

-

-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 "misc.h"

-#include "resource.h"

-#include <X11/Xproto.h>

-#include <X11/Xatom.h>

-#include "windowstr.h"

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "cursorstr.h"

-#include "dixstruct.h"

-#include "ptrveloc.h"

-#include "site.h"

-#include "xkbsrv.h"

-#include "privates.h"

-#include "xace.h"

-#include "mi.h"

-

-#include "dispatch.h"

-#include "swaprep.h"

-#include "dixevents.h"

-#include "mipointer.h"

-#include "eventstr.h"

-

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

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

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

-#include <math.h>

-#include <pixman.h>

-#include "exglobals.h"

-#include "exevents.h"

-#include "xiquerydevice.h" /* for SizeDeviceClasses */

-#include "xiproperty.h"

-#include "enterleave.h" /* for EnterWindow() */

-#include "xserver-properties.h"

-#include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */

-

-/** @file

- * This file handles input device-related stuff.

- */

-

-static void RecalculateMasterButtons(DeviceIntPtr slave);

-

-static void

-DeviceSetTransform(DeviceIntPtr dev, float *transform)

-{

-    struct pixman_f_transform scale;

-    double sx, sy;

-    int x, y;

-

-    /**

-     * calculate combined transformation matrix:

-     *

-     * M = InvScale * Transform * Scale

-     *

-     * So we can later transform points using M * p

-     *

-     * Where:

-     *  Scale scales coordinates into 0..1 range

-     *  Transform is the user supplied (affine) transform

-     *  InvScale scales coordinates back up into their native range

-     */

-    sx = dev->valuator->axes[0].max_value - dev->valuator->axes[0].min_value;

-    sy = dev->valuator->axes[1].max_value - dev->valuator->axes[1].min_value;

-

-    /* invscale */

-    pixman_f_transform_init_scale(&scale, sx, sy);

-    scale.m[0][2] = dev->valuator->axes[0].min_value;

-    scale.m[1][2] = dev->valuator->axes[1].min_value;

-

-    /* transform */

-    for (y=0; y<3; y++)

-        for (x=0; x<3; x++)

-            dev->transform.m[y][x] = *transform++;

-

-    pixman_f_transform_multiply(&dev->transform, &scale, &dev->transform);

-

-    /* scale */

-    pixman_f_transform_init_scale(&scale, 1.0 / sx, 1.0 / sy);

-    scale.m[0][2] = -dev->valuator->axes[0].min_value / sx;

-    scale.m[1][2] = -dev->valuator->axes[1].min_value / sy;

-

-    pixman_f_transform_multiply(&dev->transform, &dev->transform, &scale);

-}

-

-/**

- * DIX property handler.

- */

-static int

-DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,

-                  BOOL checkonly)

-{

-    if (property == XIGetKnownProperty(XI_PROP_ENABLED))

-    {

-        if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1)

-            return BadValue;

-

-        /* Don't allow disabling of VCP/VCK */

-        if ((dev == inputInfo.pointer || dev == inputInfo.keyboard) &&

-            !(*(CARD8*)prop->data))

-            return BadAccess;

-

-        if (!checkonly)

-        {

-            if ((*((CARD8*)prop->data)) && !dev->enabled)

-                EnableDevice(dev, TRUE);

-            else if (!(*((CARD8*)prop->data)) && dev->enabled)

-                DisableDevice(dev, TRUE);

-        }

-    } else if (property == XIGetKnownProperty(XI_PROP_TRANSFORM))

-    {

-        float *f = (float*)prop->data;

-        int i;

-

-        if (prop->format != 32 || prop->size != 9 ||

-            prop->type != XIGetKnownProperty(XATOM_FLOAT))

-            return BadValue;

-

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

-            if (!isfinite(f[i]))

-                return BadValue;

-

-        if (!checkonly)

-            DeviceSetTransform(dev, f);

-    }

-

-    return Success;

-}

-

-/* Pair the keyboard to the pointer device. Keyboard events will follow the

- * pointer sprite. Only applicable for master devices.

- * If the client is set, the request to pair comes from some client. In this

- * case, we need to check for access. If the client is NULL, it's from an

- * internal automatic pairing, we must always permit this.

- */

-static int

-PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)

-{

-    if (!ptr)

-        return BadDevice;

-

-    /* Don't allow pairing for slave devices */

-    if (!IsMaster(ptr) || !IsMaster(kbd))

-        return BadDevice;

-

-    if (ptr->spriteInfo->paired)

-        return BadDevice;

-

-    if (kbd->spriteInfo->spriteOwner)

-    {

-        free(kbd->spriteInfo->sprite);

-        kbd->spriteInfo->sprite = NULL;

-        kbd->spriteInfo->spriteOwner = FALSE;

-    }

-

-    kbd->spriteInfo->sprite = ptr->spriteInfo->sprite;

-    kbd->spriteInfo->paired = ptr;

-    ptr->spriteInfo->paired = kbd;

-    return Success;

-}

-

-

-/**

- * Find and return the next unpaired MD pointer device.

- */

-static DeviceIntPtr

-NextFreePointerDevice(void)

-{

-    DeviceIntPtr dev;

-    for (dev = inputInfo.devices; dev; dev = dev->next)

-        if (IsMaster(dev) &&

-                dev->spriteInfo->spriteOwner &&

-                !dev->spriteInfo->paired)

-            return dev;

-    return NULL;

-}

-

-/**

- * Create a new input device and init it to sane values. The device is added

- * to the server's off_devices list.

- *

- * @param deviceProc Callback for device control function (switch dev on/off).

- * @return The newly created device.

- */

-DeviceIntPtr

-AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)

-{

-    DeviceIntPtr dev, *prev; /* not a typo */

-    DeviceIntPtr devtmp;

-    int devid;

-    char devind[MAXDEVICES];

-    BOOL enabled;

-    float transform[9];

-

-    /* Find next available id, 0 and 1 are reserved */

-    memset(devind, 0, sizeof(char)*MAXDEVICES);

-    for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)

-	devind[devtmp->id]++;

-    for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)

-	devind[devtmp->id]++;

-    for (devid = 2; devid < MAXDEVICES && devind[devid]; devid++)

-	;

-

-    if (devid >= MAXDEVICES)

-	return (DeviceIntPtr)NULL;

-    dev =  _dixAllocateObjectWithPrivates(sizeof(DeviceIntRec) + sizeof(SpriteInfoRec),

-					  sizeof(DeviceIntRec) + sizeof(SpriteInfoRec),

-					  offsetof(DeviceIntRec, devPrivates), PRIVATE_DEVICE);

-    if (!dev)

-	return (DeviceIntPtr)NULL;

-    dev->id = devid;

-    dev->public.processInputProc = ProcessOtherEvent;

-    dev->public.realInputProc = ProcessOtherEvent;

-    dev->public.enqueueInputProc = EnqueueEvent;

-    dev->deviceProc = deviceProc;

-    dev->startup = autoStart;

-

-    /* device grab defaults */

-    dev->deviceGrab.grabTime = currentTime;

-    dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;

-    dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;

-

-    XkbSetExtension(dev, ProcessKeyboardEvent);

-

-    dev->coreEvents = TRUE;

-

-    /* sprite defaults */

-    dev->spriteInfo = (SpriteInfoPtr)&dev[1];

-

-    /*  security creation/labeling check

-     */

-    if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixCreateAccess)) {

-	free(dev);

-	return NULL;

-    }

-

-    inputInfo.numDevices++;

-

-    for (prev = &inputInfo.off_devices; *prev; prev = &(*prev)->next)

-        ;

-    *prev = dev;

-    dev->next = NULL;

-

-    enabled = FALSE;

-    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),

-                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,

-                           FALSE);

-    XISetDevicePropertyDeletable(dev, XIGetKnownProperty(XI_PROP_ENABLED), FALSE);

-

-    /* unity matrix */

-    memset(transform, 0, sizeof(transform));

-    transform[0] = transform[4] = transform[8] = 1.0f;

-

-    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),

-                           XIGetKnownProperty(XATOM_FLOAT), 32,

-                           PropModeReplace, 9, transform, FALSE);

-    XISetDevicePropertyDeletable(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),

-                                 FALSE);

-

-    XIRegisterPropertyHandler(dev, DeviceSetProperty, NULL, NULL);

-

-    return dev;

-}

-

-void

-SendDevicePresenceEvent(int deviceid, int type)

-{

-    DeviceIntRec dummyDev;

-    devicePresenceNotify ev;

-

-    memset(&dummyDev, 0, sizeof(DeviceIntRec));

-    ev.type = DevicePresenceNotify;

-    ev.time = currentTime.milliseconds;

-    ev.devchange = type;

-    ev.deviceid = deviceid;

-    dummyDev.id = XIAllDevices;

-    SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,

-                          (xEvent*)&ev, 1);

-}

-

-/**

- * Enable the device through the driver, add the device to the device list.

- * Switch device ON through the driver and push it onto the global device

- * list. Initialize the DIX sprite or pair the device. All clients are

- * notified about the device being enabled.

- *

- * A master pointer device needs to be enabled before a master keyboard

- * device.

- *

- * @param The device to be enabled.

- * @param sendevent True if an XI2 event should be sent.

- * @return TRUE on success or FALSE otherwise.

- */

-Bool

-EnableDevice(DeviceIntPtr dev, BOOL sendevent)

-{

-    DeviceIntPtr *prev;

-    int ret;

-    DeviceIntPtr other;

-    BOOL enabled;

-    int flags[MAXDEVICES] = {0};

-

-    for (prev = &inputInfo.off_devices;

-	 *prev && (*prev != dev);

-	 prev = &(*prev)->next)

-	;

-

-    if (!dev->spriteInfo->sprite)

-    {

-        if (IsMaster(dev))

-        {

-            /* Sprites appear on first root window, so we can hardcode it */

-            if (dev->spriteInfo->spriteOwner)

-            {

-                InitializeSprite(dev, screenInfo.screens[0]->root);

-                                                 /* mode doesn't matter */

-                EnterWindow(dev, screenInfo.screens[0]->root, NotifyAncestor);

-            }

-            else if ((other = NextFreePointerDevice()) == NULL)

-            {

-                ErrorF("[dix] cannot find pointer to pair with. "

-                       "This is a bug.\n");

-                return FALSE;

-            } else

-                PairDevices(NULL, other, dev);

-        } else

-        {

-            if (dev->coreEvents)

-                other = (IsPointerDevice(dev)) ? inputInfo.pointer :

-                    inputInfo.keyboard;

-            else

-                other = NULL; /* auto-float non-core devices */

-            AttachDevice(NULL, dev, other);

-        }

-    }

-

-    if ((*prev != dev) || !dev->inited ||

-	((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {

-        ErrorF("[dix] couldn't enable device %d\n", dev->id);

-	return FALSE;

-    }

-    dev->enabled = TRUE;

-    *prev = dev->next;

-

-    for (prev = &inputInfo.devices; *prev; prev = &(*prev)->next)

-        ;

-    *prev = dev;

-    dev->next = NULL;

-

-    enabled = TRUE;

-    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),

-                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,

-                           TRUE);

-

-    SendDevicePresenceEvent(dev->id, DeviceEnabled);

-    if (sendevent)

-    {

-        flags[dev->id] |= XIDeviceEnabled;

-        XISendDeviceHierarchyEvent(flags);

-    }

-

-    RecalculateMasterButtons(dev);

-

-    return TRUE;

-}

-

-/**

- * Switch a device off through the driver and push it onto the off_devices

- * list. A device will not send events while disabled. All clients are

- * notified about the device being disabled.

- *

- * Master keyboard devices have to be disabled before master pointer devices

- * otherwise things turn bad.

- *

- * @param sendevent True if an XI2 event should be sent.

- * @return TRUE on success or FALSE otherwise.

- */

-Bool

-DisableDevice(DeviceIntPtr dev, BOOL sendevent)

-{

-    DeviceIntPtr *prev, other;

-    BOOL enabled;

-    int flags[MAXDEVICES] = {0};

-

-    for (prev = &inputInfo.devices;

-	 *prev && (*prev != dev);

-	 prev = &(*prev)->next)

-	;

-    if (*prev != dev)

-	return FALSE;

-

-    /* float attached devices */

-    if (IsMaster(dev))

-    {

-        for (other = inputInfo.devices; other; other = other->next)

-        {

-            if (!IsMaster(other) && GetMaster(other, MASTER_ATTACHED) == dev)

-            {

-                AttachDevice(NULL, other, NULL);

-                flags[other->id] |= XISlaveDetached;

-            }

-        }

-    }

-    else

-    {

-        for (other = inputInfo.devices; other; other = other->next)

-        {

-	    if (IsMaster(other) && other->lastSlave == dev)

-		other->lastSlave = NULL;

-	}

-    }

-

-    if (IsMaster(dev) && dev->spriteInfo->sprite)

-    {

-        for (other = inputInfo.devices; other; other = other->next)

-        {

-            if (other->spriteInfo->paired == dev)

-            {

-                ErrorF("[dix] cannot disable device, still paired. "

-                        "This is a bug. \n");

-                return FALSE;

-            }

-        }

-    }

-

-    (void)(*dev->deviceProc)(dev, DEVICE_OFF);

-    dev->enabled = FALSE;

-

-    /* now that the device is disabled, we can reset the signal handler's

-     * last.slave */

-    OsBlockSignals();

-    for (other = inputInfo.devices; other; other = other->next)

-    {

-        if (other->last.slave == dev)

-            other->last.slave = NULL;

-    }

-    OsReleaseSignals();

-

-    LeaveWindow(dev);

-    SetFocusOut(dev);

-

-    *prev = dev->next;

-    dev->next = inputInfo.off_devices;

-    inputInfo.off_devices = dev;

-

-    enabled = FALSE;

-    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),

-                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,

-                           TRUE);

-

-    SendDevicePresenceEvent(dev->id, DeviceDisabled);

-    if (sendevent)

-    {

-        flags[dev->id] = XIDeviceDisabled;

-        XISendDeviceHierarchyEvent(flags);

-    }

-

-    RecalculateMasterButtons(dev);

-

-    return TRUE;

-}

-

-/**

- * Initialise a new device through the driver and tell all clients about the

- * new device.

- *

- * Must be called before EnableDevice.

- * The device will NOT send events until it is enabled!

- *

- * @param sendevent True if an XI2 event should be sent.

- * @return Success or an error code on failure.

- */

-int

-ActivateDevice(DeviceIntPtr dev, BOOL sendevent)

-{

-    int ret = Success;

-    ScreenPtr pScreen = screenInfo.screens[0];

-

-    if (!dev || !dev->deviceProc)

-        return BadImplementation;

-

-    ret = (*dev->deviceProc) (dev, DEVICE_INIT);

-    dev->inited = (ret == Success);

-    if (!dev->inited)

-        return ret;

-

-    /* Initialize memory for sprites. */

-    if (IsMaster(dev) && dev->spriteInfo->spriteOwner)

-        if (!pScreen->DeviceCursorInitialize(dev, pScreen))

-            ret = BadAlloc;

-

-    SendDevicePresenceEvent(dev->id, DeviceAdded);

-    if (sendevent)

-    {

-        int flags[MAXDEVICES] = {0};

-        flags[dev->id] = XISlaveAdded;

-        XISendDeviceHierarchyEvent(flags);

-    }

-    return ret;

-}

-

-/**

- * Ring the bell.

- * The actual task of ringing the bell is the job of the DDX.

- */

-static void

-CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something)

-{

-    KeybdCtrl *ctrl = arg;

-

-    DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);

-}

-

-static void

-CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)

-{

-    return;

-}

-

-/**

- * Device control function for the Virtual Core Keyboard.

- */

-int

-CoreKeyboardProc(DeviceIntPtr pDev, int what)

-{

-

-    switch (what) {

-    case DEVICE_INIT:

-        if (!InitKeyboardDeviceStruct(pDev, NULL, CoreKeyboardBell,

-                                      CoreKeyboardCtl))

-        {

-            ErrorF("Keyboard initialization failed. This could be a missing "

-                   "or incorrect setup of xkeyboard-config.\n");

-            return BadValue;

-        }

-        return Success;

-

-    case DEVICE_ON:

-    case DEVICE_OFF:

-        return Success;

-

-    case DEVICE_CLOSE:

-        return Success;

-    }

-

-    return BadMatch;

-}

-

-/**

- * Device control function for the Virtual Core Pointer.

- */

-int

-CorePointerProc(DeviceIntPtr pDev, int what)

-{

-#define NBUTTONS 10

-#define NAXES 2

-    BYTE map[NBUTTONS + 1];

-    int i = 0;

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-    case DEVICE_INIT:

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

-            map[i] = i;

-

-	btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-	btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-	btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-	btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

-	btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

-	btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

-	btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

-	/* don't know about the rest */

-

-	axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

-	axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

-

-        if (!InitPointerDeviceStruct((DevicePtr)pDev, map, NBUTTONS, btn_labels,

-                                (PtrCtrlProcPtr)NoopDDA,

-                                GetMotionHistorySize(), NAXES, axes_labels))

-        {

-            ErrorF("Could not initialize device '%s'. Out of memory.\n",

-                   pDev->name);

-            return BadAlloc; /* IPDS only fails on allocs */

-        }

-        pDev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;

-        pDev->last.valuators[0] = pDev->valuator->axisVal[0];

-        pDev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;

-        pDev->last.valuators[1] = pDev->valuator->axisVal[1];

-        break;

-

-    case DEVICE_CLOSE:

-        break;

-

-    default:

-        break;

-    }

-

-    return Success;

-

-#undef NBUTTONS

-#undef NAXES

-}

-

-/**

- * Initialise the two core devices, VCP and VCK (see events.c).

- * Both devices are not tied to physical devices, but guarantee that there is

- * always a keyboard and a pointer present and keep the protocol semantics.

- *

- * Note that the server MUST have two core devices at all times, even if there

- * is no physical device connected.

- */

-void

-InitCoreDevices(void)

-{

-    if (AllocDevicePair(serverClient, "Virtual core",

-                        &inputInfo.pointer, &inputInfo.keyboard,

-                        CorePointerProc, CoreKeyboardProc,

-                        TRUE) != Success)

-        FatalError("Failed to allocate core devices");

-

-    if (ActivateDevice(inputInfo.pointer, TRUE) != Success ||

-        ActivateDevice(inputInfo.keyboard, TRUE) != Success)

-        FatalError("Failed to activate core devices.");

-    if (!EnableDevice(inputInfo.pointer, TRUE) ||

-        !EnableDevice(inputInfo.keyboard, TRUE))

-        FatalError("Failed to enable core devices.");

-

-    InitXTestDevices();

-}

-

-/**

- * Activate all switched-off devices and then enable all those devices.

- *

- * Will return an error if no core keyboard or core pointer is present.

- * In theory this should never happen if you call InitCoreDevices() first.

- *

- * InitAndStartDevices needs to be called AFTER the windows are initialized.

- * Devices will start sending events after InitAndStartDevices() has

- * completed.

- *

- * @return Success or error code on failure.

- */

-int

-InitAndStartDevices(void)

-{

-    DeviceIntPtr dev, next;

-

-    for (dev = inputInfo.off_devices; dev; dev = dev->next) {

-        DebugF("(dix) initialising device %d\n", dev->id);

-        if (!dev->inited)

-            ActivateDevice(dev, TRUE);

-    }

-

-    /* enable real devices */

-    for (dev = inputInfo.off_devices; dev; dev = next)

-    {

-        DebugF("(dix) enabling device %d\n", dev->id);

-	next = dev->next;

-	if (dev->inited && dev->startup)

-	    EnableDevice(dev, TRUE);

-    }

-

-    return Success;

-}

-

-/**

- * Free the given device class and reset the pointer to NULL.

- */

-static void

-FreeDeviceClass(int type, pointer *class)

-{

-    if (!(*class))

-        return;

-

-    switch(type)

-    {

-        case KeyClass:

-            {

-                KeyClassPtr* k = (KeyClassPtr*)class;

-                if ((*k)->xkbInfo)

-                {

-                    XkbFreeInfo((*k)->xkbInfo);

-                    (*k)->xkbInfo = NULL;

-                }

-                free((*k));

-                break;

-            }

-        case ButtonClass:

-            {

-                ButtonClassPtr *b = (ButtonClassPtr*)class;

-                free((*b)->xkb_acts);

-                free((*b));

-                break;

-            }

-        case ValuatorClass:

-            {

-                ValuatorClassPtr *v = (ValuatorClassPtr*)class;

-

-                free((*v)->motion);

-                free((*v));

-                break;

-            }

-        case FocusClass:

-            {

-                FocusClassPtr *f = (FocusClassPtr*)class;

-                free((*f)->trace);

-                free((*f));

-                break;

-            }

-        case ProximityClass:

-            {

-                ProximityClassPtr *p = (ProximityClassPtr*)class;

-                free((*p));

-                break;

-            }

-    }

-    *class = NULL;

-}

-

-static void

-FreeFeedbackClass(int type, pointer *class)

-{

-    if (!(*class))

-        return;

-

-    switch(type)

-    {

-        case KbdFeedbackClass:

-            {

-                KbdFeedbackPtr *kbdfeed = (KbdFeedbackPtr*)class;

-                KbdFeedbackPtr k, knext;

-                for (k = (*kbdfeed); k; k = knext) {

-                    knext = k->next;

-                    if (k->xkb_sli)

-                        XkbFreeSrvLedInfo(k->xkb_sli);

-                    free(k);

-                }

-                break;

-            }

-        case PtrFeedbackClass:

-            {

-                PtrFeedbackPtr *ptrfeed = (PtrFeedbackPtr*)class;

-                PtrFeedbackPtr p, pnext;

-

-                for (p = (*ptrfeed); p; p = pnext) {

-                    pnext = p->next;

-                    free(p);

-                }

-                break;

-            }

-        case IntegerFeedbackClass:

-            {

-                IntegerFeedbackPtr *intfeed = (IntegerFeedbackPtr*)class;

-                IntegerFeedbackPtr i, inext;

-

-                for (i = (*intfeed); i; i = inext) {

-                    inext = i->next;

-                    free(i);

-                }

-                break;

-            }

-        case StringFeedbackClass:

-            {

-                StringFeedbackPtr *stringfeed = (StringFeedbackPtr*)class;

-                StringFeedbackPtr s, snext;

-

-                for (s = (*stringfeed); s; s = snext) {

-                    snext = s->next;

-                    free(s->ctrl.symbols_supported);

-                    free(s->ctrl.symbols_displayed);

-                    free(s);

-                }

-                break;

-            }

-        case BellFeedbackClass:

-            {

-                BellFeedbackPtr *bell = (BellFeedbackPtr*)class;

-                BellFeedbackPtr b, bnext;

-

-                for (b = (*bell); b; b = bnext) {

-                    bnext = b->next;

-                    free(b);

-                }

-                break;

-            }

-        case LedFeedbackClass:

-            {

-                LedFeedbackPtr *leds = (LedFeedbackPtr*)class;

-                LedFeedbackPtr l, lnext;

-

-                for (l = (*leds); l; l = lnext) {

-                    lnext = l->next;

-                    if (l->xkb_sli)

-                        XkbFreeSrvLedInfo(l->xkb_sli);

-                    free(l);

-                }

-                break;

-            }

-    }

-    *class = NULL;

-}

-

-static void

-FreeAllDeviceClasses(ClassesPtr classes)

-{

-    if (!classes)

-        return;

-

-    FreeDeviceClass(KeyClass, (pointer)&classes->key);

-    FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);

-    FreeDeviceClass(ButtonClass, (pointer)&classes->button);

-    FreeDeviceClass(FocusClass, (pointer)&classes->focus);

-    FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);

-

-    FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);

-    FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);

-    FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);

-    FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);

-    FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);

-    FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);

-

-}

-

-/**

- * Close down a device and free all resources.

- * Once closed down, the driver will probably not expect you that you'll ever

- * enable it again and free associated structs. If you want the device to just

- * be disabled, DisableDevice().

- * Don't call this function directly, use RemoveDevice() instead.

- */

-static void

-CloseDevice(DeviceIntPtr dev)

-{

-    ScreenPtr screen = screenInfo.screens[0];

-    ClassesPtr classes;

-    int j;

-

-    if (!dev)

-        return;

-

-    XIDeleteAllDeviceProperties(dev);

-

-    if (dev->inited)

-	(void)(*dev->deviceProc)(dev, DEVICE_CLOSE);

-

-    /* free sprite memory */

-    if (IsMaster(dev) && dev->spriteInfo->sprite)

-        screen->DeviceCursorCleanup(dev, screen);

-

-    /* free acceleration info */

-    if(dev->valuator && dev->valuator->accelScheme.AccelCleanupProc)

-	dev->valuator->accelScheme.AccelCleanupProc(dev);

-

-    while (dev->xkb_interest)

-	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);

-

-    free(dev->name);

-

-    classes = (ClassesPtr)&dev->key;

-    FreeAllDeviceClasses(classes);

-

-    if (IsMaster(dev))

-    {

-        classes = dev->unused_classes;

-        FreeAllDeviceClasses(classes);

-	free(classes);

-    }

-

-    if (DevHasCursor(dev) && dev->spriteInfo->sprite) {

-	if (dev->spriteInfo->sprite->current)

-	    FreeCursor(dev->spriteInfo->sprite->current, None);

-        free(dev->spriteInfo->sprite->spriteTrace);

-        free(dev->spriteInfo->sprite);

-    }

-

-    /* a client may have the device set as client pointer */

-    for (j = 0; j < currentMaxClients; j++)

-    {

-        if (clients[j] && clients[j]->clientPtr == dev)

-        {

-            clients[j]->clientPtr = NULL;

-            clients[j]->clientPtr = PickPointer(clients[j]);

-        }

-    }

-

-    free(dev->deviceGrab.sync.event);

-    free(dev->config_info);     /* Allocated in xf86ActivateDevice. */

-    dev->config_info = NULL;

-    dixFreeObjectWithPrivates(dev, PRIVATE_DEVICE);

-}

-

-/**

- * Shut down all devices of one list and free all resources.

- */

-static

-void

-CloseDeviceList(DeviceIntPtr *listHead)

-{

-    /* Used to mark devices that we tried to free */

-    Bool freedIds[MAXDEVICES];

-    DeviceIntPtr dev;

-    int i;

-

-    if (listHead == NULL)

-        return;

-

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

-        freedIds[i] = FALSE;

-

-    dev = *listHead;

-    while (dev != NULL)

-    {

-        freedIds[dev->id] = TRUE;

-        DeleteInputDeviceRequest(dev);

-

-        dev = *listHead;

-        while (dev != NULL && freedIds[dev->id])

-            dev = dev->next;

-    }

-}

-

-/**

- * Shut down all devices, free all resources, etc.

- * Only useful if you're shutting down the server!

- */

-void

-CloseDownDevices(void)

-{

-    DeviceIntPtr dev;

-

-    /* Float all SDs before closing them. Note that at this point resources

-     * (e.g. cursors) have been freed already, so we can't just call

-     * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master

-     * to NULL and pretend nothing happened.

-     */

-    for (dev = inputInfo.devices; dev; dev = dev->next)

-    {

-        if (!IsMaster(dev) && !IsFloating(dev))

-            dev->master = NULL;

-    }

-

-    CloseDeviceList(&inputInfo.devices);

-    CloseDeviceList(&inputInfo.off_devices);

-

-    CloseDevice(inputInfo.pointer);

-    CloseDevice(inputInfo.keyboard);

-

-    inputInfo.devices = NULL;

-    inputInfo.off_devices = NULL;

-    inputInfo.keyboard = NULL;

-    inputInfo.pointer = NULL;

-    XkbDeleteRulesDflts();

-}

-

-/**

- * Remove the cursor sprite for all devices. This needs to be done before any

- * resources are freed or any device is deleted.

- */

-void

-UndisplayDevices(void)

-{

-    DeviceIntPtr dev;

-    ScreenPtr screen = screenInfo.screens[0];

-

-    for (dev = inputInfo.devices; dev; dev = dev->next)

-        screen->DisplayCursor(dev, screen, NullCursor);

-}

-

-/**

- * Remove a device from the device list, closes it and thus frees all

- * resources.

- * Removes both enabled and disabled devices and notifies all devices about

- * the removal of the device.

- *

- * No PresenceNotify is sent for device that the client never saw. This can

- * happen if a malloc fails during the addition of master devices. If

- * dev->init is FALSE it means the client never received a DeviceAdded event,

- * so let's not send a DeviceRemoved event either.

- *

- * @param sendevent True if an XI2 event should be sent.

- */

-int

-RemoveDevice(DeviceIntPtr dev, BOOL sendevent)

-{

-    DeviceIntPtr prev,tmp,next;

-    int ret = BadMatch;

-    ScreenPtr screen = screenInfo.screens[0];

-    int deviceid;

-    int initialized;

-    int flags[MAXDEVICES] = {0};

-

-    DebugF("(dix) removing device %d\n", dev->id);

-

-    if (!dev || dev == inputInfo.keyboard || dev == inputInfo.pointer)

-        return BadImplementation;

-

-    initialized = dev->inited;

-    deviceid = dev->id;

-

-    if (initialized)

-    {

-        if (DevHasCursor(dev))

-            screen->DisplayCursor(dev, screen, NullCursor);

-

-        DisableDevice(dev, sendevent);

-        flags[dev->id] = XIDeviceDisabled;

-    }

-

-    prev = NULL;

-    for (tmp = inputInfo.devices; tmp; (prev = tmp), (tmp = next)) {

-	next = tmp->next;

-	if (tmp == dev) {

-

-	    if (prev==NULL)

-		inputInfo.devices = next;

-	    else

-		prev->next = next;

-

-	    flags[tmp->id] = IsMaster(tmp) ? XIMasterRemoved : XISlaveRemoved;

-	    CloseDevice(tmp);

-	    ret = Success;

-	}

-    }

-

-    prev = NULL;

-    for (tmp = inputInfo.off_devices; tmp; (prev = tmp), (tmp = next)) {

-	next = tmp->next;

-	if (tmp == dev) {

-	    flags[tmp->id] = IsMaster(tmp) ? XIMasterRemoved : XISlaveRemoved;

-	    CloseDevice(tmp);

-

-	    if (prev == NULL)

-		inputInfo.off_devices = next;

-	    else

-		prev->next = next;

-

-            ret = Success;

-	}

-    }

-

-    if (ret == Success && initialized) {

-        inputInfo.numDevices--;

-        SendDevicePresenceEvent(deviceid, DeviceRemoved);

-        if (sendevent)

-            XISendDeviceHierarchyEvent(flags);

-    }

-

-    return ret;

-}

-

-int

-NumMotionEvents(void)

-{

-    /* only called to fill data in initial connection reply.

-     * VCP is ok here, it is the only fixed device we have. */

-    return inputInfo.pointer->valuator->numMotionEvents;

-}

-

-int

-dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode)

-{

-    DeviceIntPtr dev;

-    int rc;

-    *pDev = NULL;

-

-    for (dev=inputInfo.devices; dev; dev=dev->next) {

-        if (dev->id == id)

-            goto found;

-    }

-    for (dev=inputInfo.off_devices; dev; dev=dev->next) {

-        if (dev->id == id)

-	    goto found;

-    }

-    return BadDevice;

-

-found:

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);

-    if (rc == Success)

-	*pDev = dev;

-    return rc;

-}

-

-void

-QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)

-{

-    if (inputInfo.keyboard) {

-	*minCode = inputInfo.keyboard->key->xkbInfo->desc->min_key_code;

-	*maxCode = inputInfo.keyboard->key->xkbInfo->desc->max_key_code;

-    }

-}

-

-/* Notably, this function does not expand the destination's keycode range, or

- * notify clients. */

-Bool

-SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)

-{

-    int i, j;

-    KeySym *tmp;

-    int rowDif = src->minKeyCode - dst->minKeyCode;

-

-    /* if keysym map size changes, grow map first */

-    if (src->mapWidth < dst->mapWidth) {

-        for (i = src->minKeyCode; i <= src->maxKeyCode; i++) {

-#define SI(r, c) (((r - src->minKeyCode) * src->mapWidth) + (c))

-#define DI(r, c) (((r - dst->minKeyCode) * dst->mapWidth) + (c))

-	    for (j = 0; j < src->mapWidth; j++)

-		dst->map[DI(i, j)] = src->map[SI(i, j)];

-	    for (j = src->mapWidth; j < dst->mapWidth; j++)

-		dst->map[DI(i, j)] = NoSymbol;

-#undef SI

-#undef DI

-	}

-	return TRUE;

-    }

-    else if (src->mapWidth > dst->mapWidth) {

-        i = sizeof(KeySym) * src->mapWidth *

-             (dst->maxKeyCode - dst->minKeyCode + 1);

-        tmp = calloc(sizeof(KeySym), i);

-        if (!tmp)

-            return FALSE;

-

-        if (dst->map) {

-            for (i = 0; i <= dst->maxKeyCode-dst->minKeyCode; i++)

-                memmove(&tmp[i * src->mapWidth], &dst->map[i * dst->mapWidth],

-                        dst->mapWidth * sizeof(KeySym));

-            free(dst->map);

-        }

-        dst->mapWidth = src->mapWidth;

-        dst->map = tmp;

-    }

-    else if (!dst->map) {

-        i = sizeof(KeySym) * src->mapWidth *

-             (dst->maxKeyCode - dst->minKeyCode + 1);

-        tmp = calloc(sizeof(KeySym), i);

-        if (!tmp)

-            return FALSE;

-

-        dst->map = tmp;

-        dst->mapWidth = src->mapWidth;

-    }

-

-    memmove(&dst->map[rowDif * dst->mapWidth], src->map,

-            (src->maxKeyCode - src->minKeyCode + 1) *

-            dst->mapWidth * sizeof(KeySym));

-

-    return TRUE;

-}

-

-Bool

-InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom* labels,

-                            CARD8 *map)

-{

-    ButtonClassPtr butc;

-    int i;

-

-    butc = calloc(1, sizeof(ButtonClassRec));

-    if (!butc)

-	return FALSE;

-    butc->numButtons = numButtons;

-    butc->sourceid = dev->id;

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

-	butc->map[i] = map[i];

-    for (i = numButtons + 1; i < MAP_LENGTH; i++)

-        butc->map[i] = i;

-    memcpy(butc->labels, labels, numButtons * sizeof(Atom));

-    dev->button = butc;

-    return TRUE;

-}

-

-Bool

-InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,

-                              int numMotionEvents, int mode)

-{

-    int i;

-    ValuatorClassPtr valc;

-    union align_u { ValuatorClassRec valc; double d; } *align;

-

-    if (!dev)

-        return FALSE;

-

-    if (numAxes > MAX_VALUATORS)

-    {

-        LogMessage(X_WARNING,

-                   "Device '%s' has %d axes, only using first %d.\n",

-                   dev->name, numAxes, MAX_VALUATORS);

-        numAxes = MAX_VALUATORS;

-    }

-

-    align = (union align_u *) calloc(1, sizeof(union align_u) +

-				     numAxes * sizeof(double) +

-				     numAxes * sizeof(AxisInfo));

-    if (!align)

-	return FALSE;

-

-    valc = &align->valc;

-    valc->sourceid = dev->id;

-    valc->motion = NULL;

-    valc->first_motion = 0;

-    valc->last_motion = 0;

-

-    valc->numMotionEvents = numMotionEvents;

-    valc->motionHintWindow = NullWindow;

-    valc->numAxes = numAxes;

-    valc->axisVal = (double *)(align + 1);

-    valc->axes = (AxisInfoPtr)(valc->axisVal + numAxes);

-

-    if (mode & OutOfProximity)

-        InitProximityClassDeviceStruct(dev);

-

-    dev->valuator = valc;

-

-    AllocateMotionHistory(dev);

-

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

-        InitValuatorAxisStruct(dev, i, labels[i], NO_AXIS_LIMITS, NO_AXIS_LIMITS,

-                               0, 0, 0, mode);

-	valc->axisVal[i]=0;

-    }

-

-    dev->last.numValuators = numAxes;

-

-    if (IsMaster(dev) || /* do not accelerate master or xtest devices */

-        IsXTestDevice(dev, NULL))

-	InitPointerAccelerationScheme(dev, PtrAccelNoOp);

-    else

-	InitPointerAccelerationScheme(dev, PtrAccelDefault);

-    return TRUE;

-}

-

-/* global list of acceleration schemes */

-ValuatorAccelerationRec pointerAccelerationScheme[] = {

-    {PtrAccelNoOp, NULL, NULL, NULL, NULL},

-    {PtrAccelPredictable, acceleratePointerPredictable, NULL,

-        InitPredictableAccelerationScheme, AccelerationDefaultCleanup},

-    {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL, NULL},

-    {-1, NULL, NULL, NULL, NULL} /* terminator */

-};

-

-/**

- * install an acceleration scheme. returns TRUE on success, and should not

- * change anything if unsuccessful.

- */

-Bool

-InitPointerAccelerationScheme(DeviceIntPtr dev,

-                              int scheme)

-{

-    int x, i = -1;

-    ValuatorClassPtr val;

-

-    val = dev->valuator;

-

-    if (!val)

-        return FALSE;

-

-    if (IsMaster(dev) && scheme != PtrAccelNoOp)

-        return FALSE;

-

-    for (x = 0; pointerAccelerationScheme[x].number >= 0; x++) {

-        if(pointerAccelerationScheme[x].number == scheme){

-            i = x;

-            break;

-        }

-    }

-

-    if (-1 == i)

-        return FALSE;

-

-    if (val->accelScheme.AccelCleanupProc)

-        val->accelScheme.AccelCleanupProc(dev);

-

-    if (pointerAccelerationScheme[i].AccelInitProc) {

-        if (!pointerAccelerationScheme[i].AccelInitProc(dev,

-                                            &pointerAccelerationScheme[i])) {

-            return FALSE;

-        }

-    } else {

-        val->accelScheme = pointerAccelerationScheme[i];

-    }

-    return TRUE;

-}

-

-Bool

-InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)

-{

-    AbsoluteClassPtr abs;

-

-    abs = malloc(sizeof(AbsoluteClassRec));

-    if (!abs)

-        return FALSE;

-

-    /* we don't do anything sensible with these, but should */

-    abs->min_x = NO_AXIS_LIMITS;

-    abs->min_y = NO_AXIS_LIMITS;

-    abs->max_x = NO_AXIS_LIMITS;

-    abs->max_y = NO_AXIS_LIMITS;

-    abs->flip_x = 0;

-    abs->flip_y = 0;

-    abs->rotation = 0;

-    abs->button_threshold = 0;

-

-    abs->offset_x = 0;

-    abs->offset_y = 0;

-    abs->width = NO_AXIS_LIMITS;

-    abs->height = NO_AXIS_LIMITS;

-    abs->following = 0;

-    abs->screen = 0;

-

-    abs->sourceid = dev->id;

-

-    dev->absolute = abs;

-

-    return TRUE;

-}

-

-Bool

-InitFocusClassDeviceStruct(DeviceIntPtr dev)

-{

-    FocusClassPtr focc;

-

-    focc = malloc(sizeof(FocusClassRec));

-    if (!focc)

-	return FALSE;

-    focc->win = PointerRootWin;

-    focc->revert = None;

-    focc->time = currentTime;

-    focc->trace = (WindowPtr *)NULL;

-    focc->traceSize = 0;

-    focc->traceGood = 0;

-    focc->sourceid = dev->id;

-    dev->focus = focc;

-    return TRUE;

-}

-

-Bool

-InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)

-{

-    PtrFeedbackPtr feedc;

-

-    feedc = malloc(sizeof(PtrFeedbackClassRec));

-    if (!feedc)

-	return FALSE;

-    feedc->CtrlProc = controlProc;

-    feedc->ctrl = defaultPointerControl;

-    feedc->ctrl.id = 0;

-    if ( (feedc->next = dev->ptrfeed) )

-        feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;

-    dev->ptrfeed = feedc;

-    (*controlProc)(dev, &feedc->ctrl);

-    return TRUE;

-}

-

-

-static LedCtrl defaultLedControl = {

-	DEFAULT_LEDS, DEFAULT_LEDS_MASK, 0};

-

-static BellCtrl defaultBellControl = {

-	DEFAULT_BELL,

-	DEFAULT_BELL_PITCH,

-	DEFAULT_BELL_DURATION,

-	0};

-

-static IntegerCtrl defaultIntegerControl = {

-	DEFAULT_INT_RESOLUTION,

-	DEFAULT_INT_MIN_VALUE,

-	DEFAULT_INT_MAX_VALUE,

-	DEFAULT_INT_DISPLAYED,

-	0};

-

-Bool

-InitStringFeedbackClassDeviceStruct (

-      DeviceIntPtr dev, StringCtrlProcPtr controlProc,

-      int max_symbols, int num_symbols_supported, KeySym *symbols)

-{

-    int i;

-    StringFeedbackPtr feedc;

-

-    feedc = malloc(sizeof(StringFeedbackClassRec));

-    if (!feedc)

-	return FALSE;

-    feedc->CtrlProc = controlProc;

-    feedc->ctrl.num_symbols_supported = num_symbols_supported;

-    feedc->ctrl.num_symbols_displayed = 0;

-    feedc->ctrl.max_symbols = max_symbols;

-    feedc->ctrl.symbols_supported = malloc(sizeof (KeySym) * num_symbols_supported);

-    feedc->ctrl.symbols_displayed = malloc(sizeof (KeySym) * max_symbols);

-    if (!feedc->ctrl.symbols_supported || !feedc->ctrl.symbols_displayed)

-    {

-	free(feedc->ctrl.symbols_supported);

-	free(feedc->ctrl.symbols_displayed);

-	free(feedc);

-	return FALSE;

-    }

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

-	*(feedc->ctrl.symbols_supported+i) = *symbols++;

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

-	*(feedc->ctrl.symbols_displayed+i) = (KeySym) 0;

-    feedc->ctrl.id = 0;

-    if ( (feedc->next = dev->stringfeed) )

-	feedc->ctrl.id = dev->stringfeed->ctrl.id + 1;

-    dev->stringfeed = feedc;

-    (*controlProc)(dev, &feedc->ctrl);

-    return TRUE;

-}

-

-Bool

-InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,

-                                   BellCtrlProcPtr controlProc)

-{

-    BellFeedbackPtr feedc;

-

-    feedc = malloc(sizeof(BellFeedbackClassRec));

-    if (!feedc)

-	return FALSE;

-    feedc->CtrlProc = controlProc;

-    feedc->BellProc = bellProc;

-    feedc->ctrl = defaultBellControl;

-    feedc->ctrl.id = 0;

-    if ( (feedc->next = dev->bell) )

-	feedc->ctrl.id = dev->bell->ctrl.id + 1;

-    dev->bell = feedc;

-    (*controlProc)(dev, &feedc->ctrl);

-    return TRUE;

-}

-

-Bool

-InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)

-{

-    LedFeedbackPtr feedc;

-

-    feedc = malloc(sizeof(LedFeedbackClassRec));

-    if (!feedc)

-	return FALSE;

-    feedc->CtrlProc = controlProc;

-    feedc->ctrl = defaultLedControl;

-    feedc->ctrl.id = 0;

-    if ( (feedc->next = dev->leds) )

-	feedc->ctrl.id = dev->leds->ctrl.id + 1;

-    feedc->xkb_sli= NULL;

-    dev->leds = feedc;

-    (*controlProc)(dev, &feedc->ctrl);

-    return TRUE;

-}

-

-Bool

-InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)

-{

-    IntegerFeedbackPtr feedc;

-

-    feedc = malloc(sizeof(IntegerFeedbackClassRec));

-    if (!feedc)

-	return FALSE;

-    feedc->CtrlProc = controlProc;

-    feedc->ctrl = defaultIntegerControl;

-    feedc->ctrl.id = 0;

-    if ( (feedc->next = dev->intfeed) )

-	feedc->ctrl.id = dev->intfeed->ctrl.id + 1;

-    dev->intfeed = feedc;

-    (*controlProc)(dev, &feedc->ctrl);

-    return TRUE;

-}

-

-Bool

-InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons, Atom* btn_labels,

-                        PtrCtrlProcPtr controlProc, int numMotionEvents,

-                        int numAxes, Atom *axes_labels)

-{

-    DeviceIntPtr dev = (DeviceIntPtr)device;

-

-    return(InitButtonClassDeviceStruct(dev, numButtons, btn_labels, map) &&

-	   InitValuatorClassDeviceStruct(dev, numAxes, axes_labels,

-					 numMotionEvents, Relative) &&

-	   InitPtrFeedbackClassDeviceStruct(dev, controlProc));

-}

-

-/*

- * Check if the given buffer contains elements between low (inclusive) and

- * high (inclusive) only.

- *

- * @return TRUE if the device map is invalid, FALSE otherwise.

- */

-Bool

-BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)

-{

-    int i;

-

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

-	if (buff[i])		       /* only check non-zero elements */

-	{

-	    if ((low > buff[i]) || (high < buff[i]))

-	    {

-		*errval = buff[i];

-		return TRUE;

-	    }

-	}

-    return FALSE;

-}

-

-int

-ProcSetModifierMapping(ClientPtr client)

-{

-    xSetModifierMappingReply rep;

-    int rc;

-    REQUEST(xSetModifierMappingReq);

-    REQUEST_AT_LEAST_SIZE(xSetModifierMappingReq);

-

-    if (client->req_len != ((stuff->numKeyPerModifier << 1) +

-                bytes_to_int32(sizeof(xSetModifierMappingReq))))

-	return BadLength;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    rc = change_modmap(client, PickKeyboard(client), (KeyCode *)&stuff[1],

-                       stuff->numKeyPerModifier);

-    if (rc == MappingFailed || rc == -1)

-        return BadValue;

-    if (rc != Success && rc != MappingSuccess && rc != MappingFailed &&

-        rc != MappingBusy)

-	return rc;

-

-    rep.success = rc;

-

-    WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep);

-    return Success;

-}

-

-int

-ProcGetModifierMapping(ClientPtr client)

-{

-    xGetModifierMappingReply rep;

-    int max_keys_per_mod = 0;

-    KeyCode *modkeymap = NULL;

-    REQUEST_SIZE_MATCH(xReq);

-

-    generate_modkeymap(client, PickKeyboard(client), &modkeymap,

-                       &max_keys_per_mod);

-

-    memset(&rep, 0, sizeof(xGetModifierMappingReply));

-    rep.type = X_Reply;

-    rep.numKeyPerModifier = max_keys_per_mod;

-    rep.sequenceNumber = client->sequence;

-    /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */

-    rep.length = max_keys_per_mod << 1;

-

-    WriteReplyToClient(client, sizeof(xGetModifierMappingReply), &rep);

-    (void)WriteToClient(client, max_keys_per_mod * 8, (char *) modkeymap);

-

-    free(modkeymap);

-

-    return Success;

-}

-

-int

-ProcChangeKeyboardMapping(ClientPtr client)

-{

-    REQUEST(xChangeKeyboardMappingReq);

-    unsigned len;

-    KeySymsRec keysyms;

-    DeviceIntPtr pDev, tmp;

-    int rc;

-    REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);

-

-    len = client->req_len - bytes_to_int32(sizeof(xChangeKeyboardMappingReq));

-    if (len != (stuff->keyCodes * stuff->keySymsPerKeyCode))

-            return BadLength;

-

-    pDev = PickKeyboard(client);

-

-    if ((stuff->firstKeyCode < pDev->key->xkbInfo->desc->min_key_code) ||

-	(stuff->firstKeyCode > pDev->key->xkbInfo->desc->max_key_code)) {

-	    client->errorValue = stuff->firstKeyCode;

-	    return BadValue;

-

-    }

-    if (((unsigned)(stuff->firstKeyCode + stuff->keyCodes - 1) >

-          pDev->key->xkbInfo->desc->max_key_code) ||

-        (stuff->keySymsPerKeyCode == 0)) {

-	    client->errorValue = stuff->keySymsPerKeyCode;

-	    return BadValue;

-    }

-

-    keysyms.minKeyCode = stuff->firstKeyCode;

-    keysyms.maxKeyCode = stuff->firstKeyCode + stuff->keyCodes - 1;

-    keysyms.mapWidth = stuff->keySymsPerKeyCode;

-    keysyms.map = (KeySym *) &stuff[1];

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);

-    if (rc != Success)

-        return rc;

-

-    XkbApplyMappingChange(pDev, &keysyms, stuff->firstKeyCode,

-                          stuff->keyCodes, NULL, client);

-

-    for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {

-        if (IsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev)

-            continue;

-        if (!tmp->key)

-            continue;

-

-        rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);

-        if (rc != Success)

-            continue;

-

-        XkbApplyMappingChange(tmp, &keysyms, stuff->firstKeyCode,

-                              stuff->keyCodes, NULL, client);

-    }

-

-    return Success;

-}

-

-int

-ProcSetPointerMapping(ClientPtr client)

-{

-    BYTE *map;

-    int ret;

-    int i, j;

-    DeviceIntPtr ptr = PickPointer(client);

-    xSetPointerMappingReply rep;

-    REQUEST(xSetPointerMappingReq);

-    REQUEST_AT_LEAST_SIZE(xSetPointerMappingReq);

-

-    if (client->req_len !=

-            bytes_to_int32(sizeof(xSetPointerMappingReq) + stuff->nElts))

-	return BadLength;

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.success = MappingSuccess;

-    map = (BYTE *)&stuff[1];

-

-    /* So we're bounded here by the number of core buttons.  This check

-     * probably wants disabling through XFixes. */

-    /* MPX: With ClientPointer, we can return the right number of buttons.

-     * Let's just hope nobody changed ClientPointer between GetPointerMapping

-     * and SetPointerMapping

-     */

-    if (stuff->nElts != ptr->button->numButtons) {

-	client->errorValue = stuff->nElts;

-	return BadValue;

-    }

-

-    /* Core protocol specs don't allow for duplicate mappings; this check

-     * almost certainly wants disabling through XFixes too. */

-    for (i = 0; i < stuff->nElts; i++) {

-        for (j = i + 1; j < stuff->nElts; j++) {

-            if (map[i] && map[i] == map[j]) {

-                client->errorValue = map[i];

-                return BadValue;

-            }

-        }

-    }

-

-    ret = ApplyPointerMapping(ptr, map, stuff->nElts, client);

-    if (ret == MappingBusy)

-        rep.success = ret;

-    else if (ret == -1)

-        return BadValue;

-    else if (ret != Success)

-        return ret;

-

-    WriteReplyToClient(client, sizeof(xSetPointerMappingReply), &rep);

-    return Success;

-}

-

-int

-ProcGetKeyboardMapping(ClientPtr client)

-{

-    xGetKeyboardMappingReply rep;

-    DeviceIntPtr kbd = PickKeyboard(client);

-    XkbDescPtr xkb;

-    KeySymsPtr syms;

-    int rc;

-    REQUEST(xGetKeyboardMappingReq);

-    REQUEST_SIZE_MATCH(xGetKeyboardMappingReq);

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    xkb = kbd->key->xkbInfo->desc;

-

-    if ((stuff->firstKeyCode < xkb->min_key_code) ||

-        (stuff->firstKeyCode > xkb->max_key_code)) {

-	client->errorValue = stuff->firstKeyCode;

-	return BadValue;

-    }

-    if (stuff->firstKeyCode + stuff->count > xkb->max_key_code + 1) {

-	client->errorValue = stuff->count;

-        return BadValue;

-    }

-

-    syms = XkbGetCoreMap(kbd);

-    if (!syms)

-        return BadAlloc;

-

-    memset(&rep, 0, sizeof(xGetKeyboardMappingReply));

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.keySymsPerKeyCode = syms->mapWidth;

-    /* length is a count of 4 byte quantities and KeySyms are 4 bytes */

-    rep.length = syms->mapWidth * stuff->count;

-    WriteReplyToClient(client, sizeof(xGetKeyboardMappingReply), &rep);

-    client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;

-    WriteSwappedDataToClient(client,

-                             syms->mapWidth * stuff->count * sizeof(KeySym),

-                             &syms->map[syms->mapWidth * (stuff->firstKeyCode -

-                                                          syms->minKeyCode)]);

-    free(syms->map);

-    free(syms);

-

-    return Success;

-}

-

-int

-ProcGetPointerMapping(ClientPtr client)

-{

-    xGetPointerMappingReply rep;

-    /* Apps may get different values each time they call GetPointerMapping as

-     * the ClientPointer could change. */

-    DeviceIntPtr ptr = PickPointer(client);

-    ButtonClassPtr butc = ptr->button;

-    int rc;

-    REQUEST_SIZE_MATCH(xReq);

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.nElts = (butc) ? butc->numButtons : 0;

-    rep.length = ((unsigned)rep.nElts + (4-1))/4;

-    WriteReplyToClient(client, sizeof(xGetPointerMappingReply), &rep);

-    if (butc)

-        WriteToClient(client, (int)rep.nElts, (char *)&butc->map[1]);

-    return Success;

-}

-

-void

-NoteLedState(DeviceIntPtr keybd, int led, Bool on)

-{

-    KeybdCtrl *ctrl = &keybd->kbdfeed->ctrl;

-    if (on)

-	ctrl->leds |= ((Leds)1 << (led - 1));

-    else

-	ctrl->leds &= ~((Leds)1 << (led - 1));

-}

-

-int

-Ones(unsigned long mask)             /* HACKMEM 169 */

-{

-    unsigned long y;

-

-    y = (mask >> 1) &033333333333;

-    y = mask - y - ((y >>1) & 033333333333);

-    return (((y + (y >> 3)) & 030707070707) % 077);

-}

-

-static int

-DoChangeKeyboardControl (ClientPtr client, DeviceIntPtr keybd, XID *vlist,

-                         BITS32 vmask)

-{

-#define DO_ALL    (-1)

-    KeybdCtrl ctrl;

-    int t;

-    int led = DO_ALL;

-    int key = DO_ALL;

-    BITS32 index2;

-    int mask = vmask, i;

-    XkbEventCauseRec cause;

-

-    ctrl = keybd->kbdfeed->ctrl;

-    while (vmask) {

-	index2 = (BITS32) lowbit (vmask);

-	vmask &= ~index2;

-	switch (index2) {

-	case KBKeyClickPercent:

-	    t = (INT8)*vlist;

-	    vlist++;

-	    if (t == -1) {

-		t = defaultKeyboardControl.click;

-            }

-	    else if (t < 0 || t > 100) {

-		client->errorValue = t;

-		return BadValue;

-	    }

-	    ctrl.click = t;

-	    break;

-	case KBBellPercent:

-	    t = (INT8)*vlist;

-	    vlist++;

-	    if (t == -1) {

-		t = defaultKeyboardControl.bell;

-            }

-	    else if (t < 0 || t > 100) {

-		client->errorValue = t;

-		return BadValue;

-	    }

-	    ctrl.bell = t;

-	    break;

-	case KBBellPitch:

-	    t = (INT16)*vlist;

-	    vlist++;

-	    if (t == -1) {

-		t = defaultKeyboardControl.bell_pitch;

-            }

-	    else if (t < 0) {

-		client->errorValue = t;

-		return BadValue;

-	    }

-	    ctrl.bell_pitch = t;

-	    break;

-	case KBBellDuration:

-	    t = (INT16)*vlist;

-	    vlist++;

-	    if (t == -1)

-		t = defaultKeyboardControl.bell_duration;

-	    else if (t < 0) {

-		client->errorValue = t;

-		return BadValue;

-	    }

-	    ctrl.bell_duration = t;

-	    break;

-	case KBLed:

-	    led = (CARD8)*vlist;

-	    vlist++;

-	    if (led < 1 || led > 32) {

-		client->errorValue = led;

-		return BadValue;

-	    }

-	    if (!(mask & KBLedMode))

-		return BadMatch;

-	    break;

-	case KBLedMode:

-	    t = (CARD8)*vlist;

-	    vlist++;

-	    if (t == LedModeOff) {

-		if (led == DO_ALL)

-		    ctrl.leds = 0x0;

-		else

-		    ctrl.leds &= ~(((Leds)(1)) << (led - 1));

-	    }

-	    else if (t == LedModeOn) {

-		if (led == DO_ALL)

-		    ctrl.leds = ~0L;

-		else

-		    ctrl.leds |= (((Leds)(1)) << (led - 1));

-	    }

-	    else {

-		client->errorValue = t;

-		return BadValue;

-	    }

-

-            XkbSetCauseCoreReq(&cause,X_ChangeKeyboardControl,client);

-            XkbSetIndicators(keybd,((led == DO_ALL) ? ~0L : (1L<<(led-1))),

- 			     ctrl.leds, &cause);

-            ctrl.leds = keybd->kbdfeed->ctrl.leds;

-

-	    break;

-	case KBKey:

-	    key = (KeyCode)*vlist;

-	    vlist++;

-	    if ((KeyCode)key < keybd->key->xkbInfo->desc->min_key_code ||

-		(KeyCode)key > keybd->key->xkbInfo->desc->max_key_code) {

-		client->errorValue = key;

-		return BadValue;

-	    }

-	    if (!(mask & KBAutoRepeatMode))

-		return BadMatch;

-	    break;

-	case KBAutoRepeatMode:

-	    i = (key >> 3);

-	    mask = (1 << (key & 7));

-	    t = (CARD8)*vlist;

-	    vlist++;

-            if (key != DO_ALL)

-                XkbDisableComputedAutoRepeats(keybd,key);

-	    if (t == AutoRepeatModeOff) {

-		if (key == DO_ALL)

-		    ctrl.autoRepeat = FALSE;

-		else

-		    ctrl.autoRepeats[i] &= ~mask;

-	    }

-	    else if (t == AutoRepeatModeOn) {

-		if (key == DO_ALL)

-		    ctrl.autoRepeat = TRUE;

-		else

-		    ctrl.autoRepeats[i] |= mask;

-	    }

-	    else if (t == AutoRepeatModeDefault) {

-		if (key == DO_ALL)

-		    ctrl.autoRepeat = defaultKeyboardControl.autoRepeat;

-		else

-		    ctrl.autoRepeats[i] =

-			    (ctrl.autoRepeats[i] & ~mask) |

-			    (defaultKeyboardControl.autoRepeats[i] & mask);

-	    }

-	    else {

-		client->errorValue = t;

-		return BadValue;

-	    }

-	    break;

-	default:

-	    client->errorValue = mask;

-	    return BadValue;

-	}

-    }

-    keybd->kbdfeed->ctrl = ctrl;

-

-    /* The XKB RepeatKeys control and core protocol global autorepeat */

-    /* value are linked	*/

-    XkbSetRepeatKeys(keybd, key, keybd->kbdfeed->ctrl.autoRepeat);

-

-    return Success;

-

-#undef DO_ALL

-}

-

-/**

- * Changes kbd control on the ClientPointer and all attached SDs.

- */

-int

-ProcChangeKeyboardControl (ClientPtr client)

-{

-    XID *vlist;

-    BITS32 vmask;

-    int ret = Success, error = Success;

-    DeviceIntPtr pDev = NULL, keyboard;

-    REQUEST(xChangeKeyboardControlReq);

-

-    REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq);

-

-    vmask = stuff->mask;

-    vlist = (XID *)&stuff[1];

-

-    if (client->req_len != (sizeof(xChangeKeyboardControlReq)>>2)+Ones(vmask))

-	return BadLength;

-

-    keyboard = PickKeyboard(client);

-

-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {

-        if ((pDev == keyboard ||

-	     (!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))

-	    && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {

-            ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);

-	    if (ret != Success)

-                return ret;

-        }

-    }

-

-    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {

-        if ((pDev == keyboard ||

-	     (!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))

-	    && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {

-            ret = DoChangeKeyboardControl(client, pDev, vlist, vmask);

-            if (ret != Success)

-                error = ret;

-        }

-    }

-

-    return error;

-}

-

-int

-ProcGetKeyboardControl (ClientPtr client)

-{

-    int rc, i;

-    DeviceIntPtr kbd = PickKeyboard(client);

-    KeybdCtrl *ctrl = &kbd->kbdfeed->ctrl;

-    xGetKeyboardControlReply rep;

-    REQUEST_SIZE_MATCH(xReq);

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.length = 5;

-    rep.sequenceNumber = client->sequence;

-    rep.globalAutoRepeat = ctrl->autoRepeat;

-    rep.keyClickPercent = ctrl->click;

-    rep.bellPercent = ctrl->bell;

-    rep.bellPitch = ctrl->bell_pitch;

-    rep.bellDuration = ctrl->bell_duration;

-    rep.ledMask = ctrl->leds;

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

-	rep.map[i] = ctrl->autoRepeats[i];

-    WriteReplyToClient(client, sizeof(xGetKeyboardControlReply), &rep);

-    return Success;

-}

-

-int

-ProcBell(ClientPtr client)

-{

-    DeviceIntPtr dev, keybd = PickKeyboard(client);

-    int base = keybd->kbdfeed->ctrl.bell;

-    int newpercent;

-    int rc;

-    REQUEST(xBellReq);

-    REQUEST_SIZE_MATCH(xBellReq);

-

-    if (stuff->percent < -100 || stuff->percent > 100) {

-	client->errorValue = stuff->percent;

-	return BadValue;

-    }

-

-    newpercent = (base * stuff->percent) / 100;

-    if (stuff->percent < 0)

-        newpercent = base + newpercent;

-    else

-	newpercent = base - newpercent + stuff->percent;

-

-    for (dev = inputInfo.devices; dev; dev = dev->next) {

-        if ((dev == keybd ||

-	     (!IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == keybd)) &&

-            dev->kbdfeed && dev->kbdfeed->BellProc) {

-

-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);

-	    if (rc != Success)

-		return rc;

-            XkbHandleBell(FALSE, FALSE, dev, newpercent,

-                          &dev->kbdfeed->ctrl, 0, None, NULL, client);

-        }

-    }

-

-    return Success;

-}

-

-int

-ProcChangePointerControl(ClientPtr client)

-{

-    DeviceIntPtr dev, mouse = PickPointer(client);

-    PtrCtrl ctrl;		/* might get BadValue part way through */

-    int rc;

-    REQUEST(xChangePointerControlReq);

-    REQUEST_SIZE_MATCH(xChangePointerControlReq);

-

-    ctrl = mouse->ptrfeed->ctrl;

-    if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) {

-	client->errorValue = stuff->doAccel;

-	return BadValue;

-    }

-    if ((stuff->doThresh != xTrue) && (stuff->doThresh != xFalse)) {

-	client->errorValue = stuff->doThresh;

-	return BadValue;

-    }

-    if (stuff->doAccel) {

-	if (stuff->accelNum == -1) {

-	    ctrl.num = defaultPointerControl.num;

-        }

-	else if (stuff->accelNum < 0) {

-	    client->errorValue = stuff->accelNum;

-	    return BadValue;

-	}

-	else {

-            ctrl.num = stuff->accelNum;

-        }

-

-	if (stuff->accelDenum == -1) {

-	    ctrl.den = defaultPointerControl.den;

-        }

-	else if (stuff->accelDenum <= 0) {

-	    client->errorValue = stuff->accelDenum;

-	    return BadValue;

-	}

-	else {

-            ctrl.den = stuff->accelDenum;

-        }

-    }

-    if (stuff->doThresh) {

-	if (stuff->threshold == -1) {

-	    ctrl.threshold = defaultPointerControl.threshold;

-        }

-	else if (stuff->threshold < 0) {

-	    client->errorValue = stuff->threshold;

-	    return BadValue;

-	}

-	else {

-            ctrl.threshold = stuff->threshold;

-        }

-    }

-

-    for (dev = inputInfo.devices; dev; dev = dev->next) {

-        if ((dev == mouse ||

-	     (!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&

-            dev->ptrfeed) {

-	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);

-	    if (rc != Success)

-		return rc;

-	}

-    }

-

-    for (dev = inputInfo.devices; dev; dev = dev->next) {

-        if ((dev == mouse ||

-	     (!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&

-            dev->ptrfeed) {

-            dev->ptrfeed->ctrl = ctrl;

-        }

-    }

-

-    return Success;

-}

-

-int

-ProcGetPointerControl(ClientPtr client)

-{

-    DeviceIntPtr ptr = PickPointer(client);

-    PtrCtrl *ctrl = &ptr->ptrfeed->ctrl;

-    xGetPointerControlReply rep;

-    int rc;

-    REQUEST_SIZE_MATCH(xReq);

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.threshold = ctrl->threshold;

-    rep.accelNumerator = ctrl->num;

-    rep.accelDenominator = ctrl->den;

-    WriteReplyToClient(client, sizeof(xGenericReply), &rep);

-    return Success;

-}

-

-void

-MaybeStopHint(DeviceIntPtr dev, ClientPtr client)

-{

-    GrabPtr grab = dev->deviceGrab.grab;

-

-    if ((grab && SameClient(grab, client) &&

-	 ((grab->eventMask & PointerMotionHintMask) ||

-	  (grab->ownerEvents &&

-	   (EventMaskForClient(dev->valuator->motionHintWindow, client) &

-	    PointerMotionHintMask)))) ||

-	(!grab &&

-	 (EventMaskForClient(dev->valuator->motionHintWindow, client) &

-	  PointerMotionHintMask)))

-	dev->valuator->motionHintWindow = NullWindow;

-}

-

-int

-ProcGetMotionEvents(ClientPtr client)

-{

-    WindowPtr pWin;

-    xTimecoord * coords = (xTimecoord *) NULL;

-    xGetMotionEventsReply rep;

-    int i, count, xmin, xmax, ymin, ymax, rc;

-    unsigned long nEvents;

-    DeviceIntPtr mouse = PickPointer(client);

-    TimeStamp start, stop;

-    REQUEST(xGetMotionEventsReq);

-    REQUEST_SIZE_MATCH(xGetMotionEventsReq);

-

-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

-    if (rc != Success)

-	return rc;

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);

-    if (rc != Success)

-	return rc;

-

-    if (mouse->valuator->motionHintWindow)

-	MaybeStopHint(mouse, client);

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    nEvents = 0;

-    start = ClientTimeToServerTime(stuff->start);

-    stop = ClientTimeToServerTime(stuff->stop);

-    if ((CompareTimeStamps(start, stop) != LATER) &&

-	(CompareTimeStamps(start, currentTime) != LATER) &&

-	mouse->valuator->numMotionEvents)

-    {

-	if (CompareTimeStamps(stop, currentTime) == LATER)

-	    stop = currentTime;

-	count = GetMotionHistory(mouse, &coords, start.milliseconds,

-				 stop.milliseconds, pWin->drawable.pScreen,

-                                 TRUE);

-	xmin = pWin->drawable.x - wBorderWidth (pWin);

-	xmax = pWin->drawable.x + (int)pWin->drawable.width +

-		wBorderWidth (pWin);

-	ymin = pWin->drawable.y - wBorderWidth (pWin);

-	ymax = pWin->drawable.y + (int)pWin->drawable.height +

-		wBorderWidth (pWin);

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

-	    if ((xmin <= coords[i].x) && (coords[i].x < xmax) &&

-		    (ymin <= coords[i].y) && (coords[i].y < ymax))

-	    {

-		coords[nEvents].time = coords[i].time;

-		coords[nEvents].x = coords[i].x - pWin->drawable.x;

-		coords[nEvents].y = coords[i].y - pWin->drawable.y;

-		nEvents++;

-	    }

-    }

-    rep.length = nEvents * bytes_to_int32(sizeof(xTimecoord));

-    rep.nEvents = nEvents;

-    WriteReplyToClient(client, sizeof(xGetMotionEventsReply), &rep);

-    if (nEvents)

-    {

-	client->pSwapReplyFunc = (ReplySwapPtr) SwapTimeCoordWrite;

-	WriteSwappedDataToClient(client, nEvents * sizeof(xTimecoord),

-				 (char *)coords);

-    }

-    free(coords);

-    return Success;

-}

-

-int

-ProcQueryKeymap(ClientPtr client)

-{

-    xQueryKeymapReply rep;

-    int rc, i;

-    DeviceIntPtr keybd = PickKeyboard(client);

-    CARD8 *down = keybd->key->down;

-

-    REQUEST_SIZE_MATCH(xReq);

-    rep.type = X_Reply;

-    rep.sequenceNumber = client->sequence;

-    rep.length = 2;

-

-    rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess);

-    if (rc != Success && rc != BadAccess)

-	return rc;

-

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

-	rep.map[i] = down[i];

-

-    if (rc == BadAccess)

-	memset(rep.map, 0, 32);

-

-    WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);

-

-   return Success;

-}

-

-

-/**

- * Recalculate the number of buttons for the master device. The number of

- * buttons on the master device is equal to the number of buttons on the

- * slave device with the highest number of buttons.

- */

-static void

-RecalculateMasterButtons(DeviceIntPtr slave)

-{

-    DeviceIntPtr dev, master;

-    int maxbuttons = 0;

-

-    if (!slave->button || IsMaster(slave))

-        return;

-

-    master = GetMaster(slave, MASTER_POINTER);

-    if (!master)

-        return;

-

-    for (dev = inputInfo.devices; dev; dev = dev->next)

-    {

-        if (IsMaster(dev) ||

-            GetMaster(dev, MASTER_ATTACHED) != master ||

-            !dev->button)

-            continue;

-

-        maxbuttons = max(maxbuttons, dev->button->numButtons);

-    }

-

-    if (master->button && master->button->numButtons != maxbuttons)

-    {

-        int i;

-        DeviceChangedEvent event;

-

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

-

-        master->button->numButtons = maxbuttons;

-

-        event.header = ET_Internal;

-        event.type = ET_DeviceChanged;

-        event.time = GetTimeInMillis();

-        event.deviceid = master->id;

-        event.flags = DEVCHANGE_POINTER_EVENT | DEVCHANGE_DEVICE_CHANGE;

-        event.buttons.num_buttons = maxbuttons;

-        memcpy(&event.buttons.names, master->button->labels, maxbuttons *

-                sizeof(Atom));

-

-        if (master->valuator)

-        {

-            event.num_valuators = master->valuator->numAxes;

-            for (i = 0; i < event.num_valuators; i++)

-            {

-                event.valuators[i].min = master->valuator->axes[i].min_value;

-                event.valuators[i].max = master->valuator->axes[i].max_value;

-                event.valuators[i].resolution = master->valuator->axes[i].resolution;

-                event.valuators[i].mode = master->valuator->axes[i].mode;

-                event.valuators[i].name = master->valuator->axes[i].label;

-            }

-        }

-

-        if (master->key)

-        {

-            event.keys.min_keycode = master->key->xkbInfo->desc->min_key_code;

-            event.keys.max_keycode = master->key->xkbInfo->desc->max_key_code;

-        }

-

-        XISendDeviceChangedEvent(master, master, &event);

-    }

-}

-

-/**

- * Generate release events for all keys/button currently down on this

- * device.

- */

-static void

-ReleaseButtonsAndKeys(DeviceIntPtr dev)

-{

-    EventListPtr        eventlist = InitEventList(GetMaximumEventsNum());

-    ButtonClassPtr      b = dev->button;

-    KeyClassPtr         k = dev->key;

-    int                 i, j, nevents;

-

-    if (!eventlist) /* no release events for you */

-        return;

-

-    /* Release all buttons */

-    for (i = 0; b && i < b->numButtons; i++)

-    {

-        if (BitIsOn(b->down, i))

-        {

-            nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);

-            for (j = 0; j < nevents; j++)

-                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

-        }

-    }

-

-    /* Release all keys */

-    for (i = 0; k && i < MAP_LENGTH; i++)

-    {

-        if (BitIsOn(k->down, i))

-        {

-            nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);

-            for (j = 0; j < nevents; j++)

-                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);

-        }

-    }

-

-    FreeEventList(eventlist, GetMaximumEventsNum());

-}

-

-/**

- * Attach device 'dev' to device 'master'.

- * Client is set to the client that issued the request, or NULL if it comes

- * from some internal automatic pairing.

- *

- * Master may be NULL to set the device floating.

- *

- * We don't allow multi-layer hierarchies right now. You can't attach a slave

- * to another slave.

- */

-int

-AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)

-{

-    ScreenPtr screen;

-    DeviceIntPtr oldmaster;

-    if (!dev || IsMaster(dev))

-        return BadDevice;

-

-    if (master && !IsMaster(master)) /* can't attach to slaves */

-        return BadDevice;

-

-    /* set from floating to floating? */

-    if (IsFloating(dev) && !master && dev->enabled)

-        return Success;

-

-    /* free the existing sprite. */

-    if (IsFloating(dev) && dev->spriteInfo->paired == dev)

-    {

-        screen = miPointerGetScreen(dev);

-        screen->DeviceCursorCleanup(dev, screen);

-        free(dev->spriteInfo->sprite);

-    }

-

-    ReleaseButtonsAndKeys(dev);

-

-    oldmaster = GetMaster(dev, MASTER_ATTACHED);

-    dev->master = master;

-

-    /* If device is set to floating, we need to create a sprite for it,

-     * otherwise things go bad. However, we don't want to render the cursor,

-     * so we reset spriteOwner.

-     * Sprite has to be forced to NULL first, otherwise InitializeSprite won't

-     * alloc new memory but overwrite the previous one.

-     */

-    if (!master)

-    {

-        WindowPtr currentRoot;

-

-        if (dev->spriteInfo->sprite)

-            currentRoot = GetCurrentRootWindow(dev);

-        else /* new device auto-set to floating */

-            currentRoot = screenInfo.screens[0]->root;

-

-        /* we need to init a fake sprite */

-        screen = currentRoot->drawable.pScreen;

-        screen->DeviceCursorInitialize(dev, screen);

-        dev->spriteInfo->sprite = NULL;

-        InitializeSprite(dev, currentRoot);

-        dev->spriteInfo->spriteOwner = FALSE;

-        dev->spriteInfo->paired = dev;

-    } else

-    {

-        dev->spriteInfo->sprite = master->spriteInfo->sprite;

-        dev->spriteInfo->paired = master;

-        dev->spriteInfo->spriteOwner = FALSE;

-

-        RecalculateMasterButtons(master);

-    }

-

-    /* XXX: in theory, the MD should change back to its old, original

-     * classes when the last SD is detached. Thanks to the XTEST devices,

-     * we'll always have an SD attached until the MD is removed.

-     * So let's not worry about that.

-     */

-

-    return Success;

-}

-

-/**

- * Return the device paired with the given device or NULL.

- * Returns the device paired with the parent master if the given device is a

- * slave device.

- */

-DeviceIntPtr

-GetPairedDevice(DeviceIntPtr dev)

-{

-    if (!IsMaster(dev) && !IsFloating(dev))

-        dev = GetMaster(dev, MASTER_ATTACHED);

-

-    return dev->spriteInfo->paired;

-}

-

-

-/**

- * Returns the right master for the type of event needed. If the event is a

- * keyboard event.

- * This function may be called with a master device as argument. If so, the

- * returned master is either the device itself or the paired master device.

- * If dev is a floating slave device, NULL is returned.

- *

- * @type ::MASTER_KEYBOARD or ::MASTER_POINTER or ::MASTER_ATTACHED

- * @return The requested master device. In the case of MASTER_ATTACHED, this

- * is the directly attached master to this device, regardless of the type.

- * Otherwise, it is either the master keyboard or pointer for this device.

- */

-DeviceIntPtr

-GetMaster(DeviceIntPtr dev, int which)

-{

-    DeviceIntPtr master;

-

-    if (IsMaster(dev))

-        master = dev;

-    else

-        master = dev->master;

-

-    if (master && which != MASTER_ATTACHED)

-    {

-        if (which == MASTER_KEYBOARD)

-        {

-            if (master->type != MASTER_KEYBOARD)

-                master = GetPairedDevice(master);

-        } else

-        {

-            if (master->type != MASTER_POINTER)

-                master = GetPairedDevice(master);

-        }

-    }

-

-    return master;

-}

-

-/**

- * Create a new device pair (== one pointer, one keyboard device).

- * Only allocates the devices, you will need to call ActivateDevice() and

- * EnableDevice() manually.

- * Either a master or a slave device can be created depending on

- * the value for master.

- */

-int

-AllocDevicePair (ClientPtr client, char* name,

-                 DeviceIntPtr* ptr,

-                 DeviceIntPtr* keybd,

-                 DeviceProc ptr_proc,

-                 DeviceProc keybd_proc,

-                 Bool master)

-{

-    DeviceIntPtr pointer;

-    DeviceIntPtr keyboard;

-    *ptr = *keybd = NULL;

-

-    pointer = AddInputDevice(client, ptr_proc, TRUE);

-    if (!pointer)

-        return BadAlloc;

-

-    if (asprintf(&pointer->name, "%s pointer", name) == -1) {

-        pointer->name = NULL;

-        RemoveDevice(pointer, FALSE);

-        return BadAlloc;

-    }

-

-    pointer->public.processInputProc = ProcessOtherEvent;

-    pointer->public.realInputProc = ProcessOtherEvent;

-    XkbSetExtension(pointer, ProcessPointerEvent);

-    pointer->deviceGrab.ActivateGrab = ActivatePointerGrab;

-    pointer->deviceGrab.DeactivateGrab = DeactivatePointerGrab;

-    pointer->coreEvents = TRUE;

-    pointer->spriteInfo->spriteOwner = TRUE;

-

-    pointer->lastSlave = NULL;

-    pointer->last.slave = NULL;

-    pointer->type = (master) ? MASTER_POINTER : SLAVE;

-

-    keyboard = AddInputDevice(client, keybd_proc, TRUE);

-    if (!keyboard)

-    {

-        RemoveDevice(pointer, FALSE);

-        return BadAlloc;

-    }

-

-    if (asprintf(&keyboard->name, "%s keyboard", name) == -1) {

-        keyboard->name = NULL;

-        RemoveDevice(keyboard, FALSE);

-        RemoveDevice(pointer, FALSE);

-        return BadAlloc;

-    }

-

-    keyboard->public.processInputProc = ProcessOtherEvent;

-    keyboard->public.realInputProc = ProcessOtherEvent;

-    XkbSetExtension(keyboard, ProcessKeyboardEvent);

-    keyboard->deviceGrab.ActivateGrab = ActivateKeyboardGrab;

-    keyboard->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;

-    keyboard->coreEvents = TRUE;

-    keyboard->spriteInfo->spriteOwner = FALSE;

-

-    keyboard->lastSlave = NULL;

-    keyboard->last.slave = NULL;

-    keyboard->type = (master) ? MASTER_KEYBOARD : SLAVE;

-

-    /* The ClassesRec stores the device classes currently not used. */

-    pointer->unused_classes = calloc(1, sizeof(ClassesRec));

-    keyboard->unused_classes = calloc(1, sizeof(ClassesRec));

-

-    *ptr = pointer;

-    *keybd = keyboard;

-

-    return Success;

-}

-

-/**

- * Return Relative or Absolute for the device.

- */

-int valuator_get_mode(DeviceIntPtr dev, int axis)

-{

-    return (dev->valuator->axes[axis].mode & DeviceMode);

-}

-

-/**

- * Set the given mode for the axis. If axis is VALUATOR_MODE_ALL_AXES, then

- * set the mode for all axes.

- */

-void valuator_set_mode(DeviceIntPtr dev, int axis, int mode)

-{

-    if (axis != VALUATOR_MODE_ALL_AXES)

-        dev->valuator->axes[axis].mode = mode;

-    else {

-        int i;

-        for (i = 0; i < dev->valuator->numAxes; i++)

-            dev->valuator->axes[i].mode = mode;

-    }

-}

+/************************************************************
+
+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 "misc.h"
+#include "resource.h"
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
+#include "windowstr.h"
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "cursorstr.h"
+#include "dixstruct.h"
+#include "ptrveloc.h"
+#include "site.h"
+#include "xkbsrv.h"
+#include "privates.h"
+#include "xace.h"
+#include "mi.h"
+
+#include "dispatch.h"
+#include "swaprep.h"
+#include "dixevents.h"
+#include "mipointer.h"
+#include "eventstr.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XIproto.h>
+#include <math.h>
+#include <pixman.h>
+#include "exglobals.h"
+#include "exevents.h"
+#include "xiquerydevice.h" /* for SizeDeviceClasses */
+#include "xiproperty.h"
+#include "enterleave.h" /* for EnterWindow() */
+#include "xserver-properties.h"
+#include "xichangehierarchy.h" /* For XISendDeviceHierarchyEvent */
+
+/** @file
+ * This file handles input device-related stuff.
+ */
+
+static void RecalculateMasterButtons(DeviceIntPtr slave);
+
+static void
+DeviceSetTransform(DeviceIntPtr dev, float *transform)
+{
+    struct pixman_f_transform scale;
+    double sx, sy;
+    int x, y;
+
+    /**
+     * calculate combined transformation matrix:
+     *
+     * M = InvScale * Transform * Scale
+     *
+     * So we can later transform points using M * p
+     *
+     * Where:
+     *  Scale scales coordinates into 0..1 range
+     *  Transform is the user supplied (affine) transform
+     *  InvScale scales coordinates back up into their native range
+     */
+    sx = dev->valuator->axes[0].max_value - dev->valuator->axes[0].min_value;
+    sy = dev->valuator->axes[1].max_value - dev->valuator->axes[1].min_value;
+
+    /* invscale */
+    pixman_f_transform_init_scale(&scale, sx, sy);
+    scale.m[0][2] = dev->valuator->axes[0].min_value;
+    scale.m[1][2] = dev->valuator->axes[1].min_value;
+
+    /* transform */
+    for (y=0; y<3; y++)
+        for (x=0; x<3; x++)
+            dev->transform.m[y][x] = *transform++;
+
+    pixman_f_transform_multiply(&dev->transform, &scale, &dev->transform);
+
+    /* scale */
+    pixman_f_transform_init_scale(&scale, 1.0 / sx, 1.0 / sy);
+    scale.m[0][2] = -dev->valuator->axes[0].min_value / sx;
+    scale.m[1][2] = -dev->valuator->axes[1].min_value / sy;
+
+    pixman_f_transform_multiply(&dev->transform, &dev->transform, &scale);
+}
+
+/**
+ * DIX property handler.
+ */
+static int
+DeviceSetProperty(DeviceIntPtr dev, Atom property, XIPropertyValuePtr prop,
+                  BOOL checkonly)
+{
+    if (property == XIGetKnownProperty(XI_PROP_ENABLED))
+    {
+        if (prop->format != 8 || prop->type != XA_INTEGER || prop->size != 1)
+            return BadValue;
+
+        /* Don't allow disabling of VCP/VCK */
+        if ((dev == inputInfo.pointer || dev == inputInfo.keyboard) &&
+            !(*(CARD8*)prop->data))
+            return BadAccess;
+
+        if (!checkonly)
+        {
+            if ((*((CARD8*)prop->data)) && !dev->enabled)
+                EnableDevice(dev, TRUE);
+            else if (!(*((CARD8*)prop->data)) && dev->enabled)
+                DisableDevice(dev, TRUE);
+        }
+    } else if (property == XIGetKnownProperty(XI_PROP_TRANSFORM))
+    {
+        float *f = (float*)prop->data;
+        int i;
+
+        if (prop->format != 32 || prop->size != 9 ||
+            prop->type != XIGetKnownProperty(XATOM_FLOAT))
+            return BadValue;
+
+        for (i=0; i<9; i++)
+            if (!isfinite(f[i]))
+                return BadValue;
+
+        if (!checkonly)
+            DeviceSetTransform(dev, f);
+    }
+
+    return Success;
+}
+
+/* Pair the keyboard to the pointer device. Keyboard events will follow the
+ * pointer sprite. Only applicable for master devices.
+ * If the client is set, the request to pair comes from some client. In this
+ * case, we need to check for access. If the client is NULL, it's from an
+ * internal automatic pairing, we must always permit this.
+ */
+static int
+PairDevices(ClientPtr client, DeviceIntPtr ptr, DeviceIntPtr kbd)
+{
+    if (!ptr)
+        return BadDevice;
+
+    /* Don't allow pairing for slave devices */
+    if (!IsMaster(ptr) || !IsMaster(kbd))
+        return BadDevice;
+
+    if (ptr->spriteInfo->paired)
+        return BadDevice;
+
+    if (kbd->spriteInfo->spriteOwner)
+    {
+        free(kbd->spriteInfo->sprite);
+        kbd->spriteInfo->sprite = NULL;
+        kbd->spriteInfo->spriteOwner = FALSE;
+    }
+
+    kbd->spriteInfo->sprite = ptr->spriteInfo->sprite;
+    kbd->spriteInfo->paired = ptr;
+    ptr->spriteInfo->paired = kbd;
+    return Success;
+}
+
+
+/**
+ * Find and return the next unpaired MD pointer device.
+ */
+static DeviceIntPtr
+NextFreePointerDevice(void)
+{
+    DeviceIntPtr dev;
+    for (dev = inputInfo.devices; dev; dev = dev->next)
+        if (IsMaster(dev) &&
+                dev->spriteInfo->spriteOwner &&
+                !dev->spriteInfo->paired)
+            return dev;
+    return NULL;
+}
+
+/**
+ * Create a new input device and init it to sane values. The device is added
+ * to the server's off_devices list.
+ *
+ * @param deviceProc Callback for device control function (switch dev on/off).
+ * @return The newly created device.
+ */
+DeviceIntPtr
+AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
+{
+    DeviceIntPtr dev, *prev; /* not a typo */
+    DeviceIntPtr devtmp;
+    int devid;
+    char devind[MAXDEVICES];
+    BOOL enabled;
+    float transform[9];
+
+    /* Find next available id, 0 and 1 are reserved */
+    memset(devind, 0, sizeof(char)*MAXDEVICES);
+    for (devtmp = inputInfo.devices; devtmp; devtmp = devtmp->next)
+	devind[devtmp->id]++;
+    for (devtmp = inputInfo.off_devices; devtmp; devtmp = devtmp->next)
+	devind[devtmp->id]++;
+    for (devid = 2; devid < MAXDEVICES && devind[devid]; devid++)
+	;
+
+    if (devid >= MAXDEVICES)
+	return (DeviceIntPtr)NULL;
+    dev =  _dixAllocateObjectWithPrivates(sizeof(DeviceIntRec) + sizeof(SpriteInfoRec),
+					  sizeof(DeviceIntRec) + sizeof(SpriteInfoRec),
+					  offsetof(DeviceIntRec, devPrivates), PRIVATE_DEVICE);
+    if (!dev)
+	return (DeviceIntPtr)NULL;
+    dev->id = devid;
+    dev->public.processInputProc = ProcessOtherEvent;
+    dev->public.realInputProc = ProcessOtherEvent;
+    dev->public.enqueueInputProc = EnqueueEvent;
+    dev->deviceProc = deviceProc;
+    dev->startup = autoStart;
+
+    /* device grab defaults */
+    dev->deviceGrab.grabTime = currentTime;
+    dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+    dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
+
+    XkbSetExtension(dev, ProcessKeyboardEvent);
+
+    dev->coreEvents = TRUE;
+
+    /* sprite defaults */
+    dev->spriteInfo = (SpriteInfoPtr)&dev[1];
+
+    /*  security creation/labeling check
+     */
+    if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixCreateAccess)) {
+	free(dev);
+	return NULL;
+    }
+
+    inputInfo.numDevices++;
+
+    for (prev = &inputInfo.off_devices; *prev; prev = &(*prev)->next)
+        ;
+    *prev = dev;
+    dev->next = NULL;
+
+    enabled = FALSE;
+    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
+                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,
+                           FALSE);
+    XISetDevicePropertyDeletable(dev, XIGetKnownProperty(XI_PROP_ENABLED), FALSE);
+
+    /* unity matrix */
+    memset(transform, 0, sizeof(transform));
+    transform[0] = transform[4] = transform[8] = 1.0f;
+
+    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
+                           XIGetKnownProperty(XATOM_FLOAT), 32,
+                           PropModeReplace, 9, transform, FALSE);
+    XISetDevicePropertyDeletable(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
+                                 FALSE);
+
+    XIRegisterPropertyHandler(dev, DeviceSetProperty, NULL, NULL);
+
+    return dev;
+}
+
+void
+SendDevicePresenceEvent(int deviceid, int type)
+{
+    DeviceIntRec dummyDev;
+    devicePresenceNotify ev;
+
+    memset(&dummyDev, 0, sizeof(DeviceIntRec));
+    ev.type = DevicePresenceNotify;
+    ev.time = currentTime.milliseconds;
+    ev.devchange = type;
+    ev.deviceid = deviceid;
+    dummyDev.id = XIAllDevices;
+    SendEventToAllWindows(&dummyDev, DevicePresenceNotifyMask,
+                          (xEvent*)&ev, 1);
+}
+
+/**
+ * Enable the device through the driver, add the device to the device list.
+ * Switch device ON through the driver and push it onto the global device
+ * list. Initialize the DIX sprite or pair the device. All clients are
+ * notified about the device being enabled.
+ *
+ * A master pointer device needs to be enabled before a master keyboard
+ * device.
+ *
+ * @param The device to be enabled.
+ * @param sendevent True if an XI2 event should be sent.
+ * @return TRUE on success or FALSE otherwise.
+ */
+Bool
+EnableDevice(DeviceIntPtr dev, BOOL sendevent)
+{
+    DeviceIntPtr *prev;
+    int ret;
+    DeviceIntPtr other;
+    BOOL enabled;
+    int flags[MAXDEVICES] = {0};
+
+    for (prev = &inputInfo.off_devices;
+	 *prev && (*prev != dev);
+	 prev = &(*prev)->next)
+	;
+
+    if (!dev->spriteInfo->sprite)
+    {
+        if (IsMaster(dev))
+        {
+            /* Sprites appear on first root window, so we can hardcode it */
+            if (dev->spriteInfo->spriteOwner)
+            {
+                InitializeSprite(dev, screenInfo.screens[0]->root);
+                                                 /* mode doesn't matter */
+                EnterWindow(dev, screenInfo.screens[0]->root, NotifyAncestor);
+            }
+            else if ((other = NextFreePointerDevice()) == NULL)
+            {
+                ErrorF("[dix] cannot find pointer to pair with. "
+                       "This is a bug.\n");
+                return FALSE;
+            } else
+                PairDevices(NULL, other, dev);
+        } else
+        {
+            if (dev->coreEvents)
+                other = (IsPointerDevice(dev)) ? inputInfo.pointer :
+                    inputInfo.keyboard;
+            else
+                other = NULL; /* auto-float non-core devices */
+            AttachDevice(NULL, dev, other);
+        }
+    }
+
+    if ((*prev != dev) || !dev->inited ||
+	((ret = (*dev->deviceProc)(dev, DEVICE_ON)) != Success)) {
+        ErrorF("[dix] couldn't enable device %d\n", dev->id);
+	return FALSE;
+    }
+    dev->enabled = TRUE;
+    *prev = dev->next;
+
+    for (prev = &inputInfo.devices; *prev; prev = &(*prev)->next)
+        ;
+    *prev = dev;
+    dev->next = NULL;
+
+    enabled = TRUE;
+    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
+                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,
+                           TRUE);
+
+    SendDevicePresenceEvent(dev->id, DeviceEnabled);
+    if (sendevent)
+    {
+        flags[dev->id] |= XIDeviceEnabled;
+        XISendDeviceHierarchyEvent(flags);
+    }
+
+    RecalculateMasterButtons(dev);
+
+    return TRUE;
+}
+
+/**
+ * Switch a device off through the driver and push it onto the off_devices
+ * list. A device will not send events while disabled. All clients are
+ * notified about the device being disabled.
+ *
+ * Master keyboard devices have to be disabled before master pointer devices
+ * otherwise things turn bad.
+ *
+ * @param sendevent True if an XI2 event should be sent.
+ * @return TRUE on success or FALSE otherwise.
+ */
+Bool
+DisableDevice(DeviceIntPtr dev, BOOL sendevent)
+{
+    DeviceIntPtr *prev, other;
+    BOOL enabled;
+    int flags[MAXDEVICES] = {0};
+
+    for (prev = &inputInfo.devices;
+	 *prev && (*prev != dev);
+	 prev = &(*prev)->next)
+	;
+    if (*prev != dev)
+	return FALSE;
+
+    /* float attached devices */
+    if (IsMaster(dev))
+    {
+        for (other = inputInfo.devices; other; other = other->next)
+        {
+            if (!IsMaster(other) && GetMaster(other, MASTER_ATTACHED) == dev)
+            {
+                AttachDevice(NULL, other, NULL);
+                flags[other->id] |= XISlaveDetached;
+            }
+        }
+    }
+    else
+    {
+        for (other = inputInfo.devices; other; other = other->next)
+        {
+	    if (IsMaster(other) && other->lastSlave == dev)
+		other->lastSlave = NULL;
+	}
+    }
+
+    if (IsMaster(dev) && dev->spriteInfo->sprite)
+    {
+        for (other = inputInfo.devices; other; other = other->next)
+        {
+            if (other->spriteInfo->paired == dev)
+            {
+                ErrorF("[dix] cannot disable device, still paired. "
+                        "This is a bug. \n");
+                return FALSE;
+            }
+        }
+    }
+
+    (void)(*dev->deviceProc)(dev, DEVICE_OFF);
+    dev->enabled = FALSE;
+
+    /* now that the device is disabled, we can reset the signal handler's
+     * last.slave */
+    OsBlockSignals();
+    for (other = inputInfo.devices; other; other = other->next)
+    {
+        if (other->last.slave == dev)
+            other->last.slave = NULL;
+    }
+    OsReleaseSignals();
+
+    LeaveWindow(dev);
+    SetFocusOut(dev);
+
+    *prev = dev->next;
+    dev->next = inputInfo.off_devices;
+    inputInfo.off_devices = dev;
+
+    enabled = FALSE;
+    XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_ENABLED),
+                           XA_INTEGER, 8, PropModeReplace, 1, &enabled,
+                           TRUE);
+
+    SendDevicePresenceEvent(dev->id, DeviceDisabled);
+    if (sendevent)
+    {
+        flags[dev->id] = XIDeviceDisabled;
+        XISendDeviceHierarchyEvent(flags);
+    }
+
+    RecalculateMasterButtons(dev);
+
+    return TRUE;
+}
+
+/**
+ * Initialise a new device through the driver and tell all clients about the
+ * new device.
+ *
+ * Must be called before EnableDevice.
+ * The device will NOT send events until it is enabled!
+ *
+ * @param sendevent True if an XI2 event should be sent.
+ * @return Success or an error code on failure.
+ */
+int
+ActivateDevice(DeviceIntPtr dev, BOOL sendevent)
+{
+    int ret = Success;
+    ScreenPtr pScreen = screenInfo.screens[0];
+
+    if (!dev || !dev->deviceProc)
+        return BadImplementation;
+
+    ret = (*dev->deviceProc) (dev, DEVICE_INIT);
+    dev->inited = (ret == Success);
+    if (!dev->inited)
+        return ret;
+
+    /* Initialize memory for sprites. */
+    if (IsMaster(dev) && dev->spriteInfo->spriteOwner)
+        if (!pScreen->DeviceCursorInitialize(dev, pScreen))
+            ret = BadAlloc;
+
+    SendDevicePresenceEvent(dev->id, DeviceAdded);
+    if (sendevent)
+    {
+        int flags[MAXDEVICES] = {0};
+        flags[dev->id] = XISlaveAdded;
+        XISendDeviceHierarchyEvent(flags);
+    }
+    return ret;
+}
+
+/**
+ * Ring the bell.
+ * The actual task of ringing the bell is the job of the DDX.
+ */
+static void
+CoreKeyboardBell(int volume, DeviceIntPtr pDev, pointer arg, int something)
+{
+    KeybdCtrl *ctrl = arg;
+
+    DDXRingBell(volume, ctrl->bell_pitch, ctrl->bell_duration);
+}
+
+static void
+CoreKeyboardCtl(DeviceIntPtr pDev, KeybdCtrl *ctrl)
+{
+    return;
+}
+
+/**
+ * Device control function for the Virtual Core Keyboard.
+ */
+int
+CoreKeyboardProc(DeviceIntPtr pDev, int what)
+{
+
+    switch (what) {
+    case DEVICE_INIT:
+        if (!InitKeyboardDeviceStruct(pDev, NULL, CoreKeyboardBell,
+                                      CoreKeyboardCtl))
+        {
+            ErrorF("Keyboard initialization failed. This could be a missing "
+                   "or incorrect setup of xkeyboard-config.\n");
+            return BadValue;
+        }
+        return Success;
+
+    case DEVICE_ON:
+    case DEVICE_OFF:
+        return Success;
+
+    case DEVICE_CLOSE:
+        return Success;
+    }
+
+    return BadMatch;
+}
+
+/**
+ * Device control function for the Virtual Core Pointer.
+ */
+int
+CorePointerProc(DeviceIntPtr pDev, int what)
+{
+#define NBUTTONS 10
+#define NAXES 2
+    BYTE map[NBUTTONS + 1];
+    int i = 0;
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+    case DEVICE_INIT:
+        for (i = 1; i <= NBUTTONS; i++)
+            map[i] = i;
+
+	btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+	btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+	btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+	btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+	btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+	btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+	btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+	/* don't know about the rest */
+
+	axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+	axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+        if (!InitPointerDeviceStruct((DevicePtr)pDev, map, NBUTTONS, btn_labels,
+                                (PtrCtrlProcPtr)NoopDDA,
+                                GetMotionHistorySize(), NAXES, axes_labels))
+        {
+            ErrorF("Could not initialize device '%s'. Out of memory.\n",
+                   pDev->name);
+            return BadAlloc; /* IPDS only fails on allocs */
+        }
+        pDev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
+        pDev->last.valuators[0] = pDev->valuator->axisVal[0];
+        pDev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
+        pDev->last.valuators[1] = pDev->valuator->axisVal[1];
+        break;
+
+    case DEVICE_CLOSE:
+        break;
+
+    default:
+        break;
+    }
+
+    return Success;
+
+#undef NBUTTONS
+#undef NAXES
+}
+
+/**
+ * Initialise the two core devices, VCP and VCK (see events.c).
+ * Both devices are not tied to physical devices, but guarantee that there is
+ * always a keyboard and a pointer present and keep the protocol semantics.
+ *
+ * Note that the server MUST have two core devices at all times, even if there
+ * is no physical device connected.
+ */
+void
+InitCoreDevices(void)
+{
+    if (AllocDevicePair(serverClient, "Virtual core",
+                        &inputInfo.pointer, &inputInfo.keyboard,
+                        CorePointerProc, CoreKeyboardProc,
+                        TRUE) != Success)
+        FatalError("Failed to allocate core devices");
+
+    if (ActivateDevice(inputInfo.pointer, TRUE) != Success ||
+        ActivateDevice(inputInfo.keyboard, TRUE) != Success)
+        FatalError("Failed to activate core devices.");
+    if (!EnableDevice(inputInfo.pointer, TRUE) ||
+        !EnableDevice(inputInfo.keyboard, TRUE))
+        FatalError("Failed to enable core devices.");
+
+    InitXTestDevices();
+}
+
+/**
+ * Activate all switched-off devices and then enable all those devices.
+ *
+ * Will return an error if no core keyboard or core pointer is present.
+ * In theory this should never happen if you call InitCoreDevices() first.
+ *
+ * InitAndStartDevices needs to be called AFTER the windows are initialized.
+ * Devices will start sending events after InitAndStartDevices() has
+ * completed.
+ *
+ * @return Success or error code on failure.
+ */
+int
+InitAndStartDevices(void)
+{
+    DeviceIntPtr dev, next;
+
+    for (dev = inputInfo.off_devices; dev; dev = dev->next) {
+        DebugF("(dix) initialising device %d\n", dev->id);
+        if (!dev->inited)
+            ActivateDevice(dev, TRUE);
+    }
+
+    /* enable real devices */
+    for (dev = inputInfo.off_devices; dev; dev = next)
+    {
+        DebugF("(dix) enabling device %d\n", dev->id);
+	next = dev->next;
+	if (dev->inited && dev->startup)
+	    EnableDevice(dev, TRUE);
+    }
+
+    return Success;
+}
+
+/**
+ * Free the given device class and reset the pointer to NULL.
+ */
+static void
+FreeDeviceClass(int type, pointer *class)
+{
+    if (!(*class))
+        return;
+
+    switch(type)
+    {
+        case KeyClass:
+            {
+                KeyClassPtr* k = (KeyClassPtr*)class;
+                if ((*k)->xkbInfo)
+                {
+                    XkbFreeInfo((*k)->xkbInfo);
+                    (*k)->xkbInfo = NULL;
+                }
+                free((*k));
+                break;
+            }
+        case ButtonClass:
+            {
+                ButtonClassPtr *b = (ButtonClassPtr*)class;
+                free((*b)->xkb_acts);
+                free((*b));
+                break;
+            }
+        case ValuatorClass:
+            {
+                ValuatorClassPtr *v = (ValuatorClassPtr*)class;
+
+                free((*v)->motion);
+                free((*v));
+                break;
+            }
+        case FocusClass:
+            {
+                FocusClassPtr *f = (FocusClassPtr*)class;
+                free((*f)->trace);
+                free((*f));
+                break;
+            }
+        case ProximityClass:
+            {
+                ProximityClassPtr *p = (ProximityClassPtr*)class;
+                free((*p));
+                break;
+            }
+    }
+    *class = NULL;
+}
+
+static void
+FreeFeedbackClass(int type, pointer *class)
+{
+    if (!(*class))
+        return;
+
+    switch(type)
+    {
+        case KbdFeedbackClass:
+            {
+                KbdFeedbackPtr *kbdfeed = (KbdFeedbackPtr*)class;
+                KbdFeedbackPtr k, knext;
+                for (k = (*kbdfeed); k; k = knext) {
+                    knext = k->next;
+                    if (k->xkb_sli)
+                        XkbFreeSrvLedInfo(k->xkb_sli);
+                    free(k);
+                }
+                break;
+            }
+        case PtrFeedbackClass:
+            {
+                PtrFeedbackPtr *ptrfeed = (PtrFeedbackPtr*)class;
+                PtrFeedbackPtr p, pnext;
+
+                for (p = (*ptrfeed); p; p = pnext) {
+                    pnext = p->next;
+                    free(p);
+                }
+                break;
+            }
+        case IntegerFeedbackClass:
+            {
+                IntegerFeedbackPtr *intfeed = (IntegerFeedbackPtr*)class;
+                IntegerFeedbackPtr i, inext;
+
+                for (i = (*intfeed); i; i = inext) {
+                    inext = i->next;
+                    free(i);
+                }
+                break;
+            }
+        case StringFeedbackClass:
+            {
+                StringFeedbackPtr *stringfeed = (StringFeedbackPtr*)class;
+                StringFeedbackPtr s, snext;
+
+                for (s = (*stringfeed); s; s = snext) {
+                    snext = s->next;
+                    free(s->ctrl.symbols_supported);
+                    free(s->ctrl.symbols_displayed);
+                    free(s);
+                }
+                break;
+            }
+        case BellFeedbackClass:
+            {
+                BellFeedbackPtr *bell = (BellFeedbackPtr*)class;
+                BellFeedbackPtr b, bnext;
+
+                for (b = (*bell); b; b = bnext) {
+                    bnext = b->next;
+                    free(b);
+                }
+                break;
+            }
+        case LedFeedbackClass:
+            {
+                LedFeedbackPtr *leds = (LedFeedbackPtr*)class;
+                LedFeedbackPtr l, lnext;
+
+                for (l = (*leds); l; l = lnext) {
+                    lnext = l->next;
+                    if (l->xkb_sli)
+                        XkbFreeSrvLedInfo(l->xkb_sli);
+                    free(l);
+                }
+                break;
+            }
+    }
+    *class = NULL;
+}
+
+static void
+FreeAllDeviceClasses(ClassesPtr classes)
+{
+    if (!classes)
+        return;
+
+    FreeDeviceClass(KeyClass, (pointer)&classes->key);
+    FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
+    FreeDeviceClass(ButtonClass, (pointer)&classes->button);
+    FreeDeviceClass(FocusClass, (pointer)&classes->focus);
+    FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
+
+    FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
+    FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
+    FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
+    FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
+    FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
+    FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
+
+}
+
+/**
+ * Close down a device and free all resources.
+ * Once closed down, the driver will probably not expect you that you'll ever
+ * enable it again and free associated structs. If you want the device to just
+ * be disabled, DisableDevice().
+ * Don't call this function directly, use RemoveDevice() instead.
+ */
+static void
+CloseDevice(DeviceIntPtr dev)
+{
+    ScreenPtr screen = screenInfo.screens[0];
+    ClassesPtr classes;
+    int j;
+
+    if (!dev)
+        return;
+
+    XIDeleteAllDeviceProperties(dev);
+
+    if (dev->inited)
+	(void)(*dev->deviceProc)(dev, DEVICE_CLOSE);
+
+    /* free sprite memory */
+    if (IsMaster(dev) && dev->spriteInfo->sprite)
+        screen->DeviceCursorCleanup(dev, screen);
+
+    /* free acceleration info */
+    if(dev->valuator && dev->valuator->accelScheme.AccelCleanupProc)
+	dev->valuator->accelScheme.AccelCleanupProc(dev);
+
+    while (dev->xkb_interest)
+	XkbRemoveResourceClient((DevicePtr)dev,dev->xkb_interest->resource);
+
+    free(dev->name);
+
+    classes = (ClassesPtr)&dev->key;
+    FreeAllDeviceClasses(classes);
+
+    if (IsMaster(dev))
+    {
+        classes = dev->unused_classes;
+        FreeAllDeviceClasses(classes);
+	free(classes);
+    }
+
+    if (DevHasCursor(dev) && dev->spriteInfo->sprite) {
+	if (dev->spriteInfo->sprite->current)
+	    FreeCursor(dev->spriteInfo->sprite->current, None);
+        free(dev->spriteInfo->sprite->spriteTrace);
+        free(dev->spriteInfo->sprite);
+    }
+
+    /* a client may have the device set as client pointer */
+    for (j = 0; j < currentMaxClients; j++)
+    {
+        if (clients[j] && clients[j]->clientPtr == dev)
+        {
+            clients[j]->clientPtr = NULL;
+            clients[j]->clientPtr = PickPointer(clients[j]);
+        }
+    }
+
+    free(dev->deviceGrab.sync.event);
+    free(dev->config_info);     /* Allocated in xf86ActivateDevice. */
+    dev->config_info = NULL;
+    dixFreeObjectWithPrivates(dev, PRIVATE_DEVICE);
+}
+
+/**
+ * Shut down all devices of one list and free all resources.
+ */
+static
+void
+CloseDeviceList(DeviceIntPtr *listHead)
+{
+    /* Used to mark devices that we tried to free */
+    Bool freedIds[MAXDEVICES];
+    DeviceIntPtr dev;
+    int i;
+
+    if (listHead == NULL)
+        return;
+
+    for (i = 0; i < MAXDEVICES; i++)
+        freedIds[i] = FALSE;
+
+    dev = *listHead;
+    while (dev != NULL)
+    {
+        freedIds[dev->id] = TRUE;
+        DeleteInputDeviceRequest(dev);
+
+        dev = *listHead;
+        while (dev != NULL && freedIds[dev->id])
+            dev = dev->next;
+    }
+}
+
+/**
+ * Shut down all devices, free all resources, etc.
+ * Only useful if you're shutting down the server!
+ */
+void
+CloseDownDevices(void)
+{
+    DeviceIntPtr dev;
+
+    /* Float all SDs before closing them. Note that at this point resources
+     * (e.g. cursors) have been freed already, so we can't just call
+     * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master
+     * to NULL and pretend nothing happened.
+     */
+    for (dev = inputInfo.devices; dev; dev = dev->next)
+    {
+        if (!IsMaster(dev) && !IsFloating(dev))
+            dev->master = NULL;
+    }
+
+    CloseDeviceList(&inputInfo.devices);
+    CloseDeviceList(&inputInfo.off_devices);
+
+    CloseDevice(inputInfo.pointer);
+    CloseDevice(inputInfo.keyboard);
+
+    inputInfo.devices = NULL;
+    inputInfo.off_devices = NULL;
+    inputInfo.keyboard = NULL;
+    inputInfo.pointer = NULL;
+    XkbDeleteRulesDflts();
+}
+
+/**
+ * Remove the cursor sprite for all devices. This needs to be done before any
+ * resources are freed or any device is deleted.
+ */
+void
+UndisplayDevices(void)
+{
+    DeviceIntPtr dev;
+    ScreenPtr screen = screenInfo.screens[0];
+
+    for (dev = inputInfo.devices; dev; dev = dev->next)
+        screen->DisplayCursor(dev, screen, NullCursor);
+}
+
+/**
+ * Remove a device from the device list, closes it and thus frees all
+ * resources.
+ * Removes both enabled and disabled devices and notifies all devices about
+ * the removal of the device.
+ *
+ * No PresenceNotify is sent for device that the client never saw. This can
+ * happen if a malloc fails during the addition of master devices. If
+ * dev->init is FALSE it means the client never received a DeviceAdded event,
+ * so let's not send a DeviceRemoved event either.
+ *
+ * @param sendevent True if an XI2 event should be sent.
+ */
+int
+RemoveDevice(DeviceIntPtr dev, BOOL sendevent)
+{
+    DeviceIntPtr prev,tmp,next;
+    int ret = BadMatch;
+    ScreenPtr screen = screenInfo.screens[0];
+    int deviceid;
+    int initialized;
+    int flags[MAXDEVICES] = {0};
+
+    DebugF("(dix) removing device %d\n", dev->id);
+
+    if (!dev || dev == inputInfo.keyboard || dev == inputInfo.pointer)
+        return BadImplementation;
+
+    initialized = dev->inited;
+    deviceid = dev->id;
+
+    if (initialized)
+    {
+        if (DevHasCursor(dev))
+            screen->DisplayCursor(dev, screen, NullCursor);
+
+        DisableDevice(dev, sendevent);
+        flags[dev->id] = XIDeviceDisabled;
+    }
+
+    prev = NULL;
+    for (tmp = inputInfo.devices; tmp; (prev = tmp), (tmp = next)) {
+	next = tmp->next;
+	if (tmp == dev) {
+
+	    if (prev==NULL)
+		inputInfo.devices = next;
+	    else
+		prev->next = next;
+
+	    flags[tmp->id] = IsMaster(tmp) ? XIMasterRemoved : XISlaveRemoved;
+	    CloseDevice(tmp);
+	    ret = Success;
+	}
+    }
+
+    prev = NULL;
+    for (tmp = inputInfo.off_devices; tmp; (prev = tmp), (tmp = next)) {
+	next = tmp->next;
+	if (tmp == dev) {
+	    flags[tmp->id] = IsMaster(tmp) ? XIMasterRemoved : XISlaveRemoved;
+	    CloseDevice(tmp);
+
+	    if (prev == NULL)
+		inputInfo.off_devices = next;
+	    else
+		prev->next = next;
+
+            ret = Success;
+	}
+    }
+
+    if (ret == Success && initialized) {
+        inputInfo.numDevices--;
+        SendDevicePresenceEvent(deviceid, DeviceRemoved);
+        if (sendevent)
+            XISendDeviceHierarchyEvent(flags);
+    }
+
+    return ret;
+}
+
+int
+NumMotionEvents(void)
+{
+    /* only called to fill data in initial connection reply.
+     * VCP is ok here, it is the only fixed device we have. */
+    return inputInfo.pointer->valuator->numMotionEvents;
+}
+
+int
+dixLookupDevice(DeviceIntPtr *pDev, int id, ClientPtr client, Mask access_mode)
+{
+    DeviceIntPtr dev;
+    int rc;
+    *pDev = NULL;
+
+    for (dev=inputInfo.devices; dev; dev=dev->next) {
+        if (dev->id == id)
+            goto found;
+    }
+    for (dev=inputInfo.off_devices; dev; dev=dev->next) {
+        if (dev->id == id)
+	    goto found;
+    }
+    return BadDevice;
+
+found:
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, access_mode);
+    if (rc == Success)
+	*pDev = dev;
+    return rc;
+}
+
+void
+QueryMinMaxKeyCodes(KeyCode *minCode, KeyCode *maxCode)
+{
+    if (inputInfo.keyboard) {
+	*minCode = inputInfo.keyboard->key->xkbInfo->desc->min_key_code;
+	*maxCode = inputInfo.keyboard->key->xkbInfo->desc->max_key_code;
+    }
+}
+
+/* Notably, this function does not expand the destination's keycode range, or
+ * notify clients. */
+Bool
+SetKeySymsMap(KeySymsPtr dst, KeySymsPtr src)
+{
+    int i, j;
+    KeySym *tmp;
+    int rowDif = src->minKeyCode - dst->minKeyCode;
+
+    /* if keysym map size changes, grow map first */
+    if (src->mapWidth < dst->mapWidth) {
+        for (i = src->minKeyCode; i <= src->maxKeyCode; i++) {
+#define SI(r, c) (((r - src->minKeyCode) * src->mapWidth) + (c))
+#define DI(r, c) (((r - dst->minKeyCode) * dst->mapWidth) + (c))
+	    for (j = 0; j < src->mapWidth; j++)
+		dst->map[DI(i, j)] = src->map[SI(i, j)];
+	    for (j = src->mapWidth; j < dst->mapWidth; j++)
+		dst->map[DI(i, j)] = NoSymbol;
+#undef SI
+#undef DI
+	}
+	return TRUE;
+    }
+    else if (src->mapWidth > dst->mapWidth) {
+        i = sizeof(KeySym) * src->mapWidth *
+             (dst->maxKeyCode - dst->minKeyCode + 1);
+        tmp = calloc(sizeof(KeySym), i);
+        if (!tmp)
+            return FALSE;
+
+        if (dst->map) {
+            for (i = 0; i <= dst->maxKeyCode-dst->minKeyCode; i++)
+                memmove(&tmp[i * src->mapWidth], &dst->map[i * dst->mapWidth],
+                        dst->mapWidth * sizeof(KeySym));
+            free(dst->map);
+        }
+        dst->mapWidth = src->mapWidth;
+        dst->map = tmp;
+    }
+    else if (!dst->map) {
+        i = sizeof(KeySym) * src->mapWidth *
+             (dst->maxKeyCode - dst->minKeyCode + 1);
+        tmp = calloc(sizeof(KeySym), i);
+        if (!tmp)
+            return FALSE;
+
+        dst->map = tmp;
+        dst->mapWidth = src->mapWidth;
+    }
+
+    memmove(&dst->map[rowDif * dst->mapWidth], src->map,
+            (src->maxKeyCode - src->minKeyCode + 1) *
+            dst->mapWidth * sizeof(KeySym));
+
+    return TRUE;
+}
+
+Bool
+InitButtonClassDeviceStruct(DeviceIntPtr dev, int numButtons, Atom* labels,
+                            CARD8 *map)
+{
+    ButtonClassPtr butc;
+    int i;
+
+    butc = calloc(1, sizeof(ButtonClassRec));
+    if (!butc)
+	return FALSE;
+    butc->numButtons = numButtons;
+    butc->sourceid = dev->id;
+    for (i = 1; i <= numButtons; i++)
+	butc->map[i] = map[i];
+    for (i = numButtons + 1; i < MAP_LENGTH; i++)
+        butc->map[i] = i;
+    memcpy(butc->labels, labels, numButtons * sizeof(Atom));
+    dev->button = butc;
+    return TRUE;
+}
+
+Bool
+InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels,
+                              int numMotionEvents, int mode)
+{
+    int i;
+    ValuatorClassPtr valc;
+    union align_u { ValuatorClassRec valc; double d; } *align;
+
+    if (!dev)
+        return FALSE;
+
+    if (numAxes > MAX_VALUATORS)
+    {
+        LogMessage(X_WARNING,
+                   "Device '%s' has %d axes, only using first %d.\n",
+                   dev->name, numAxes, MAX_VALUATORS);
+        numAxes = MAX_VALUATORS;
+    }
+
+    align = (union align_u *) calloc(1, sizeof(union align_u) +
+				     numAxes * sizeof(double) +
+				     numAxes * sizeof(AxisInfo));
+    if (!align)
+	return FALSE;
+
+    valc = &align->valc;
+    valc->sourceid = dev->id;
+    valc->motion = NULL;
+    valc->first_motion = 0;
+    valc->last_motion = 0;
+
+    valc->numMotionEvents = numMotionEvents;
+    valc->motionHintWindow = NullWindow;
+    valc->numAxes = numAxes;
+    valc->axisVal = (double *)(align + 1);
+    valc->axes = (AxisInfoPtr)(valc->axisVal + numAxes);
+
+    if (mode & OutOfProximity)
+        InitProximityClassDeviceStruct(dev);
+
+    dev->valuator = valc;
+
+    AllocateMotionHistory(dev);
+
+    for (i=0; i<numAxes; i++) {
+        InitValuatorAxisStruct(dev, i, labels[i], NO_AXIS_LIMITS, NO_AXIS_LIMITS,
+                               0, 0, 0, mode);
+	valc->axisVal[i]=0;
+    }
+
+    dev->last.numValuators = numAxes;
+
+    if (IsMaster(dev) || /* do not accelerate master or xtest devices */
+        IsXTestDevice(dev, NULL))
+	InitPointerAccelerationScheme(dev, PtrAccelNoOp);
+    else
+	InitPointerAccelerationScheme(dev, PtrAccelDefault);
+    return TRUE;
+}
+
+/* global list of acceleration schemes */
+ValuatorAccelerationRec pointerAccelerationScheme[] = {
+    {PtrAccelNoOp, NULL, NULL, NULL, NULL},
+    {PtrAccelPredictable, acceleratePointerPredictable, NULL,
+        InitPredictableAccelerationScheme, AccelerationDefaultCleanup},
+    {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL, NULL},
+    {-1, NULL, NULL, NULL, NULL} /* terminator */
+};
+
+/**
+ * install an acceleration scheme. returns TRUE on success, and should not
+ * change anything if unsuccessful.
+ */
+Bool
+InitPointerAccelerationScheme(DeviceIntPtr dev,
+                              int scheme)
+{
+    int x, i = -1;
+    ValuatorClassPtr val;
+
+    val = dev->valuator;
+
+    if (!val)
+        return FALSE;
+
+    if (IsMaster(dev) && scheme != PtrAccelNoOp)
+        return FALSE;
+
+    for (x = 0; pointerAccelerationScheme[x].number >= 0; x++) {
+        if(pointerAccelerationScheme[x].number == scheme){
+            i = x;
+            break;
+        }
+    }
+
+    if (-1 == i)
+        return FALSE;
+
+    if (val->accelScheme.AccelCleanupProc)
+        val->accelScheme.AccelCleanupProc(dev);
+
+    if (pointerAccelerationScheme[i].AccelInitProc) {
+        if (!pointerAccelerationScheme[i].AccelInitProc(dev,
+                                            &pointerAccelerationScheme[i])) {
+            return FALSE;
+        }
+    } else {
+        val->accelScheme = pointerAccelerationScheme[i];
+    }
+    return TRUE;
+}
+
+Bool
+InitAbsoluteClassDeviceStruct(DeviceIntPtr dev)
+{
+    /* This is an API-preserving noop. Instructions: Kill when no more drivers
+     * call it. The infrastructure behind hasn't really been used, so any calls
+     * are likely just a declaration that the device is absolute. */
+    return FALSE;
+}
+
+Bool
+InitFocusClassDeviceStruct(DeviceIntPtr dev)
+{
+    FocusClassPtr focc;
+
+    focc = malloc(sizeof(FocusClassRec));
+    if (!focc)
+	return FALSE;
+    focc->win = PointerRootWin;
+    focc->revert = None;
+    focc->time = currentTime;
+    focc->trace = (WindowPtr *)NULL;
+    focc->traceSize = 0;
+    focc->traceGood = 0;
+    focc->sourceid = dev->id;
+    dev->focus = focc;
+    return TRUE;
+}
+
+Bool
+InitPtrFeedbackClassDeviceStruct(DeviceIntPtr dev, PtrCtrlProcPtr controlProc)
+{
+    PtrFeedbackPtr feedc;
+
+    feedc = malloc(sizeof(PtrFeedbackClassRec));
+    if (!feedc)
+	return FALSE;
+    feedc->CtrlProc = controlProc;
+    feedc->ctrl = defaultPointerControl;
+    feedc->ctrl.id = 0;
+    if ( (feedc->next = dev->ptrfeed) )
+        feedc->ctrl.id = dev->ptrfeed->ctrl.id + 1;
+    dev->ptrfeed = feedc;
+    (*controlProc)(dev, &feedc->ctrl);
+    return TRUE;
+}
+
+
+static LedCtrl defaultLedControl = {
+	DEFAULT_LEDS, DEFAULT_LEDS_MASK, 0};
+
+static BellCtrl defaultBellControl = {
+	DEFAULT_BELL,
+	DEFAULT_BELL_PITCH,
+	DEFAULT_BELL_DURATION,
+	0};
+
+static IntegerCtrl defaultIntegerControl = {
+	DEFAULT_INT_RESOLUTION,
+	DEFAULT_INT_MIN_VALUE,
+	DEFAULT_INT_MAX_VALUE,
+	DEFAULT_INT_DISPLAYED,
+	0};
+
+Bool
+InitStringFeedbackClassDeviceStruct (
+      DeviceIntPtr dev, StringCtrlProcPtr controlProc,
+      int max_symbols, int num_symbols_supported, KeySym *symbols)
+{
+    int i;
+    StringFeedbackPtr feedc;
+
+    feedc = malloc(sizeof(StringFeedbackClassRec));
+    if (!feedc)
+	return FALSE;
+    feedc->CtrlProc = controlProc;
+    feedc->ctrl.num_symbols_supported = num_symbols_supported;
+    feedc->ctrl.num_symbols_displayed = 0;
+    feedc->ctrl.max_symbols = max_symbols;
+    feedc->ctrl.symbols_supported = malloc(sizeof (KeySym) * num_symbols_supported);
+    feedc->ctrl.symbols_displayed = malloc(sizeof (KeySym) * max_symbols);
+    if (!feedc->ctrl.symbols_supported || !feedc->ctrl.symbols_displayed)
+    {
+	free(feedc->ctrl.symbols_supported);
+	free(feedc->ctrl.symbols_displayed);
+	free(feedc);
+	return FALSE;
+    }
+    for (i=0; i<num_symbols_supported; i++)
+	*(feedc->ctrl.symbols_supported+i) = *symbols++;
+    for (i=0; i<max_symbols; i++)
+	*(feedc->ctrl.symbols_displayed+i) = (KeySym) 0;
+    feedc->ctrl.id = 0;
+    if ( (feedc->next = dev->stringfeed) )
+	feedc->ctrl.id = dev->stringfeed->ctrl.id + 1;
+    dev->stringfeed = feedc;
+    (*controlProc)(dev, &feedc->ctrl);
+    return TRUE;
+}
+
+Bool
+InitBellFeedbackClassDeviceStruct (DeviceIntPtr dev, BellProcPtr bellProc,
+                                   BellCtrlProcPtr controlProc)
+{
+    BellFeedbackPtr feedc;
+
+    feedc = malloc(sizeof(BellFeedbackClassRec));
+    if (!feedc)
+	return FALSE;
+    feedc->CtrlProc = controlProc;
+    feedc->BellProc = bellProc;
+    feedc->ctrl = defaultBellControl;
+    feedc->ctrl.id = 0;
+    if ( (feedc->next = dev->bell) )
+	feedc->ctrl.id = dev->bell->ctrl.id + 1;
+    dev->bell = feedc;
+    (*controlProc)(dev, &feedc->ctrl);
+    return TRUE;
+}
+
+Bool
+InitLedFeedbackClassDeviceStruct (DeviceIntPtr dev, LedCtrlProcPtr controlProc)
+{
+    LedFeedbackPtr feedc;
+
+    feedc = malloc(sizeof(LedFeedbackClassRec));
+    if (!feedc)
+	return FALSE;
+    feedc->CtrlProc = controlProc;
+    feedc->ctrl = defaultLedControl;
+    feedc->ctrl.id = 0;
+    if ( (feedc->next = dev->leds) )
+	feedc->ctrl.id = dev->leds->ctrl.id + 1;
+    feedc->xkb_sli= NULL;
+    dev->leds = feedc;
+    (*controlProc)(dev, &feedc->ctrl);
+    return TRUE;
+}
+
+Bool
+InitIntegerFeedbackClassDeviceStruct (DeviceIntPtr dev, IntegerCtrlProcPtr controlProc)
+{
+    IntegerFeedbackPtr feedc;
+
+    feedc = malloc(sizeof(IntegerFeedbackClassRec));
+    if (!feedc)
+	return FALSE;
+    feedc->CtrlProc = controlProc;
+    feedc->ctrl = defaultIntegerControl;
+    feedc->ctrl.id = 0;
+    if ( (feedc->next = dev->intfeed) )
+	feedc->ctrl.id = dev->intfeed->ctrl.id + 1;
+    dev->intfeed = feedc;
+    (*controlProc)(dev, &feedc->ctrl);
+    return TRUE;
+}
+
+Bool
+InitPointerDeviceStruct(DevicePtr device, CARD8 *map, int numButtons, Atom* btn_labels,
+                        PtrCtrlProcPtr controlProc, int numMotionEvents,
+                        int numAxes, Atom *axes_labels)
+{
+    DeviceIntPtr dev = (DeviceIntPtr)device;
+
+    return(InitButtonClassDeviceStruct(dev, numButtons, btn_labels, map) &&
+	   InitValuatorClassDeviceStruct(dev, numAxes, axes_labels,
+					 numMotionEvents, Relative) &&
+	   InitPtrFeedbackClassDeviceStruct(dev, controlProc));
+}
+
+/*
+ * Check if the given buffer contains elements between low (inclusive) and
+ * high (inclusive) only.
+ *
+ * @return TRUE if the device map is invalid, FALSE otherwise.
+ */
+Bool
+BadDeviceMap(BYTE *buff, int length, unsigned low, unsigned high, XID *errval)
+{
+    int i;
+
+    for (i = 0; i < length; i++)
+	if (buff[i])		       /* only check non-zero elements */
+	{
+	    if ((low > buff[i]) || (high < buff[i]))
+	    {
+		*errval = buff[i];
+		return TRUE;
+	    }
+	}
+    return FALSE;
+}
+
+int
+ProcSetModifierMapping(ClientPtr client)
+{
+    xSetModifierMappingReply rep;
+    int rc;
+    REQUEST(xSetModifierMappingReq);
+    REQUEST_AT_LEAST_SIZE(xSetModifierMappingReq);
+
+    if (client->req_len != ((stuff->numKeyPerModifier << 1) +
+                bytes_to_int32(sizeof(xSetModifierMappingReq))))
+	return BadLength;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    rc = change_modmap(client, PickKeyboard(client), (KeyCode *)&stuff[1],
+                       stuff->numKeyPerModifier);
+    if (rc == MappingFailed || rc == -1)
+        return BadValue;
+    if (rc != Success && rc != MappingSuccess && rc != MappingFailed &&
+        rc != MappingBusy)
+	return rc;
+
+    rep.success = rc;
+
+    WriteReplyToClient(client, sizeof(xSetModifierMappingReply), &rep);
+    return Success;
+}
+
+int
+ProcGetModifierMapping(ClientPtr client)
+{
+    xGetModifierMappingReply rep;
+    int max_keys_per_mod = 0;
+    KeyCode *modkeymap = NULL;
+    REQUEST_SIZE_MATCH(xReq);
+
+    generate_modkeymap(client, PickKeyboard(client), &modkeymap,
+                       &max_keys_per_mod);
+
+    memset(&rep, 0, sizeof(xGetModifierMappingReply));
+    rep.type = X_Reply;
+    rep.numKeyPerModifier = max_keys_per_mod;
+    rep.sequenceNumber = client->sequence;
+    /* length counts 4 byte quantities - there are 8 modifiers 1 byte big */
+    rep.length = max_keys_per_mod << 1;
+
+    WriteReplyToClient(client, sizeof(xGetModifierMappingReply), &rep);
+    (void)WriteToClient(client, max_keys_per_mod * 8, (char *) modkeymap);
+
+    free(modkeymap);
+
+    return Success;
+}
+
+int
+ProcChangeKeyboardMapping(ClientPtr client)
+{
+    REQUEST(xChangeKeyboardMappingReq);
+    unsigned len;
+    KeySymsRec keysyms;
+    DeviceIntPtr pDev, tmp;
+    int rc;
+    REQUEST_AT_LEAST_SIZE(xChangeKeyboardMappingReq);
+
+    len = client->req_len - bytes_to_int32(sizeof(xChangeKeyboardMappingReq));
+    if (len != (stuff->keyCodes * stuff->keySymsPerKeyCode))
+            return BadLength;
+
+    pDev = PickKeyboard(client);
+
+    if ((stuff->firstKeyCode < pDev->key->xkbInfo->desc->min_key_code) ||
+	(stuff->firstKeyCode > pDev->key->xkbInfo->desc->max_key_code)) {
+	    client->errorValue = stuff->firstKeyCode;
+	    return BadValue;
+
+    }
+    if (((unsigned)(stuff->firstKeyCode + stuff->keyCodes - 1) >
+          pDev->key->xkbInfo->desc->max_key_code) ||
+        (stuff->keySymsPerKeyCode == 0)) {
+	    client->errorValue = stuff->keySymsPerKeyCode;
+	    return BadValue;
+    }
+
+    keysyms.minKeyCode = stuff->firstKeyCode;
+    keysyms.maxKeyCode = stuff->firstKeyCode + stuff->keyCodes - 1;
+    keysyms.mapWidth = stuff->keySymsPerKeyCode;
+    keysyms.map = (KeySym *) &stuff[1];
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
+    if (rc != Success)
+        return rc;
+
+    XkbApplyMappingChange(pDev, &keysyms, stuff->firstKeyCode,
+                          stuff->keyCodes, NULL, client);
+
+    for (tmp = inputInfo.devices; tmp; tmp = tmp->next) {
+        if (IsMaster(tmp) || GetMaster(tmp, MASTER_KEYBOARD) != pDev)
+            continue;
+        if (!tmp->key)
+            continue;
+
+        rc = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
+        if (rc != Success)
+            continue;
+
+        XkbApplyMappingChange(tmp, &keysyms, stuff->firstKeyCode,
+                              stuff->keyCodes, NULL, client);
+    }
+
+    return Success;
+}
+
+int
+ProcSetPointerMapping(ClientPtr client)
+{
+    BYTE *map;
+    int ret;
+    int i, j;
+    DeviceIntPtr ptr = PickPointer(client);
+    xSetPointerMappingReply rep;
+    REQUEST(xSetPointerMappingReq);
+    REQUEST_AT_LEAST_SIZE(xSetPointerMappingReq);
+
+    if (client->req_len !=
+            bytes_to_int32(sizeof(xSetPointerMappingReq) + stuff->nElts))
+	return BadLength;
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.success = MappingSuccess;
+    map = (BYTE *)&stuff[1];
+
+    /* So we're bounded here by the number of core buttons.  This check
+     * probably wants disabling through XFixes. */
+    /* MPX: With ClientPointer, we can return the right number of buttons.
+     * Let's just hope nobody changed ClientPointer between GetPointerMapping
+     * and SetPointerMapping
+     */
+    if (stuff->nElts != ptr->button->numButtons) {
+	client->errorValue = stuff->nElts;
+	return BadValue;
+    }
+
+    /* Core protocol specs don't allow for duplicate mappings; this check
+     * almost certainly wants disabling through XFixes too. */
+    for (i = 0; i < stuff->nElts; i++) {
+        for (j = i + 1; j < stuff->nElts; j++) {
+            if (map[i] && map[i] == map[j]) {
+                client->errorValue = map[i];
+                return BadValue;
+            }
+        }
+    }
+
+    ret = ApplyPointerMapping(ptr, map, stuff->nElts, client);
+    if (ret == MappingBusy)
+        rep.success = ret;
+    else if (ret == -1)
+        return BadValue;
+    else if (ret != Success)
+        return ret;
+
+    WriteReplyToClient(client, sizeof(xSetPointerMappingReply), &rep);
+    return Success;
+}
+
+int
+ProcGetKeyboardMapping(ClientPtr client)
+{
+    xGetKeyboardMappingReply rep;
+    DeviceIntPtr kbd = PickKeyboard(client);
+    XkbDescPtr xkb;
+    KeySymsPtr syms;
+    int rc;
+    REQUEST(xGetKeyboardMappingReq);
+    REQUEST_SIZE_MATCH(xGetKeyboardMappingReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    xkb = kbd->key->xkbInfo->desc;
+
+    if ((stuff->firstKeyCode < xkb->min_key_code) ||
+        (stuff->firstKeyCode > xkb->max_key_code)) {
+	client->errorValue = stuff->firstKeyCode;
+	return BadValue;
+    }
+    if (stuff->firstKeyCode + stuff->count > xkb->max_key_code + 1) {
+	client->errorValue = stuff->count;
+        return BadValue;
+    }
+
+    syms = XkbGetCoreMap(kbd);
+    if (!syms)
+        return BadAlloc;
+
+    memset(&rep, 0, sizeof(xGetKeyboardMappingReply));
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.keySymsPerKeyCode = syms->mapWidth;
+    /* length is a count of 4 byte quantities and KeySyms are 4 bytes */
+    rep.length = syms->mapWidth * stuff->count;
+    WriteReplyToClient(client, sizeof(xGetKeyboardMappingReply), &rep);
+    client->pSwapReplyFunc = (ReplySwapPtr) CopySwap32Write;
+    WriteSwappedDataToClient(client,
+                             syms->mapWidth * stuff->count * sizeof(KeySym),
+                             &syms->map[syms->mapWidth * (stuff->firstKeyCode -
+                                                          syms->minKeyCode)]);
+    free(syms->map);
+    free(syms);
+
+    return Success;
+}
+
+int
+ProcGetPointerMapping(ClientPtr client)
+{
+    xGetPointerMappingReply rep;
+    /* Apps may get different values each time they call GetPointerMapping as
+     * the ClientPointer could change. */
+    DeviceIntPtr ptr = PickPointer(client);
+    ButtonClassPtr butc = ptr->button;
+    int rc;
+    REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.nElts = (butc) ? butc->numButtons : 0;
+    rep.length = ((unsigned)rep.nElts + (4-1))/4;
+    WriteReplyToClient(client, sizeof(xGetPointerMappingReply), &rep);
+    if (butc)
+        WriteToClient(client, (int)rep.nElts, (char *)&butc->map[1]);
+    return Success;
+}
+
+void
+NoteLedState(DeviceIntPtr keybd, int led, Bool on)
+{
+    KeybdCtrl *ctrl = &keybd->kbdfeed->ctrl;
+    if (on)
+	ctrl->leds |= ((Leds)1 << (led - 1));
+    else
+	ctrl->leds &= ~((Leds)1 << (led - 1));
+}
+
+int
+Ones(unsigned long mask)             /* HACKMEM 169 */
+{
+    unsigned long y;
+
+    y = (mask >> 1) &033333333333;
+    y = mask - y - ((y >>1) & 033333333333);
+    return (((y + (y >> 3)) & 030707070707) % 077);
+}
+
+static int
+DoChangeKeyboardControl (ClientPtr client, DeviceIntPtr keybd, XID *vlist,
+                         BITS32 vmask)
+{
+#define DO_ALL    (-1)
+    KeybdCtrl ctrl;
+    int t;
+    int led = DO_ALL;
+    int key = DO_ALL;
+    BITS32 index2;
+    int mask = vmask, i;
+    XkbEventCauseRec cause;
+
+    ctrl = keybd->kbdfeed->ctrl;
+    while (vmask) {
+	index2 = (BITS32) lowbit (vmask);
+	vmask &= ~index2;
+	switch (index2) {
+	case KBKeyClickPercent:
+	    t = (INT8)*vlist;
+	    vlist++;
+	    if (t == -1) {
+		t = defaultKeyboardControl.click;
+            }
+	    else if (t < 0 || t > 100) {
+		client->errorValue = t;
+		return BadValue;
+	    }
+	    ctrl.click = t;
+	    break;
+	case KBBellPercent:
+	    t = (INT8)*vlist;
+	    vlist++;
+	    if (t == -1) {
+		t = defaultKeyboardControl.bell;
+            }
+	    else if (t < 0 || t > 100) {
+		client->errorValue = t;
+		return BadValue;
+	    }
+	    ctrl.bell = t;
+	    break;
+	case KBBellPitch:
+	    t = (INT16)*vlist;
+	    vlist++;
+	    if (t == -1) {
+		t = defaultKeyboardControl.bell_pitch;
+            }
+	    else if (t < 0) {
+		client->errorValue = t;
+		return BadValue;
+	    }
+	    ctrl.bell_pitch = t;
+	    break;
+	case KBBellDuration:
+	    t = (INT16)*vlist;
+	    vlist++;
+	    if (t == -1)
+		t = defaultKeyboardControl.bell_duration;
+	    else if (t < 0) {
+		client->errorValue = t;
+		return BadValue;
+	    }
+	    ctrl.bell_duration = t;
+	    break;
+	case KBLed:
+	    led = (CARD8)*vlist;
+	    vlist++;
+	    if (led < 1 || led > 32) {
+		client->errorValue = led;
+		return BadValue;
+	    }
+	    if (!(mask & KBLedMode))
+		return BadMatch;
+	    break;
+	case KBLedMode:
+	    t = (CARD8)*vlist;
+	    vlist++;
+	    if (t == LedModeOff) {
+		if (led == DO_ALL)
+		    ctrl.leds = 0x0;
+		else
+		    ctrl.leds &= ~(((Leds)(1)) << (led - 1));
+	    }
+	    else if (t == LedModeOn) {
+		if (led == DO_ALL)
+		    ctrl.leds = ~0L;
+		else
+		    ctrl.leds |= (((Leds)(1)) << (led - 1));
+	    }
+	    else {
+		client->errorValue = t;
+		return BadValue;
+	    }
+
+            XkbSetCauseCoreReq(&cause,X_ChangeKeyboardControl,client);
+            XkbSetIndicators(keybd,((led == DO_ALL) ? ~0L : (1L<<(led-1))),
+ 			     ctrl.leds, &cause);
+            ctrl.leds = keybd->kbdfeed->ctrl.leds;
+
+	    break;
+	case KBKey:
+	    key = (KeyCode)*vlist;
+	    vlist++;
+	    if ((KeyCode)key < keybd->key->xkbInfo->desc->min_key_code ||
+		(KeyCode)key > keybd->key->xkbInfo->desc->max_key_code) {
+		client->errorValue = key;
+		return BadValue;
+	    }
+	    if (!(mask & KBAutoRepeatMode))
+		return BadMatch;
+	    break;
+	case KBAutoRepeatMode:
+	    i = (key >> 3);
+	    mask = (1 << (key & 7));
+	    t = (CARD8)*vlist;
+	    vlist++;
+            if (key != DO_ALL)
+                XkbDisableComputedAutoRepeats(keybd,key);
+	    if (t == AutoRepeatModeOff) {
+		if (key == DO_ALL)
+		    ctrl.autoRepeat = FALSE;
+		else
+		    ctrl.autoRepeats[i] &= ~mask;
+	    }
+	    else if (t == AutoRepeatModeOn) {
+		if (key == DO_ALL)
+		    ctrl.autoRepeat = TRUE;
+		else
+		    ctrl.autoRepeats[i] |= mask;
+	    }
+	    else if (t == AutoRepeatModeDefault) {
+		if (key == DO_ALL)
+		    ctrl.autoRepeat = defaultKeyboardControl.autoRepeat;
+		else
+		    ctrl.autoRepeats[i] =
+			    (ctrl.autoRepeats[i] & ~mask) |
+			    (defaultKeyboardControl.autoRepeats[i] & mask);
+	    }
+	    else {
+		client->errorValue = t;
+		return BadValue;
+	    }
+	    break;
+	default:
+	    client->errorValue = mask;
+	    return BadValue;
+	}
+    }
+    keybd->kbdfeed->ctrl = ctrl;
+
+    /* The XKB RepeatKeys control and core protocol global autorepeat */
+    /* value are linked	*/
+    XkbSetRepeatKeys(keybd, key, keybd->kbdfeed->ctrl.autoRepeat);
+
+    return Success;
+
+#undef DO_ALL
+}
+
+/**
+ * Changes kbd control on the ClientPointer and all attached SDs.
+ */
+int
+ProcChangeKeyboardControl (ClientPtr client)
+{
+    XID *vlist;
+    BITS32 vmask;
+    int ret = Success, error = Success;
+    DeviceIntPtr pDev = NULL, keyboard;
+    REQUEST(xChangeKeyboardControlReq);
+
+    REQUEST_AT_LEAST_SIZE(xChangeKeyboardControlReq);
+
+    vmask = stuff->mask;
+    vlist = (XID *)&stuff[1];
+
+    if (client->req_len != (sizeof(xChangeKeyboardControlReq)>>2)+Ones(vmask))
+	return BadLength;
+
+    keyboard = PickKeyboard(client);
+
+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+        if ((pDev == keyboard ||
+	     (!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
+	    && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
+            ret = XaceHook(XACE_DEVICE_ACCESS, client, pDev, DixManageAccess);
+	    if (ret != Success)
+                return ret;
+        }
+    }
+
+    for (pDev = inputInfo.devices; pDev; pDev = pDev->next) {
+        if ((pDev == keyboard ||
+	     (!IsMaster(pDev) && GetMaster(pDev, MASTER_KEYBOARD) == keyboard))
+	    && pDev->kbdfeed && pDev->kbdfeed->CtrlProc) {
+            ret = DoChangeKeyboardControl(client, pDev, vlist, vmask);
+            if (ret != Success)
+                error = ret;
+        }
+    }
+
+    return error;
+}
+
+int
+ProcGetKeyboardControl (ClientPtr client)
+{
+    int rc, i;
+    DeviceIntPtr kbd = PickKeyboard(client);
+    KeybdCtrl *ctrl = &kbd->kbdfeed->ctrl;
+    xGetKeyboardControlReply rep;
+    REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, kbd, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.length = 5;
+    rep.sequenceNumber = client->sequence;
+    rep.globalAutoRepeat = ctrl->autoRepeat;
+    rep.keyClickPercent = ctrl->click;
+    rep.bellPercent = ctrl->bell;
+    rep.bellPitch = ctrl->bell_pitch;
+    rep.bellDuration = ctrl->bell_duration;
+    rep.ledMask = ctrl->leds;
+    for (i = 0; i < 32; i++)
+	rep.map[i] = ctrl->autoRepeats[i];
+    WriteReplyToClient(client, sizeof(xGetKeyboardControlReply), &rep);
+    return Success;
+}
+
+int
+ProcBell(ClientPtr client)
+{
+    DeviceIntPtr dev, keybd = PickKeyboard(client);
+    int base = keybd->kbdfeed->ctrl.bell;
+    int newpercent;
+    int rc;
+    REQUEST(xBellReq);
+    REQUEST_SIZE_MATCH(xBellReq);
+
+    if (stuff->percent < -100 || stuff->percent > 100) {
+	client->errorValue = stuff->percent;
+	return BadValue;
+    }
+
+    newpercent = (base * stuff->percent) / 100;
+    if (stuff->percent < 0)
+        newpercent = base + newpercent;
+    else
+	newpercent = base - newpercent + stuff->percent;
+
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if ((dev == keybd ||
+	     (!IsMaster(dev) && GetMaster(dev, MASTER_KEYBOARD) == keybd)) &&
+            dev->kbdfeed && dev->kbdfeed->BellProc) {
+
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixBellAccess);
+	    if (rc != Success)
+		return rc;
+            XkbHandleBell(FALSE, FALSE, dev, newpercent,
+                          &dev->kbdfeed->ctrl, 0, None, NULL, client);
+        }
+    }
+
+    return Success;
+}
+
+int
+ProcChangePointerControl(ClientPtr client)
+{
+    DeviceIntPtr dev, mouse = PickPointer(client);
+    PtrCtrl ctrl;		/* might get BadValue part way through */
+    int rc;
+    REQUEST(xChangePointerControlReq);
+    REQUEST_SIZE_MATCH(xChangePointerControlReq);
+
+    ctrl = mouse->ptrfeed->ctrl;
+    if ((stuff->doAccel != xTrue) && (stuff->doAccel != xFalse)) {
+	client->errorValue = stuff->doAccel;
+	return BadValue;
+    }
+    if ((stuff->doThresh != xTrue) && (stuff->doThresh != xFalse)) {
+	client->errorValue = stuff->doThresh;
+	return BadValue;
+    }
+    if (stuff->doAccel) {
+	if (stuff->accelNum == -1) {
+	    ctrl.num = defaultPointerControl.num;
+        }
+	else if (stuff->accelNum < 0) {
+	    client->errorValue = stuff->accelNum;
+	    return BadValue;
+	}
+	else {
+            ctrl.num = stuff->accelNum;
+        }
+
+	if (stuff->accelDenum == -1) {
+	    ctrl.den = defaultPointerControl.den;
+        }
+	else if (stuff->accelDenum <= 0) {
+	    client->errorValue = stuff->accelDenum;
+	    return BadValue;
+	}
+	else {
+            ctrl.den = stuff->accelDenum;
+        }
+    }
+    if (stuff->doThresh) {
+	if (stuff->threshold == -1) {
+	    ctrl.threshold = defaultPointerControl.threshold;
+        }
+	else if (stuff->threshold < 0) {
+	    client->errorValue = stuff->threshold;
+	    return BadValue;
+	}
+	else {
+            ctrl.threshold = stuff->threshold;
+        }
+    }
+
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if ((dev == mouse ||
+	     (!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
+            dev->ptrfeed) {
+	    rc = XaceHook(XACE_DEVICE_ACCESS, client, dev, DixManageAccess);
+	    if (rc != Success)
+		return rc;
+	}
+    }
+
+    for (dev = inputInfo.devices; dev; dev = dev->next) {
+        if ((dev == mouse ||
+	     (!IsMaster(dev) && GetMaster(dev, MASTER_POINTER) == mouse)) &&
+            dev->ptrfeed) {
+            dev->ptrfeed->ctrl = ctrl;
+        }
+    }
+
+    return Success;
+}
+
+int
+ProcGetPointerControl(ClientPtr client)
+{
+    DeviceIntPtr ptr = PickPointer(client);
+    PtrCtrl *ctrl = &ptr->ptrfeed->ctrl;
+    xGetPointerControlReply rep;
+    int rc;
+    REQUEST_SIZE_MATCH(xReq);
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, ptr, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.threshold = ctrl->threshold;
+    rep.accelNumerator = ctrl->num;
+    rep.accelDenominator = ctrl->den;
+    WriteReplyToClient(client, sizeof(xGenericReply), &rep);
+    return Success;
+}
+
+void
+MaybeStopHint(DeviceIntPtr dev, ClientPtr client)
+{
+    GrabPtr grab = dev->deviceGrab.grab;
+
+    if ((grab && SameClient(grab, client) &&
+	 ((grab->eventMask & PointerMotionHintMask) ||
+	  (grab->ownerEvents &&
+	   (EventMaskForClient(dev->valuator->motionHintWindow, client) &
+	    PointerMotionHintMask)))) ||
+	(!grab &&
+	 (EventMaskForClient(dev->valuator->motionHintWindow, client) &
+	  PointerMotionHintMask)))
+	dev->valuator->motionHintWindow = NullWindow;
+}
+
+int
+ProcGetMotionEvents(ClientPtr client)
+{
+    WindowPtr pWin;
+    xTimecoord * coords = (xTimecoord *) NULL;
+    xGetMotionEventsReply rep;
+    int i, count, xmin, xmax, ymin, ymax, rc;
+    unsigned long nEvents;
+    DeviceIntPtr mouse = PickPointer(client);
+    TimeStamp start, stop;
+    REQUEST(xGetMotionEventsReq);
+    REQUEST_SIZE_MATCH(xGetMotionEventsReq);
+
+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
+    if (rc != Success)
+	return rc;
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, mouse, DixReadAccess);
+    if (rc != Success)
+	return rc;
+
+    if (mouse->valuator->motionHintWindow)
+	MaybeStopHint(mouse, client);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    nEvents = 0;
+    start = ClientTimeToServerTime(stuff->start);
+    stop = ClientTimeToServerTime(stuff->stop);
+    if ((CompareTimeStamps(start, stop) != LATER) &&
+	(CompareTimeStamps(start, currentTime) != LATER) &&
+	mouse->valuator->numMotionEvents)
+    {
+	if (CompareTimeStamps(stop, currentTime) == LATER)
+	    stop = currentTime;
+	count = GetMotionHistory(mouse, &coords, start.milliseconds,
+				 stop.milliseconds, pWin->drawable.pScreen,
+                                 TRUE);
+	xmin = pWin->drawable.x - wBorderWidth (pWin);
+	xmax = pWin->drawable.x + (int)pWin->drawable.width +
+		wBorderWidth (pWin);
+	ymin = pWin->drawable.y - wBorderWidth (pWin);
+	ymax = pWin->drawable.y + (int)pWin->drawable.height +
+		wBorderWidth (pWin);
+	for (i = 0; i < count; i++)
+	    if ((xmin <= coords[i].x) && (coords[i].x < xmax) &&
+		    (ymin <= coords[i].y) && (coords[i].y < ymax))
+	    {
+		coords[nEvents].time = coords[i].time;
+		coords[nEvents].x = coords[i].x - pWin->drawable.x;
+		coords[nEvents].y = coords[i].y - pWin->drawable.y;
+		nEvents++;
+	    }
+    }
+    rep.length = nEvents * bytes_to_int32(sizeof(xTimecoord));
+    rep.nEvents = nEvents;
+    WriteReplyToClient(client, sizeof(xGetMotionEventsReply), &rep);
+    if (nEvents)
+    {
+	client->pSwapReplyFunc = (ReplySwapPtr) SwapTimeCoordWrite;
+	WriteSwappedDataToClient(client, nEvents * sizeof(xTimecoord),
+				 (char *)coords);
+    }
+    free(coords);
+    return Success;
+}
+
+int
+ProcQueryKeymap(ClientPtr client)
+{
+    xQueryKeymapReply rep;
+    int rc, i;
+    DeviceIntPtr keybd = PickKeyboard(client);
+    CARD8 *down = keybd->key->down;
+
+    REQUEST_SIZE_MATCH(xReq);
+    rep.type = X_Reply;
+    rep.sequenceNumber = client->sequence;
+    rep.length = 2;
+
+    rc = XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess);
+    if (rc != Success && rc != BadAccess)
+	return rc;
+
+    for (i = 0; i<32; i++)
+	rep.map[i] = down[i];
+
+    if (rc == BadAccess)
+	memset(rep.map, 0, 32);
+
+    WriteReplyToClient(client, sizeof(xQueryKeymapReply), &rep);
+
+   return Success;
+}
+
+
+/**
+ * Recalculate the number of buttons for the master device. The number of
+ * buttons on the master device is equal to the number of buttons on the
+ * slave device with the highest number of buttons.
+ */
+static void
+RecalculateMasterButtons(DeviceIntPtr slave)
+{
+    DeviceIntPtr dev, master;
+    int maxbuttons = 0;
+
+    if (!slave->button || IsMaster(slave))
+        return;
+
+    master = GetMaster(slave, MASTER_POINTER);
+    if (!master)
+        return;
+
+    for (dev = inputInfo.devices; dev; dev = dev->next)
+    {
+        if (IsMaster(dev) ||
+            GetMaster(dev, MASTER_ATTACHED) != master ||
+            !dev->button)
+            continue;
+
+        maxbuttons = max(maxbuttons, dev->button->numButtons);
+    }
+
+    if (master->button && master->button->numButtons != maxbuttons)
+    {
+        int i;
+        DeviceChangedEvent event;
+
+        memset(&event, 0, sizeof(event));
+
+        master->button->numButtons = maxbuttons;
+
+        event.header = ET_Internal;
+        event.type = ET_DeviceChanged;
+        event.time = GetTimeInMillis();
+        event.deviceid = master->id;
+        event.flags = DEVCHANGE_POINTER_EVENT | DEVCHANGE_DEVICE_CHANGE;
+        event.buttons.num_buttons = maxbuttons;
+        memcpy(&event.buttons.names, master->button->labels, maxbuttons *
+                sizeof(Atom));
+
+        if (master->valuator)
+        {
+            event.num_valuators = master->valuator->numAxes;
+            for (i = 0; i < event.num_valuators; i++)
+            {
+                event.valuators[i].min = master->valuator->axes[i].min_value;
+                event.valuators[i].max = master->valuator->axes[i].max_value;
+                event.valuators[i].resolution = master->valuator->axes[i].resolution;
+                event.valuators[i].mode = master->valuator->axes[i].mode;
+                event.valuators[i].name = master->valuator->axes[i].label;
+            }
+        }
+
+        if (master->key)
+        {
+            event.keys.min_keycode = master->key->xkbInfo->desc->min_key_code;
+            event.keys.max_keycode = master->key->xkbInfo->desc->max_key_code;
+        }
+
+        XISendDeviceChangedEvent(master, master, &event);
+    }
+}
+
+/**
+ * Generate release events for all keys/button currently down on this
+ * device.
+ */
+static void
+ReleaseButtonsAndKeys(DeviceIntPtr dev)
+{
+    EventListPtr        eventlist = InitEventList(GetMaximumEventsNum());
+    ButtonClassPtr      b = dev->button;
+    KeyClassPtr         k = dev->key;
+    int                 i, j, nevents;
+
+    if (!eventlist) /* no release events for you */
+        return;
+
+    /* Release all buttons */
+    for (i = 0; b && i < b->numButtons; i++)
+    {
+        if (BitIsOn(b->down, i))
+        {
+            nevents = GetPointerEvents(eventlist, dev, ButtonRelease, i, 0, NULL);
+            for (j = 0; j < nevents; j++)
+                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);
+        }
+    }
+
+    /* Release all keys */
+    for (i = 0; k && i < MAP_LENGTH; i++)
+    {
+        if (BitIsOn(k->down, i))
+        {
+            nevents = GetKeyboardEvents(eventlist, dev, KeyRelease, i);
+            for (j = 0; j < nevents; j++)
+                mieqProcessDeviceEvent(dev, (InternalEvent*)(eventlist+j)->event, NULL);
+        }
+    }
+
+    FreeEventList(eventlist, GetMaximumEventsNum());
+}
+
+/**
+ * Attach device 'dev' to device 'master'.
+ * Client is set to the client that issued the request, or NULL if it comes
+ * from some internal automatic pairing.
+ *
+ * Master may be NULL to set the device floating.
+ *
+ * We don't allow multi-layer hierarchies right now. You can't attach a slave
+ * to another slave.
+ */
+int
+AttachDevice(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr master)
+{
+    ScreenPtr screen;
+    DeviceIntPtr oldmaster;
+    if (!dev || IsMaster(dev))
+        return BadDevice;
+
+    if (master && !IsMaster(master)) /* can't attach to slaves */
+        return BadDevice;
+
+    /* set from floating to floating? */
+    if (IsFloating(dev) && !master && dev->enabled)
+        return Success;
+
+    /* free the existing sprite. */
+    if (IsFloating(dev) && dev->spriteInfo->paired == dev)
+    {
+        screen = miPointerGetScreen(dev);
+        screen->DeviceCursorCleanup(dev, screen);
+        free(dev->spriteInfo->sprite);
+    }
+
+    ReleaseButtonsAndKeys(dev);
+
+    oldmaster = GetMaster(dev, MASTER_ATTACHED);
+    dev->master = master;
+
+    /* If device is set to floating, we need to create a sprite for it,
+     * otherwise things go bad. However, we don't want to render the cursor,
+     * so we reset spriteOwner.
+     * Sprite has to be forced to NULL first, otherwise InitializeSprite won't
+     * alloc new memory but overwrite the previous one.
+     */
+    if (!master)
+    {
+        WindowPtr currentRoot;
+
+        if (dev->spriteInfo->sprite)
+            currentRoot = GetCurrentRootWindow(dev);
+        else /* new device auto-set to floating */
+            currentRoot = screenInfo.screens[0]->root;
+
+        /* we need to init a fake sprite */
+        screen = currentRoot->drawable.pScreen;
+        screen->DeviceCursorInitialize(dev, screen);
+        dev->spriteInfo->sprite = NULL;
+        InitializeSprite(dev, currentRoot);
+        dev->spriteInfo->spriteOwner = FALSE;
+        dev->spriteInfo->paired = dev;
+    } else
+    {
+        dev->spriteInfo->sprite = master->spriteInfo->sprite;
+        dev->spriteInfo->paired = master;
+        dev->spriteInfo->spriteOwner = FALSE;
+
+        RecalculateMasterButtons(master);
+    }
+
+    /* XXX: in theory, the MD should change back to its old, original
+     * classes when the last SD is detached. Thanks to the XTEST devices,
+     * we'll always have an SD attached until the MD is removed.
+     * So let's not worry about that.
+     */
+
+    return Success;
+}
+
+/**
+ * Return the device paired with the given device or NULL.
+ * Returns the device paired with the parent master if the given device is a
+ * slave device.
+ */
+DeviceIntPtr
+GetPairedDevice(DeviceIntPtr dev)
+{
+    if (!IsMaster(dev) && !IsFloating(dev))
+        dev = GetMaster(dev, MASTER_ATTACHED);
+
+    return dev->spriteInfo->paired;
+}
+
+
+/**
+ * Returns the right master for the type of event needed. If the event is a
+ * keyboard event.
+ * This function may be called with a master device as argument. If so, the
+ * returned master is either the device itself or the paired master device.
+ * If dev is a floating slave device, NULL is returned.
+ *
+ * @type ::MASTER_KEYBOARD or ::MASTER_POINTER or ::MASTER_ATTACHED
+ * @return The requested master device. In the case of MASTER_ATTACHED, this
+ * is the directly attached master to this device, regardless of the type.
+ * Otherwise, it is either the master keyboard or pointer for this device.
+ */
+DeviceIntPtr
+GetMaster(DeviceIntPtr dev, int which)
+{
+    DeviceIntPtr master;
+
+    if (IsMaster(dev))
+        master = dev;
+    else
+        master = dev->master;
+
+    if (master && which != MASTER_ATTACHED)
+    {
+        if (which == MASTER_KEYBOARD)
+        {
+            if (master->type != MASTER_KEYBOARD)
+                master = GetPairedDevice(master);
+        } else
+        {
+            if (master->type != MASTER_POINTER)
+                master = GetPairedDevice(master);
+        }
+    }
+
+    return master;
+}
+
+/**
+ * Create a new device pair (== one pointer, one keyboard device).
+ * Only allocates the devices, you will need to call ActivateDevice() and
+ * EnableDevice() manually.
+ * Either a master or a slave device can be created depending on
+ * the value for master.
+ */
+int
+AllocDevicePair (ClientPtr client, char* name,
+                 DeviceIntPtr* ptr,
+                 DeviceIntPtr* keybd,
+                 DeviceProc ptr_proc,
+                 DeviceProc keybd_proc,
+                 Bool master)
+{
+    DeviceIntPtr pointer;
+    DeviceIntPtr keyboard;
+    *ptr = *keybd = NULL;
+
+    pointer = AddInputDevice(client, ptr_proc, TRUE);
+    if (!pointer)
+        return BadAlloc;
+
+    if (asprintf(&pointer->name, "%s pointer", name) == -1) {
+        pointer->name = NULL;
+        RemoveDevice(pointer, FALSE);
+        return BadAlloc;
+    }
+
+    pointer->public.processInputProc = ProcessOtherEvent;
+    pointer->public.realInputProc = ProcessOtherEvent;
+    XkbSetExtension(pointer, ProcessPointerEvent);
+    pointer->deviceGrab.ActivateGrab = ActivatePointerGrab;
+    pointer->deviceGrab.DeactivateGrab = DeactivatePointerGrab;
+    pointer->coreEvents = TRUE;
+    pointer->spriteInfo->spriteOwner = TRUE;
+
+    pointer->lastSlave = NULL;
+    pointer->last.slave = NULL;
+    pointer->type = (master) ? MASTER_POINTER : SLAVE;
+
+    keyboard = AddInputDevice(client, keybd_proc, TRUE);
+    if (!keyboard)
+    {
+        RemoveDevice(pointer, FALSE);
+        return BadAlloc;
+    }
+
+    if (asprintf(&keyboard->name, "%s keyboard", name) == -1) {
+        keyboard->name = NULL;
+        RemoveDevice(keyboard, FALSE);
+        RemoveDevice(pointer, FALSE);
+        return BadAlloc;
+    }
+
+    keyboard->public.processInputProc = ProcessOtherEvent;
+    keyboard->public.realInputProc = ProcessOtherEvent;
+    XkbSetExtension(keyboard, ProcessKeyboardEvent);
+    keyboard->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+    keyboard->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
+    keyboard->coreEvents = TRUE;
+    keyboard->spriteInfo->spriteOwner = FALSE;
+
+    keyboard->lastSlave = NULL;
+    keyboard->last.slave = NULL;
+    keyboard->type = (master) ? MASTER_KEYBOARD : SLAVE;
+
+    /* The ClassesRec stores the device classes currently not used. */
+    pointer->unused_classes = calloc(1, sizeof(ClassesRec));
+    keyboard->unused_classes = calloc(1, sizeof(ClassesRec));
+
+    *ptr = pointer;
+    *keybd = keyboard;
+
+    return Success;
+}
+
+/**
+ * Return Relative or Absolute for the device.
+ */
+int valuator_get_mode(DeviceIntPtr dev, int axis)
+{
+    return (dev->valuator->axes[axis].mode & DeviceMode);
+}
+
+/**
+ * Set the given mode for the axis. If axis is VALUATOR_MODE_ALL_AXES, then
+ * set the mode for all axes.
+ */
+void valuator_set_mode(DeviceIntPtr dev, int axis, int mode)
+{
+    if (axis != VALUATOR_MODE_ALL_AXES)
+        dev->valuator->axes[axis].mode = mode;
+    else {
+        int i;
+        for (i = 0; i < dev->valuator->numAxes; i++)
+            dev->valuator->axes[i].mode = mode;
+    }
+}
diff --git a/xorg-server/dix/window.c b/xorg-server/dix/window.c
index 3668370b3..cd28d054a 100644
--- a/xorg-server/dix/window.c
+++ b/xorg-server/dix/window.c
@@ -116,6 +116,7 @@ Equipment Corporation.
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "servermd.h"
+#include "mivalidate.h"
 #ifdef PANORAMIX
 #include "panoramiX.h"
 #include "panoramiXsrv.h"
@@ -3684,3 +3685,105 @@ WindowParentHasDeviceCursor(WindowPtr pWin,
     }
     return FALSE;
 }
+
+/*
+ * SetRootClip --
+ *	Enable or disable rendering to the screen by
+ *	setting the root clip list and revalidating
+ *	all of the windows
+ */
+void
+SetRootClip(ScreenPtr pScreen, Bool enable)
+{
+    WindowPtr	pWin = pScreen->root;
+    WindowPtr	pChild;
+    Bool	WasViewable;
+    Bool	anyMarked = FALSE;
+    WindowPtr   pLayerWin;
+    BoxRec	box;
+
+    if (!pWin)
+	return;
+    WasViewable = (Bool)(pWin->viewable);
+    if (WasViewable)
+    {
+	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
+	{
+	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
+						     pChild,
+						     &pLayerWin);
+	}
+	(*pScreen->MarkWindow) (pWin);
+	anyMarked = TRUE;
+	if (pWin->valdata)
+	{
+	    if (HasBorder (pWin))
+	    {
+		RegionPtr	borderVisible;
+
+		borderVisible = RegionCreate(NullBox, 1);
+		RegionSubtract(borderVisible,
+				&pWin->borderClip, &pWin->winSize);
+		pWin->valdata->before.borderVisible = borderVisible;
+	    }
+	    pWin->valdata->before.resized = TRUE;
+	}
+    }
+
+    /*
+     * Use REGION_BREAK to avoid optimizations in ValidateTree
+     * that assume the root borderClip can't change well, normally
+     * it doesn't...)
+     */
+    if (enable)
+    {
+	box.x1 = 0;
+	box.y1 = 0;
+	box.x2 = pScreen->width;
+	box.y2 = pScreen->height;
+	RegionInit(&pWin->winSize, &box, 1);
+	RegionInit(&pWin->borderSize, &box, 1);
+	if (WasViewable)
+	    RegionReset(&pWin->borderClip, &box);
+	pWin->drawable.width = pScreen->width;
+	pWin->drawable.height = pScreen->height;
+	RegionBreak(&pWin->clipList);
+    }
+    else
+    {
+	RegionEmpty(&pWin->borderClip);
+	RegionBreak(&pWin->clipList);
+    }
+
+    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
+
+    if (WasViewable)
+    {
+	if (pWin->firstChild)
+	{
+	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
+							   pWin->firstChild,
+							   (WindowPtr *)NULL);
+	}
+	else
+	{
+	    (*pScreen->MarkWindow) (pWin);
+	    anyMarked = TRUE;
+	}
+
+
+	if (anyMarked)
+	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
+    }
+
+    if (WasViewable)
+    {
+	if (anyMarked)
+	    (*pScreen->HandleExposures)(pWin);
+	if (anyMarked && pScreen->PostValidateTree)
+	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
+    }
+    if (pWin->realized)
+	WindowsRestructured ();   
+    FlushAllOutput();
+}
diff --git a/xorg-server/glx/glapi.c b/xorg-server/glx/glapi.c
index 209ae50c0..19576a775 100644
--- a/xorg-server/glx/glapi.c
+++ b/xorg-server/glx/glapi.c
@@ -184,11 +184,11 @@ static GLint NoOpUnused(void)
 /*@{*/
 #if defined(GLX_USE_TLS)
 
-PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch
+PUBLIC TLS struct _glapi_table * _glapi_tls_Dispatch
     __attribute__((tls_model("initial-exec")))
     = (struct _glapi_table *) __glapi_noop_table;
 
-PUBLIC __thread void * _glapi_tls_Context
+PUBLIC TLS void * _glapi_tls_Context
     __attribute__((tls_model("initial-exec")));
 
 PUBLIC const struct _glapi_table *_glapi_Dispatch = NULL;
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 80b53aa92..dec8328cd 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -83,7 +83,7 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 const extern void *_glapi_Context;
 const extern struct _glapi_table *_glapi_Dispatch;
 
-extern __thread void * _glapi_tls_Context
+extern TLS void * _glapi_tls_Context
     __attribute__((tls_model("initial-exec")));
 
 # define GET_CURRENT_CONTEXT(C)  GLcontext *C = (GLcontext *) _glapi_tls_Context
diff --git a/xorg-server/glx/glthread.h b/xorg-server/glx/glthread.h
index 28793fcc7..140e2aa8e 100644
--- a/xorg-server/glx/glthread.h
+++ b/xorg-server/glx/glthread.h
@@ -233,7 +233,7 @@ _glthread_SetTSD(_glthread_TSD *, void *);
 
 #if defined(GLX_USE_TLS)
 
-extern __thread struct _glapi_table * _glapi_tls_Dispatch
+extern TLS struct _glapi_table * _glapi_tls_Dispatch
     __attribute__((tls_model("initial-exec")));
 
 #define GET_DISPATCH() _glapi_tls_Dispatch
diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index 7f42248c0..f034ce463 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -1,1278 +1,1189 @@
-/*

- * Copyright © 1999 Keith Packard

- *

- * 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, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD 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_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-#include <mivalidate.h>

-#include <dixstruct.h>

-#include "privates.h"

-#ifdef RANDR

-#include <randrstr.h>

-#endif

-

-#ifdef XV

-#include "kxv.h"

-#endif

-

-#ifdef DPMSExtension

-#include "dpmsproc.h"

-#endif

-

-#ifdef HAVE_EXECINFO_H

-#include <execinfo.h>

-#endif

-

-#include <signal.h>

-

-typedef struct _kdDepths {

-    CARD8   depth;

-    CARD8   bpp;

-} KdDepths;

-

-KdDepths    kdDepths[] = {

-    { 1, 1 },

-    { 4, 4 },

-    { 8, 8 },

-    { 15, 16 },

-    { 16, 16 },

-    { 24, 32 },

-    { 32, 32 }

-};

-

-#define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))

-

-#define KD_DEFAULT_BUTTONS 5

-

-DevPrivateKeyRec    kdScreenPrivateKeyRec;

-unsigned long	    kdGeneration;

-

-Bool                kdVideoTest;

-unsigned long       kdVideoTestTime;

-Bool		    kdEmulateMiddleButton;

-Bool		    kdRawPointerCoordinates;

-Bool		    kdDisableZaphod;

-Bool                kdAllowZap;

-Bool		    kdEnabled;

-int		    kdSubpixelOrder;

-int		    kdVirtualTerminal = -1;

-Bool		    kdSwitchPending;

-char		    *kdSwitchCmd;

-DDXPointRec	    kdOrigin;

-Bool		    kdHasPointer = FALSE;

-Bool		    kdHasKbd = FALSE;

-

-static Bool         kdCaughtSignal = FALSE;

-

-/*

- * Carry arguments from InitOutput through driver initialization

- * to KdScreenInit

- */

-

-KdOsFuncs	*kdOsFuncs;

-

-void

-KdSetRootClip (ScreenPtr pScreen, BOOL enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable;

-    Bool	anyMarked = FALSE;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (!pWin)

-	return;

-    WasViewable = (Bool)(pWin->viewable);

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	pWin->drawable.width = pScreen->width;

-	pWin->drawable.height = pScreen->height;

-	RegionInit(&pWin->winSize, &box, 1);

-	RegionInit(&pWin->borderSize, &box, 1);

-	RegionReset(&pWin->borderClip, &box);

-	RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-}

-

-void

-KdDisableScreen (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-

-    if (!pScreenPriv->enabled)

-	return;

-    if (!pScreenPriv->closed)

-	KdSetRootClip (pScreen, FALSE);

-    KdDisableColormap (pScreen);

-    if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->disableAccel)

-	(*pScreenPriv->card->cfuncs->disableAccel) (pScreen);

-    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->disableCursor)

-	(*pScreenPriv->card->cfuncs->disableCursor) (pScreen);

-    if (pScreenPriv->card->cfuncs->dpms)

-	(*pScreenPriv->card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);

-    pScreenPriv->enabled = FALSE;

-    if(pScreenPriv->card->cfuncs->disable)

-        (*pScreenPriv->card->cfuncs->disable) (pScreen);

-}

-

-static void

-KdDoSwitchCmd (char *reason)

-{

-    if (kdSwitchCmd)

-    {

-	char    *command = malloc(strlen (kdSwitchCmd) +

-				   1 +

-				   strlen (reason) +

-				   1);

-	if (!command)

-	    return;

-	strcpy (command, kdSwitchCmd);

-	strcat (command, " ");

-	strcat (command, reason);

-	system (command);

-	free(command);

-    }

-}

-

-void

-KdSuspend (void)

-{

-    KdCardInfo	    *card;

-    KdScreenInfo    *screen;

-

-    if (kdEnabled)

-    {

-	for (card = kdCardInfo; card; card = card->next)

-	{

-	    for (screen = card->screenList; screen; screen = screen->next)

-		if (screen->mynum == card->selected && screen->pScreen)

-		    KdDisableScreen (screen->pScreen);

-	    if (card->driver && card->cfuncs->restore)

-		(*card->cfuncs->restore) (card);

-	}

-	KdDisableInput ();

-	KdDoSwitchCmd ("suspend");

-    }

-}

-

-void

-KdDisableScreens (void)

-{

-    KdSuspend ();

-    if (kdEnabled)

-    {

-        if (kdOsFuncs->Disable)

-            (*kdOsFuncs->Disable) ();

-	kdEnabled = FALSE;

-    }

-}

-

-Bool

-KdEnableScreen (ScreenPtr pScreen)

-{

-    KdScreenPriv (pScreen);

-

-    if (pScreenPriv->enabled)

-	return TRUE;

-    if(pScreenPriv->card->cfuncs->enable)

-	if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))

-	    return FALSE;

-    pScreenPriv->enabled = TRUE;

-    pScreenPriv->dpmsState = KD_DPMS_NORMAL;

-    pScreenPriv->card->selected = pScreenPriv->screen->mynum;

-    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->enableCursor)

-	(*pScreenPriv->card->cfuncs->enableCursor) (pScreen);

-    if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->enableAccel)

-	(*pScreenPriv->card->cfuncs->enableAccel) (pScreen);

-    KdEnableColormap (pScreen);

-    KdSetRootClip (pScreen, TRUE);

-    if (pScreenPriv->card->cfuncs->dpms)

-	(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);

-    return TRUE;

-}

-

-void

-KdResume (void)

-{

-    KdCardInfo	    *card;

-    KdScreenInfo    *screen;

-

-    if (kdEnabled)

-    {

-	KdDoSwitchCmd ("resume");

-	for (card = kdCardInfo; card; card = card->next)

-	{

-	    if(card->cfuncs->preserve)

-		(*card->cfuncs->preserve) (card);

-	    for (screen = card->screenList; screen; screen = screen->next)

-		if (screen->mynum == card->selected && screen->pScreen)

-		    KdEnableScreen (screen->pScreen);

-	}

-	KdEnableInput ();

-	KdReleaseAllKeys ();

-    }

-}

-

-void

-KdEnableScreens (void)

-{

-    if (!kdEnabled)

-    {

-	kdEnabled = TRUE;

-        if (kdOsFuncs->Enable)

-            (*kdOsFuncs->Enable) ();

-    }

-    KdResume ();

-}

-

-void

-KdProcessSwitch (void)

-{

-    if (kdEnabled)

-	KdDisableScreens ();

-    else

-	KdEnableScreens ();

-}

-

-void

-AbortDDX(void)

-{

-    KdDisableScreens ();

-    if (kdOsFuncs)

-    {

-	if (kdEnabled && kdOsFuncs->Disable)

-	    (*kdOsFuncs->Disable) ();

-        if (kdOsFuncs->Fini)

-            (*kdOsFuncs->Fini) ();

-	KdDoSwitchCmd ("stop");

-    }

-

-    if (kdCaughtSignal)

-        OsAbort();

-}

-

-void

-ddxGiveUp (void)

-{

-    AbortDDX ();

-}

-

-Bool	kdDumbDriver;

-Bool	kdSoftCursor;

-

-char *

-KdParseFindNext (char *cur, char *delim, char *save, char *last)

-{

-    while (*cur && !strchr (delim, *cur))

-    {

-	*save++ = *cur++;

-    }

-    *save = 0;

-    *last = *cur;

-    if (*cur)

-	cur++;

-    return cur;

-}

-

-Rotation

-KdAddRotation (Rotation a, Rotation b)

-{

-    Rotation	rotate = (a & RR_Rotate_All) * (b & RR_Rotate_All);

-    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);

-

-    if (rotate > RR_Rotate_270)

-	rotate /= (RR_Rotate_270 * RR_Rotate_90);

-    return reflect | rotate;

-}

-

-Rotation

-KdSubRotation (Rotation a, Rotation b)

-{

-    Rotation	rotate = (a & RR_Rotate_All) * 16 / (b & RR_Rotate_All);

-    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);

-

-    if (rotate > RR_Rotate_270)

-	rotate /= (RR_Rotate_270 * RR_Rotate_90);

-    return reflect | rotate;

-}

-

-void

-KdParseScreen (KdScreenInfo *screen,

-	       char	    *arg)

-{

-    char    delim;

-    char    save[1024];

-    int	    i;

-    int	    pixels, mm;

-

-    screen->dumb = kdDumbDriver;

-    screen->softCursor = kdSoftCursor;

-    screen->origin = kdOrigin;

-    screen->randr = RR_Rotate_0;

-    screen->width = 0;

-    screen->height = 0;

-    screen->width_mm = 0;

-    screen->height_mm = 0;

-    screen->subpixel_order = kdSubpixelOrder;

-    screen->rate = 0;

-    screen->fb.depth = 0;

-    if (!arg)

-	return;

-    if (strlen (arg) >= sizeof (save))

-	return;

-

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

-    {

-	arg = KdParseFindNext (arg, "x/@XY", save, &delim);

-	if (!save[0])

-	    return;

-

-	pixels = atoi(save);

-	mm = 0;

-

-	if (delim == '/')

-	{

-	    arg = KdParseFindNext (arg, "x@XY", save, &delim);

-	    if (!save[0])

-		return;

-	    mm = atoi(save);

-	}

-

-	if (i == 0)

-	{

-	    screen->width = pixels;

-	    screen->width_mm = mm;

-	}

-	else

-	{

-	    screen->height = pixels;

-	    screen->height_mm = mm;

-	}

-	if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y')

-	    return;

-    }

-

-    kdOrigin.x += screen->width;

-    kdOrigin.y = 0;

-    kdDumbDriver = FALSE;

-    kdSoftCursor = FALSE;

-    kdSubpixelOrder = SubPixelUnknown;

-

-    if (delim == '@')

-    {

-	arg = KdParseFindNext (arg, "xXY", save, &delim);

-	if (save[0])

-	{

-	    int	    rotate = atoi (save);

-	    if (rotate < 45)

-		screen->randr = RR_Rotate_0;

-	    else if (rotate < 135)

-		screen->randr = RR_Rotate_90;

-	    else if (rotate < 225)

-		screen->randr = RR_Rotate_180;

-	    else if (rotate < 315)

-		screen->randr = RR_Rotate_270;

-	    else

-		screen->randr = RR_Rotate_0;

-	}

-    }

-    if (delim == 'X')

-    {

-	arg = KdParseFindNext (arg, "xY", save, &delim);

-	screen->randr |= RR_Reflect_X;

-    }

-

-    if (delim == 'Y')

-    {

-	arg = KdParseFindNext (arg, "xY", save, &delim);

-	screen->randr |= RR_Reflect_Y;

-    }

-

-    arg = KdParseFindNext (arg, "x/,", save, &delim);

-    if (save[0])

-    {

-	screen->fb.depth = atoi(save);

-	if (delim == '/')

-	{

-	    arg = KdParseFindNext (arg, "x,", save, &delim);

-	    if (save[0])

-		screen->fb.bitsPerPixel = atoi (save);

-	}

-	else

-	    screen->fb.bitsPerPixel = 0;

-    }

-

-    if (delim == 'x')

-    {

-	arg = KdParseFindNext (arg, "x", save, &delim);

-	if (save[0])

-	    screen->rate = atoi(save);

-    }

-}

-

-/*

- * Mouse argument syntax:

- *

- *  device,protocol,options...

- *

- *  Options are any of:

- *	1-5	    n button mouse

- *	2button	    emulate middle button

- *	{NMO}	    Reorder buttons

- */

-

-void

-KdParseRgba (char *rgba)

-{

-    if (!strcmp (rgba, "rgb"))

-	kdSubpixelOrder = SubPixelHorizontalRGB;

-    else if (!strcmp (rgba, "bgr"))

-	kdSubpixelOrder = SubPixelHorizontalBGR;

-    else if (!strcmp (rgba, "vrgb"))

-	kdSubpixelOrder = SubPixelVerticalRGB;

-    else if (!strcmp (rgba, "vbgr"))

-	kdSubpixelOrder = SubPixelVerticalBGR;

-    else if (!strcmp (rgba, "none"))

-	kdSubpixelOrder = SubPixelNone;

-    else

-	kdSubpixelOrder = SubPixelUnknown;

-}

-

-void

-KdUseMsg (void)

-{

-    ErrorF("\nTinyX Device Dependent Usage:\n");

-    ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]]  Specify screen characteristics\n");

-    ErrorF("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");

-    ErrorF("-mouse driver [,n,,options]    Specify the pointer driver and its options (n is the number of buttons)\n");

-    ErrorF("-keybd driver [,,options]      Specify the keyboard driver and its options\n");

-    ErrorF("-zaphod          Disable cursor screen switching\n");

-    ErrorF("-2button         Emulate 3 button mouse\n");

-    ErrorF("-3button         Disable 3 button mouse emulation\n");

-    ErrorF("-rawcoord        Don't transform pointer coordinates on rotation\n");

-    ErrorF("-dumb            Disable hardware acceleration\n");

-    ErrorF("-softCursor      Force software cursor\n");

-    ErrorF("-videoTest       Start the server, pause momentarily and exit\n");

-    ErrorF("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");

-    ErrorF("-switchCmd       Command to execute on vt switch\n");

-    ErrorF("-zap             Terminate server on Ctrl+Alt+Backspace\n");

-    ErrorF("vtxx             Use virtual terminal xx instead of the next available\n");

-}

-

-int

-KdProcessArgument (int argc, char **argv, int i)

-{

-    KdCardInfo	    *card;

-    KdScreenInfo    *screen;

-

-    if (!strcmp (argv[i], "-screen"))

-    {

-	if ((i+1) < argc)

-	{

-	    card = KdCardInfoLast ();

-	    if (!card)

-	    {

-		InitCard (0);

-		card = KdCardInfoLast ();

-	    }

-	    if (card) {

-		screen = KdScreenInfoAdd (card);

-		KdParseScreen (screen, argv[i+1]);

-	    } else

-		ErrorF("No matching card found!\n");

-	}

-	else

-	    UseMsg ();

-	return 2;

-    }

-    if (!strcmp (argv[i], "-zaphod"))

-    {

-	kdDisableZaphod = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-zap"))

-    {

-	kdAllowZap = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-3button"))

-    {

-	kdEmulateMiddleButton = FALSE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-2button"))

-    {

-	kdEmulateMiddleButton = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-rawcoord"))

-    {

-	kdRawPointerCoordinates = 1;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-dumb"))

-    {

-	kdDumbDriver = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-softCursor"))

-    {

-	kdSoftCursor = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-videoTest"))

-    {

-	kdVideoTest = TRUE;

-	return 1;

-    }

-    if (!strcmp (argv[i], "-origin"))

-    {

-	if ((i+1) < argc)

-	{

-	    char    *x = argv[i+1];

-	    char    *y = strchr (x, ',');

-	    if (x)

-		kdOrigin.x = atoi (x);

-	    else

-		kdOrigin.x = 0;

-	    if (y)

-		kdOrigin.y = atoi(y+1);

-	    else

-		kdOrigin.y = 0;

-	}

-	else

-	    UseMsg ();

-	return 2;

-    }

-    if (!strcmp (argv[i], "-rgba"))

-    {

-	if ((i+1) < argc)

-	    KdParseRgba (argv[i+1]);

-	else

-	    UseMsg ();

-	return 2;

-    }

-    if (!strcmp (argv[i], "-switchCmd"))

-    {

-	if ((i+1) < argc)

-	    kdSwitchCmd = argv[i+1];

-	else

-	    UseMsg ();

-	return 2;

-    }

-    if (!strncmp (argv[i], "vt", 2) &&

-	sscanf (argv[i], "vt%2d", &kdVirtualTerminal) == 1)

-    {

-	return 1;

-    }

-    if (!strcmp (argv[i], "-mouse") ||

-        !strcmp (argv[i], "-pointer")) {

-        if (i + 1 >= argc)

-            UseMsg();

-        KdAddConfigPointer(argv[i + 1]);

-	kdHasPointer = TRUE;

-        return 2;

-    }

-    if (!strcmp (argv[i], "-keybd")) {

-        if (i + 1 >= argc)

-            UseMsg();

-        KdAddConfigKeyboard(argv[i + 1]);

-	kdHasKbd = TRUE;

-        return 2;

-    }

-

-    return 0;

-}

-

-/*

- * These are getting tossed in here until I can think of where

- * they really belong

- */

-

-void

-KdOsInit (KdOsFuncs *pOsFuncs)

-{

-    kdOsFuncs = pOsFuncs;

-    if (pOsFuncs)

-    {

-	if (serverGeneration == 1)

-	{

-	    KdDoSwitchCmd ("start");

-            if (pOsFuncs->Init)

-                (*pOsFuncs->Init) ();

-	}

-    }

-}

-

-Bool

-KdAllocatePrivates (ScreenPtr pScreen)

-{

-    KdPrivScreenPtr	pScreenPriv;

-

-    if (kdGeneration != serverGeneration)

-	kdGeneration = serverGeneration;

-

-    if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    pScreenPriv = calloc(1, sizeof (*pScreenPriv));

-    if (!pScreenPriv)

-	return FALSE;

-    KdSetScreenPriv (pScreen, pScreenPriv);

-    return TRUE;

-}

-

-Bool

-KdCreateScreenResources (ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    KdCardInfo	    *card = pScreenPriv->card;

-    Bool ret;

-

-    pScreen->CreateScreenResources = pScreenPriv->CreateScreenResources;

-    if(pScreen->CreateScreenResources)

-	ret = (*pScreen->CreateScreenResources) (pScreen);

-    else

-	ret= -1;

-    pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;

-    pScreen->CreateScreenResources = KdCreateScreenResources;

-    if (ret && card->cfuncs->createRes)

-	ret = (*card->cfuncs->createRes) (pScreen);

-    return ret;

-}

-

-Bool

-KdCloseScreen (int index, ScreenPtr pScreen)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo    *screen = pScreenPriv->screen;

-    KdCardInfo	    *card = pScreenPriv->card;

-    Bool	    ret;

-

-    pScreenPriv->closed = TRUE;

-    pScreen->CloseScreen = pScreenPriv->CloseScreen;

-    if(pScreen->CloseScreen)

-        ret = (*pScreen->CloseScreen) (index, pScreen);

-    else

-	ret = TRUE;

-

-    if (pScreenPriv->dpmsState != KD_DPMS_NORMAL)

-	(*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);

-

-    if (screen->mynum == card->selected)

-	KdDisableScreen (pScreen);

-

-    /*

-     * Restore video hardware when last screen is closed

-     */

-    if (screen == card->screenList)

-    {

-	if (kdEnabled && card->cfuncs->restore)

-	    (*card->cfuncs->restore) (card);

-    }

-

-    if (!pScreenPriv->screen->dumb && card->cfuncs->finiAccel)

-	(*card->cfuncs->finiAccel) (pScreen);

-

-    if (!pScreenPriv->screen->softCursor && card->cfuncs->finiCursor)

-	(*card->cfuncs->finiCursor) (pScreen);

-

-    if(card->cfuncs->scrfini)

-        (*card->cfuncs->scrfini) (screen);

-

-    /*

-     * Clean up card when last screen is closed, DIX closes them in

-     * reverse order, thus we check for when the first in the list is closed

-     */

-    if (screen == card->screenList)

-    {

-	if(card->cfuncs->cardfini)

-	    (*card->cfuncs->cardfini) (card);

-	/*

-	 * Clean up OS when last card is closed

-	 */

-	if (card == kdCardInfo)

-	{

-	    if (kdEnabled)

-	    {

-		kdEnabled = FALSE;

-		if(kdOsFuncs->Disable)

-		    (*kdOsFuncs->Disable) ();

-	    }

-	}

-    }

-

-    pScreenPriv->screen->pScreen = 0;

-

-    free((pointer) pScreenPriv);

-    return ret;

-}

-

-Bool

-KdSaveScreen (ScreenPtr pScreen, int on)

-{

-    KdScreenPriv(pScreen);

-    int	    dpmsState;

-

-    if (!pScreenPriv->card->cfuncs->dpms)

-	return FALSE;

-

-    dpmsState = pScreenPriv->dpmsState;

-    switch (on) {

-    case SCREEN_SAVER_OFF:

-	dpmsState = KD_DPMS_NORMAL;

-	break;

-    case SCREEN_SAVER_ON:

-	if (dpmsState == KD_DPMS_NORMAL)

-	    dpmsState = KD_DPMS_NORMAL+1;

-	break;

-    case SCREEN_SAVER_CYCLE:

-	if (dpmsState < KD_DPMS_MAX)

-	    dpmsState++;

-	break;

-    case SCREEN_SAVER_FORCER:

-	break;

-    }

-    if (dpmsState != pScreenPriv->dpmsState)

-    {

-	if (pScreenPriv->enabled)

-	    (*pScreenPriv->card->cfuncs->dpms) (pScreen, dpmsState);

-	pScreenPriv->dpmsState = dpmsState;

-    }

-    return TRUE;

-}

-

-static Bool

-KdCreateWindow (WindowPtr pWin)

-{

-#ifndef PHOENIX

-    if (!pWin->parent)

-    {

-	KdScreenPriv(pWin->drawable.pScreen);

-

-	if (!pScreenPriv->enabled)

-	{

-	    RegionEmpty(&pWin->borderClip);

-	    RegionBreak(&pWin->clipList);

-	}

-    }

-#endif

-    return fbCreateWindow (pWin);

-}

-

-void

-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr)

-{

-    KdScreenPriv(pScreen);

-    KdScreenInfo	*screen = pScreenPriv->screen;

-    int			subpixel_order = screen->subpixel_order;

-    Rotation		subpixel_dir;

-    int			i;

-

-    static struct {

-	int	    subpixel_order;

-	Rotation    direction;

-    } orders[] = {

-	{ SubPixelHorizontalRGB, 	RR_Rotate_0 },

-	{ SubPixelHorizontalBGR,	RR_Rotate_180 },

-	{ SubPixelVerticalRGB,		RR_Rotate_270 },

-	{ SubPixelVerticalBGR,		RR_Rotate_90 },

-    };

-

-    static struct {

-	int	bit;

-	int	normal;

-	int	reflect;

-    } reflects[] = {

-	{ RR_Reflect_X, SubPixelHorizontalRGB,	SubPixelHorizontalBGR },

-	{ RR_Reflect_X, SubPixelHorizontalBGR,	SubPixelHorizontalRGB },

-	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalBGR },

-	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalRGB },

-    };

-

-    /* map subpixel to direction */

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

-	if (orders[i].subpixel_order == subpixel_order)

-	    break;

-    if (i < 4)

-    {

-	subpixel_dir = KdAddRotation (randr & RR_Rotate_All, orders[i].direction);

-

-	/* map back to subpixel order */

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

-	    if (orders[i].direction & subpixel_dir)

-	    {

-		subpixel_order = orders[i].subpixel_order;

-		break;

-	    }

-	/* reflect */

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

-	    if ((randr & reflects[i].bit) &&

-		reflects[i].normal == subpixel_order)

-	    {

-		subpixel_order = reflects[i].reflect;

-		break;

-	    }

-    }

-    PictureSetSubpixelOrder (pScreen, subpixel_order);

-}

-

-/* Pass through AddScreen, which doesn't take any closure */

-static KdScreenInfo *kdCurrentScreen;

-

-Bool

-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)

-{

-    KdScreenInfo	*screen = kdCurrentScreen;

-    KdCardInfo		*card = screen->card;

-    KdPrivScreenPtr	pScreenPriv;

-    /*

-     * note that screen->fb is set up for the nominal orientation

-     * of the screen; that means if randr is rotated, the values

-     * there should reflect a rotated frame buffer (or shadow).

-     */

-    Bool		rotated = (screen->randr & (RR_Rotate_90|RR_Rotate_270)) != 0;

-    int			width, height, *width_mmp, *height_mmp;

-

-    KdAllocatePrivates (pScreen);

-

-    pScreenPriv = KdGetScreenPriv(pScreen);

-

-    if (!rotated)

-    {

-	width = screen->width;

-	height = screen->height;

-	width_mmp = &screen->width_mm;

-	height_mmp = &screen->height_mm;

-    }

-    else

-    {

-	width = screen->height;

-	height = screen->width;

-	width_mmp = &screen->height_mm;

-	height_mmp = &screen->width_mm;

-    }

-    screen->pScreen = pScreen;

-    pScreenPriv->screen = screen;

-    pScreenPriv->card = card;

-    pScreenPriv->bytesPerPixel = screen->fb.bitsPerPixel >> 3;

-    pScreenPriv->dpmsState = KD_DPMS_NORMAL;

-    pScreen->x = screen->origin.x;

-    pScreen->y = screen->origin.y;

-

-    if (!monitorResolution)

-	monitorResolution = 75;

-    /*

-     * This is done in this order so that backing store wraps

-     * our GC functions; fbFinishScreenInit initializes MI

-     * backing store

-     */

-    if (!fbSetupScreen (pScreen,

-			screen->fb.frameBuffer,

-			width, height,

-			monitorResolution, monitorResolution,

-			screen->fb.pixelStride,

-			screen->fb.bitsPerPixel))

-    {

-	return FALSE;

-    }

-

-    /*

-     * Set colormap functions

-     */

-    pScreen->InstallColormap	= KdInstallColormap;

-    pScreen->UninstallColormap	= KdUninstallColormap;

-    pScreen->ListInstalledColormaps = KdListInstalledColormaps;

-    pScreen->StoreColors	= KdStoreColors;

-

-    pScreen->SaveScreen		= KdSaveScreen;

-    pScreen->CreateWindow	= KdCreateWindow;

-

-    if (!fbFinishScreenInit (pScreen,

-			     screen->fb.frameBuffer,

-			     width, height,

-			     monitorResolution, monitorResolution,

-			     screen->fb.pixelStride,

-			     screen->fb.bitsPerPixel))

-    {

-	return FALSE;

-    }

-

-    /*

-     * Fix screen sizes; for some reason mi takes dpi instead of mm.

-     * Rounding errors are annoying

-     */

-    if (*width_mmp)

-	pScreen->mmWidth = *width_mmp;

-    else

-	*width_mmp = pScreen->mmWidth;

-    if (*height_mmp)

-	pScreen->mmHeight = *height_mmp;

-    else

-	*height_mmp = pScreen->mmHeight;

-

-    /*

-     * Plug in our own block/wakeup handlers.

-     * miScreenInit installs NoopDDA in both places

-     */

-    pScreen->BlockHandler	= KdBlockHandler;

-    pScreen->WakeupHandler	= KdWakeupHandler;

-

-    if (!fbPictureInit (pScreen, 0, 0))

-	return FALSE;

-    if (card->cfuncs->initScreen)

-	if (!(*card->cfuncs->initScreen) (pScreen))

-	    return FALSE;

-

-    if (!screen->dumb && card->cfuncs->initAccel)

-	if (!(*card->cfuncs->initAccel) (pScreen))

-	    screen->dumb = TRUE;

-

-    if (card->cfuncs->finishInitScreen)

-	if (!(*card->cfuncs->finishInitScreen) (pScreen))

-	    return FALSE;

-

-#if 0

-    fbInitValidateTree (pScreen);

-#endif

-

-    /*

-     * Wrap CloseScreen, the order now is:

-     *	KdCloseScreen

-     *	miBSCloseScreen

-     *	fbCloseScreen

-     */

-    pScreenPriv->CloseScreen = pScreen->CloseScreen;

-    pScreen->CloseScreen = KdCloseScreen;

-

-    pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;

-    pScreen->CreateScreenResources = KdCreateScreenResources;

-

-    if (screen->softCursor ||

-	!card->cfuncs->initCursor ||

-	!(*card->cfuncs->initCursor) (pScreen))

-    {

-	/* Use MI for cursor display and event queueing. */

-	screen->softCursor = TRUE;

-	miDCInitialize(pScreen, &kdPointerScreenFuncs);

-    }

-

-

-    if (!fbCreateDefColormap (pScreen))

-    {

-	return FALSE;

-    }

-

-    KdSetSubpixelOrder (pScreen, screen->randr);

-

-    /*

-     * Enable the hardware

-     */

-    if (!kdEnabled)

-    {

-	kdEnabled = TRUE;

-	if(kdOsFuncs->Enable)

-	    (*kdOsFuncs->Enable) ();

-    }

-

-    if (screen->mynum == card->selected)

-    {

-	if(card->cfuncs->preserve)

-	    (*card->cfuncs->preserve) (card);

-	if(card->cfuncs->enable)

-	    if (!(*card->cfuncs->enable) (pScreen))

-		return FALSE;

-	pScreenPriv->enabled = TRUE;

-	if (!screen->softCursor && card->cfuncs->enableCursor)

-	    (*card->cfuncs->enableCursor) (pScreen);

-	KdEnableColormap (pScreen);

-	if (!screen->dumb && card->cfuncs->enableAccel)

-	    (*card->cfuncs->enableAccel) (pScreen);

-    }

-

-    return TRUE;

-}

-

-void

-KdInitScreen (ScreenInfo    *pScreenInfo,

-	      KdScreenInfo  *screen,

-	      int	    argc,

-	      char	    **argv)

-{

-    KdCardInfo	*card = screen->card;

-

-    (*card->cfuncs->scrinit) (screen);

-

-    if (!card->cfuncs->initAccel)

-	screen->dumb = TRUE;

-    if (!card->cfuncs->initCursor)

-	screen->softCursor = TRUE;

-}

-

-static Bool

-KdSetPixmapFormats (ScreenInfo	*pScreenInfo)

-{

-    CARD8	    depthToBpp[33];	/* depth -> bpp map */

-    KdCardInfo	    *card;

-    KdScreenInfo    *screen;

-    int		    i;

-    int		    bpp;

-    PixmapFormatRec *format;

-

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

-	depthToBpp[i] = 0;

-

-    /*

-     * Generate mappings between bitsPerPixel and depth,

-     * also ensure that all screens comply with protocol

-     * restrictions on equivalent formats for the same

-     * depth on different screens

-     */

-    for (card = kdCardInfo; card; card = card->next)

-    {

-	for (screen = card->screenList; screen; screen = screen->next)

-	{

-	    bpp = screen->fb.bitsPerPixel;

-	    if (bpp == 24)

-		bpp = 32;

-	    if (!depthToBpp[screen->fb.depth])

-		depthToBpp[screen->fb.depth] = bpp;

-	    else if (depthToBpp[screen->fb.depth] != bpp)

-		return FALSE;

-	}

-    }

-

-    /*

-     * Fill in additional formats

-     */

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

-	if (!depthToBpp[kdDepths[i].depth])

-	    depthToBpp[kdDepths[i].depth] = kdDepths[i].bpp;

-

-    pScreenInfo->imageByteOrder     = IMAGE_BYTE_ORDER;

-    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-    pScreenInfo->bitmapScanlinePad  = BITMAP_SCANLINE_PAD;

-    pScreenInfo->bitmapBitOrder     = BITMAP_BIT_ORDER;

-

-    pScreenInfo->numPixmapFormats = 0;

-

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

-    {

-	if (depthToBpp[i])

-	{

-	    format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats++];

-	    format->depth = i;

-	    format->bitsPerPixel = depthToBpp[i];

-	    format->scanlinePad = BITMAP_SCANLINE_PAD;

-	}

-    }

-

-    return TRUE;

-}

-

-static void

-KdAddScreen (ScreenInfo	    *pScreenInfo,

-	     KdScreenInfo   *screen,

-	     int	    argc,

-	     char	    **argv)

-{

-    int	    i;

-    /*

-     * Fill in fb visual type masks for this screen

-     */

-    for (i = 0; i < pScreenInfo->numPixmapFormats; i++)

-    {

-	unsigned long	visuals;

-	Pixel		rm, gm, bm;

-

-	visuals = 0;

-	rm = gm = bm = 0;

-	if (pScreenInfo->formats[i].depth == screen->fb.depth)

-	{

-	    visuals = screen->fb.visuals;

-	    rm = screen->fb.redMask;

-	    gm = screen->fb.greenMask;

-	    bm = screen->fb.blueMask;

-	}

-	fbSetVisualTypesAndMasks (pScreenInfo->formats[i].depth,

-				  visuals,

-				  8,

-				  rm, gm, bm);

-    }

-

-    kdCurrentScreen = screen;

-

-    AddScreen (KdScreenInit, argc, argv);

-}

-

-#if 0 /* This function is not used currently */

-

-int

-KdDepthToFb (ScreenPtr	pScreen, int depth)

-{

-    KdScreenPriv(pScreen);

-

-    for (fb = 0; fb <= KD_MAX_FB && pScreenPriv->screen->fb.frameBuffer; fb++)

-	if (pScreenPriv->screen->fb.depth == depth)

-	    return fb;

-}

-

-#endif

-

-static int

-KdSignalWrapper (int signum)

-{

-    kdCaughtSignal = TRUE;

-    return 1; /* use generic OS layer cleanup & abort */

-}

-

-void

-KdInitOutput (ScreenInfo    *pScreenInfo,

-	      int	    argc,

-	      char	    **argv)

-{

-    KdCardInfo	    *card;

-    KdScreenInfo    *screen;

-

-    if (!kdCardInfo)

-    {

-	InitCard (0);

-	if (!(card = KdCardInfoLast ()))

-	    FatalError("No matching cards found!\n");

-	screen = KdScreenInfoAdd (card);

-	KdParseScreen (screen, 0);

-    }

-    /*

-     * Initialize all of the screens for all of the cards

-     */

-    for (card = kdCardInfo; card; card = card->next)

-    {

-	int ret=1;

-	if(card->cfuncs->cardinit)

-		ret=(*card->cfuncs->cardinit) (card);

-	if (ret)

-	{

-	    for (screen = card->screenList; screen; screen = screen->next)

-		KdInitScreen (pScreenInfo, screen, argc, argv);

-	}

-    }

-

-    /*

-     * Merge the various pixmap formats together, this can fail

-     * when two screens share depth but not bitsPerPixel

-     */

-    if (!KdSetPixmapFormats (pScreenInfo))

-	return;

-

-    /*

-     * Add all of the screens

-     */

-    for (card = kdCardInfo; card; card = card->next)

-	for (screen = card->screenList; screen; screen = screen->next)

-	    KdAddScreen (pScreenInfo, screen, argc, argv);

-

-    OsRegisterSigWrapper(KdSignalWrapper);

-}

-

-void

-OsVendorFatalError(void)

-{

-}

-

-int

-DPMSSet(ClientPtr client, int level)

-{

-    return Success;

-}

-

-Bool

-DPMSSupported (void)

-{

-    return FALSE;

-}

+/*
+ * Copyright © 1999 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+#include <mivalidate.h>
+#include <dixstruct.h>
+#include "privates.h"
+#ifdef RANDR
+#include <randrstr.h>
+#endif
+
+#ifdef XV
+#include "kxv.h"
+#endif
+
+#ifdef DPMSExtension
+#include "dpmsproc.h"
+#endif
+
+#ifdef HAVE_EXECINFO_H
+#include <execinfo.h>
+#endif
+
+#include <signal.h>
+
+typedef struct _kdDepths {
+    CARD8   depth;
+    CARD8   bpp;
+} KdDepths;
+
+KdDepths    kdDepths[] = {
+    { 1, 1 },
+    { 4, 4 },
+    { 8, 8 },
+    { 15, 16 },
+    { 16, 16 },
+    { 24, 32 },
+    { 32, 32 }
+};
+
+#define NUM_KD_DEPTHS (sizeof (kdDepths) / sizeof (kdDepths[0]))
+
+#define KD_DEFAULT_BUTTONS 5
+
+DevPrivateKeyRec    kdScreenPrivateKeyRec;
+unsigned long	    kdGeneration;
+
+Bool                kdVideoTest;
+unsigned long       kdVideoTestTime;
+Bool		    kdEmulateMiddleButton;
+Bool		    kdRawPointerCoordinates;
+Bool		    kdDisableZaphod;
+Bool                kdAllowZap;
+Bool		    kdEnabled;
+int		    kdSubpixelOrder;
+int		    kdVirtualTerminal = -1;
+Bool		    kdSwitchPending;
+char		    *kdSwitchCmd;
+DDXPointRec	    kdOrigin;
+Bool		    kdHasPointer = FALSE;
+Bool		    kdHasKbd = FALSE;
+
+static Bool         kdCaughtSignal = FALSE;
+
+/*
+ * Carry arguments from InitOutput through driver initialization
+ * to KdScreenInit
+ */
+
+KdOsFuncs	*kdOsFuncs;
+
+void
+KdDisableScreen (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+
+    if (!pScreenPriv->enabled)
+	return;
+    if (!pScreenPriv->closed)
+	SetRootClip (pScreen, FALSE);
+    KdDisableColormap (pScreen);
+    if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->disableAccel)
+	(*pScreenPriv->card->cfuncs->disableAccel) (pScreen);
+    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->disableCursor)
+	(*pScreenPriv->card->cfuncs->disableCursor) (pScreen);
+    if (pScreenPriv->card->cfuncs->dpms)
+	(*pScreenPriv->card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
+    pScreenPriv->enabled = FALSE;
+    if(pScreenPriv->card->cfuncs->disable)
+        (*pScreenPriv->card->cfuncs->disable) (pScreen);
+}
+
+static void
+KdDoSwitchCmd (char *reason)
+{
+    if (kdSwitchCmd)
+    {
+	char    *command = malloc(strlen (kdSwitchCmd) +
+				   1 +
+				   strlen (reason) +
+				   1);
+	if (!command)
+	    return;
+	strcpy (command, kdSwitchCmd);
+	strcat (command, " ");
+	strcat (command, reason);
+	system (command);
+	free(command);
+    }
+}
+
+void
+KdSuspend (void)
+{
+    KdCardInfo	    *card;
+    KdScreenInfo    *screen;
+
+    if (kdEnabled)
+    {
+	for (card = kdCardInfo; card; card = card->next)
+	{
+	    for (screen = card->screenList; screen; screen = screen->next)
+		if (screen->mynum == card->selected && screen->pScreen)
+		    KdDisableScreen (screen->pScreen);
+	    if (card->driver && card->cfuncs->restore)
+		(*card->cfuncs->restore) (card);
+	}
+	KdDisableInput ();
+	KdDoSwitchCmd ("suspend");
+    }
+}
+
+void
+KdDisableScreens (void)
+{
+    KdSuspend ();
+    if (kdEnabled)
+    {
+        if (kdOsFuncs->Disable)
+            (*kdOsFuncs->Disable) ();
+	kdEnabled = FALSE;
+    }
+}
+
+Bool
+KdEnableScreen (ScreenPtr pScreen)
+{
+    KdScreenPriv (pScreen);
+
+    if (pScreenPriv->enabled)
+	return TRUE;
+    if(pScreenPriv->card->cfuncs->enable)
+	if (!(*pScreenPriv->card->cfuncs->enable) (pScreen))
+	    return FALSE;
+    pScreenPriv->enabled = TRUE;
+    pScreenPriv->dpmsState = KD_DPMS_NORMAL;
+    pScreenPriv->card->selected = pScreenPriv->screen->mynum;
+    if (!pScreenPriv->screen->softCursor && pScreenPriv->card->cfuncs->enableCursor)
+	(*pScreenPriv->card->cfuncs->enableCursor) (pScreen);
+    if (!pScreenPriv->screen->dumb && pScreenPriv->card->cfuncs->enableAccel)
+	(*pScreenPriv->card->cfuncs->enableAccel) (pScreen);
+    KdEnableColormap (pScreen);
+    SetRootClip (pScreen, TRUE);
+    if (pScreenPriv->card->cfuncs->dpms)
+	(*pScreenPriv->card->cfuncs->dpms) (pScreen, pScreenPriv->dpmsState);
+    return TRUE;
+}
+
+void
+KdResume (void)
+{
+    KdCardInfo	    *card;
+    KdScreenInfo    *screen;
+
+    if (kdEnabled)
+    {
+	KdDoSwitchCmd ("resume");
+	for (card = kdCardInfo; card; card = card->next)
+	{
+	    if(card->cfuncs->preserve)
+		(*card->cfuncs->preserve) (card);
+	    for (screen = card->screenList; screen; screen = screen->next)
+		if (screen->mynum == card->selected && screen->pScreen)
+		    KdEnableScreen (screen->pScreen);
+	}
+	KdEnableInput ();
+	KdReleaseAllKeys ();
+    }
+}
+
+void
+KdEnableScreens (void)
+{
+    if (!kdEnabled)
+    {
+	kdEnabled = TRUE;
+        if (kdOsFuncs->Enable)
+            (*kdOsFuncs->Enable) ();
+    }
+    KdResume ();
+}
+
+void
+KdProcessSwitch (void)
+{
+    if (kdEnabled)
+	KdDisableScreens ();
+    else
+	KdEnableScreens ();
+}
+
+void
+AbortDDX(void)
+{
+    KdDisableScreens ();
+    if (kdOsFuncs)
+    {
+	if (kdEnabled && kdOsFuncs->Disable)
+	    (*kdOsFuncs->Disable) ();
+        if (kdOsFuncs->Fini)
+            (*kdOsFuncs->Fini) ();
+	KdDoSwitchCmd ("stop");
+    }
+
+    if (kdCaughtSignal)
+        OsAbort();
+}
+
+void
+ddxGiveUp (void)
+{
+    AbortDDX ();
+}
+
+Bool	kdDumbDriver;
+Bool	kdSoftCursor;
+
+char *
+KdParseFindNext (char *cur, char *delim, char *save, char *last)
+{
+    while (*cur && !strchr (delim, *cur))
+    {
+	*save++ = *cur++;
+    }
+    *save = 0;
+    *last = *cur;
+    if (*cur)
+	cur++;
+    return cur;
+}
+
+Rotation
+KdAddRotation (Rotation a, Rotation b)
+{
+    Rotation	rotate = (a & RR_Rotate_All) * (b & RR_Rotate_All);
+    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
+
+    if (rotate > RR_Rotate_270)
+	rotate /= (RR_Rotate_270 * RR_Rotate_90);
+    return reflect | rotate;
+}
+
+Rotation
+KdSubRotation (Rotation a, Rotation b)
+{
+    Rotation	rotate = (a & RR_Rotate_All) * 16 / (b & RR_Rotate_All);
+    Rotation	reflect = (a & RR_Reflect_All) ^ (b & RR_Reflect_All);
+
+    if (rotate > RR_Rotate_270)
+	rotate /= (RR_Rotate_270 * RR_Rotate_90);
+    return reflect | rotate;
+}
+
+void
+KdParseScreen (KdScreenInfo *screen,
+	       char	    *arg)
+{
+    char    delim;
+    char    save[1024];
+    int	    i;
+    int	    pixels, mm;
+
+    screen->dumb = kdDumbDriver;
+    screen->softCursor = kdSoftCursor;
+    screen->origin = kdOrigin;
+    screen->randr = RR_Rotate_0;
+    screen->width = 0;
+    screen->height = 0;
+    screen->width_mm = 0;
+    screen->height_mm = 0;
+    screen->subpixel_order = kdSubpixelOrder;
+    screen->rate = 0;
+    screen->fb.depth = 0;
+    if (!arg)
+	return;
+    if (strlen (arg) >= sizeof (save))
+	return;
+
+    for (i = 0; i < 2; i++)
+    {
+	arg = KdParseFindNext (arg, "x/@XY", save, &delim);
+	if (!save[0])
+	    return;
+
+	pixels = atoi(save);
+	mm = 0;
+
+	if (delim == '/')
+	{
+	    arg = KdParseFindNext (arg, "x@XY", save, &delim);
+	    if (!save[0])
+		return;
+	    mm = atoi(save);
+	}
+
+	if (i == 0)
+	{
+	    screen->width = pixels;
+	    screen->width_mm = mm;
+	}
+	else
+	{
+	    screen->height = pixels;
+	    screen->height_mm = mm;
+	}
+	if (delim != 'x' && delim != '@' && delim != 'X' && delim != 'Y')
+	    return;
+    }
+
+    kdOrigin.x += screen->width;
+    kdOrigin.y = 0;
+    kdDumbDriver = FALSE;
+    kdSoftCursor = FALSE;
+    kdSubpixelOrder = SubPixelUnknown;
+
+    if (delim == '@')
+    {
+	arg = KdParseFindNext (arg, "xXY", save, &delim);
+	if (save[0])
+	{
+	    int	    rotate = atoi (save);
+	    if (rotate < 45)
+		screen->randr = RR_Rotate_0;
+	    else if (rotate < 135)
+		screen->randr = RR_Rotate_90;
+	    else if (rotate < 225)
+		screen->randr = RR_Rotate_180;
+	    else if (rotate < 315)
+		screen->randr = RR_Rotate_270;
+	    else
+		screen->randr = RR_Rotate_0;
+	}
+    }
+    if (delim == 'X')
+    {
+	arg = KdParseFindNext (arg, "xY", save, &delim);
+	screen->randr |= RR_Reflect_X;
+    }
+
+    if (delim == 'Y')
+    {
+	arg = KdParseFindNext (arg, "xY", save, &delim);
+	screen->randr |= RR_Reflect_Y;
+    }
+
+    arg = KdParseFindNext (arg, "x/,", save, &delim);
+    if (save[0])
+    {
+	screen->fb.depth = atoi(save);
+	if (delim == '/')
+	{
+	    arg = KdParseFindNext (arg, "x,", save, &delim);
+	    if (save[0])
+		screen->fb.bitsPerPixel = atoi (save);
+	}
+	else
+	    screen->fb.bitsPerPixel = 0;
+    }
+
+    if (delim == 'x')
+    {
+	arg = KdParseFindNext (arg, "x", save, &delim);
+	if (save[0])
+	    screen->rate = atoi(save);
+    }
+}
+
+/*
+ * Mouse argument syntax:
+ *
+ *  device,protocol,options...
+ *
+ *  Options are any of:
+ *	1-5	    n button mouse
+ *	2button	    emulate middle button
+ *	{NMO}	    Reorder buttons
+ */
+
+void
+KdParseRgba (char *rgba)
+{
+    if (!strcmp (rgba, "rgb"))
+	kdSubpixelOrder = SubPixelHorizontalRGB;
+    else if (!strcmp (rgba, "bgr"))
+	kdSubpixelOrder = SubPixelHorizontalBGR;
+    else if (!strcmp (rgba, "vrgb"))
+	kdSubpixelOrder = SubPixelVerticalRGB;
+    else if (!strcmp (rgba, "vbgr"))
+	kdSubpixelOrder = SubPixelVerticalBGR;
+    else if (!strcmp (rgba, "none"))
+	kdSubpixelOrder = SubPixelNone;
+    else
+	kdSubpixelOrder = SubPixelUnknown;
+}
+
+void
+KdUseMsg (void)
+{
+    ErrorF("\nTinyX Device Dependent Usage:\n");
+    ErrorF("-screen WIDTH[/WIDTHMM]xHEIGHT[/HEIGHTMM][@ROTATION][X][Y][xDEPTH/BPP[xFREQ]]  Specify screen characteristics\n");
+    ErrorF("-rgba rgb/bgr/vrgb/vbgr/none   Specify subpixel ordering for LCD panels\n");
+    ErrorF("-mouse driver [,n,,options]    Specify the pointer driver and its options (n is the number of buttons)\n");
+    ErrorF("-keybd driver [,,options]      Specify the keyboard driver and its options\n");
+    ErrorF("-zaphod          Disable cursor screen switching\n");
+    ErrorF("-2button         Emulate 3 button mouse\n");
+    ErrorF("-3button         Disable 3 button mouse emulation\n");
+    ErrorF("-rawcoord        Don't transform pointer coordinates on rotation\n");
+    ErrorF("-dumb            Disable hardware acceleration\n");
+    ErrorF("-softCursor      Force software cursor\n");
+    ErrorF("-videoTest       Start the server, pause momentarily and exit\n");
+    ErrorF("-origin X,Y      Locates the next screen in the the virtual screen (Xinerama)\n");
+    ErrorF("-switchCmd       Command to execute on vt switch\n");
+    ErrorF("-zap             Terminate server on Ctrl+Alt+Backspace\n");
+    ErrorF("vtxx             Use virtual terminal xx instead of the next available\n");
+}
+
+int
+KdProcessArgument (int argc, char **argv, int i)
+{
+    KdCardInfo	    *card;
+    KdScreenInfo    *screen;
+
+    if (!strcmp (argv[i], "-screen"))
+    {
+	if ((i+1) < argc)
+	{
+	    card = KdCardInfoLast ();
+	    if (!card)
+	    {
+		InitCard (0);
+		card = KdCardInfoLast ();
+	    }
+	    if (card) {
+		screen = KdScreenInfoAdd (card);
+		KdParseScreen (screen, argv[i+1]);
+	    } else
+		ErrorF("No matching card found!\n");
+	}
+	else
+	    UseMsg ();
+	return 2;
+    }
+    if (!strcmp (argv[i], "-zaphod"))
+    {
+	kdDisableZaphod = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-zap"))
+    {
+	kdAllowZap = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-3button"))
+    {
+	kdEmulateMiddleButton = FALSE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-2button"))
+    {
+	kdEmulateMiddleButton = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-rawcoord"))
+    {
+	kdRawPointerCoordinates = 1;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-dumb"))
+    {
+	kdDumbDriver = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-softCursor"))
+    {
+	kdSoftCursor = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-videoTest"))
+    {
+	kdVideoTest = TRUE;
+	return 1;
+    }
+    if (!strcmp (argv[i], "-origin"))
+    {
+	if ((i+1) < argc)
+	{
+	    char    *x = argv[i+1];
+	    char    *y = strchr (x, ',');
+	    if (x)
+		kdOrigin.x = atoi (x);
+	    else
+		kdOrigin.x = 0;
+	    if (y)
+		kdOrigin.y = atoi(y+1);
+	    else
+		kdOrigin.y = 0;
+	}
+	else
+	    UseMsg ();
+	return 2;
+    }
+    if (!strcmp (argv[i], "-rgba"))
+    {
+	if ((i+1) < argc)
+	    KdParseRgba (argv[i+1]);
+	else
+	    UseMsg ();
+	return 2;
+    }
+    if (!strcmp (argv[i], "-switchCmd"))
+    {
+	if ((i+1) < argc)
+	    kdSwitchCmd = argv[i+1];
+	else
+	    UseMsg ();
+	return 2;
+    }
+    if (!strncmp (argv[i], "vt", 2) &&
+	sscanf (argv[i], "vt%2d", &kdVirtualTerminal) == 1)
+    {
+	return 1;
+    }
+    if (!strcmp (argv[i], "-mouse") ||
+        !strcmp (argv[i], "-pointer")) {
+        if (i + 1 >= argc)
+            UseMsg();
+        KdAddConfigPointer(argv[i + 1]);
+	kdHasPointer = TRUE;
+        return 2;
+    }
+    if (!strcmp (argv[i], "-keybd")) {
+        if (i + 1 >= argc)
+            UseMsg();
+        KdAddConfigKeyboard(argv[i + 1]);
+	kdHasKbd = TRUE;
+        return 2;
+    }
+
+    return 0;
+}
+
+/*
+ * These are getting tossed in here until I can think of where
+ * they really belong
+ */
+
+void
+KdOsInit (KdOsFuncs *pOsFuncs)
+{
+    kdOsFuncs = pOsFuncs;
+    if (pOsFuncs)
+    {
+	if (serverGeneration == 1)
+	{
+	    KdDoSwitchCmd ("start");
+            if (pOsFuncs->Init)
+                (*pOsFuncs->Init) ();
+	}
+    }
+}
+
+Bool
+KdAllocatePrivates (ScreenPtr pScreen)
+{
+    KdPrivScreenPtr	pScreenPriv;
+
+    if (kdGeneration != serverGeneration)
+	kdGeneration = serverGeneration;
+
+    if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    pScreenPriv = calloc(1, sizeof (*pScreenPriv));
+    if (!pScreenPriv)
+	return FALSE;
+    KdSetScreenPriv (pScreen, pScreenPriv);
+    return TRUE;
+}
+
+Bool
+KdCreateScreenResources (ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdCardInfo	    *card = pScreenPriv->card;
+    Bool ret;
+
+    pScreen->CreateScreenResources = pScreenPriv->CreateScreenResources;
+    if(pScreen->CreateScreenResources)
+	ret = (*pScreen->CreateScreenResources) (pScreen);
+    else
+	ret= -1;
+    pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;
+    pScreen->CreateScreenResources = KdCreateScreenResources;
+    if (ret && card->cfuncs->createRes)
+	ret = (*card->cfuncs->createRes) (pScreen);
+    return ret;
+}
+
+Bool
+KdCloseScreen (int index, ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo    *screen = pScreenPriv->screen;
+    KdCardInfo	    *card = pScreenPriv->card;
+    Bool	    ret;
+
+    pScreenPriv->closed = TRUE;
+    pScreen->CloseScreen = pScreenPriv->CloseScreen;
+    if(pScreen->CloseScreen)
+        ret = (*pScreen->CloseScreen) (index, pScreen);
+    else
+	ret = TRUE;
+
+    if (pScreenPriv->dpmsState != KD_DPMS_NORMAL)
+	(*card->cfuncs->dpms) (pScreen, KD_DPMS_NORMAL);
+
+    if (screen->mynum == card->selected)
+	KdDisableScreen (pScreen);
+
+    /*
+     * Restore video hardware when last screen is closed
+     */
+    if (screen == card->screenList)
+    {
+	if (kdEnabled && card->cfuncs->restore)
+	    (*card->cfuncs->restore) (card);
+    }
+
+    if (!pScreenPriv->screen->dumb && card->cfuncs->finiAccel)
+	(*card->cfuncs->finiAccel) (pScreen);
+
+    if (!pScreenPriv->screen->softCursor && card->cfuncs->finiCursor)
+	(*card->cfuncs->finiCursor) (pScreen);
+
+    if(card->cfuncs->scrfini)
+        (*card->cfuncs->scrfini) (screen);
+
+    /*
+     * Clean up card when last screen is closed, DIX closes them in
+     * reverse order, thus we check for when the first in the list is closed
+     */
+    if (screen == card->screenList)
+    {
+	if(card->cfuncs->cardfini)
+	    (*card->cfuncs->cardfini) (card);
+	/*
+	 * Clean up OS when last card is closed
+	 */
+	if (card == kdCardInfo)
+	{
+	    if (kdEnabled)
+	    {
+		kdEnabled = FALSE;
+		if(kdOsFuncs->Disable)
+		    (*kdOsFuncs->Disable) ();
+	    }
+	}
+    }
+
+    pScreenPriv->screen->pScreen = 0;
+
+    free((pointer) pScreenPriv);
+    return ret;
+}
+
+Bool
+KdSaveScreen (ScreenPtr pScreen, int on)
+{
+    KdScreenPriv(pScreen);
+    int	    dpmsState;
+
+    if (!pScreenPriv->card->cfuncs->dpms)
+	return FALSE;
+
+    dpmsState = pScreenPriv->dpmsState;
+    switch (on) {
+    case SCREEN_SAVER_OFF:
+	dpmsState = KD_DPMS_NORMAL;
+	break;
+    case SCREEN_SAVER_ON:
+	if (dpmsState == KD_DPMS_NORMAL)
+	    dpmsState = KD_DPMS_NORMAL+1;
+	break;
+    case SCREEN_SAVER_CYCLE:
+	if (dpmsState < KD_DPMS_MAX)
+	    dpmsState++;
+	break;
+    case SCREEN_SAVER_FORCER:
+	break;
+    }
+    if (dpmsState != pScreenPriv->dpmsState)
+    {
+	if (pScreenPriv->enabled)
+	    (*pScreenPriv->card->cfuncs->dpms) (pScreen, dpmsState);
+	pScreenPriv->dpmsState = dpmsState;
+    }
+    return TRUE;
+}
+
+static Bool
+KdCreateWindow (WindowPtr pWin)
+{
+#ifndef PHOENIX
+    if (!pWin->parent)
+    {
+	KdScreenPriv(pWin->drawable.pScreen);
+
+	if (!pScreenPriv->enabled)
+	{
+	    RegionEmpty(&pWin->borderClip);
+	    RegionBreak(&pWin->clipList);
+	}
+    }
+#endif
+    return fbCreateWindow (pWin);
+}
+
+void
+KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo	*screen = pScreenPriv->screen;
+    int			subpixel_order = screen->subpixel_order;
+    Rotation		subpixel_dir;
+    int			i;
+
+    static struct {
+	int	    subpixel_order;
+	Rotation    direction;
+    } orders[] = {
+	{ SubPixelHorizontalRGB, 	RR_Rotate_0 },
+	{ SubPixelHorizontalBGR,	RR_Rotate_180 },
+	{ SubPixelVerticalRGB,		RR_Rotate_270 },
+	{ SubPixelVerticalBGR,		RR_Rotate_90 },
+    };
+
+    static struct {
+	int	bit;
+	int	normal;
+	int	reflect;
+    } reflects[] = {
+	{ RR_Reflect_X, SubPixelHorizontalRGB,	SubPixelHorizontalBGR },
+	{ RR_Reflect_X, SubPixelHorizontalBGR,	SubPixelHorizontalRGB },
+	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalBGR },
+	{ RR_Reflect_Y, SubPixelVerticalRGB,	SubPixelVerticalRGB },
+    };
+
+    /* map subpixel to direction */
+    for (i = 0; i < 4; i++)
+	if (orders[i].subpixel_order == subpixel_order)
+	    break;
+    if (i < 4)
+    {
+	subpixel_dir = KdAddRotation (randr & RR_Rotate_All, orders[i].direction);
+
+	/* map back to subpixel order */
+	for (i = 0; i < 4; i++)
+	    if (orders[i].direction & subpixel_dir)
+	    {
+		subpixel_order = orders[i].subpixel_order;
+		break;
+	    }
+	/* reflect */
+	for (i = 0; i < 4; i++)
+	    if ((randr & reflects[i].bit) &&
+		reflects[i].normal == subpixel_order)
+	    {
+		subpixel_order = reflects[i].reflect;
+		break;
+	    }
+    }
+    PictureSetSubpixelOrder (pScreen, subpixel_order);
+}
+
+/* Pass through AddScreen, which doesn't take any closure */
+static KdScreenInfo *kdCurrentScreen;
+
+Bool
+KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
+{
+    KdScreenInfo	*screen = kdCurrentScreen;
+    KdCardInfo		*card = screen->card;
+    KdPrivScreenPtr	pScreenPriv;
+    /*
+     * note that screen->fb is set up for the nominal orientation
+     * of the screen; that means if randr is rotated, the values
+     * there should reflect a rotated frame buffer (or shadow).
+     */
+    Bool		rotated = (screen->randr & (RR_Rotate_90|RR_Rotate_270)) != 0;
+    int			width, height, *width_mmp, *height_mmp;
+
+    KdAllocatePrivates (pScreen);
+
+    pScreenPriv = KdGetScreenPriv(pScreen);
+
+    if (!rotated)
+    {
+	width = screen->width;
+	height = screen->height;
+	width_mmp = &screen->width_mm;
+	height_mmp = &screen->height_mm;
+    }
+    else
+    {
+	width = screen->height;
+	height = screen->width;
+	width_mmp = &screen->height_mm;
+	height_mmp = &screen->width_mm;
+    }
+    screen->pScreen = pScreen;
+    pScreenPriv->screen = screen;
+    pScreenPriv->card = card;
+    pScreenPriv->bytesPerPixel = screen->fb.bitsPerPixel >> 3;
+    pScreenPriv->dpmsState = KD_DPMS_NORMAL;
+    pScreen->x = screen->origin.x;
+    pScreen->y = screen->origin.y;
+
+    if (!monitorResolution)
+	monitorResolution = 75;
+    /*
+     * This is done in this order so that backing store wraps
+     * our GC functions; fbFinishScreenInit initializes MI
+     * backing store
+     */
+    if (!fbSetupScreen (pScreen,
+			screen->fb.frameBuffer,
+			width, height,
+			monitorResolution, monitorResolution,
+			screen->fb.pixelStride,
+			screen->fb.bitsPerPixel))
+    {
+	return FALSE;
+    }
+
+    /*
+     * Set colormap functions
+     */
+    pScreen->InstallColormap	= KdInstallColormap;
+    pScreen->UninstallColormap	= KdUninstallColormap;
+    pScreen->ListInstalledColormaps = KdListInstalledColormaps;
+    pScreen->StoreColors	= KdStoreColors;
+
+    pScreen->SaveScreen		= KdSaveScreen;
+    pScreen->CreateWindow	= KdCreateWindow;
+
+    if (!fbFinishScreenInit (pScreen,
+			     screen->fb.frameBuffer,
+			     width, height,
+			     monitorResolution, monitorResolution,
+			     screen->fb.pixelStride,
+			     screen->fb.bitsPerPixel))
+    {
+	return FALSE;
+    }
+
+    /*
+     * Fix screen sizes; for some reason mi takes dpi instead of mm.
+     * Rounding errors are annoying
+     */
+    if (*width_mmp)
+	pScreen->mmWidth = *width_mmp;
+    else
+	*width_mmp = pScreen->mmWidth;
+    if (*height_mmp)
+	pScreen->mmHeight = *height_mmp;
+    else
+	*height_mmp = pScreen->mmHeight;
+
+    /*
+     * Plug in our own block/wakeup handlers.
+     * miScreenInit installs NoopDDA in both places
+     */
+    pScreen->BlockHandler	= KdBlockHandler;
+    pScreen->WakeupHandler	= KdWakeupHandler;
+
+    if (!fbPictureInit (pScreen, 0, 0))
+	return FALSE;
+    if (card->cfuncs->initScreen)
+	if (!(*card->cfuncs->initScreen) (pScreen))
+	    return FALSE;
+
+    if (!screen->dumb && card->cfuncs->initAccel)
+	if (!(*card->cfuncs->initAccel) (pScreen))
+	    screen->dumb = TRUE;
+
+    if (card->cfuncs->finishInitScreen)
+	if (!(*card->cfuncs->finishInitScreen) (pScreen))
+	    return FALSE;
+
+#if 0
+    fbInitValidateTree (pScreen);
+#endif
+
+    /*
+     * Wrap CloseScreen, the order now is:
+     *	KdCloseScreen
+     *	miBSCloseScreen
+     *	fbCloseScreen
+     */
+    pScreenPriv->CloseScreen = pScreen->CloseScreen;
+    pScreen->CloseScreen = KdCloseScreen;
+
+    pScreenPriv->CreateScreenResources = pScreen->CreateScreenResources;
+    pScreen->CreateScreenResources = KdCreateScreenResources;
+
+    if (screen->softCursor ||
+	!card->cfuncs->initCursor ||
+	!(*card->cfuncs->initCursor) (pScreen))
+    {
+	/* Use MI for cursor display and event queueing. */
+	screen->softCursor = TRUE;
+	miDCInitialize(pScreen, &kdPointerScreenFuncs);
+    }
+
+
+    if (!fbCreateDefColormap (pScreen))
+    {
+	return FALSE;
+    }
+
+    KdSetSubpixelOrder (pScreen, screen->randr);
+
+    /*
+     * Enable the hardware
+     */
+    if (!kdEnabled)
+    {
+	kdEnabled = TRUE;
+	if(kdOsFuncs->Enable)
+	    (*kdOsFuncs->Enable) ();
+    }
+
+    if (screen->mynum == card->selected)
+    {
+	if(card->cfuncs->preserve)
+	    (*card->cfuncs->preserve) (card);
+	if(card->cfuncs->enable)
+	    if (!(*card->cfuncs->enable) (pScreen))
+		return FALSE;
+	pScreenPriv->enabled = TRUE;
+	if (!screen->softCursor && card->cfuncs->enableCursor)
+	    (*card->cfuncs->enableCursor) (pScreen);
+	KdEnableColormap (pScreen);
+	if (!screen->dumb && card->cfuncs->enableAccel)
+	    (*card->cfuncs->enableAccel) (pScreen);
+    }
+
+    return TRUE;
+}
+
+void
+KdInitScreen (ScreenInfo    *pScreenInfo,
+	      KdScreenInfo  *screen,
+	      int	    argc,
+	      char	    **argv)
+{
+    KdCardInfo	*card = screen->card;
+
+    (*card->cfuncs->scrinit) (screen);
+
+    if (!card->cfuncs->initAccel)
+	screen->dumb = TRUE;
+    if (!card->cfuncs->initCursor)
+	screen->softCursor = TRUE;
+}
+
+static Bool
+KdSetPixmapFormats (ScreenInfo	*pScreenInfo)
+{
+    CARD8	    depthToBpp[33];	/* depth -> bpp map */
+    KdCardInfo	    *card;
+    KdScreenInfo    *screen;
+    int		    i;
+    int		    bpp;
+    PixmapFormatRec *format;
+
+    for (i = 1; i <= 32; i++)
+	depthToBpp[i] = 0;
+
+    /*
+     * Generate mappings between bitsPerPixel and depth,
+     * also ensure that all screens comply with protocol
+     * restrictions on equivalent formats for the same
+     * depth on different screens
+     */
+    for (card = kdCardInfo; card; card = card->next)
+    {
+	for (screen = card->screenList; screen; screen = screen->next)
+	{
+	    bpp = screen->fb.bitsPerPixel;
+	    if (bpp == 24)
+		bpp = 32;
+	    if (!depthToBpp[screen->fb.depth])
+		depthToBpp[screen->fb.depth] = bpp;
+	    else if (depthToBpp[screen->fb.depth] != bpp)
+		return FALSE;
+	}
+    }
+
+    /*
+     * Fill in additional formats
+     */
+    for (i = 0; i < NUM_KD_DEPTHS; i++)
+	if (!depthToBpp[kdDepths[i].depth])
+	    depthToBpp[kdDepths[i].depth] = kdDepths[i].bpp;
+
+    pScreenInfo->imageByteOrder     = IMAGE_BYTE_ORDER;
+    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+    pScreenInfo->bitmapScanlinePad  = BITMAP_SCANLINE_PAD;
+    pScreenInfo->bitmapBitOrder     = BITMAP_BIT_ORDER;
+
+    pScreenInfo->numPixmapFormats = 0;
+
+    for (i = 1; i <= 32; i++)
+    {
+	if (depthToBpp[i])
+	{
+	    format = &pScreenInfo->formats[pScreenInfo->numPixmapFormats++];
+	    format->depth = i;
+	    format->bitsPerPixel = depthToBpp[i];
+	    format->scanlinePad = BITMAP_SCANLINE_PAD;
+	}
+    }
+
+    return TRUE;
+}
+
+static void
+KdAddScreen (ScreenInfo	    *pScreenInfo,
+	     KdScreenInfo   *screen,
+	     int	    argc,
+	     char	    **argv)
+{
+    int	    i;
+    /*
+     * Fill in fb visual type masks for this screen
+     */
+    for (i = 0; i < pScreenInfo->numPixmapFormats; i++)
+    {
+	unsigned long	visuals;
+	Pixel		rm, gm, bm;
+
+	visuals = 0;
+	rm = gm = bm = 0;
+	if (pScreenInfo->formats[i].depth == screen->fb.depth)
+	{
+	    visuals = screen->fb.visuals;
+	    rm = screen->fb.redMask;
+	    gm = screen->fb.greenMask;
+	    bm = screen->fb.blueMask;
+	}
+	fbSetVisualTypesAndMasks (pScreenInfo->formats[i].depth,
+				  visuals,
+				  8,
+				  rm, gm, bm);
+    }
+
+    kdCurrentScreen = screen;
+
+    AddScreen (KdScreenInit, argc, argv);
+}
+
+#if 0 /* This function is not used currently */
+
+int
+KdDepthToFb (ScreenPtr	pScreen, int depth)
+{
+    KdScreenPriv(pScreen);
+
+    for (fb = 0; fb <= KD_MAX_FB && pScreenPriv->screen->fb.frameBuffer; fb++)
+	if (pScreenPriv->screen->fb.depth == depth)
+	    return fb;
+}
+
+#endif
+
+static int
+KdSignalWrapper (int signum)
+{
+    kdCaughtSignal = TRUE;
+    return 1; /* use generic OS layer cleanup & abort */
+}
+
+void
+KdInitOutput (ScreenInfo    *pScreenInfo,
+	      int	    argc,
+	      char	    **argv)
+{
+    KdCardInfo	    *card;
+    KdScreenInfo    *screen;
+
+    if (!kdCardInfo)
+    {
+	InitCard (0);
+	if (!(card = KdCardInfoLast ()))
+	    FatalError("No matching cards found!\n");
+	screen = KdScreenInfoAdd (card);
+	KdParseScreen (screen, 0);
+    }
+    /*
+     * Initialize all of the screens for all of the cards
+     */
+    for (card = kdCardInfo; card; card = card->next)
+    {
+	int ret=1;
+	if(card->cfuncs->cardinit)
+		ret=(*card->cfuncs->cardinit) (card);
+	if (ret)
+	{
+	    for (screen = card->screenList; screen; screen = screen->next)
+		KdInitScreen (pScreenInfo, screen, argc, argv);
+	}
+    }
+
+    /*
+     * Merge the various pixmap formats together, this can fail
+     * when two screens share depth but not bitsPerPixel
+     */
+    if (!KdSetPixmapFormats (pScreenInfo))
+	return;
+
+    /*
+     * Add all of the screens
+     */
+    for (card = kdCardInfo; card; card = card->next)
+	for (screen = card->screenList; screen; screen = screen->next)
+	    KdAddScreen (pScreenInfo, screen, argc, argv);
+
+    OsRegisterSigWrapper(KdSignalWrapper);
+}
+
+void
+OsVendorFatalError(void)
+{
+}
+
+int
+DPMSSet(ClientPtr client, int level)
+{
+    return Success;
+}
+
+Bool
+DPMSSupported (void)
+{
+    return FALSE;
+}
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 8873662ee..2ab535aef 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -1,628 +1,625 @@
-/*

- * Copyright � 1999 Keith Packard

- *

- * 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, and that the name of Keith Packard not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  Keith Packard makes no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL KEITH PACKARD 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 _KDRIVE_H_

-#define _KDRIVE_H_

-

-#include <stdio.h>

-#include <string.h>

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <X11/Xos.h>

-#include "scrnintstr.h"

-#include "pixmapstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#include "mibstore.h"

-#include "colormapst.h"

-#include "gcstruct.h"

-#include "input.h"

-#include "mipointer.h"

-#include "mi.h"

-#include "dix.h"

-#include "fb.h"

-#include "fboverlay.h"

-#include "shadow.h"

-#include "randrstr.h"

-#include "globals.h"

-

-#include "xkbstr.h"

-

-#define KD_DPMS_NORMAL	    0

-#define KD_DPMS_STANDBY	    1

-#define KD_DPMS_SUSPEND	    2

-#define KD_DPMS_POWERDOWN   3

-#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN

-

-#define Status int

-

-typedef struct _KdCardInfo {

-    struct _KdCardFuncs	    *cfuncs;

-    void		    *closure;

-    void		    *driver;

-    struct _KdScreenInfo    *screenList;

-    int			    selected;

-    struct _KdCardInfo	    *next;

-} KdCardInfo;

-

-extern KdCardInfo	*kdCardInfo;

-

-/*

- * Configuration information per X screen

- */

-typedef struct _KdFrameBuffer {

-    CARD8	*frameBuffer;

-    int		depth;

-    int		bitsPerPixel;

-    int		pixelStride;

-    int		byteStride;

-    Bool	shadow;

-    unsigned long   visuals;

-    Pixel       redMask, greenMask, blueMask;

-    void	*closure;

-} KdFrameBuffer;

-

-#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)

-#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)

-

-typedef struct _KdScreenInfo {

-    struct _KdScreenInfo    *next;

-    KdCardInfo	*card;

-    ScreenPtr	pScreen;

-    void	*driver;

-    Rotation	randr;	/* rotation and reflection */

-    int		width;

-    int		height;

-    int		rate;

-    int		width_mm;

-    int		height_mm;

-    int		subpixel_order;

-    Bool        dumb;

-    Bool        softCursor;

-    int		mynum;

-    DDXPointRec	origin;

-    KdFrameBuffer   fb;

-} KdScreenInfo;

-

-typedef struct _KdCardFuncs {

-    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */

-    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */

-    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */

-    Bool	(*finishInitScreen) (ScreenPtr pScreen);

-    Bool	(*createRes) (ScreenPtr);   /* create screen resources */

-    void	(*preserve) (KdCardInfo *); /* save graphics card state */

-    Bool        (*enable) (ScreenPtr);      /* set up for rendering */

-    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */

-    void        (*disable) (ScreenPtr);     /* turn off rendering */

-    void	(*restore) (KdCardInfo *);  /* restore graphics card state */

-    void	(*scrfini) (KdScreenInfo *);/* close down screen */

-    void        (*cardfini) (KdCardInfo *); /* close down */

-

-    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */

-    void        (*enableCursor) (ScreenPtr);    /* enable cursor */

-    void        (*disableCursor) (ScreenPtr);   /* disable cursor */

-    void        (*finiCursor) (ScreenPtr);      /* close down */

-    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);

-

-    Bool        (*initAccel) (ScreenPtr);

-    void        (*enableAccel) (ScreenPtr);

-    void        (*disableAccel) (ScreenPtr);

-    void        (*finiAccel) (ScreenPtr);

-

-    void        (*getColors) (ScreenPtr, int, xColorItem *);

-    void        (*putColors) (ScreenPtr, int, xColorItem *);

-

-} KdCardFuncs;

-

-#define KD_MAX_PSEUDO_DEPTH 8

-#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)

-

-typedef struct {

-    KdScreenInfo    *screen;

-    KdCardInfo	    *card;

-

-    Bool	    enabled;

-    Bool	    closed;

-    int		    bytesPerPixel;

-

-    int		    dpmsState;

-

-    ColormapPtr     pInstalledmap;                    /* current colormap */

-    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */

-

-    CreateScreenResourcesProcPtr    CreateScreenResources;

-    CloseScreenProcPtr  CloseScreen;

-} KdPrivScreenRec, *KdPrivScreenPtr;

-

-typedef enum _kdPointerState {

-    start,

-    button_1_pend,

-    button_1_down,

-    button_2_down,

-    button_3_pend,

-    button_3_down,

-    synth_2_down_13,

-    synth_2_down_3,

-    synth_2_down_1,

-    num_input_states

-} KdPointerState;

-

-#define KD_MAX_BUTTON  32

-

-#define KD_KEYBOARD 1

-#define KD_MOUSE 2

-#define KD_TOUCHSCREEN 3

-

-typedef struct _KdPointerInfo KdPointerInfo;

-

-typedef struct _KdPointerDriver {

-    char                    *name;

-    Status                  (*Init)    (KdPointerInfo *);

-    Status                  (*Enable)  (KdPointerInfo *);

-    void                    (*Disable) (KdPointerInfo *);

-    void                    (*Fini)    (KdPointerInfo *);

-    struct _KdPointerDriver *next;

-} KdPointerDriver;

-

-struct _KdPointerInfo {

-    DeviceIntPtr          dixdev;

-    char                  *name;

-    char                  *path;

-    char                  *protocol;

-    InputOption           *options;

-    int                   inputClass;

-

-    CARD8                 map[KD_MAX_BUTTON + 1];

-    int                   nButtons;

-    int                   nAxes;

-

-    Bool                  emulateMiddleButton;

-    unsigned long         emulationTimeout;

-    int                   emulationDx, emulationDy;

-

-    Bool                  timeoutPending;

-    KdPointerState        mouseState;

-    Bool                  eventHeld;

-    struct {

-        int type;

-        int x;

-        int y;

-        int z;

-        int flags;

-        int absrel;

-    } heldEvent;

-    unsigned char         buttonState;

-    Bool                  transformCoordinates;

-    int                   pressureThreshold;

-

-    KdPointerDriver       *driver;

-    void                  *driverPrivate;

-

-    struct _KdPointerInfo *next;

-};

-

-extern int KdCurScreen;

-

-void KdAddPointerDriver (KdPointerDriver *driver);

-void KdRemovePointerDriver (KdPointerDriver *driver);

-KdPointerInfo *KdNewPointer (void);

-void KdFreePointer (KdPointerInfo *);

-int KdAddPointer (KdPointerInfo *ki);

-int KdAddConfigPointer (char *pointer);

-void KdRemovePointer (KdPointerInfo *ki);

-

-

-#define KD_KEY_COUNT 248

-#define KD_MIN_KEYCODE  8

-#define KD_MAX_KEYCODE  255

-#define KD_MAX_WIDTH    4

-#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)

-

-typedef struct {

-    KeySym modsym;

-    int    modbit;

-} KdKeySymModsRec;

-

-typedef struct _KdKeyboardInfo KdKeyboardInfo;

-

-typedef struct _KdKeyboardDriver {

-    char                  *name;

-    Bool                  (*Init)    (KdKeyboardInfo *);

-    Bool                  (*Enable)  (KdKeyboardInfo *);

-    void                  (*Leds)    (KdKeyboardInfo *, int);

-    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);

-    void                  (*Disable) (KdKeyboardInfo *);

-    void                  (*Fini)    (KdKeyboardInfo *);

-    struct _KdKeyboardDriver *next;

-} KdKeyboardDriver;

-

-struct _KdKeyboardInfo {

-    struct _KdKeyboardInfo *next;

-    DeviceIntPtr        dixdev;

-    void                *closure;

-    char                *name;

-    char                *path;

-    int                 inputClass;

-    char                *xkbRules;

-    char                *xkbModel;

-    char                *xkbLayout;

-    char                *xkbVariant;

-    char                *xkbOptions;

-    int                 LockLed;

-

-    int                 minScanCode;

-    int                 maxScanCode;

-

-    int                 leds;

-    int                 bellPitch;

-    int                 bellDuration;

-    InputOption         *options;

-

-    KdKeyboardDriver    *driver;

-    void                *driverPrivate;

-};

-

-void KdAddKeyboardDriver (KdKeyboardDriver *driver);

-void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);

-KdKeyboardInfo *KdNewKeyboard (void);

-void KdFreeKeyboard (KdKeyboardInfo *ki);

-int KdAddConfigKeyboard (char *pointer);

-int KdAddKeyboard (KdKeyboardInfo *ki);

-void KdRemoveKeyboard (KdKeyboardInfo *ki);

-

-typedef struct _KdOsFuncs {

-    int		    (*Init) (void);

-    void	    (*Enable) (void);

-    Bool	    (*SpecialKey) (KeySym);

-    void	    (*Disable) (void);

-    void	    (*Fini) (void);

-    void	    (*pollEvents) (void);

-    void            (*Bell) (int, int, int);

-} KdOsFuncs;

-

-typedef enum _KdSyncPolarity {

-    KdSyncNegative, KdSyncPositive

-} KdSyncPolarity;

-

-typedef struct _KdMonitorTiming {

-    /* label */

-    int		    horizontal;

-    int		    vertical;

-    int		    rate;

-    /* pixel clock */

-    int		    clock;  /* in KHz */

-    /* horizontal timing */

-    int		    hfp;    /* front porch */

-    int		    hbp;    /* back porch */

-    int		    hblank; /* blanking */

-    KdSyncPolarity  hpol;   /* polarity */

-    /* vertical timing */

-    int		    vfp;    /* front porch */

-    int		    vbp;    /* back porch */

-    int		    vblank; /* blanking */

-    KdSyncPolarity  vpol;   /* polarity */

-} KdMonitorTiming;

-

-extern const KdMonitorTiming	kdMonitorTimings[];

-extern const int		kdNumMonitorTimings;

-

-typedef struct _KdPointerMatrix {

-    int	    matrix[2][3];

-} KdPointerMatrix;

-

-/*

- * This is the only completely portable way to

- * compute this info.

- */

-

-#ifndef BitsPerPixel

-#define BitsPerPixel(d) (\

-    PixmapWidthPaddingInfo[d].notPower2 ? \

-    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \

-    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \

-    (PixmapWidthPaddingInfo[d].padRoundUp+1)))

-#endif

-

-extern DevPrivateKeyRec	kdScreenPrivateKeyRec;

-#define kdScreenPrivateKey (&kdScreenPrivateKeyRec)

-

-extern unsigned long	kdGeneration;

-extern Bool		kdEnabled;

-extern Bool		kdSwitchPending;

-extern Bool		kdEmulateMiddleButton;

-extern Bool		kdDisableZaphod;

-extern Bool		kdAllowZap;

-extern int		kdVirtualTerminal;

-extern char		*kdSwitchCmd;

-extern KdOsFuncs	*kdOsFuncs;

-

-#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \

-    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))

-#define KdSetScreenPriv(pScreen,v) \

-    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)

-#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)

-

-/* kcmap.c */

-void

-KdSetColormap (ScreenPtr pScreen);

-

-void

-KdEnableColormap (ScreenPtr pScreen);

-

-void

-KdDisableColormap (ScreenPtr pScreen);

-

-void

-KdInstallColormap (ColormapPtr pCmap);

-

-void

-KdUninstallColormap (ColormapPtr pCmap);

-

-int

-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);

-

-void

-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);

-

-/* kdrive.c */

-extern miPointerScreenFuncRec kdPointerScreenFuncs;

-

-void

-KdSetRootClip (ScreenPtr pScreen, BOOL enable);

-

-void

-KdDisableScreen (ScreenPtr pScreen);

-

-void

-KdDisableScreens (void);

-

-Bool

-KdEnableScreen (ScreenPtr pScreen);

-

-void

-KdEnableScreens (void);

-

-void

-KdSuspend (void);

-

-void

-KdResume (void);

-

-void

-KdProcessSwitch (void);

-

-Rotation

-KdAddRotation (Rotation a, Rotation b);

-

-Rotation

-KdSubRotation (Rotation a, Rotation b);

-

-void

-KdParseScreen (KdScreenInfo *screen,

-	       char	    *arg);

-

-KdPointerInfo *

-KdParsePointer (char *arg);

-

-KdKeyboardInfo *

-KdParseKeyboard (char *arg);

-

-char *

-KdParseFindNext (char *cur, char *delim, char *save, char *last);

-

-void

-KdParseRgba (char *rgba);

-

-void

-KdUseMsg (void);

-

-int

-KdProcessArgument (int argc, char **argv, int i);

-

-void

-KdOsInit (KdOsFuncs *pOsFuncs);

-

-void

-KdOsAddInputDrivers (void);

-

-Bool

-KdAllocatePrivates (ScreenPtr pScreen);

-

-Bool

-KdCreateScreenResources (ScreenPtr pScreen);

-

-Bool

-KdCloseScreen (int index, ScreenPtr pScreen);

-

-Bool

-KdSaveScreen (ScreenPtr pScreen, int on);

-

-Bool

-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);

-

-void

-KdInitScreen (ScreenInfo    *pScreenInfo,

-	      KdScreenInfo  *screen,

-	      int	    argc,

-	      char	    **argv);

-

-void

-KdInitCard (ScreenInfo	    *pScreenInfo,

-	    KdCardInfo	    *card,

-	    int		    argc,

-	    char	    **argv);

-

-void

-KdInitOutput (ScreenInfo    *pScreenInfo,

-	      int	    argc,

-	      char	    **argv);

-

-void

-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);

-

-void

-KdBacktrace (int signum);

-

-/* kinfo.c */

-KdCardInfo *

-KdCardInfoAdd (KdCardFuncs  *funcs,

-	       void	    *closure);

-

-KdCardInfo *

-KdCardInfoLast (void);

-

-void

-KdCardInfoDispose (KdCardInfo *ci);

-

-KdScreenInfo *

-KdScreenInfoAdd (KdCardInfo *ci);

-

-void

-KdScreenInfoDispose (KdScreenInfo *si);

-

-

-/* kinput.c */

-void

-KdInitInput(void);

-

-void

-KdAddPointerDriver(KdPointerDriver *);

-

-void

-KdAddKeyboardDriver(KdKeyboardDriver *);

-

-Bool

-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);

-

-void

-KdUnregisterFds (void *closure, Bool do_close);

-

-void

-KdUnregisterFd (void *closure, int fd, Bool do_close);

-

-void

-KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,

-                    unsigned char is_up);

-

-#define KD_BUTTON_1	0x01

-#define KD_BUTTON_2	0x02

-#define KD_BUTTON_3	0x04

-#define KD_BUTTON_4	0x08

-#define KD_BUTTON_5	0x10

-#define KD_BUTTON_8	0x80

-#define KD_MOUSE_DELTA	0x80000000

-

-void

-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,

-                      int rz);

-

-void

-_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,

-                       int b, int absrel, Bool force);

-

-void

-KdReleaseAllKeys (void);

-

-void

-KdSetLed (KdKeyboardInfo *ki, int led, Bool on);

-

-void

-KdSetPointerMatrix (KdPointerMatrix *pointer);

-

-void

-KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);

-

-void

-KdScreenToPointerCoords (int *x, int *y);

-

-void

-KdBlockHandler (int		screen,

-		pointer		blockData,

-		pointer		timeout,

-		pointer		readmask);

-

-void

-KdWakeupHandler (int		screen,

-		 pointer    	data,

-		 unsigned long	result,

-		 pointer	readmask);

-

-void

-KdDisableInput (void);

-

-void

-KdEnableInput (void);

-

-void

-ProcessInputEvents (void);

-

-void

-KdRingBell (KdKeyboardInfo      *ki,

-            int                 volume,

-            int                 pitch,

-            int                 duration);

-

-/* kmode.c */

-const KdMonitorTiming *

-KdFindMode (KdScreenInfo    *screen,

-	    Bool	    (*supported) (KdScreenInfo *,

-					  const KdMonitorTiming *));

-

-Bool

-KdTuneMode (KdScreenInfo    *screen,

-	    Bool	    (*usable) (KdScreenInfo *),

-	    Bool	    (*supported) (KdScreenInfo *,

-					  const KdMonitorTiming *));

-

-#ifdef RANDR

-Bool

-KdRandRGetInfo (ScreenPtr pScreen,

-		int randr,

-		Bool (*supported) (ScreenPtr pScreen,

-				   const KdMonitorTiming *));

-

-const KdMonitorTiming *

-KdRandRGetTiming (ScreenPtr	    pScreen,

-		  Bool		    (*supported) (ScreenPtr pScreen,

-						  const KdMonitorTiming *),

-		  int		    rate,

-		  RRScreenSizePtr   pSize);

-#endif

-

-/* kshadow.c */

-Bool

-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);

-

-void

-KdShadowFbFree (KdScreenInfo *screen);

-

-Bool

-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);

-

-void

-KdShadowUnset (ScreenPtr pScreen);

-

-/* function prototypes to be implemented by the drivers */

-void

-InitCard (char *name);

-

-#endif /* _KDRIVE_H_ */

+/*
+ * Copyright � 1999 Keith Packard
+ *
+ * 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, and that the name of Keith Packard not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  Keith Packard makes no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL KEITH PACKARD 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 _KDRIVE_H_
+#define _KDRIVE_H_
+
+#include <stdio.h>
+#include <string.h>
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/Xos.h>
+#include "scrnintstr.h"
+#include "pixmapstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#include "mibstore.h"
+#include "colormapst.h"
+#include "gcstruct.h"
+#include "input.h"
+#include "mipointer.h"
+#include "mi.h"
+#include "dix.h"
+#include "fb.h"
+#include "fboverlay.h"
+#include "shadow.h"
+#include "randrstr.h"
+#include "globals.h"
+
+#include "xkbstr.h"
+
+#define KD_DPMS_NORMAL	    0
+#define KD_DPMS_STANDBY	    1
+#define KD_DPMS_SUSPEND	    2
+#define KD_DPMS_POWERDOWN   3
+#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
+
+#define Status int
+
+typedef struct _KdCardInfo {
+    struct _KdCardFuncs	    *cfuncs;
+    void		    *closure;
+    void		    *driver;
+    struct _KdScreenInfo    *screenList;
+    int			    selected;
+    struct _KdCardInfo	    *next;
+} KdCardInfo;
+
+extern KdCardInfo	*kdCardInfo;
+
+/*
+ * Configuration information per X screen
+ */
+typedef struct _KdFrameBuffer {
+    CARD8	*frameBuffer;
+    int		depth;
+    int		bitsPerPixel;
+    int		pixelStride;
+    int		byteStride;
+    Bool	shadow;
+    unsigned long   visuals;
+    Pixel       redMask, greenMask, blueMask;
+    void	*closure;
+} KdFrameBuffer;
+
+#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
+#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)
+
+typedef struct _KdScreenInfo {
+    struct _KdScreenInfo    *next;
+    KdCardInfo	*card;
+    ScreenPtr	pScreen;
+    void	*driver;
+    Rotation	randr;	/* rotation and reflection */
+    int		width;
+    int		height;
+    int		rate;
+    int		width_mm;
+    int		height_mm;
+    int		subpixel_order;
+    Bool        dumb;
+    Bool        softCursor;
+    int		mynum;
+    DDXPointRec	origin;
+    KdFrameBuffer   fb;
+} KdScreenInfo;
+
+typedef struct _KdCardFuncs {
+    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */
+    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */
+    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */
+    Bool	(*finishInitScreen) (ScreenPtr pScreen);
+    Bool	(*createRes) (ScreenPtr);   /* create screen resources */
+    void	(*preserve) (KdCardInfo *); /* save graphics card state */
+    Bool        (*enable) (ScreenPtr);      /* set up for rendering */
+    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */
+    void        (*disable) (ScreenPtr);     /* turn off rendering */
+    void	(*restore) (KdCardInfo *);  /* restore graphics card state */
+    void	(*scrfini) (KdScreenInfo *);/* close down screen */
+    void        (*cardfini) (KdCardInfo *); /* close down */
+
+    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */
+    void        (*enableCursor) (ScreenPtr);    /* enable cursor */
+    void        (*disableCursor) (ScreenPtr);   /* disable cursor */
+    void        (*finiCursor) (ScreenPtr);      /* close down */
+    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);
+
+    Bool        (*initAccel) (ScreenPtr);
+    void        (*enableAccel) (ScreenPtr);
+    void        (*disableAccel) (ScreenPtr);
+    void        (*finiAccel) (ScreenPtr);
+
+    void        (*getColors) (ScreenPtr, int, xColorItem *);
+    void        (*putColors) (ScreenPtr, int, xColorItem *);
+
+} KdCardFuncs;
+
+#define KD_MAX_PSEUDO_DEPTH 8
+#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)
+
+typedef struct {
+    KdScreenInfo    *screen;
+    KdCardInfo	    *card;
+
+    Bool	    enabled;
+    Bool	    closed;
+    int		    bytesPerPixel;
+
+    int		    dpmsState;
+
+    ColormapPtr     pInstalledmap;                    /* current colormap */
+    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */
+
+    CreateScreenResourcesProcPtr    CreateScreenResources;
+    CloseScreenProcPtr  CloseScreen;
+} KdPrivScreenRec, *KdPrivScreenPtr;
+
+typedef enum _kdPointerState {
+    start,
+    button_1_pend,
+    button_1_down,
+    button_2_down,
+    button_3_pend,
+    button_3_down,
+    synth_2_down_13,
+    synth_2_down_3,
+    synth_2_down_1,
+    num_input_states
+} KdPointerState;
+
+#define KD_MAX_BUTTON  32
+
+#define KD_KEYBOARD 1
+#define KD_MOUSE 2
+#define KD_TOUCHSCREEN 3
+
+typedef struct _KdPointerInfo KdPointerInfo;
+
+typedef struct _KdPointerDriver {
+    char                    *name;
+    Status                  (*Init)    (KdPointerInfo *);
+    Status                  (*Enable)  (KdPointerInfo *);
+    void                    (*Disable) (KdPointerInfo *);
+    void                    (*Fini)    (KdPointerInfo *);
+    struct _KdPointerDriver *next;
+} KdPointerDriver;
+
+struct _KdPointerInfo {
+    DeviceIntPtr          dixdev;
+    char                  *name;
+    char                  *path;
+    char                  *protocol;
+    InputOption           *options;
+    int                   inputClass;
+
+    CARD8                 map[KD_MAX_BUTTON + 1];
+    int                   nButtons;
+    int                   nAxes;
+
+    Bool                  emulateMiddleButton;
+    unsigned long         emulationTimeout;
+    int                   emulationDx, emulationDy;
+
+    Bool                  timeoutPending;
+    KdPointerState        mouseState;
+    Bool                  eventHeld;
+    struct {
+        int type;
+        int x;
+        int y;
+        int z;
+        int flags;
+        int absrel;
+    } heldEvent;
+    unsigned char         buttonState;
+    Bool                  transformCoordinates;
+    int                   pressureThreshold;
+
+    KdPointerDriver       *driver;
+    void                  *driverPrivate;
+
+    struct _KdPointerInfo *next;
+};
+
+extern int KdCurScreen;
+
+void KdAddPointerDriver (KdPointerDriver *driver);
+void KdRemovePointerDriver (KdPointerDriver *driver);
+KdPointerInfo *KdNewPointer (void);
+void KdFreePointer (KdPointerInfo *);
+int KdAddPointer (KdPointerInfo *ki);
+int KdAddConfigPointer (char *pointer);
+void KdRemovePointer (KdPointerInfo *ki);
+
+
+#define KD_KEY_COUNT 248
+#define KD_MIN_KEYCODE  8
+#define KD_MAX_KEYCODE  255
+#define KD_MAX_WIDTH    4
+#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)
+
+typedef struct {
+    KeySym modsym;
+    int    modbit;
+} KdKeySymModsRec;
+
+typedef struct _KdKeyboardInfo KdKeyboardInfo;
+
+typedef struct _KdKeyboardDriver {
+    char                  *name;
+    Bool                  (*Init)    (KdKeyboardInfo *);
+    Bool                  (*Enable)  (KdKeyboardInfo *);
+    void                  (*Leds)    (KdKeyboardInfo *, int);
+    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);
+    void                  (*Disable) (KdKeyboardInfo *);
+    void                  (*Fini)    (KdKeyboardInfo *);
+    struct _KdKeyboardDriver *next;
+} KdKeyboardDriver;
+
+struct _KdKeyboardInfo {
+    struct _KdKeyboardInfo *next;
+    DeviceIntPtr        dixdev;
+    void                *closure;
+    char                *name;
+    char                *path;
+    int                 inputClass;
+    char                *xkbRules;
+    char                *xkbModel;
+    char                *xkbLayout;
+    char                *xkbVariant;
+    char                *xkbOptions;
+    int                 LockLed;
+
+    int                 minScanCode;
+    int                 maxScanCode;
+
+    int                 leds;
+    int                 bellPitch;
+    int                 bellDuration;
+    InputOption         *options;
+
+    KdKeyboardDriver    *driver;
+    void                *driverPrivate;
+};
+
+void KdAddKeyboardDriver (KdKeyboardDriver *driver);
+void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);
+KdKeyboardInfo *KdNewKeyboard (void);
+void KdFreeKeyboard (KdKeyboardInfo *ki);
+int KdAddConfigKeyboard (char *pointer);
+int KdAddKeyboard (KdKeyboardInfo *ki);
+void KdRemoveKeyboard (KdKeyboardInfo *ki);
+
+typedef struct _KdOsFuncs {
+    int		    (*Init) (void);
+    void	    (*Enable) (void);
+    Bool	    (*SpecialKey) (KeySym);
+    void	    (*Disable) (void);
+    void	    (*Fini) (void);
+    void	    (*pollEvents) (void);
+    void            (*Bell) (int, int, int);
+} KdOsFuncs;
+
+typedef enum _KdSyncPolarity {
+    KdSyncNegative, KdSyncPositive
+} KdSyncPolarity;
+
+typedef struct _KdMonitorTiming {
+    /* label */
+    int		    horizontal;
+    int		    vertical;
+    int		    rate;
+    /* pixel clock */
+    int		    clock;  /* in KHz */
+    /* horizontal timing */
+    int		    hfp;    /* front porch */
+    int		    hbp;    /* back porch */
+    int		    hblank; /* blanking */
+    KdSyncPolarity  hpol;   /* polarity */
+    /* vertical timing */
+    int		    vfp;    /* front porch */
+    int		    vbp;    /* back porch */
+    int		    vblank; /* blanking */
+    KdSyncPolarity  vpol;   /* polarity */
+} KdMonitorTiming;
+
+extern const KdMonitorTiming	kdMonitorTimings[];
+extern const int		kdNumMonitorTimings;
+
+typedef struct _KdPointerMatrix {
+    int	    matrix[2][3];
+} KdPointerMatrix;
+
+/*
+ * This is the only completely portable way to
+ * compute this info.
+ */
+
+#ifndef BitsPerPixel
+#define BitsPerPixel(d) (\
+    PixmapWidthPaddingInfo[d].notPower2 ? \
+    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \
+    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \
+    (PixmapWidthPaddingInfo[d].padRoundUp+1)))
+#endif
+
+extern DevPrivateKeyRec	kdScreenPrivateKeyRec;
+#define kdScreenPrivateKey (&kdScreenPrivateKeyRec)
+
+extern unsigned long	kdGeneration;
+extern Bool		kdEnabled;
+extern Bool		kdSwitchPending;
+extern Bool		kdEmulateMiddleButton;
+extern Bool		kdDisableZaphod;
+extern Bool		kdAllowZap;
+extern int		kdVirtualTerminal;
+extern char		*kdSwitchCmd;
+extern KdOsFuncs	*kdOsFuncs;
+
+#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
+    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
+#define KdSetScreenPriv(pScreen,v) \
+    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)
+#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)
+
+/* kcmap.c */
+void
+KdSetColormap (ScreenPtr pScreen);
+
+void
+KdEnableColormap (ScreenPtr pScreen);
+
+void
+KdDisableColormap (ScreenPtr pScreen);
+
+void
+KdInstallColormap (ColormapPtr pCmap);
+
+void
+KdUninstallColormap (ColormapPtr pCmap);
+
+int
+KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);
+
+void
+KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);
+
+/* kdrive.c */
+extern miPointerScreenFuncRec kdPointerScreenFuncs;
+
+void
+KdDisableScreen (ScreenPtr pScreen);
+
+void
+KdDisableScreens (void);
+
+Bool
+KdEnableScreen (ScreenPtr pScreen);
+
+void
+KdEnableScreens (void);
+
+void
+KdSuspend (void);
+
+void
+KdResume (void);
+
+void
+KdProcessSwitch (void);
+
+Rotation
+KdAddRotation (Rotation a, Rotation b);
+
+Rotation
+KdSubRotation (Rotation a, Rotation b);
+
+void
+KdParseScreen (KdScreenInfo *screen,
+	       char	    *arg);
+
+KdPointerInfo *
+KdParsePointer (char *arg);
+
+KdKeyboardInfo *
+KdParseKeyboard (char *arg);
+
+char *
+KdParseFindNext (char *cur, char *delim, char *save, char *last);
+
+void
+KdParseRgba (char *rgba);
+
+void
+KdUseMsg (void);
+
+int
+KdProcessArgument (int argc, char **argv, int i);
+
+void
+KdOsInit (KdOsFuncs *pOsFuncs);
+
+void
+KdOsAddInputDrivers (void);
+
+Bool
+KdAllocatePrivates (ScreenPtr pScreen);
+
+Bool
+KdCreateScreenResources (ScreenPtr pScreen);
+
+Bool
+KdCloseScreen (int index, ScreenPtr pScreen);
+
+Bool
+KdSaveScreen (ScreenPtr pScreen, int on);
+
+Bool
+KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
+
+void
+KdInitScreen (ScreenInfo    *pScreenInfo,
+	      KdScreenInfo  *screen,
+	      int	    argc,
+	      char	    **argv);
+
+void
+KdInitCard (ScreenInfo	    *pScreenInfo,
+	    KdCardInfo	    *card,
+	    int		    argc,
+	    char	    **argv);
+
+void
+KdInitOutput (ScreenInfo    *pScreenInfo,
+	      int	    argc,
+	      char	    **argv);
+
+void
+KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);
+
+void
+KdBacktrace (int signum);
+
+/* kinfo.c */
+KdCardInfo *
+KdCardInfoAdd (KdCardFuncs  *funcs,
+	       void	    *closure);
+
+KdCardInfo *
+KdCardInfoLast (void);
+
+void
+KdCardInfoDispose (KdCardInfo *ci);
+
+KdScreenInfo *
+KdScreenInfoAdd (KdCardInfo *ci);
+
+void
+KdScreenInfoDispose (KdScreenInfo *si);
+
+
+/* kinput.c */
+void
+KdInitInput(void);
+
+void
+KdAddPointerDriver(KdPointerDriver *);
+
+void
+KdAddKeyboardDriver(KdKeyboardDriver *);
+
+Bool
+KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
+
+void
+KdUnregisterFds (void *closure, Bool do_close);
+
+void
+KdUnregisterFd (void *closure, int fd, Bool do_close);
+
+void
+KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
+                    unsigned char is_up);
+
+#define KD_BUTTON_1	0x01
+#define KD_BUTTON_2	0x02
+#define KD_BUTTON_3	0x04
+#define KD_BUTTON_4	0x08
+#define KD_BUTTON_5	0x10
+#define KD_BUTTON_8	0x80
+#define KD_MOUSE_DELTA	0x80000000
+
+void
+KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
+                      int rz);
+
+void
+_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,
+                       int b, int absrel, Bool force);
+
+void
+KdReleaseAllKeys (void);
+
+void
+KdSetLed (KdKeyboardInfo *ki, int led, Bool on);
+
+void
+KdSetPointerMatrix (KdPointerMatrix *pointer);
+
+void
+KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
+
+void
+KdScreenToPointerCoords (int *x, int *y);
+
+void
+KdBlockHandler (int		screen,
+		pointer		blockData,
+		pointer		timeout,
+		pointer		readmask);
+
+void
+KdWakeupHandler (int		screen,
+		 pointer    	data,
+		 unsigned long	result,
+		 pointer	readmask);
+
+void
+KdDisableInput (void);
+
+void
+KdEnableInput (void);
+
+void
+ProcessInputEvents (void);
+
+void
+KdRingBell (KdKeyboardInfo      *ki,
+            int                 volume,
+            int                 pitch,
+            int                 duration);
+
+/* kmode.c */
+const KdMonitorTiming *
+KdFindMode (KdScreenInfo    *screen,
+	    Bool	    (*supported) (KdScreenInfo *,
+					  const KdMonitorTiming *));
+
+Bool
+KdTuneMode (KdScreenInfo    *screen,
+	    Bool	    (*usable) (KdScreenInfo *),
+	    Bool	    (*supported) (KdScreenInfo *,
+					  const KdMonitorTiming *));
+
+#ifdef RANDR
+Bool
+KdRandRGetInfo (ScreenPtr pScreen,
+		int randr,
+		Bool (*supported) (ScreenPtr pScreen,
+				   const KdMonitorTiming *));
+
+const KdMonitorTiming *
+KdRandRGetTiming (ScreenPtr	    pScreen,
+		  Bool		    (*supported) (ScreenPtr pScreen,
+						  const KdMonitorTiming *),
+		  int		    rate,
+		  RRScreenSizePtr   pSize);
+#endif
+
+/* kshadow.c */
+Bool
+KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);
+
+void
+KdShadowFbFree (KdScreenInfo *screen);
+
+Bool
+KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);
+
+void
+KdShadowUnset (ScreenPtr pScreen);
+
+/* function prototypes to be implemented by the drivers */
+void
+InitCard (char *name);
+
+#endif /* _KDRIVE_H_ */
diff --git a/xorg-server/hw/kdrive/src/kinput.c b/xorg-server/hw/kdrive/src/kinput.c
index 0485dc413..e3bc4c523 100644
--- a/xorg-server/hw/kdrive/src/kinput.c
+++ b/xorg-server/hw/kdrive/src/kinput.c
@@ -1,2331 +1,2328 @@
-/*

- * Copyright � 1999 Keith Packard

- * Copyright � 2006 Nokia Corporation

- *

- * 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, and that the name of the authors not be used in

- * advertising or publicity pertaining to distribution of the software without

- * specific, written prior permission.  The authors make no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.

- *

- * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE AUTHORS 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_CONFIG_H

-#include <kdrive-config.h>

-#endif

-#include "kdrive.h"

-#include "inputstr.h"

-

-#define XK_PUBLISHING

-#include <X11/keysym.h>

-#if HAVE_X11_XF86KEYSYM_H

-#include <X11/XF86keysym.h>

-#endif

-#include <signal.h>

-#include <stdio.h>

-#ifdef sun

-#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */

-#endif

-

-#include "xkbsrv.h"

-

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

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

-#include "XIstubs.h" /* even though we don't use stubs.  cute, no? */

-#include "exevents.h"

-#include "extinit.h"

-#include "exglobals.h"

-#include "eventstr.h"

-#include "xserver-properties.h"

-#include "inpututils.h"

-

-#define AtomFromName(x) MakeAtom(x, strlen(x), 1)

-

-struct KdConfigDevice {

-    char *line;

-    struct KdConfigDevice *next;

-};

-

-/* kdKeyboards and kdPointers hold all the real devices. */

-static KdKeyboardInfo *kdKeyboards         = NULL;

-static KdPointerInfo  *kdPointers          = NULL;

-static struct KdConfigDevice *kdConfigKeyboards   = NULL;

-static struct KdConfigDevice *kdConfigPointers    = NULL;

-

-static KdKeyboardDriver *kdKeyboardDrivers = NULL;

-static KdPointerDriver  *kdPointerDrivers  = NULL;

-

-static EventListPtr     kdEvents = NULL;

-

-static Bool		kdInputEnabled;

-static Bool		kdOffScreen;

-static unsigned long	kdOffScreenTime;

-static KdPointerMatrix	kdPointerMatrix = {

-   { { 1, 0, 0 },

-     { 0, 1, 0 } }

-};

-

-void KdResetInputMachine (void);

-

-#define KD_MAX_INPUT_FDS    8

-

-typedef struct _kdInputFd {

-    int	        fd;

-    void        (*read) (int fd, void *closure);

-    int	        (*enable) (int fd, void *closure);

-    void        (*disable) (int fd, void *closure);

-    void        *closure;

-} KdInputFd;

-

-static KdInputFd kdInputFds[KD_MAX_INPUT_FDS];

-static int	 kdNumInputFds;

-

-extern Bool      kdRawPointerCoordinates;

-

-static void

-KdSigio (int sig)

-{

-    int	i;

-

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

-	(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);

-}

-

-static void

-KdBlockSigio (void)

-{

-    sigset_t	set;

-

-    sigemptyset (&set);

-    sigaddset (&set, SIGIO);

-    sigprocmask (SIG_BLOCK, &set, 0);

-}

-

-static void

-KdUnblockSigio (void)

-{

-    sigset_t	set;

-

-    sigemptyset (&set);

-    sigaddset (&set, SIGIO);

-    sigprocmask (SIG_UNBLOCK, &set, 0);

-}

-

-#ifdef DEBUG_SIGIO

-

-void

-KdAssertSigioBlocked (char *where)

-{

-    sigset_t	set, old;

-

-    sigemptyset (&set);

-    sigprocmask (SIG_BLOCK, &set, &old);

-    if (!sigismember (&old, SIGIO)) {

-	ErrorF ("SIGIO not blocked at %s\n", where);

-        KdBacktrace(0);

-    }

-}

-

-#else

-

-#define KdAssertSigioBlocked(s)

-

-#endif

-

-static int  kdnFds;

-

-#ifdef FNONBLOCK

-#define NOBLOCK FNONBLOCK

-#else

-#define NOBLOCK FNDELAY

-#endif

-

-void

-KdResetInputMachine (void)

-{

-    KdPointerInfo *pi;

-

-    for (pi = kdPointers; pi; pi = pi->next) {

-        pi->mouseState = start;

-        pi->eventHeld = FALSE;

-    }

-}

-

-static void

-KdNonBlockFd (int fd)

-{

-    int	flags;

-    flags = fcntl (fd, F_GETFL);

-    flags |= FASYNC|NOBLOCK;

-    fcntl (fd, F_SETFL, flags);

-}

-

-static void

-KdAddFd (int fd)

-{

-    struct sigaction	act;

-    sigset_t		set;

-

-    kdnFds++;

-    fcntl (fd, F_SETOWN, getpid());

-    KdNonBlockFd (fd);

-    AddEnabledDevice (fd);

-    memset (&act, '\0', sizeof act);

-    act.sa_handler = KdSigio;

-    sigemptyset (&act.sa_mask);

-    sigaddset (&act.sa_mask, SIGIO);

-    sigaddset (&act.sa_mask, SIGALRM);

-    sigaddset (&act.sa_mask, SIGVTALRM);

-    sigaction (SIGIO, &act, 0);

-    sigemptyset (&set);

-    sigprocmask (SIG_SETMASK, &set, 0);

-}

-

-static void

-KdRemoveFd (int fd)

-{

-    struct sigaction	act;

-    int			flags;

-

-    kdnFds--;

-    RemoveEnabledDevice (fd);

-    flags = fcntl (fd, F_GETFL);

-    flags &= ~(FASYNC|NOBLOCK);

-    fcntl (fd, F_SETFL, flags);

-    if (kdnFds == 0)

-    {

-	memset (&act, '\0', sizeof act);

-	act.sa_handler = SIG_IGN;

-	sigemptyset (&act.sa_mask);

-	sigaction (SIGIO, &act, 0);

-    }

-}

-

-Bool

-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)

-{

-    if (kdNumInputFds == KD_MAX_INPUT_FDS)

-	return FALSE;

-    kdInputFds[kdNumInputFds].fd = fd;

-    kdInputFds[kdNumInputFds].read = read;

-    kdInputFds[kdNumInputFds].enable = 0;

-    kdInputFds[kdNumInputFds].disable = 0;

-    kdInputFds[kdNumInputFds].closure = closure;

-    kdNumInputFds++;

-    if (kdInputEnabled)

-	KdAddFd (fd);

-    return TRUE;

-}

-

-void

-KdUnregisterFd (void *closure, int fd, Bool do_close)

-{

-    int	i, j;

-

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

-	if (kdInputFds[i].closure == closure &&

-            (fd == -1 || kdInputFds[i].fd == fd)) {

-	    if (kdInputEnabled)

-		KdRemoveFd (kdInputFds[i].fd);

-	    if (do_close)

-		close (kdInputFds[i].fd);

-	    kdNumInputFds--;

-	    for (j = i; j < kdNumInputFds; j++)

-		kdInputFds[j] = kdInputFds[j+1];

-            break;

-	}

-    }

-}

-

-void

-KdUnregisterFds (void *closure, Bool do_close)

-{

-    KdUnregisterFd(closure, -1, do_close);

-}

-

-void

-KdDisableInput (void)

-{

-    KdKeyboardInfo *ki;

-    KdPointerInfo *pi;

-    int found = 0, i = 0;

-

-    KdBlockSigio();

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->driver && ki->driver->Disable)

-            (*ki->driver->Disable) (ki);

-    }

-

-    for (pi = kdPointers; pi; pi = pi->next) {

-        if (pi->driver && pi->driver->Disable)

-            (*pi->driver->Disable) (pi);

-    }

-

-    if (kdNumInputFds) {

-        ErrorF("[KdDisableInput] Buggy drivers: still %d input fds left!",

-               kdNumInputFds);

-        i = 0;

-        while (i < kdNumInputFds) {

-            found = 0;

-            for (ki = kdKeyboards; ki; ki = ki->next) {

-                if (ki == kdInputFds[i].closure) {

-                    ErrorF("    fd %d belongs to keybd driver %s\n",

-                           kdInputFds[i].fd,

-                           ki->driver && ki->driver->name ?

-                             ki->driver->name : "(unnamed!)");

-                    found = 1;

-                    break;

-                }

-            }

-

-            if (found) {

-                i++;

-                continue;

-            }

-

-            for (pi = kdPointers; pi; pi = pi->next) {

-                if (pi == kdInputFds[i].closure) {

-                    ErrorF("    fd %d belongs to pointer driver %s\n",

-                           kdInputFds[i].fd,

-                           pi->driver && pi->driver->name ?

-                             pi->driver->name : "(unnamed!)");

-                    break;

-                }

-            }

-

-            if (found) {

-                i++;

-                continue;

-            }

-

-            ErrorF("    fd %d not claimed by any active device!\n",

-                   kdInputFds[i].fd);

-            KdUnregisterFd(kdInputFds[i].closure, kdInputFds[i].fd, TRUE);

-        }

-    }

-

-    kdInputEnabled = FALSE;

-}

-

-void

-KdEnableInput (void)

-{

-    InternalEvent ev;

-    KdKeyboardInfo *ki;

-    KdPointerInfo *pi;

-

-    kdInputEnabled = TRUE;

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->driver && ki->driver->Enable)

-            (*ki->driver->Enable) (ki);

-    }

-

-    for (pi = kdPointers; pi; pi = pi->next) {

-        if (pi->driver && pi->driver->Enable)

-            (*pi->driver->Enable) (pi);

-    }

-

-    /* reset screen saver */

-    ev.any.time = GetTimeInMillis ();

-    NoticeEventTime (&ev);

-

-    KdUnblockSigio ();

-}

-

-static KdKeyboardDriver *

-KdFindKeyboardDriver (char *name)

-{

-    KdKeyboardDriver *ret;

-

-    /* ask a stupid question ... */

-    if (!name)

-        return NULL;

-

-    for (ret = kdKeyboardDrivers; ret; ret = ret->next) {

-        if (strcmp(ret->name, name) == 0)

-            return ret;

-    }

-

-    return NULL;

-}

-

-static KdPointerDriver *

-KdFindPointerDriver (char *name)

-{

-    KdPointerDriver *ret;

-

-    /* ask a stupid question ... */

-    if (!name)

-        return NULL;

-

-    for (ret = kdPointerDrivers; ret; ret = ret->next) {

-        if (strcmp(ret->name, name) == 0)

-            return ret;

-    }

-

-    return NULL;

-}

-

-static int

-KdPointerProc(DeviceIntPtr pDevice, int onoff)

-{

-    DevicePtr       pDev = (DevicePtr)pDevice;

-    KdPointerInfo   *pi;

-    Atom            xiclass;

-    Atom            *btn_labels;

-    Atom            *axes_labels;

-

-    if (!pDev)

-	return BadImplementation;

-

-    for (pi = kdPointers; pi; pi = pi->next) {

-        if (pi->dixdev && pi->dixdev->id == pDevice->id)

-            break;

-    }

-

-    if (!pi || !pi->dixdev || pi->dixdev->id != pDevice->id) {

-        ErrorF("[KdPointerProc] Failed to find pointer for device %d!\n",

-               pDevice->id);

-        return BadImplementation;

-    }

-

-    switch (onoff)

-    {

-    case DEVICE_INIT:

-#ifdef DEBUG

-        ErrorF("initialising pointer %s ...\n", pi->name);

-#endif

-        if (!pi->driver) {

-            if (!pi->driverPrivate) {

-                ErrorF("no driver specified for %s\n", pi->name);

-                return BadImplementation;

-            }

-

-            pi->driver = KdFindPointerDriver(pi->driverPrivate);

-            if (!pi->driver) {

-                ErrorF("Couldn't find pointer driver %s\n",

-                       pi->driverPrivate ? (char *) pi->driverPrivate :

-                       "(unnamed)");

-                return !Success;

-            }

-            free(pi->driverPrivate);

-            pi->driverPrivate = NULL;

-        }

-

-        if (!pi->driver->Init) {

-            ErrorF("no init function\n");

-            return BadImplementation;

-        }

-

-        if ((*pi->driver->Init) (pi) != Success) {

-            return !Success;

-        }

-

-	btn_labels = calloc(pi->nButtons, sizeof(Atom));

-	if (!btn_labels)

-	    return BadAlloc;

-	axes_labels = calloc(pi->nAxes, sizeof(Atom));

-	if (!axes_labels) {

-	    free(btn_labels);

-	    return BadAlloc;

-	}

-

-	switch(pi->nAxes)

-	{

-	    default:

-	    case 7:

-		btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

-	    case 6:

-		btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

-	    case 5:

-		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

-	    case 4:

-		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

-	    case 3:

-		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-	    case 2:

-		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-	    case 1:

-		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-	    case 0:

-		break;

-	}

-

-	if (pi->nAxes >= 2) {

-	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

-	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

-	}

-

-	InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,

-	    (PtrCtrlProcPtr)NoopDDA,

-	    GetMotionHistorySize(), pi->nAxes, axes_labels);

-

-        free(btn_labels);

-        free(axes_labels);

-

-        if (pi->inputClass == KD_TOUCHSCREEN) {

-            InitAbsoluteClassDeviceStruct(pDevice);

-            xiclass = AtomFromName(XI_TOUCHSCREEN);

-        }

-        else {

-            xiclass = AtomFromName(XI_MOUSE);

-        }

-

-        AssignTypeAndName(pi->dixdev, xiclass,

-                          pi->name ? pi->name : "Generic KDrive Pointer");

-

-	return Success;

-

-    case DEVICE_ON:

-        if (pDev->on == TRUE)

-            return Success;

-

-        if (!pi->driver->Enable) {

-            ErrorF("no enable function\n");

-            return BadImplementation;

-        }

-

-        if ((*pi->driver->Enable) (pi) == Success) {

-            pDev->on = TRUE;

-            return Success;

-        }

-        else {

-            return BadImplementation;

-        }

-

-	return Success;

-

-    case DEVICE_OFF:

-        if (pDev->on == FALSE) {

-            return Success;

-        }

-

-        if (!pi->driver->Disable) {

-            return BadImplementation;

-        }

-        else {

-            (*pi->driver->Disable) (pi);

-            pDev->on = FALSE;

-            return Success;

-        }

-

-        return Success;

-

-    case DEVICE_CLOSE:

-	if (pDev->on) {

-            if (!pi->driver->Disable) {

-                return BadImplementation;

-            }

-            (*pi->driver->Disable) (pi);

-            pDev->on = FALSE;

-        }

-

-        if (!pi->driver->Fini)

-            return BadImplementation;

-

-        (*pi->driver->Fini) (pi);

-

-        KdRemovePointer(pi);

-

-        return Success;

-    }

-

-    /* NOTREACHED */

-    return BadImplementation;

-}

-

-Bool

-LegalModifier(unsigned int key, DeviceIntPtr pDev)

-{

-    return TRUE;

-}

-

-static void

-KdBell (int volume, DeviceIntPtr pDev, pointer arg, int something)

-{

-    KeybdCtrl *ctrl = arg;

-    KdKeyboardInfo *ki = NULL;

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->dixdev && ki->dixdev->id == pDev->id)

-            break;

-    }

-

-    if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver)

-        return;

-

-    KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);

-}

-

-void

-DDXRingBell(int volume, int pitch, int duration)

-{

-    KdKeyboardInfo *ki = NULL;

-

-    if (kdOsFuncs->Bell) {

-        (*kdOsFuncs->Bell)(volume, pitch, duration);

-    }

-    else {

-        for (ki = kdKeyboards; ki; ki = ki->next) {

-            if (ki->dixdev->coreEvents)

-                KdRingBell(ki, volume, pitch, duration);

-        }

-    }

-}

-

-void

-KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)

-{

-    if (!ki || !ki->driver || !ki->driver->Bell)

-        return;

-

-    if (kdInputEnabled)

-        (*ki->driver->Bell) (ki, volume, pitch, duration);

-}

-

-

-static void

-KdSetLeds (KdKeyboardInfo *ki, int leds)

-{

-    if (!ki || !ki->driver)

-        return;

-

-    if (kdInputEnabled) {

-        if (ki->driver->Leds)

-            (*ki->driver->Leds) (ki, leds);

-    }

-}

-

-void

-KdSetLed (KdKeyboardInfo *ki, int led, Bool on)

-{

-    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed)

-        return;

-

-    NoteLedState (ki->dixdev, led, on);

-    KdSetLeds (ki, ki->dixdev->kbdfeed->ctrl.leds);

-}

-

-void

-KdSetPointerMatrix (KdPointerMatrix *matrix)

-{

-    kdPointerMatrix = *matrix;

-}

-

-void

-KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,

-                        int height)

-{

-    int		    x_dir = 1, y_dir = 1;

-    int		    i, j;

-    int		    size[2];

-

-    size[0] = width; size[1] = height;

-    if (randr & RR_Reflect_X)

-	x_dir = -1;

-    if (randr & RR_Reflect_Y)

-	y_dir = -1;

-    switch (randr & (RR_Rotate_All)) {

-    case RR_Rotate_0:

-	m->matrix[0][0] = x_dir; m->matrix[0][1] = 0;

-	m->matrix[1][0] = 0; m->matrix[1][1] = y_dir;

-	break;

-    case RR_Rotate_90:

-	m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir;

-	m->matrix[1][0] = y_dir; m->matrix[1][1] = 0;

-	break;

-    case RR_Rotate_180:

-	m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0;

-	m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir;

-	break;

-    case RR_Rotate_270:

-	m->matrix[0][0] = 0; m->matrix[0][1] = x_dir;

-	m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0;

-	break;

-    }

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

-    {

-	m->matrix[i][2] = 0;

-	for (j = 0 ; j < 2; j++)

-	    if (m->matrix[i][j] < 0)

-		m->matrix[i][2] = size[j] - 1;

-    }

-}

-

-void

-KdScreenToPointerCoords (int *x, int *y)

-{

-    int	(*m)[3] = kdPointerMatrix.matrix;

-    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];

-    int sx = *x;

-    int sy = *y;

-

-    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;

-    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;

-}

-

-static void

-KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)

-{

-    KdKeyboardInfo *ki;

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->dixdev && ki->dixdev->id == pDevice->id)

-            break;

-    }

-

-    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id || !ki->driver)

-        return;

-

-    KdSetLeds(ki, ctrl->leds);

-    ki->bellPitch = ctrl->bell_pitch;

-    ki->bellDuration = ctrl->bell_duration;

-}

-

-extern KeybdCtrl defaultKeyboardControl;

-

-static int

-KdKeyboardProc(DeviceIntPtr pDevice, int onoff)

-{

-    Bool        ret;

-    DevicePtr   pDev = (DevicePtr)pDevice;

-    KdKeyboardInfo *ki;

-    Atom xiclass;

-    XkbRMLVOSet rmlvo;

-

-    if (!pDev)

-	return BadImplementation;

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        if (ki->dixdev && ki->dixdev->id == pDevice->id)

-            break;

-    }

-

-    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id) {

-        return BadImplementation;

-    }

-

-    switch (onoff)

-    {

-    case DEVICE_INIT:

-#ifdef DEBUG

-        ErrorF("initialising keyboard %s\n", ki->name);

-#endif

-        if (!ki->driver) {

-            if (!ki->driverPrivate) {

-                ErrorF("no driver specified!\n");

-                return BadImplementation;

-            }

-

-            ki->driver = KdFindKeyboardDriver(ki->driverPrivate);

-            if (!ki->driver) {

-                ErrorF("Couldn't find keyboard driver %s\n",

-                       ki->driverPrivate ? (char *) ki->driverPrivate :

-                       "(unnamed)");

-                return !Success;

-            }

-            free(ki->driverPrivate);

-            ki->driverPrivate = NULL;

-        }

-

-        if (!ki->driver->Init) {

-            ErrorF("Keyboard %s: no init function\n", ki->name);

-            return BadImplementation;

-        }

-

-        if ((*ki->driver->Init) (ki) != Success) {

-            return !Success;

-        }

-

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

-        rmlvo.rules = ki->xkbRules;

-        rmlvo.model = ki->xkbModel;

-        rmlvo.layout = ki->xkbLayout;

-        rmlvo.variant = ki->xkbVariant;

-        rmlvo.options = ki->xkbOptions;

-        ret = InitKeyboardDeviceStruct (pDevice, &rmlvo, KdBell, KdKbdCtrl);

-	if (!ret) {

-            ErrorF("Couldn't initialise keyboard %s\n", ki->name);

-	    return BadImplementation;

-        }

-

-        xiclass = AtomFromName(XI_KEYBOARD);

-        AssignTypeAndName(pDevice, xiclass,

-                          ki->name ? ki->name : "Generic KDrive Keyboard");

-

-        KdResetInputMachine();

-

-        return Success;

-

-    case DEVICE_ON:

-        if (pDev->on == TRUE)

-            return Success;

-

-        if (!ki->driver->Enable)

-            return BadImplementation;

-

-        if ((*ki->driver->Enable) (ki) != Success) {

-            return BadMatch;

-        }

-

-        pDev->on = TRUE;

-        return Success;

-

-    case DEVICE_OFF:

-        if (pDev->on == FALSE)

-            return Success;

-

-        if (!ki->driver->Disable)

-            return BadImplementation;

-

-        (*ki->driver->Disable) (ki);

-        pDev->on = FALSE;

-

-        return Success;

-

-        break;

-

-    case DEVICE_CLOSE:

-	if (pDev->on) {

-            if (!ki->driver->Disable)

-                return BadImplementation;

-

-            (*ki->driver->Disable) (ki);

-            pDev->on = FALSE;

-	}

-

-        if (!ki->driver->Fini)

-            return BadImplementation;

-

-        (*ki->driver->Fini) (ki);

-

-        KdRemoveKeyboard(ki);

-

-        return Success;

-    }

-

-    /* NOTREACHED */

-    return BadImplementation;

-}

-

-void

-KdAddPointerDriver (KdPointerDriver *driver)

-{

-    KdPointerDriver **prev;

-

-    if (!driver)

-        return;

-

-    for (prev = &kdPointerDrivers; *prev; prev = &(*prev)->next) {

-        if (*prev == driver)

-            return;

-    }

-    *prev = driver;

-}

-

-void

-KdRemovePointerDriver (KdPointerDriver *driver)

-{

-    KdPointerDriver *tmp;

-

-    if (!driver)

-        return;

-

-    /* FIXME remove all pointers using this driver */

-    for (tmp = kdPointerDrivers; tmp; tmp = tmp->next) {

-        if (tmp->next == driver)

-            tmp->next = driver->next;

-    }

-    if (tmp == driver)

-        tmp = NULL;

-}

-

-void

-KdAddKeyboardDriver (KdKeyboardDriver *driver)

-{

-    KdKeyboardDriver **prev;

-

-    if (!driver)

-        return;

-

-    for (prev = &kdKeyboardDrivers; *prev; prev = &(*prev)->next) {

-        if (*prev == driver)

-            return;

-    }

-    *prev = driver;

-}

-

-void

-KdRemoveKeyboardDriver (KdKeyboardDriver *driver)

-{

-    KdKeyboardDriver *tmp;

-

-    if (!driver)

-        return;

-

-    /* FIXME remove all keyboards using this driver */

-    for (tmp = kdKeyboardDrivers; tmp; tmp = tmp->next) {

-        if (tmp->next == driver)

-            tmp->next = driver->next;

-    }

-    if (tmp == driver)

-        tmp = NULL;

-}

-

-KdKeyboardInfo *

-KdNewKeyboard (void)

-{

-    KdKeyboardInfo *ki = calloc(sizeof(KdKeyboardInfo), 1);

-    if (!ki)

-        return NULL;

-

-    ki->minScanCode = 0;

-    ki->maxScanCode = 0;

-    ki->leds = 0;

-    ki->bellPitch = 1000;

-    ki->bellDuration = 200;

-    ki->next = NULL;

-    ki->options = NULL;

-    ki->xkbRules = strdup(XKB_DFLT_RULES);

-    ki->xkbModel = strdup(XKB_DFLT_MODEL);

-    ki->xkbLayout = strdup(XKB_DFLT_LAYOUT);

-    ki->xkbVariant = strdup(XKB_DFLT_VARIANT);

-    ki->xkbOptions = strdup(XKB_DFLT_OPTIONS);

-

-    return ki;

-}

-

-int

-KdAddConfigKeyboard (char *keyboard)

-{

-    struct KdConfigDevice **prev, *new;

-

-    if (!keyboard)

-        return Success;

-

-    new = (struct KdConfigDevice *) calloc(sizeof(struct KdConfigDevice), 1);

-    if (!new)

-        return BadAlloc;

-

-    new->line = strdup(keyboard);

-    new->next = NULL;

-

-    for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);

-    *prev = new;

-

-    return Success;

-}

-

-int

-KdAddKeyboard (KdKeyboardInfo *ki)

-{

-    KdKeyboardInfo **prev;

-

-    if (!ki)

-        return !Success;

-

-    ki->dixdev = AddInputDevice(serverClient, KdKeyboardProc, TRUE);

-    if (!ki->dixdev) {

-        ErrorF("Couldn't register keyboard device %s\n",

-               ki->name ? ki->name : "(unnamed)");

-        return !Success;

-    }

-

-#ifdef DEBUG

-    ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);

-#endif

-

-    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next);

-    *prev = ki;

-

-    return Success;

-}

-

-void

-KdRemoveKeyboard (KdKeyboardInfo *ki)

-{

-    KdKeyboardInfo **prev;

-

-    if (!ki)

-        return;

-

-    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next) {

-        if (*prev == ki) {

-            *prev = ki->next;

-            break;

-        }

-    }

-

-    KdFreeKeyboard(ki);

-}

-

-int

-KdAddConfigPointer (char *pointer)

-{

-    struct KdConfigDevice **prev, *new;

-

-    if (!pointer)

-        return Success;

-

-    new = (struct KdConfigDevice *) calloc(sizeof(struct KdConfigDevice), 1);

-    if (!new)

-        return BadAlloc;

-

-    new->line = strdup(pointer);

-    new->next = NULL;

-

-    for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);

-    *prev = new;

-

-    return Success;

-}

-

-int

-KdAddPointer (KdPointerInfo *pi)

-{

-    KdPointerInfo **prev;

-

-    if (!pi)

-        return Success;

-

-    pi->mouseState = start;

-    pi->eventHeld = FALSE;

-

-    pi->dixdev = AddInputDevice(serverClient, KdPointerProc, TRUE);

-    if (!pi->dixdev) {

-        ErrorF("Couldn't add pointer device %s\n",

-               pi->name ? pi->name : "(unnamed)");

-        return BadDevice;

-    }

-

-    for (prev = &kdPointers; *prev; prev = &(*prev)->next);

-    *prev = pi;

-

-    return Success;

-}

-

-void

-KdRemovePointer (KdPointerInfo *pi)

-{

-    KdPointerInfo **prev;

-

-    if (!pi)

-        return;

-

-    for (prev = &kdPointers; *prev; prev = &(*prev)->next) {

-        if (*prev == pi) {

-            *prev = pi->next;

-            break;

-        }

-    }

-

-    KdFreePointer(pi);

-}

-

-/*

- * You can call your kdriver server with something like:

- * $ ./hw/kdrive/yourserver/X :1 -mouse evdev,,device=/dev/input/event4 -keybd

- * evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br

- */

-static Bool

-KdGetOptions (InputOption **options, char *string)

-{

-    InputOption     *newopt = NULL, **tmpo = NULL;

-    int             tam_key = 0;

-

-    newopt = calloc(1, sizeof (InputOption));

-    if (!newopt)

-        return FALSE;

-

-    for (tmpo = options; *tmpo; tmpo = &(*tmpo)->next)

-        ; /* Hello, I'm here */

-    *tmpo = newopt;

-

-    if (strchr(string, '='))

-    {

-        tam_key = (strchr(string, '=') - string);

-        newopt->key = (char *)malloc(tam_key);

-        strncpy(newopt->key, string, tam_key);

-        newopt->key[tam_key] = '\0';

-        newopt->value = strdup(strchr(string, '=') + 1);

-    }

-    else

-    {

-        newopt->key = strdup(string);

-        newopt->value = NULL;

-    }

-    newopt->next = NULL;

-

-    return TRUE;

-}

-

-static void

-KdParseKbdOptions (KdKeyboardInfo *ki)

-{

-    InputOption *option = NULL;

-

-    for (option = ki->options; option; option = option->next)

-    {

-        if (strcasecmp(option->key, "XkbRules") == 0)

-            ki->xkbRules = option->value;

-        else if (strcasecmp(option->key, "XkbModel") == 0)

-            ki->xkbModel = option->value;

-        else if (strcasecmp(option->key, "XkbLayout") == 0)

-            ki->xkbLayout = option->value;

-        else if (strcasecmp(option->key, "XkbVariant") == 0)

-            ki->xkbVariant = option->value;

-        else if (strcasecmp(option->key, "XkbOptions") == 0)

-            ki->xkbOptions = option->value;

-        else if (!strcasecmp (option->key, "device"))

-            ki->path = strdup(option->value);

-        else

-           ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",

-                    option->key, option->value);

-    }

-}

-

-KdKeyboardInfo *

-KdParseKeyboard (char *arg)

-{

-    char            save[1024];

-    char            delim;

-    InputOption     *options = NULL;

-    KdKeyboardInfo     *ki = NULL;

-

-    ki = KdNewKeyboard();

-    if (!ki)

-        return NULL;

-

-    ki->name = strdup("Unknown KDrive Keyboard");

-    ki->path = NULL;

-    ki->driver = NULL;

-    ki->driverPrivate = NULL;

-    ki->next = NULL;

-

-    if (!arg)

-    {

-        ErrorF("keybd: no arg\n");

-        KdFreeKeyboard (ki);

-        return NULL;

-    }

-

-    if (strlen (arg) >= sizeof (save))

-    {

-        ErrorF("keybd: arg too long\n");

-        KdFreeKeyboard (ki);

-        return NULL;

-    }

-

-    arg = KdParseFindNext (arg, ",", save, &delim);

-    if (!save[0])

-    {

-        ErrorF("keybd: failed on save[0]\n");

-        KdFreeKeyboard (ki);

-        return NULL;

-    }

-

-    if (strcmp (save, "auto") == 0)

-        ki->driverPrivate = NULL;

-    else

-        ki->driverPrivate = strdup(save);

-

-    if (delim != ',')

-    {

-        return ki;

-    }

-

-    arg = KdParseFindNext (arg, ",", save, &delim);

-

-    while (delim == ',')

-    {

-        arg = KdParseFindNext (arg, ",", save, &delim);

-

-	if (!KdGetOptions(&options, save))

-	{

-	    KdFreeKeyboard(ki);

-	    return NULL;

-        }

-    }

-

-    if (options)

-    {

-        ki->options = options;

-        KdParseKbdOptions(ki);

-    }

-

-    return ki;

-}

-

-static void

-KdParsePointerOptions (KdPointerInfo *pi)

-{

-    InputOption *option = NULL;

-

-    for (option = pi->options; option; option = option->next)

-    {

-        if (!strcmp (option->key, "emulatemiddle"))

-            pi->emulateMiddleButton = TRUE;

-        else if (!strcmp (option->key, "noemulatemiddle"))

-            pi->emulateMiddleButton = FALSE;

-        else if (!strcmp (option->key, "transformcoord"))

-            pi->transformCoordinates = TRUE;

-        else if (!strcmp (option->key, "rawcoord"))

-            pi->transformCoordinates = FALSE;

-        else if (!strcasecmp (option->key, "device"))

-            pi->path = strdup(option->value);

-        else if (!strcasecmp (option->key, "protocol"))

-            pi->protocol = strdup(option->value);

-        else

-            ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",

-                    option->key, option->value);

-    }

-}

-

-KdPointerInfo *

-KdParsePointer (char *arg)

-{

-    char            save[1024];

-    char            delim;

-    KdPointerInfo   *pi = NULL;

-    InputOption     *options = NULL;

-    int             i = 0;

-

-    pi = KdNewPointer();

-    if (!pi)

-        return NULL;

-    pi->emulateMiddleButton = kdEmulateMiddleButton;

-    pi->transformCoordinates = !kdRawPointerCoordinates;

-    pi->protocol = NULL;

-    pi->nButtons = 5; /* XXX should not be hardcoded */

-    pi->inputClass = KD_MOUSE;

-

-    if (!arg)

-    {

-        ErrorF("mouse: no arg\n");

-        KdFreePointer (pi);

-        return NULL;

-    }

-

-    if (strlen (arg) >= sizeof (save))

-    {

-        ErrorF("mouse: arg too long\n");

-        KdFreePointer (pi);

-        return NULL;

-    }

-    arg = KdParseFindNext (arg, ",", save, &delim);

-    if (!save[0])

-    {

-        ErrorF("failed on save[0]\n");

-        KdFreePointer (pi);

-        return NULL;

-    }

-

-    if (strcmp(save, "auto") == 0)

-        pi->driverPrivate = NULL;

-    else

-        pi->driverPrivate = strdup(save);

-

-    if (delim != ',')

-    {

-        return pi;

-    }

-

-    arg = KdParseFindNext (arg, ",", save, &delim);

-

-    while (delim == ',')

-    {

-        arg = KdParseFindNext (arg, ",", save, &delim);

-        if (save[0] == '{')

-        {

-            char *s = save + 1;

-             i = 0;

-             while (*s && *s != '}')

-             {

-                if ('1' <= *s && *s <= '0' + pi->nButtons)

-                    pi->map[i] = *s - '0';

-                else

-                    UseMsg ();

-                s++;

-             }

-        }

-        else

-        {

-            if (!KdGetOptions(&options, save))

-            {

-                KdFreePointer(pi);

-                return NULL;

-            }

-        }

-    }

-

-    if (options)

-    {

-        pi->options = options;

-        KdParsePointerOptions(pi);

-    }

-

-    return pi;

-}

-

-

-void

-KdInitInput (void)

-{

-    KdPointerInfo *pi;

-    KdKeyboardInfo *ki;

-    struct KdConfigDevice *dev;

-

-    kdInputEnabled = TRUE;

-

-    for (dev = kdConfigPointers; dev; dev = dev->next) {

-        pi = KdParsePointer(dev->line);

-        if (!pi)

-            ErrorF("Failed to parse pointer\n");

-        if (KdAddPointer(pi) != Success)

-            ErrorF("Failed to add pointer!\n");

-    }

-    for (dev = kdConfigKeyboards; dev; dev = dev->next) {

-        ki = KdParseKeyboard(dev->line);

-        if (!ki)

-            ErrorF("Failed to parse keyboard\n");

-        if (KdAddKeyboard(ki) != Success)

-            ErrorF("Failed to add keyboard!\n");

-    }

-

-    mieqInit();

-}

-

-/*

- * Middle button emulation state machine

- *

- *  Possible transitions:

- *	Button 1 press	    v1

- *	Button 1 release    ^1

- *	Button 2 press	    v2

- *	Button 2 release    ^2

- *	Button 3 press	    v3

- *	Button 3 release    ^3

- *	Button other press  vo

- *	Button other release ^o

- *	Mouse motion	    <>

- *	Keyboard event	    k

- *	timeout		    ...

- *	outside box	    <->

- *

- *  States:

- *	start

- *	button_1_pend

- *	button_1_down

- *	button_2_down

- *	button_3_pend

- *	button_3_down

- *	synthetic_2_down_13

- *	synthetic_2_down_3

- *	synthetic_2_down_1

- *

- *  Transition diagram

- *

- *  start

- *	v1  -> (hold) (settimeout) button_1_pend

- *	^1  -> (deliver) start

- *	v2  -> (deliver) button_2_down

- *	^2  -> (deliever) start

- *	v3  -> (hold) (settimeout) button_3_pend

- *	^3  -> (deliver) start

- *	vo  -> (deliver) start

- *	^o  -> (deliver) start

- *	<>  -> (deliver) start

- *	k   -> (deliver) start

- *

- *  button_1_pend	(button 1 is down, timeout pending)

- *	^1  -> (release) (deliver) start

- *	v2  -> (release) (deliver) button_1_down

- *	^2  -> (release) (deliver) button_1_down

- *	v3  -> (cleartimeout) (generate v2) synthetic_2_down_13

- *	^3  -> (release) (deliver) button_1_down

- *	vo  -> (release) (deliver) button_1_down

- *	^o  -> (release) (deliver) button_1_down

- *	<-> -> (release) (deliver) button_1_down

- *	<>  -> (deliver) button_1_pend

- *	k   -> (release) (deliver) button_1_down

- *	... -> (release) button_1_down

- *

- *  button_1_down	(button 1 is down)

- *	^1  -> (deliver) start

- *	v2  -> (deliver) button_1_down

- *	^2  -> (deliver) button_1_down

- *	v3  -> (deliver) button_1_down

- *	^3  -> (deliver) button_1_down

- *	vo  -> (deliver) button_1_down

- *	^o  -> (deliver) button_1_down

- *	<>  -> (deliver) button_1_down

- *	k   -> (deliver) button_1_down

- *

- *  button_2_down	(button 2 is down)

- *	v1  -> (deliver) button_2_down

- *	^1  -> (deliver) button_2_down

- *	^2  -> (deliver) start

- *	v3  -> (deliver) button_2_down

- *	^3  -> (deliver) button_2_down

- *	vo  -> (deliver) button_2_down

- *	^o  -> (deliver) button_2_down

- *	<>  -> (deliver) button_2_down

- *	k   -> (deliver) button_2_down

- *

- *  button_3_pend	(button 3 is down, timeout pending)

- *	v1  -> (generate v2) synthetic_2_down

- *	^1  -> (release) (deliver) button_3_down

- *	v2  -> (release) (deliver) button_3_down

- *	^2  -> (release) (deliver) button_3_down

- *	^3  -> (release) (deliver) start

- *	vo  -> (release) (deliver) button_3_down

- *	^o  -> (release) (deliver) button_3_down

- *	<-> -> (release) (deliver) button_3_down

- *	<>  -> (deliver) button_3_pend

- *	k   -> (release) (deliver) button_3_down

- *	... -> (release) button_3_down

- *

- *  button_3_down	(button 3 is down)

- *	v1  -> (deliver) button_3_down

- *	^1  -> (deliver) button_3_down

- *	v2  -> (deliver) button_3_down

- *	^2  -> (deliver) button_3_down

- *	^3  -> (deliver) start

- *	vo  -> (deliver) button_3_down

- *	^o  -> (deliver) button_3_down

- *	<>  -> (deliver) button_3_down

- *	k   -> (deliver) button_3_down

- *

- *  synthetic_2_down_13	(button 1 and 3 are down)

- *	^1  -> (generate ^2) synthetic_2_down_3

- *	v2  -> synthetic_2_down_13

- *	^2  -> synthetic_2_down_13

- *	^3  -> (generate ^2) synthetic_2_down_1

- *	vo  -> (deliver) synthetic_2_down_13

- *	^o  -> (deliver) synthetic_2_down_13

- *	<>  -> (deliver) synthetic_2_down_13

- *	k   -> (deliver) synthetic_2_down_13

- *

- *  synthetic_2_down_3 (button 3 is down)

- *	v1  -> (deliver) synthetic_2_down_3

- *	^1  -> (deliver) synthetic_2_down_3

- *	v2  -> synthetic_2_down_3

- *	^2  -> synthetic_2_down_3

- *	^3  -> start

- *	vo  -> (deliver) synthetic_2_down_3

- *	^o  -> (deliver) synthetic_2_down_3

- *	<>  -> (deliver) synthetic_2_down_3

- *	k   -> (deliver) synthetic_2_down_3

- *

- *  synthetic_2_down_1 (button 1 is down)

- *	^1  -> start

- *	v2  -> synthetic_2_down_1

- *	^2  -> synthetic_2_down_1

- *	v3  -> (deliver) synthetic_2_down_1

- *	^3  -> (deliver) synthetic_2_down_1

- *	vo  -> (deliver) synthetic_2_down_1

- *	^o  -> (deliver) synthetic_2_down_1

- *	<>  -> (deliver) synthetic_2_down_1

- *	k   -> (deliver) synthetic_2_down_1

- */

-

-typedef enum _inputClass {

-    down_1, up_1,

-    down_2, up_2,

-    down_3, up_3,

-    down_o, up_o,

-    motion, outside_box,

-    keyboard, timeout,

-    num_input_class

-} KdInputClass;

-

-typedef enum _inputAction {

-    noop,

-    hold,

-    setto,

-    deliver,

-    release,

-    clearto,

-    gen_down_2,

-    gen_up_2

-} KdInputAction;

-

-#define MAX_ACTIONS 2

-

-typedef struct _inputTransition {

-    KdInputAction  actions[MAX_ACTIONS];

-    KdPointerState nextState;

-} KdInputTransition;

-

-static const

-KdInputTransition  kdInputMachine[num_input_states][num_input_class] = {

-    /* start */

-    {

-	{ { hold, setto },	    button_1_pend },	/* v1 */

-	{ { deliver, noop },	    start },		/* ^1 */

-	{ { deliver, noop },	    button_2_down },	/* v2 */

-	{ { deliver, noop },	    start },		/* ^2 */

-	{ { hold, setto },	    button_3_pend },	/* v3 */

-	{ { deliver, noop },	    start },		/* ^3 */

-	{ { deliver, noop },	    start },		/* vo */

-	{ { deliver, noop },	    start },		/* ^o */

-	{ { deliver, noop },	    start },		/* <> */

-	{ { deliver, noop },	    start },		/* <-> */

-	{ { noop, noop },	    start },		/* k */

-	{ { noop, noop },	    start },		/* ... */

-    },

-    /* button_1_pend */

-    {

-	{ { noop, noop },	    button_1_pend },	/* v1 */

-	{ { release, deliver },	    start },		/* ^1 */

-	{ { release, deliver },	    button_1_down },	/* v2 */

-	{ { release, deliver },	    button_1_down },	/* ^2 */

-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v3 */

-	{ { release, deliver },	    button_1_down },	/* ^3 */

-	{ { release, deliver },	    button_1_down },	/* vo */

-	{ { release, deliver },	    button_1_down },	/* ^o */

-	{ { deliver, noop },	    button_1_pend },	/* <> */

-	{ { release, deliver },	    button_1_down },	/* <-> */

-	{ { noop, noop },	    button_1_down },	/* k */

-	{ { release, noop },	    button_1_down },	/* ... */

-    },

-    /* button_1_down */

-    {

-	{ { noop, noop },	    button_1_down },	/* v1 */

-	{ { deliver, noop },	    start },		/* ^1 */

-	{ { deliver, noop },	    button_1_down },	/* v2 */

-	{ { deliver, noop },	    button_1_down },	/* ^2 */

-	{ { deliver, noop },	    button_1_down },	/* v3 */

-	{ { deliver, noop },	    button_1_down },	/* ^3 */

-	{ { deliver, noop },	    button_1_down },	/* vo */

-	{ { deliver, noop },	    button_1_down },	/* ^o */

-	{ { deliver, noop },	    button_1_down },	/* <> */

-	{ { deliver, noop },	    button_1_down },	/* <-> */

-	{ { noop, noop },	    button_1_down },	/* k */

-	{ { noop, noop },	    button_1_down },	/* ... */

-    },

-    /* button_2_down */

-    {

-	{ { deliver, noop },	    button_2_down },	/* v1 */

-	{ { deliver, noop },	    button_2_down },	/* ^1 */

-	{ { noop, noop },	    button_2_down },	/* v2 */

-	{ { deliver, noop },	    start },		/* ^2 */

-	{ { deliver, noop },	    button_2_down },	/* v3 */

-	{ { deliver, noop },	    button_2_down },	/* ^3 */

-	{ { deliver, noop },	    button_2_down },	/* vo */

-	{ { deliver, noop },	    button_2_down },	/* ^o */

-	{ { deliver, noop },	    button_2_down },	/* <> */

-	{ { deliver, noop },	    button_2_down },	/* <-> */

-	{ { noop, noop },	    button_2_down },	/* k */

-	{ { noop, noop },	    button_2_down },	/* ... */

-    },

-    /* button_3_pend */

-    {

-	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v1 */

-	{ { release, deliver },	    button_3_down },	/* ^1 */

-	{ { release, deliver },	    button_3_down },	/* v2 */

-	{ { release, deliver },	    button_3_down },	/* ^2 */

-	{ { release, deliver },	    button_3_down },	/* v3 */

-	{ { release, deliver },	    start },		/* ^3 */

-	{ { release, deliver },	    button_3_down },	/* vo */

-	{ { release, deliver },	    button_3_down },	/* ^o */

-	{ { deliver, noop },	    button_3_pend },	/* <> */

-	{ { release, deliver },	    button_3_down },	/* <-> */

-	{ { release, noop },	    button_3_down },	/* k */

-	{ { release, noop },	    button_3_down },	/* ... */

-    },

-    /* button_3_down */

-    {

-	{ { deliver, noop },	    button_3_down },	/* v1 */

-	{ { deliver, noop },	    button_3_down },	/* ^1 */

-	{ { deliver, noop },	    button_3_down },	/* v2 */

-	{ { deliver, noop },	    button_3_down },	/* ^2 */

-	{ { noop, noop },	    button_3_down },	/* v3 */

-	{ { deliver, noop },	    start },		/* ^3 */

-	{ { deliver, noop },	    button_3_down },	/* vo */

-	{ { deliver, noop },	    button_3_down },	/* ^o */

-	{ { deliver, noop },	    button_3_down },	/* <> */

-	{ { deliver, noop },	    button_3_down },	/* <-> */

-	{ { noop, noop },	    button_3_down },	/* k */

-	{ { noop, noop },	    button_3_down },	/* ... */

-    },

-    /* synthetic_2_down_13 */

-    {

-	{ { noop, noop },	    synth_2_down_13 },	/* v1 */

-	{ { gen_up_2, noop },	    synth_2_down_3 },	/* ^1 */

-	{ { noop, noop },	    synth_2_down_13 },	/* v2 */

-	{ { noop, noop },	    synth_2_down_13 },	/* ^2 */

-	{ { noop, noop },	    synth_2_down_13 },	/* v3 */

-	{ { gen_up_2, noop },	    synth_2_down_1 },	/* ^3 */

-	{ { deliver, noop },	    synth_2_down_13 },	/* vo */

-	{ { deliver, noop },	    synth_2_down_13 },	/* ^o */

-	{ { deliver, noop },	    synth_2_down_13 },	/* <> */

-	{ { deliver, noop },	    synth_2_down_13 },	/* <-> */

-	{ { noop, noop },	    synth_2_down_13 },	/* k */

-	{ { noop, noop },	    synth_2_down_13 },	/* ... */

-    },

-    /* synthetic_2_down_3 */

-    {

-	{ { deliver, noop },	    synth_2_down_3 },	/* v1 */

-	{ { deliver, noop },	    synth_2_down_3 },	/* ^1 */

-	{ { deliver, noop },	    synth_2_down_3 },	/* v2 */

-	{ { deliver, noop },	    synth_2_down_3 },	/* ^2 */

-	{ { noop, noop },	    synth_2_down_3 },	/* v3 */

-	{ { noop, noop },	    start },		/* ^3 */

-	{ { deliver, noop },	    synth_2_down_3 },	/* vo */

-	{ { deliver, noop },	    synth_2_down_3 },	/* ^o */

-	{ { deliver, noop },	    synth_2_down_3 },	/* <> */

-	{ { deliver, noop },	    synth_2_down_3 },	/* <-> */

-	{ { noop, noop },	    synth_2_down_3 },	/* k */

-	{ { noop, noop },	    synth_2_down_3 },	/* ... */

-    },

-    /* synthetic_2_down_1 */

-    {

-	{ { noop, noop },	    synth_2_down_1 },	/* v1 */

-	{ { noop, noop },	    start },		/* ^1 */

-	{ { deliver, noop },	    synth_2_down_1 },	/* v2 */

-	{ { deliver, noop },	    synth_2_down_1 },	/* ^2 */

-	{ { deliver, noop },	    synth_2_down_1 },	/* v3 */

-	{ { deliver, noop },	    synth_2_down_1 },	/* ^3 */

-	{ { deliver, noop },	    synth_2_down_1 },	/* vo */

-	{ { deliver, noop },	    synth_2_down_1 },	/* ^o */

-	{ { deliver, noop },	    synth_2_down_1 },	/* <> */

-	{ { deliver, noop },	    synth_2_down_1 },	/* <-> */

-	{ { noop, noop },	    synth_2_down_1 },	/* k */

-	{ { noop, noop },	    synth_2_down_1 },	/* ... */

-    },

-};

-

-#define EMULATION_WINDOW    10

-#define EMULATION_TIMEOUT   100

-

-static int

-KdInsideEmulationWindow (KdPointerInfo *pi, int x, int y, int z)

-{

-    pi->emulationDx = pi->heldEvent.x - x;

-    pi->emulationDy = pi->heldEvent.y - y;

-

-    return (abs (pi->emulationDx) < EMULATION_WINDOW &&

-	    abs (pi->emulationDy) < EMULATION_WINDOW);

-}

-

-static KdInputClass

-KdClassifyInput (KdPointerInfo *pi, int type, int x, int y, int z, int b)

-{

-    switch (type) {

-    case ButtonPress:

-	switch (b) {

-	case 1: return down_1;

-	case 2: return down_2;

-	case 3: return down_3;

-	default: return down_o;

-	}

-	break;

-    case ButtonRelease:

-	switch (b) {

-	case 1: return up_1;

-	case 2: return up_2;

-	case 3: return up_3;

-	default: return up_o;

-	}

-	break;

-    case MotionNotify:

-	if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))

-	    return outside_box;

-	else

-	    return motion;

-    default:

-	return keyboard;

-    }

-    return keyboard;

-}

-

-#ifdef DEBUG

-char	*kdStateNames[] = {

-    "start",

-    "button_1_pend",

-    "button_1_down",

-    "button_2_down",

-    "button_3_pend",

-    "button_3_down",

-    "synth_2_down_13",

-    "synth_2_down_3",

-    "synthetic_2_down_1",

-    "num_input_states"

-};

-

-char	*kdClassNames[] = {

-    "down_1", "up_1",

-    "down_2", "up_2",

-    "down_3", "up_3",

-    "motion", "ouside_box",

-    "keyboard", "timeout",

-    "num_input_class"

-};

-

-char *kdActionNames[] = {

-    "noop",

-    "hold",

-    "setto",

-    "deliver",

-    "release",

-    "clearto",

-    "gen_down_2",

-    "gen_up_2",

-};

-#endif /* DEBUG */

-

-static void

-KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)

-{

-    KdAssertSigioBlocked ("KdQueueEvent");

-    mieqEnqueue (pDev, ev);

-}

-

-/* We return true if we're stealing the event. */

-static Bool

-KdRunMouseMachine (KdPointerInfo *pi, KdInputClass c, int type, int x, int y,

-                   int z, int b, int absrel)

-{

-    const KdInputTransition *t;

-    int	a;

-

-    c = KdClassifyInput(pi, type, x, y, z, b);

-    t = &kdInputMachine[pi->mouseState][c];

-    for (a = 0; a < MAX_ACTIONS; a++)

-    {

-	switch (t->actions[a]) {

-	case noop:

-	    break;

-	case hold:

-	    pi->eventHeld = TRUE;

-	    pi->emulationDx = 0;

-	    pi->emulationDy = 0;

-	    pi->heldEvent.type = type;

-            pi->heldEvent.x = x;

-            pi->heldEvent.y = y;

-            pi->heldEvent.z = z;

-            pi->heldEvent.flags = b;

-            pi->heldEvent.absrel = absrel;

-            return TRUE;

-	    break;

-	case setto:

-	    pi->emulationTimeout = GetTimeInMillis () + EMULATION_TIMEOUT;

-	    pi->timeoutPending = TRUE;

-	    break;

-	case deliver:

-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,

-                                    pi->heldEvent.y, pi->heldEvent.z,

-                                    pi->heldEvent.flags, pi->heldEvent.absrel,

-                                    TRUE);

-	    break;

-	case release:

-	    pi->eventHeld = FALSE;

-	    pi->timeoutPending = FALSE;

-            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,

-                                    pi->heldEvent.y, pi->heldEvent.z,

-                                    pi->heldEvent.flags, pi->heldEvent.absrel,

-                                    TRUE);

-            return TRUE;

-	    break;

-	case clearto:

-	    pi->timeoutPending = FALSE;

-	    break;

-	case gen_down_2:

-            _KdEnqueuePointerEvent (pi, ButtonPress, x, y, z, 2, absrel,

-                                    TRUE);

-	    pi->eventHeld = FALSE;

-            return TRUE;

-	    break;

-	case gen_up_2:

-            _KdEnqueuePointerEvent (pi, ButtonRelease, x, y, z, 2, absrel,

-                                    TRUE);

-            return TRUE;

-	    break;

-	}

-    }

-    pi->mouseState = t->nextState;

-    return FALSE;

-}

-

-static int

-KdHandlePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z, int b,

-                      int absrel)

-{

-    if (pi->emulateMiddleButton)

-        return KdRunMouseMachine (pi, KdClassifyInput(pi, type, x, y, z, b),

-                                  type, x, y, z, b, absrel);

-    return FALSE;

-}

-

-static void

-KdReceiveTimeout (KdPointerInfo *pi)

-{

-    KdRunMouseMachine (pi, timeout, 0, 0, 0, 0, 0, 0);

-}

-

-/*

- * kdCheckTermination

- *

- * This function checks for the key sequence that terminates the server.  When

- * detected, it sets the dispatchException flag and returns.  The key sequence

- * is:

- *	Control-Alt

- * It's assumed that the server will be waken up by the caller when this

- * function returns.

- */

-

-extern int nClients;

-

-void

-KdReleaseAllKeys (void)

-{

-#if 0

-    int	key, nEvents, i;

-    KdKeyboardInfo *ki;

-

-    KdBlockSigio ();

-

-    for (ki = kdKeyboards; ki; ki = ki->next) {

-        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode;

-             key++) {

-            if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {

-                KdHandleKeyboardEvent(ki, KeyRelease, key);

-                GetEventList(&kdEvents);

-                nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);

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

-                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);

-            }

-        }

-    }

-

-    KdUnblockSigio ();

-#endif

-}

-

-static void

-KdCheckLock (void)

-{

-    KeyClassPtr	    keyc = NULL;

-    Bool	    isSet = FALSE, shouldBeSet = FALSE;

-    KdKeyboardInfo     *tmp = NULL;

-

-    for (tmp = kdKeyboards; tmp; tmp = tmp->next) {

-        if (tmp->LockLed && tmp->dixdev && tmp->dixdev->key) {

-            keyc = tmp->dixdev->key;

-            isSet = (tmp->leds & (1 << (tmp->LockLed-1))) != 0;

-            /* FIXME: Just use XKB indicators! */

-            shouldBeSet = !!(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);

-            if (isSet != shouldBeSet)

-                KdSetLed (tmp, tmp->LockLed, shouldBeSet);

-        }

-    }

-}

-

-void

-KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,

-                       unsigned char scan_code,

-		       unsigned char is_up)

-{

-    unsigned char key_code;

-    KeyClassPtr	keyc = NULL;

-    KeybdCtrl *ctrl = NULL;

-    int type, nEvents, i;

-

-    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)

-	return;

-

-    keyc = ki->dixdev->key;

-    ctrl = &ki->dixdev->kbdfeed->ctrl;

-

-    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode)

-    {

-	key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;

-

-	/*

-	 * Set up this event -- the type may be modified below

-	 */

-	if (is_up)

-	    type = KeyRelease;

-	else

-	    type = KeyPress;

-

-        GetEventList(&kdEvents);

-

-        nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);

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

-            KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));

-    }

-    else {

-        ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",

-               ki->name, scan_code, ki->minScanCode, ki->maxScanCode);

-    }

-}

-

-/*

- * kdEnqueuePointerEvent

- *

- * This function converts hardware mouse event information into X event

- * information.  A mouse movement event is passed off to MI to generate

- * a MotionNotify event, if appropriate.  Button events are created and

- * passed off to MI for enqueueing.

- */

-

-/* FIXME do something a little more clever to deal with multiple axes here */

-void

-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,

-                      int rz)

-{

-    CARD32        ms;

-    unsigned char buttons;

-    int           x, y, z;

-    int           (*matrix)[3] = kdPointerMatrix.matrix;

-    unsigned long button;

-    int           n;

-    int           dixflags = 0;

-

-    if (!pi)

-	return;

-

-    ms = GetTimeInMillis();

-

-    /* we don't need to transform z, so we don't. */

-    if (flags & KD_MOUSE_DELTA) {

-	if (pi->transformCoordinates) {

-	    x = matrix[0][0] * rx + matrix[0][1] * ry;

-	    y = matrix[1][0] * rx + matrix[1][1] * ry;

-	}

-	else {

-	    x = rx;

-	    y = ry;

-	}

-    }

-    else {

-	if (pi->transformCoordinates) {

-	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];

-	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];

-	}

-	else {

-	    x = rx;

-	    y = ry;

-	}

-    }

-    z = rz;

-

-    if (flags & KD_MOUSE_DELTA)

-    {

-        if (x || y || z)

-        {

-            dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;

-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);

-        }

-    } else

-    {

-        dixflags = POINTER_ABSOLUTE;

-        if (x != pi->dixdev->last.valuators[0] ||

-            y != pi->dixdev->last.valuators[1])

-            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);

-    }

-

-    buttons = flags;

-

-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;

-         button <<= 1, n++) {

-        if (((pi->buttonState & button) ^ (buttons & button)) &&

-           !(buttons & button)) {

-            _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, n,

-                                   dixflags, FALSE);

-	}

-    }

-    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;

-         button <<= 1, n++) {

-	if (((pi->buttonState & button) ^ (buttons & button)) &&

-	    (buttons & button)) {

-            _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, n,

-                                   dixflags, FALSE);

-        }

-    }

-

-    pi->buttonState = buttons;

-}

-

-void

-_KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,

-                        int b, int absrel, Bool force)

-{

-    int nEvents = 0, i = 0;

-    int valuators[3] = { x, y, z };

-    ValuatorMask mask;

-

-    /* TRUE from KdHandlePointerEvent, means 'we swallowed the event'. */

-    if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))

-        return;

-

-    valuator_mask_set_range(&mask, 0, 3, valuators);

-

-    GetEventList(&kdEvents);

-    nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, &mask);

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

-        KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));

-}

-

-void

-KdBlockHandler (int		screen,

-		pointer		blockData,

-		pointer		timeout,

-		pointer		readmask)

-{

-    KdPointerInfo		    *pi;

-    int myTimeout=0;

-

-    for (pi = kdPointers; pi; pi = pi->next)

-    {

-	if (pi->timeoutPending)

-	{

-	    int	ms;

-

-	    ms = pi->emulationTimeout - GetTimeInMillis ();

-	    if (ms < 1)

-		ms = 1;

-	    if(ms<myTimeout || myTimeout==0)

-		    myTimeout=ms;

-	}

-    }

-    /* if we need to poll for events, do that */

-    if(kdOsFuncs->pollEvents)

-    {

-	    (*kdOsFuncs->pollEvents)();

-	    myTimeout=20;

-    }

-    if(myTimeout>0)

-    	AdjustWaitForDelay (timeout, myTimeout);

-}

-

-void

-KdWakeupHandler (int		screen,

-		 pointer    	data,

-		 unsigned long	lresult,

-		 pointer	readmask)

-{

-    int		result = (int) lresult;

-    fd_set	*pReadmask = (fd_set *) readmask;

-    int		i;

-    KdPointerInfo	*pi;

-

-    if (kdInputEnabled && result > 0)

-    {

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

-	    if (FD_ISSET (kdInputFds[i].fd, pReadmask))

-	    {

-		KdBlockSigio ();

-		(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);

-		KdUnblockSigio ();

-	    }

-    }

-    for (pi = kdPointers; pi; pi = pi->next)

-    {

-	if (pi->timeoutPending)

-	{

-	    if ((long) (GetTimeInMillis () - pi->emulationTimeout) >= 0)

-	    {

-		pi->timeoutPending = FALSE;

-		KdBlockSigio ();

-		KdReceiveTimeout (pi);

-		KdUnblockSigio ();

-	    }

-	}

-    }

-    if (kdSwitchPending)

-	KdProcessSwitch ();

-}

-

-#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))

-

-static Bool

-KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)

-{

-    ScreenPtr	pScreen  = *ppScreen;

-    ScreenPtr	pNewScreen;

-    int		n;

-    int		dx, dy;

-    int		best_x, best_y;

-    int		n_best_x, n_best_y;

-    CARD32	ms;

-

-    if (kdDisableZaphod || screenInfo.numScreens <= 1)

-	return FALSE;

-

-    if (0 <= *x && *x < pScreen->width && 0 <= *y && *y < pScreen->height)

-	return FALSE;

-

-    ms = GetTimeInMillis ();

-    if (kdOffScreen && (int) (ms - kdOffScreenTime) < 1000)

-	return FALSE;

-    kdOffScreen = TRUE;

-    kdOffScreenTime = ms;

-    n_best_x = -1;

-    best_x = 32767;

-    n_best_y = -1;

-    best_y = 32767;

-    for (n = 0; n < screenInfo.numScreens; n++)

-    {

-	pNewScreen = screenInfo.screens[n];

-	if (pNewScreen == pScreen)

-	    continue;

-	dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;

-	dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;

-	if (*x < 0)

-	{

-	    if (dx <= 0 && -dx < best_x)

-	    {

-		best_x = -dx;

-		n_best_x = n;

-	    }

-	}

-	else if (*x >= pScreen->width)

-	{

-	    if (dx >= 0 && dx < best_x)

-	    {

-		best_x = dx;

-		n_best_x = n;

-	    }

-	}

-	if (*y < 0)

-	{

-	    if (dy <= 0 && -dy < best_y)

-	    {

-		best_y = -dy;

-		n_best_y = n;

-	    }

-	}

-	else if (*y >= pScreen->height)

-	{

-	    if (dy >= 0 && dy < best_y)

-	    {

-		best_y = dy;

-		n_best_y = n;

-	    }

-	}

-    }

-    if (best_y < best_x)

-	n_best_x = n_best_y;

-    if (n_best_x == -1)

-	return FALSE;

-    pNewScreen = screenInfo.screens[n_best_x];

-

-    if (*x < 0)

-	*x += pNewScreen->width;

-    if (*y < 0)

-	*y += pNewScreen->height;

-

-    if (*x >= pScreen->width)

-	*x -= pScreen->width;

-    if (*y >= pScreen->height)

-	*y -= pScreen->height;

-

-    *ppScreen = pNewScreen;

-    return TRUE;

-}

-

-static void

-KdCrossScreen(ScreenPtr pScreen, Bool entering)

-{

-#ifndef XIPAQ

-    if (entering)

-	KdEnableScreen (pScreen);

-    else

-	KdDisableScreen (pScreen);

-#endif

-}

-

-int KdCurScreen;	/* current event screen */

-

-static void

-KdWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)

-{

-    KdBlockSigio ();

-    KdCurScreen = pScreen->myNum;

-    miPointerWarpCursor(pDev, pScreen, x, y);

-    KdUnblockSigio ();

-}

-

-miPointerScreenFuncRec kdPointerScreenFuncs =

-{

-    KdCursorOffScreen,

-    KdCrossScreen,

-    KdWarpCursor

-};

-

-void

-ProcessInputEvents (void)

-{

-    mieqProcessInputEvents();

-    miPointerUpdateSprite(inputInfo.pointer);

-    if (kdSwitchPending)

-	KdProcessSwitch ();

-    KdCheckLock ();

-}

-

-/* At the moment, absolute/relative is up to the client. */

-int

-SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)

-{

-    return BadMatch;

-}

-

-int

-SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,

-                   int *valuators, int first_valuator, int num_valuators)

-{

-    return BadMatch;

-}

-

-int

-ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,

-                        xDeviceCtl *control)

-{

-    switch (control->control) {

-    case DEVICE_RESOLUTION:

-        /* FIXME do something more intelligent here */

-        return BadMatch;

-

-    case DEVICE_ABS_CALIB:

-    case DEVICE_ABS_AREA:

-        return Success;

-

-    case DEVICE_CORE:

-        return BadMatch;

-    case DEVICE_ENABLE:

-        return Success;

-

-    default:

-        return BadMatch;

-    }

-

-    /* NOTREACHED */

-    return BadImplementation;

-}

-

-int

-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,

-                      DeviceIntPtr *pdev)

-{

-    InputOption *option = NULL;

-    KdPointerInfo *pi = NULL;

-    KdKeyboardInfo *ki = NULL;

-

-    for (option = options; option; option = option->next) {

-        if (strcmp(option->key, "type") == 0) {

-            if (strcmp(option->value, "pointer") == 0) {

-                pi = KdNewPointer();

-                if (!pi)

-                    return BadAlloc;

-            }

-            else if (strcmp(option->value, "keyboard") == 0) {

-                ki = KdNewKeyboard();

-                if (!ki)

-                    return BadAlloc;

-            }

-            else {

-                ErrorF("unrecognised device type!\n");

-                return BadValue;

-            }

-        }

-#ifdef CONFIG_HAL

-        else if (strcmp(option->key, "_source") == 0 &&

-                 strcmp(option->value, "server/hal") == 0)

-        {

-            ErrorF("Ignoring device from HAL.\n");

-            return BadValue;

-        }

-#endif

-#ifdef CONFIG_UDEV

-        else if (strcmp(option->key, "_source") == 0 &&

-                 strcmp(option->value, "server/udev") == 0)

-        {

-            ErrorF("Ignoring device from udev.\n");

-            return BadValue;

-        }

-#endif

-    }

-

-    if (!ki && !pi) {

-        ErrorF("unrecognised device identifier!\n");

-        return BadValue;

-    }

-

-    /* FIXME: change this code below to use KdParseKbdOptions and

-     * KdParsePointerOptions */

-    for (option = options; option; option = option->next) {

-        if (strcmp(option->key, "device") == 0) {

-            if (pi && option->value)

-                pi->path = strdup(option->value);

-            else if (ki && option->value)

-                ki->path = strdup(option->value);

-        }

-        else if (strcmp(option->key, "driver") == 0) {

-            if (pi) {

-                pi->driver = KdFindPointerDriver(option->value);

-                if (!pi->driver) {

-                    ErrorF("couldn't find driver!\n");

-                    KdFreePointer(pi);

-                    return BadValue;

-                }

-                pi->options = options;

-            }

-            else if (ki) {

-                ki->driver = KdFindKeyboardDriver(option->value);

-                if (!ki->driver) {

-                    ErrorF("couldn't find driver!\n");

-                    KdFreeKeyboard(ki);

-                    return BadValue;

-                }

-                ki->options = options;

-            }

-        }

-    }

-

-    if (pi) {

-        if (KdAddPointer(pi) != Success ||

-            ActivateDevice(pi->dixdev, TRUE) != Success ||

-            EnableDevice(pi->dixdev, TRUE) != TRUE) {

-            ErrorF("couldn't add or enable pointer\n");

-            return BadImplementation;

-        }

-    }

-    else if (ki) {

-        if (KdAddKeyboard(ki) != Success ||

-            ActivateDevice(ki->dixdev, TRUE) != Success ||

-            EnableDevice(ki->dixdev, TRUE) != TRUE) {

-            ErrorF("couldn't add or enable keyboard\n");

-            return BadImplementation;

-        }

-    }

-

-    if (pi) {

-        *pdev = pi->dixdev;

-    } else if(ki) {

-        *pdev = ki->dixdev;

-    }

-

-    return Success;

-}

-

-void

-DeleteInputDeviceRequest(DeviceIntPtr pDev)

-{

-    RemoveDevice(pDev, TRUE);

-}

+/*
+ * Copyright � 1999 Keith Packard
+ * Copyright � 2006 Nokia Corporation
+ *
+ * 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, and that the name of the authors not be used in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific, written prior permission.  The authors make no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.
+ *
+ * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE AUTHORS 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_CONFIG_H
+#include <kdrive-config.h>
+#endif
+#include "kdrive.h"
+#include "inputstr.h"
+
+#define XK_PUBLISHING
+#include <X11/keysym.h>
+#if HAVE_X11_XF86KEYSYM_H
+#include <X11/XF86keysym.h>
+#endif
+#include <signal.h>
+#include <stdio.h>
+#ifdef sun
+#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */
+#endif
+
+#include "xkbsrv.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h" /* even though we don't use stubs.  cute, no? */
+#include "exevents.h"
+#include "extinit.h"
+#include "exglobals.h"
+#include "eventstr.h"
+#include "xserver-properties.h"
+#include "inpututils.h"
+
+#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
+
+struct KdConfigDevice {
+    char *line;
+    struct KdConfigDevice *next;
+};
+
+/* kdKeyboards and kdPointers hold all the real devices. */
+static KdKeyboardInfo *kdKeyboards         = NULL;
+static KdPointerInfo  *kdPointers          = NULL;
+static struct KdConfigDevice *kdConfigKeyboards   = NULL;
+static struct KdConfigDevice *kdConfigPointers    = NULL;
+
+static KdKeyboardDriver *kdKeyboardDrivers = NULL;
+static KdPointerDriver  *kdPointerDrivers  = NULL;
+
+static EventListPtr     kdEvents = NULL;
+
+static Bool		kdInputEnabled;
+static Bool		kdOffScreen;
+static unsigned long	kdOffScreenTime;
+static KdPointerMatrix	kdPointerMatrix = {
+   { { 1, 0, 0 },
+     { 0, 1, 0 } }
+};
+
+void KdResetInputMachine (void);
+
+#define KD_MAX_INPUT_FDS    8
+
+typedef struct _kdInputFd {
+    int	        fd;
+    void        (*read) (int fd, void *closure);
+    int	        (*enable) (int fd, void *closure);
+    void        (*disable) (int fd, void *closure);
+    void        *closure;
+} KdInputFd;
+
+static KdInputFd kdInputFds[KD_MAX_INPUT_FDS];
+static int	 kdNumInputFds;
+
+extern Bool      kdRawPointerCoordinates;
+
+static void
+KdSigio (int sig)
+{
+    int	i;
+
+    for (i = 0; i < kdNumInputFds; i++)
+	(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
+}
+
+static void
+KdBlockSigio (void)
+{
+    sigset_t	set;
+
+    sigemptyset (&set);
+    sigaddset (&set, SIGIO);
+    sigprocmask (SIG_BLOCK, &set, 0);
+}
+
+static void
+KdUnblockSigio (void)
+{
+    sigset_t	set;
+
+    sigemptyset (&set);
+    sigaddset (&set, SIGIO);
+    sigprocmask (SIG_UNBLOCK, &set, 0);
+}
+
+#ifdef DEBUG_SIGIO
+
+void
+KdAssertSigioBlocked (char *where)
+{
+    sigset_t	set, old;
+
+    sigemptyset (&set);
+    sigprocmask (SIG_BLOCK, &set, &old);
+    if (!sigismember (&old, SIGIO)) {
+	ErrorF ("SIGIO not blocked at %s\n", where);
+        KdBacktrace(0);
+    }
+}
+
+#else
+
+#define KdAssertSigioBlocked(s)
+
+#endif
+
+static int  kdnFds;
+
+#ifdef FNONBLOCK
+#define NOBLOCK FNONBLOCK
+#else
+#define NOBLOCK FNDELAY
+#endif
+
+void
+KdResetInputMachine (void)
+{
+    KdPointerInfo *pi;
+
+    for (pi = kdPointers; pi; pi = pi->next) {
+        pi->mouseState = start;
+        pi->eventHeld = FALSE;
+    }
+}
+
+static void
+KdNonBlockFd (int fd)
+{
+    int	flags;
+    flags = fcntl (fd, F_GETFL);
+    flags |= FASYNC|NOBLOCK;
+    fcntl (fd, F_SETFL, flags);
+}
+
+static void
+KdAddFd (int fd)
+{
+    struct sigaction	act;
+    sigset_t		set;
+
+    kdnFds++;
+    fcntl (fd, F_SETOWN, getpid());
+    KdNonBlockFd (fd);
+    AddEnabledDevice (fd);
+    memset (&act, '\0', sizeof act);
+    act.sa_handler = KdSigio;
+    sigemptyset (&act.sa_mask);
+    sigaddset (&act.sa_mask, SIGIO);
+    sigaddset (&act.sa_mask, SIGALRM);
+    sigaddset (&act.sa_mask, SIGVTALRM);
+    sigaction (SIGIO, &act, 0);
+    sigemptyset (&set);
+    sigprocmask (SIG_SETMASK, &set, 0);
+}
+
+static void
+KdRemoveFd (int fd)
+{
+    struct sigaction	act;
+    int			flags;
+
+    kdnFds--;
+    RemoveEnabledDevice (fd);
+    flags = fcntl (fd, F_GETFL);
+    flags &= ~(FASYNC|NOBLOCK);
+    fcntl (fd, F_SETFL, flags);
+    if (kdnFds == 0)
+    {
+	memset (&act, '\0', sizeof act);
+	act.sa_handler = SIG_IGN;
+	sigemptyset (&act.sa_mask);
+	sigaction (SIGIO, &act, 0);
+    }
+}
+
+Bool
+KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure)
+{
+    if (kdNumInputFds == KD_MAX_INPUT_FDS)
+	return FALSE;
+    kdInputFds[kdNumInputFds].fd = fd;
+    kdInputFds[kdNumInputFds].read = read;
+    kdInputFds[kdNumInputFds].enable = 0;
+    kdInputFds[kdNumInputFds].disable = 0;
+    kdInputFds[kdNumInputFds].closure = closure;
+    kdNumInputFds++;
+    if (kdInputEnabled)
+	KdAddFd (fd);
+    return TRUE;
+}
+
+void
+KdUnregisterFd (void *closure, int fd, Bool do_close)
+{
+    int	i, j;
+
+    for (i = 0; i < kdNumInputFds; i++) {
+	if (kdInputFds[i].closure == closure &&
+            (fd == -1 || kdInputFds[i].fd == fd)) {
+	    if (kdInputEnabled)
+		KdRemoveFd (kdInputFds[i].fd);
+	    if (do_close)
+		close (kdInputFds[i].fd);
+	    kdNumInputFds--;
+	    for (j = i; j < kdNumInputFds; j++)
+		kdInputFds[j] = kdInputFds[j+1];
+            break;
+	}
+    }
+}
+
+void
+KdUnregisterFds (void *closure, Bool do_close)
+{
+    KdUnregisterFd(closure, -1, do_close);
+}
+
+void
+KdDisableInput (void)
+{
+    KdKeyboardInfo *ki;
+    KdPointerInfo *pi;
+    int found = 0, i = 0;
+
+    KdBlockSigio();
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->driver && ki->driver->Disable)
+            (*ki->driver->Disable) (ki);
+    }
+
+    for (pi = kdPointers; pi; pi = pi->next) {
+        if (pi->driver && pi->driver->Disable)
+            (*pi->driver->Disable) (pi);
+    }
+
+    if (kdNumInputFds) {
+        ErrorF("[KdDisableInput] Buggy drivers: still %d input fds left!",
+               kdNumInputFds);
+        i = 0;
+        while (i < kdNumInputFds) {
+            found = 0;
+            for (ki = kdKeyboards; ki; ki = ki->next) {
+                if (ki == kdInputFds[i].closure) {
+                    ErrorF("    fd %d belongs to keybd driver %s\n",
+                           kdInputFds[i].fd,
+                           ki->driver && ki->driver->name ?
+                             ki->driver->name : "(unnamed!)");
+                    found = 1;
+                    break;
+                }
+            }
+
+            if (found) {
+                i++;
+                continue;
+            }
+
+            for (pi = kdPointers; pi; pi = pi->next) {
+                if (pi == kdInputFds[i].closure) {
+                    ErrorF("    fd %d belongs to pointer driver %s\n",
+                           kdInputFds[i].fd,
+                           pi->driver && pi->driver->name ?
+                             pi->driver->name : "(unnamed!)");
+                    break;
+                }
+            }
+
+            if (found) {
+                i++;
+                continue;
+            }
+
+            ErrorF("    fd %d not claimed by any active device!\n",
+                   kdInputFds[i].fd);
+            KdUnregisterFd(kdInputFds[i].closure, kdInputFds[i].fd, TRUE);
+        }
+    }
+
+    kdInputEnabled = FALSE;
+}
+
+void
+KdEnableInput (void)
+{
+    InternalEvent ev;
+    KdKeyboardInfo *ki;
+    KdPointerInfo *pi;
+
+    kdInputEnabled = TRUE;
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->driver && ki->driver->Enable)
+            (*ki->driver->Enable) (ki);
+    }
+
+    for (pi = kdPointers; pi; pi = pi->next) {
+        if (pi->driver && pi->driver->Enable)
+            (*pi->driver->Enable) (pi);
+    }
+
+    /* reset screen saver */
+    ev.any.time = GetTimeInMillis ();
+    NoticeEventTime (&ev);
+
+    KdUnblockSigio ();
+}
+
+static KdKeyboardDriver *
+KdFindKeyboardDriver (char *name)
+{
+    KdKeyboardDriver *ret;
+
+    /* ask a stupid question ... */
+    if (!name)
+        return NULL;
+
+    for (ret = kdKeyboardDrivers; ret; ret = ret->next) {
+        if (strcmp(ret->name, name) == 0)
+            return ret;
+    }
+
+    return NULL;
+}
+
+static KdPointerDriver *
+KdFindPointerDriver (char *name)
+{
+    KdPointerDriver *ret;
+
+    /* ask a stupid question ... */
+    if (!name)
+        return NULL;
+
+    for (ret = kdPointerDrivers; ret; ret = ret->next) {
+        if (strcmp(ret->name, name) == 0)
+            return ret;
+    }
+
+    return NULL;
+}
+
+static int
+KdPointerProc(DeviceIntPtr pDevice, int onoff)
+{
+    DevicePtr       pDev = (DevicePtr)pDevice;
+    KdPointerInfo   *pi;
+    Atom            xiclass;
+    Atom            *btn_labels;
+    Atom            *axes_labels;
+
+    if (!pDev)
+	return BadImplementation;
+
+    for (pi = kdPointers; pi; pi = pi->next) {
+        if (pi->dixdev && pi->dixdev->id == pDevice->id)
+            break;
+    }
+
+    if (!pi || !pi->dixdev || pi->dixdev->id != pDevice->id) {
+        ErrorF("[KdPointerProc] Failed to find pointer for device %d!\n",
+               pDevice->id);
+        return BadImplementation;
+    }
+
+    switch (onoff)
+    {
+    case DEVICE_INIT:
+#ifdef DEBUG
+        ErrorF("initialising pointer %s ...\n", pi->name);
+#endif
+        if (!pi->driver) {
+            if (!pi->driverPrivate) {
+                ErrorF("no driver specified for %s\n", pi->name);
+                return BadImplementation;
+            }
+
+            pi->driver = KdFindPointerDriver(pi->driverPrivate);
+            if (!pi->driver) {
+                ErrorF("Couldn't find pointer driver %s\n",
+                       pi->driverPrivate ? (char *) pi->driverPrivate :
+                       "(unnamed)");
+                return !Success;
+            }
+            free(pi->driverPrivate);
+            pi->driverPrivate = NULL;
+        }
+
+        if (!pi->driver->Init) {
+            ErrorF("no init function\n");
+            return BadImplementation;
+        }
+
+        if ((*pi->driver->Init) (pi) != Success) {
+            return !Success;
+        }
+
+	btn_labels = calloc(pi->nButtons, sizeof(Atom));
+	if (!btn_labels)
+	    return BadAlloc;
+	axes_labels = calloc(pi->nAxes, sizeof(Atom));
+	if (!axes_labels) {
+	    free(btn_labels);
+	    return BadAlloc;
+	}
+
+	switch(pi->nAxes)
+	{
+	    default:
+	    case 7:
+		btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+	    case 6:
+		btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+	    case 5:
+		btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+	    case 4:
+		btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+	    case 3:
+		btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+	    case 2:
+		btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+	    case 1:
+		btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+	    case 0:
+		break;
+	}
+
+	if (pi->nAxes >= 2) {
+	    axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+	    axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+	}
+
+	InitPointerDeviceStruct(pDev, pi->map, pi->nButtons, btn_labels,
+	    (PtrCtrlProcPtr)NoopDDA,
+	    GetMotionHistorySize(), pi->nAxes, axes_labels);
+
+        free(btn_labels);
+        free(axes_labels);
+
+        if (pi->inputClass == KD_TOUCHSCREEN) {
+            xiclass = AtomFromName(XI_TOUCHSCREEN);
+        }
+        else {
+            xiclass = AtomFromName(XI_MOUSE);
+        }
+
+        AssignTypeAndName(pi->dixdev, xiclass,
+                          pi->name ? pi->name : "Generic KDrive Pointer");
+
+	return Success;
+
+    case DEVICE_ON:
+        if (pDev->on == TRUE)
+            return Success;
+
+        if (!pi->driver->Enable) {
+            ErrorF("no enable function\n");
+            return BadImplementation;
+        }
+
+        if ((*pi->driver->Enable) (pi) == Success) {
+            pDev->on = TRUE;
+            return Success;
+        }
+        else {
+            return BadImplementation;
+        }
+
+	return Success;
+
+    case DEVICE_OFF:
+        if (pDev->on == FALSE) {
+            return Success;
+        }
+
+        if (!pi->driver->Disable) {
+            return BadImplementation;
+        }
+        else {
+            (*pi->driver->Disable) (pi);
+            pDev->on = FALSE;
+            return Success;
+        }
+
+        return Success;
+
+    case DEVICE_CLOSE:
+	if (pDev->on) {
+            if (!pi->driver->Disable) {
+                return BadImplementation;
+            }
+            (*pi->driver->Disable) (pi);
+            pDev->on = FALSE;
+        }
+
+        if (!pi->driver->Fini)
+            return BadImplementation;
+
+        (*pi->driver->Fini) (pi);
+
+        KdRemovePointer(pi);
+
+        return Success;
+    }
+
+    /* NOTREACHED */
+    return BadImplementation;
+}
+
+Bool
+LegalModifier(unsigned int key, DeviceIntPtr pDev)
+{
+    return TRUE;
+}
+
+static void
+KdBell (int volume, DeviceIntPtr pDev, pointer arg, int something)
+{
+    KeybdCtrl *ctrl = arg;
+    KdKeyboardInfo *ki = NULL;
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->dixdev && ki->dixdev->id == pDev->id)
+            break;
+    }
+
+    if (!ki || !ki->dixdev || ki->dixdev->id != pDev->id || !ki->driver)
+        return;
+
+    KdRingBell(ki, volume, ctrl->bell_pitch, ctrl->bell_duration);
+}
+
+void
+DDXRingBell(int volume, int pitch, int duration)
+{
+    KdKeyboardInfo *ki = NULL;
+
+    if (kdOsFuncs->Bell) {
+        (*kdOsFuncs->Bell)(volume, pitch, duration);
+    }
+    else {
+        for (ki = kdKeyboards; ki; ki = ki->next) {
+            if (ki->dixdev->coreEvents)
+                KdRingBell(ki, volume, pitch, duration);
+        }
+    }
+}
+
+void
+KdRingBell(KdKeyboardInfo *ki, int volume, int pitch, int duration)
+{
+    if (!ki || !ki->driver || !ki->driver->Bell)
+        return;
+
+    if (kdInputEnabled)
+        (*ki->driver->Bell) (ki, volume, pitch, duration);
+}
+
+
+static void
+KdSetLeds (KdKeyboardInfo *ki, int leds)
+{
+    if (!ki || !ki->driver)
+        return;
+
+    if (kdInputEnabled) {
+        if (ki->driver->Leds)
+            (*ki->driver->Leds) (ki, leds);
+    }
+}
+
+void
+KdSetLed (KdKeyboardInfo *ki, int led, Bool on)
+{
+    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed)
+        return;
+
+    NoteLedState (ki->dixdev, led, on);
+    KdSetLeds (ki, ki->dixdev->kbdfeed->ctrl.leds);
+}
+
+void
+KdSetPointerMatrix (KdPointerMatrix *matrix)
+{
+    kdPointerMatrix = *matrix;
+}
+
+void
+KdComputePointerMatrix (KdPointerMatrix *m, Rotation randr, int width,
+                        int height)
+{
+    int		    x_dir = 1, y_dir = 1;
+    int		    i, j;
+    int		    size[2];
+
+    size[0] = width; size[1] = height;
+    if (randr & RR_Reflect_X)
+	x_dir = -1;
+    if (randr & RR_Reflect_Y)
+	y_dir = -1;
+    switch (randr & (RR_Rotate_All)) {
+    case RR_Rotate_0:
+	m->matrix[0][0] = x_dir; m->matrix[0][1] = 0;
+	m->matrix[1][0] = 0; m->matrix[1][1] = y_dir;
+	break;
+    case RR_Rotate_90:
+	m->matrix[0][0] = 0; m->matrix[0][1] = -x_dir;
+	m->matrix[1][0] = y_dir; m->matrix[1][1] = 0;
+	break;
+    case RR_Rotate_180:
+	m->matrix[0][0] = -x_dir; m->matrix[0][1] = 0;
+	m->matrix[1][0] = 0; m->matrix[1][1] = -y_dir;
+	break;
+    case RR_Rotate_270:
+	m->matrix[0][0] = 0; m->matrix[0][1] = x_dir;
+	m->matrix[1][0] = -y_dir; m->matrix[1][1] = 0;
+	break;
+    }
+    for (i = 0; i < 2; i++)
+    {
+	m->matrix[i][2] = 0;
+	for (j = 0 ; j < 2; j++)
+	    if (m->matrix[i][j] < 0)
+		m->matrix[i][2] = size[j] - 1;
+    }
+}
+
+void
+KdScreenToPointerCoords (int *x, int *y)
+{
+    int	(*m)[3] = kdPointerMatrix.matrix;
+    int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
+    int sx = *x;
+    int sy = *y;
+
+    *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
+    *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
+}
+
+static void
+KdKbdCtrl (DeviceIntPtr pDevice, KeybdCtrl *ctrl)
+{
+    KdKeyboardInfo *ki;
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->dixdev && ki->dixdev->id == pDevice->id)
+            break;
+    }
+
+    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id || !ki->driver)
+        return;
+
+    KdSetLeds(ki, ctrl->leds);
+    ki->bellPitch = ctrl->bell_pitch;
+    ki->bellDuration = ctrl->bell_duration;
+}
+
+extern KeybdCtrl defaultKeyboardControl;
+
+static int
+KdKeyboardProc(DeviceIntPtr pDevice, int onoff)
+{
+    Bool        ret;
+    DevicePtr   pDev = (DevicePtr)pDevice;
+    KdKeyboardInfo *ki;
+    Atom xiclass;
+    XkbRMLVOSet rmlvo;
+
+    if (!pDev)
+	return BadImplementation;
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        if (ki->dixdev && ki->dixdev->id == pDevice->id)
+            break;
+    }
+
+    if (!ki || !ki->dixdev || ki->dixdev->id != pDevice->id) {
+        return BadImplementation;
+    }
+
+    switch (onoff)
+    {
+    case DEVICE_INIT:
+#ifdef DEBUG
+        ErrorF("initialising keyboard %s\n", ki->name);
+#endif
+        if (!ki->driver) {
+            if (!ki->driverPrivate) {
+                ErrorF("no driver specified!\n");
+                return BadImplementation;
+            }
+
+            ki->driver = KdFindKeyboardDriver(ki->driverPrivate);
+            if (!ki->driver) {
+                ErrorF("Couldn't find keyboard driver %s\n",
+                       ki->driverPrivate ? (char *) ki->driverPrivate :
+                       "(unnamed)");
+                return !Success;
+            }
+            free(ki->driverPrivate);
+            ki->driverPrivate = NULL;
+        }
+
+        if (!ki->driver->Init) {
+            ErrorF("Keyboard %s: no init function\n", ki->name);
+            return BadImplementation;
+        }
+
+        if ((*ki->driver->Init) (ki) != Success) {
+            return !Success;
+        }
+
+        memset(&rmlvo, 0, sizeof(rmlvo));
+        rmlvo.rules = ki->xkbRules;
+        rmlvo.model = ki->xkbModel;
+        rmlvo.layout = ki->xkbLayout;
+        rmlvo.variant = ki->xkbVariant;
+        rmlvo.options = ki->xkbOptions;
+        ret = InitKeyboardDeviceStruct (pDevice, &rmlvo, KdBell, KdKbdCtrl);
+	if (!ret) {
+            ErrorF("Couldn't initialise keyboard %s\n", ki->name);
+	    return BadImplementation;
+        }
+
+        xiclass = AtomFromName(XI_KEYBOARD);
+        AssignTypeAndName(pDevice, xiclass,
+                          ki->name ? ki->name : "Generic KDrive Keyboard");
+
+        KdResetInputMachine();
+
+        return Success;
+
+    case DEVICE_ON:
+        if (pDev->on == TRUE)
+            return Success;
+
+        if (!ki->driver->Enable)
+            return BadImplementation;
+
+        if ((*ki->driver->Enable) (ki) != Success) {
+            return BadMatch;
+        }
+
+        pDev->on = TRUE;
+        return Success;
+
+    case DEVICE_OFF:
+        if (pDev->on == FALSE)
+            return Success;
+
+        if (!ki->driver->Disable)
+            return BadImplementation;
+
+        (*ki->driver->Disable) (ki);
+        pDev->on = FALSE;
+
+        return Success;
+
+        break;
+
+    case DEVICE_CLOSE:
+	if (pDev->on) {
+            if (!ki->driver->Disable)
+                return BadImplementation;
+
+            (*ki->driver->Disable) (ki);
+            pDev->on = FALSE;
+	}
+
+        if (!ki->driver->Fini)
+            return BadImplementation;
+
+        (*ki->driver->Fini) (ki);
+
+        KdRemoveKeyboard(ki);
+
+        return Success;
+    }
+
+    /* NOTREACHED */
+    return BadImplementation;
+}
+
+void
+KdAddPointerDriver (KdPointerDriver *driver)
+{
+    KdPointerDriver **prev;
+
+    if (!driver)
+        return;
+
+    for (prev = &kdPointerDrivers; *prev; prev = &(*prev)->next) {
+        if (*prev == driver)
+            return;
+    }
+    *prev = driver;
+}
+
+void
+KdRemovePointerDriver (KdPointerDriver *driver)
+{
+    KdPointerDriver *tmp;
+
+    if (!driver)
+        return;
+
+    /* FIXME remove all pointers using this driver */
+    for (tmp = kdPointerDrivers; tmp; tmp = tmp->next) {
+        if (tmp->next == driver)
+            tmp->next = driver->next;
+    }
+    if (tmp == driver)
+        tmp = NULL;
+}
+
+void
+KdAddKeyboardDriver (KdKeyboardDriver *driver)
+{
+    KdKeyboardDriver **prev;
+
+    if (!driver)
+        return;
+
+    for (prev = &kdKeyboardDrivers; *prev; prev = &(*prev)->next) {
+        if (*prev == driver)
+            return;
+    }
+    *prev = driver;
+}
+
+void
+KdRemoveKeyboardDriver (KdKeyboardDriver *driver)
+{
+    KdKeyboardDriver *tmp;
+
+    if (!driver)
+        return;
+
+    /* FIXME remove all keyboards using this driver */
+    for (tmp = kdKeyboardDrivers; tmp; tmp = tmp->next) {
+        if (tmp->next == driver)
+            tmp->next = driver->next;
+    }
+    if (tmp == driver)
+        tmp = NULL;
+}
+
+KdKeyboardInfo *
+KdNewKeyboard (void)
+{
+    KdKeyboardInfo *ki = calloc(sizeof(KdKeyboardInfo), 1);
+    if (!ki)
+        return NULL;
+
+    ki->minScanCode = 0;
+    ki->maxScanCode = 0;
+    ki->leds = 0;
+    ki->bellPitch = 1000;
+    ki->bellDuration = 200;
+    ki->next = NULL;
+    ki->options = NULL;
+    ki->xkbRules = strdup(XKB_DFLT_RULES);
+    ki->xkbModel = strdup(XKB_DFLT_MODEL);
+    ki->xkbLayout = strdup(XKB_DFLT_LAYOUT);
+    ki->xkbVariant = strdup(XKB_DFLT_VARIANT);
+    ki->xkbOptions = strdup(XKB_DFLT_OPTIONS);
+
+    return ki;
+}
+
+int
+KdAddConfigKeyboard (char *keyboard)
+{
+    struct KdConfigDevice **prev, *new;
+
+    if (!keyboard)
+        return Success;
+
+    new = (struct KdConfigDevice *) calloc(sizeof(struct KdConfigDevice), 1);
+    if (!new)
+        return BadAlloc;
+
+    new->line = strdup(keyboard);
+    new->next = NULL;
+
+    for (prev = &kdConfigKeyboards; *prev; prev = &(*prev)->next);
+    *prev = new;
+
+    return Success;
+}
+
+int
+KdAddKeyboard (KdKeyboardInfo *ki)
+{
+    KdKeyboardInfo **prev;
+
+    if (!ki)
+        return !Success;
+
+    ki->dixdev = AddInputDevice(serverClient, KdKeyboardProc, TRUE);
+    if (!ki->dixdev) {
+        ErrorF("Couldn't register keyboard device %s\n",
+               ki->name ? ki->name : "(unnamed)");
+        return !Success;
+    }
+
+#ifdef DEBUG
+    ErrorF("added keyboard %s with dix id %d\n", ki->name, ki->dixdev->id);
+#endif
+
+    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next);
+    *prev = ki;
+
+    return Success;
+}
+
+void
+KdRemoveKeyboard (KdKeyboardInfo *ki)
+{
+    KdKeyboardInfo **prev;
+
+    if (!ki)
+        return;
+
+    for (prev = &kdKeyboards; *prev; prev = &(*prev)->next) {
+        if (*prev == ki) {
+            *prev = ki->next;
+            break;
+        }
+    }
+
+    KdFreeKeyboard(ki);
+}
+
+int
+KdAddConfigPointer (char *pointer)
+{
+    struct KdConfigDevice **prev, *new;
+
+    if (!pointer)
+        return Success;
+
+    new = (struct KdConfigDevice *) calloc(sizeof(struct KdConfigDevice), 1);
+    if (!new)
+        return BadAlloc;
+
+    new->line = strdup(pointer);
+    new->next = NULL;
+
+    for (prev = &kdConfigPointers; *prev; prev = &(*prev)->next);
+    *prev = new;
+
+    return Success;
+}
+
+int
+KdAddPointer (KdPointerInfo *pi)
+{
+    KdPointerInfo **prev;
+
+    if (!pi)
+        return Success;
+
+    pi->mouseState = start;
+    pi->eventHeld = FALSE;
+
+    pi->dixdev = AddInputDevice(serverClient, KdPointerProc, TRUE);
+    if (!pi->dixdev) {
+        ErrorF("Couldn't add pointer device %s\n",
+               pi->name ? pi->name : "(unnamed)");
+        return BadDevice;
+    }
+
+    for (prev = &kdPointers; *prev; prev = &(*prev)->next);
+    *prev = pi;
+
+    return Success;
+}
+
+void
+KdRemovePointer (KdPointerInfo *pi)
+{
+    KdPointerInfo **prev;
+
+    if (!pi)
+        return;
+
+    for (prev = &kdPointers; *prev; prev = &(*prev)->next) {
+        if (*prev == pi) {
+            *prev = pi->next;
+            break;
+        }
+    }
+
+    KdFreePointer(pi);
+}
+
+/*
+ * You can call your kdriver server with something like:
+ * $ ./hw/kdrive/yourserver/X :1 -mouse evdev,,device=/dev/input/event4 -keybd
+ * evdev,,device=/dev/input/event1,xkbmodel=abnt2,xkblayout=br
+ */
+static Bool
+KdGetOptions (InputOption **options, char *string)
+{
+    InputOption     *newopt = NULL, **tmpo = NULL;
+    int             tam_key = 0;
+
+    newopt = calloc(1, sizeof (InputOption));
+    if (!newopt)
+        return FALSE;
+
+    for (tmpo = options; *tmpo; tmpo = &(*tmpo)->next)
+        ; /* Hello, I'm here */
+    *tmpo = newopt;
+
+    if (strchr(string, '='))
+    {
+        tam_key = (strchr(string, '=') - string);
+        newopt->key = (char *)malloc(tam_key);
+        strncpy(newopt->key, string, tam_key);
+        newopt->key[tam_key] = '\0';
+        newopt->value = strdup(strchr(string, '=') + 1);
+    }
+    else
+    {
+        newopt->key = strdup(string);
+        newopt->value = NULL;
+    }
+    newopt->next = NULL;
+
+    return TRUE;
+}
+
+static void
+KdParseKbdOptions (KdKeyboardInfo *ki)
+{
+    InputOption *option = NULL;
+
+    for (option = ki->options; option; option = option->next)
+    {
+        if (strcasecmp(option->key, "XkbRules") == 0)
+            ki->xkbRules = option->value;
+        else if (strcasecmp(option->key, "XkbModel") == 0)
+            ki->xkbModel = option->value;
+        else if (strcasecmp(option->key, "XkbLayout") == 0)
+            ki->xkbLayout = option->value;
+        else if (strcasecmp(option->key, "XkbVariant") == 0)
+            ki->xkbVariant = option->value;
+        else if (strcasecmp(option->key, "XkbOptions") == 0)
+            ki->xkbOptions = option->value;
+        else if (!strcasecmp (option->key, "device"))
+            ki->path = strdup(option->value);
+        else
+           ErrorF("Kbd option key (%s) of value (%s) not assigned!\n",
+                    option->key, option->value);
+    }
+}
+
+KdKeyboardInfo *
+KdParseKeyboard (char *arg)
+{
+    char            save[1024];
+    char            delim;
+    InputOption     *options = NULL;
+    KdKeyboardInfo     *ki = NULL;
+
+    ki = KdNewKeyboard();
+    if (!ki)
+        return NULL;
+
+    ki->name = strdup("Unknown KDrive Keyboard");
+    ki->path = NULL;
+    ki->driver = NULL;
+    ki->driverPrivate = NULL;
+    ki->next = NULL;
+
+    if (!arg)
+    {
+        ErrorF("keybd: no arg\n");
+        KdFreeKeyboard (ki);
+        return NULL;
+    }
+
+    if (strlen (arg) >= sizeof (save))
+    {
+        ErrorF("keybd: arg too long\n");
+        KdFreeKeyboard (ki);
+        return NULL;
+    }
+
+    arg = KdParseFindNext (arg, ",", save, &delim);
+    if (!save[0])
+    {
+        ErrorF("keybd: failed on save[0]\n");
+        KdFreeKeyboard (ki);
+        return NULL;
+    }
+
+    if (strcmp (save, "auto") == 0)
+        ki->driverPrivate = NULL;
+    else
+        ki->driverPrivate = strdup(save);
+
+    if (delim != ',')
+    {
+        return ki;
+    }
+
+    arg = KdParseFindNext (arg, ",", save, &delim);
+
+    while (delim == ',')
+    {
+        arg = KdParseFindNext (arg, ",", save, &delim);
+
+	if (!KdGetOptions(&options, save))
+	{
+	    KdFreeKeyboard(ki);
+	    return NULL;
+        }
+    }
+
+    if (options)
+    {
+        ki->options = options;
+        KdParseKbdOptions(ki);
+    }
+
+    return ki;
+}
+
+static void
+KdParsePointerOptions (KdPointerInfo *pi)
+{
+    InputOption *option = NULL;
+
+    for (option = pi->options; option; option = option->next)
+    {
+        if (!strcmp (option->key, "emulatemiddle"))
+            pi->emulateMiddleButton = TRUE;
+        else if (!strcmp (option->key, "noemulatemiddle"))
+            pi->emulateMiddleButton = FALSE;
+        else if (!strcmp (option->key, "transformcoord"))
+            pi->transformCoordinates = TRUE;
+        else if (!strcmp (option->key, "rawcoord"))
+            pi->transformCoordinates = FALSE;
+        else if (!strcasecmp (option->key, "device"))
+            pi->path = strdup(option->value);
+        else if (!strcasecmp (option->key, "protocol"))
+            pi->protocol = strdup(option->value);
+        else
+            ErrorF("Pointer option key (%s) of value (%s) not assigned!\n",
+                    option->key, option->value);
+    }
+}
+
+KdPointerInfo *
+KdParsePointer (char *arg)
+{
+    char            save[1024];
+    char            delim;
+    KdPointerInfo   *pi = NULL;
+    InputOption     *options = NULL;
+    int             i = 0;
+
+    pi = KdNewPointer();
+    if (!pi)
+        return NULL;
+    pi->emulateMiddleButton = kdEmulateMiddleButton;
+    pi->transformCoordinates = !kdRawPointerCoordinates;
+    pi->protocol = NULL;
+    pi->nButtons = 5; /* XXX should not be hardcoded */
+    pi->inputClass = KD_MOUSE;
+
+    if (!arg)
+    {
+        ErrorF("mouse: no arg\n");
+        KdFreePointer (pi);
+        return NULL;
+    }
+
+    if (strlen (arg) >= sizeof (save))
+    {
+        ErrorF("mouse: arg too long\n");
+        KdFreePointer (pi);
+        return NULL;
+    }
+    arg = KdParseFindNext (arg, ",", save, &delim);
+    if (!save[0])
+    {
+        ErrorF("failed on save[0]\n");
+        KdFreePointer (pi);
+        return NULL;
+    }
+
+    if (strcmp(save, "auto") == 0)
+        pi->driverPrivate = NULL;
+    else
+        pi->driverPrivate = strdup(save);
+
+    if (delim != ',')
+    {
+        return pi;
+    }
+
+    arg = KdParseFindNext (arg, ",", save, &delim);
+
+    while (delim == ',')
+    {
+        arg = KdParseFindNext (arg, ",", save, &delim);
+        if (save[0] == '{')
+        {
+            char *s = save + 1;
+             i = 0;
+             while (*s && *s != '}')
+             {
+                if ('1' <= *s && *s <= '0' + pi->nButtons)
+                    pi->map[i] = *s - '0';
+                else
+                    UseMsg ();
+                s++;
+             }
+        }
+        else
+        {
+            if (!KdGetOptions(&options, save))
+            {
+                KdFreePointer(pi);
+                return NULL;
+            }
+        }
+    }
+
+    if (options)
+    {
+        pi->options = options;
+        KdParsePointerOptions(pi);
+    }
+
+    return pi;
+}
+
+
+void
+KdInitInput (void)
+{
+    KdPointerInfo *pi;
+    KdKeyboardInfo *ki;
+    struct KdConfigDevice *dev;
+
+    kdInputEnabled = TRUE;
+
+    for (dev = kdConfigPointers; dev; dev = dev->next) {
+        pi = KdParsePointer(dev->line);
+        if (!pi)
+            ErrorF("Failed to parse pointer\n");
+        if (KdAddPointer(pi) != Success)
+            ErrorF("Failed to add pointer!\n");
+    }
+    for (dev = kdConfigKeyboards; dev; dev = dev->next) {
+        ki = KdParseKeyboard(dev->line);
+        if (!ki)
+            ErrorF("Failed to parse keyboard\n");
+        if (KdAddKeyboard(ki) != Success)
+            ErrorF("Failed to add keyboard!\n");
+    }
+
+    mieqInit();
+}
+
+/*
+ * Middle button emulation state machine
+ *
+ *  Possible transitions:
+ *	Button 1 press	    v1
+ *	Button 1 release    ^1
+ *	Button 2 press	    v2
+ *	Button 2 release    ^2
+ *	Button 3 press	    v3
+ *	Button 3 release    ^3
+ *	Button other press  vo
+ *	Button other release ^o
+ *	Mouse motion	    <>
+ *	Keyboard event	    k
+ *	timeout		    ...
+ *	outside box	    <->
+ *
+ *  States:
+ *	start
+ *	button_1_pend
+ *	button_1_down
+ *	button_2_down
+ *	button_3_pend
+ *	button_3_down
+ *	synthetic_2_down_13
+ *	synthetic_2_down_3
+ *	synthetic_2_down_1
+ *
+ *  Transition diagram
+ *
+ *  start
+ *	v1  -> (hold) (settimeout) button_1_pend
+ *	^1  -> (deliver) start
+ *	v2  -> (deliver) button_2_down
+ *	^2  -> (deliever) start
+ *	v3  -> (hold) (settimeout) button_3_pend
+ *	^3  -> (deliver) start
+ *	vo  -> (deliver) start
+ *	^o  -> (deliver) start
+ *	<>  -> (deliver) start
+ *	k   -> (deliver) start
+ *
+ *  button_1_pend	(button 1 is down, timeout pending)
+ *	^1  -> (release) (deliver) start
+ *	v2  -> (release) (deliver) button_1_down
+ *	^2  -> (release) (deliver) button_1_down
+ *	v3  -> (cleartimeout) (generate v2) synthetic_2_down_13
+ *	^3  -> (release) (deliver) button_1_down
+ *	vo  -> (release) (deliver) button_1_down
+ *	^o  -> (release) (deliver) button_1_down
+ *	<-> -> (release) (deliver) button_1_down
+ *	<>  -> (deliver) button_1_pend
+ *	k   -> (release) (deliver) button_1_down
+ *	... -> (release) button_1_down
+ *
+ *  button_1_down	(button 1 is down)
+ *	^1  -> (deliver) start
+ *	v2  -> (deliver) button_1_down
+ *	^2  -> (deliver) button_1_down
+ *	v3  -> (deliver) button_1_down
+ *	^3  -> (deliver) button_1_down
+ *	vo  -> (deliver) button_1_down
+ *	^o  -> (deliver) button_1_down
+ *	<>  -> (deliver) button_1_down
+ *	k   -> (deliver) button_1_down
+ *
+ *  button_2_down	(button 2 is down)
+ *	v1  -> (deliver) button_2_down
+ *	^1  -> (deliver) button_2_down
+ *	^2  -> (deliver) start
+ *	v3  -> (deliver) button_2_down
+ *	^3  -> (deliver) button_2_down
+ *	vo  -> (deliver) button_2_down
+ *	^o  -> (deliver) button_2_down
+ *	<>  -> (deliver) button_2_down
+ *	k   -> (deliver) button_2_down
+ *
+ *  button_3_pend	(button 3 is down, timeout pending)
+ *	v1  -> (generate v2) synthetic_2_down
+ *	^1  -> (release) (deliver) button_3_down
+ *	v2  -> (release) (deliver) button_3_down
+ *	^2  -> (release) (deliver) button_3_down
+ *	^3  -> (release) (deliver) start
+ *	vo  -> (release) (deliver) button_3_down
+ *	^o  -> (release) (deliver) button_3_down
+ *	<-> -> (release) (deliver) button_3_down
+ *	<>  -> (deliver) button_3_pend
+ *	k   -> (release) (deliver) button_3_down
+ *	... -> (release) button_3_down
+ *
+ *  button_3_down	(button 3 is down)
+ *	v1  -> (deliver) button_3_down
+ *	^1  -> (deliver) button_3_down
+ *	v2  -> (deliver) button_3_down
+ *	^2  -> (deliver) button_3_down
+ *	^3  -> (deliver) start
+ *	vo  -> (deliver) button_3_down
+ *	^o  -> (deliver) button_3_down
+ *	<>  -> (deliver) button_3_down
+ *	k   -> (deliver) button_3_down
+ *
+ *  synthetic_2_down_13	(button 1 and 3 are down)
+ *	^1  -> (generate ^2) synthetic_2_down_3
+ *	v2  -> synthetic_2_down_13
+ *	^2  -> synthetic_2_down_13
+ *	^3  -> (generate ^2) synthetic_2_down_1
+ *	vo  -> (deliver) synthetic_2_down_13
+ *	^o  -> (deliver) synthetic_2_down_13
+ *	<>  -> (deliver) synthetic_2_down_13
+ *	k   -> (deliver) synthetic_2_down_13
+ *
+ *  synthetic_2_down_3 (button 3 is down)
+ *	v1  -> (deliver) synthetic_2_down_3
+ *	^1  -> (deliver) synthetic_2_down_3
+ *	v2  -> synthetic_2_down_3
+ *	^2  -> synthetic_2_down_3
+ *	^3  -> start
+ *	vo  -> (deliver) synthetic_2_down_3
+ *	^o  -> (deliver) synthetic_2_down_3
+ *	<>  -> (deliver) synthetic_2_down_3
+ *	k   -> (deliver) synthetic_2_down_3
+ *
+ *  synthetic_2_down_1 (button 1 is down)
+ *	^1  -> start
+ *	v2  -> synthetic_2_down_1
+ *	^2  -> synthetic_2_down_1
+ *	v3  -> (deliver) synthetic_2_down_1
+ *	^3  -> (deliver) synthetic_2_down_1
+ *	vo  -> (deliver) synthetic_2_down_1
+ *	^o  -> (deliver) synthetic_2_down_1
+ *	<>  -> (deliver) synthetic_2_down_1
+ *	k   -> (deliver) synthetic_2_down_1
+ */
+
+typedef enum _inputClass {
+    down_1, up_1,
+    down_2, up_2,
+    down_3, up_3,
+    down_o, up_o,
+    motion, outside_box,
+    keyboard, timeout,
+    num_input_class
+} KdInputClass;
+
+typedef enum _inputAction {
+    noop,
+    hold,
+    setto,
+    deliver,
+    release,
+    clearto,
+    gen_down_2,
+    gen_up_2
+} KdInputAction;
+
+#define MAX_ACTIONS 2
+
+typedef struct _inputTransition {
+    KdInputAction  actions[MAX_ACTIONS];
+    KdPointerState nextState;
+} KdInputTransition;
+
+static const
+KdInputTransition  kdInputMachine[num_input_states][num_input_class] = {
+    /* start */
+    {
+	{ { hold, setto },	    button_1_pend },	/* v1 */
+	{ { deliver, noop },	    start },		/* ^1 */
+	{ { deliver, noop },	    button_2_down },	/* v2 */
+	{ { deliver, noop },	    start },		/* ^2 */
+	{ { hold, setto },	    button_3_pend },	/* v3 */
+	{ { deliver, noop },	    start },		/* ^3 */
+	{ { deliver, noop },	    start },		/* vo */
+	{ { deliver, noop },	    start },		/* ^o */
+	{ { deliver, noop },	    start },		/* <> */
+	{ { deliver, noop },	    start },		/* <-> */
+	{ { noop, noop },	    start },		/* k */
+	{ { noop, noop },	    start },		/* ... */
+    },
+    /* button_1_pend */
+    {
+	{ { noop, noop },	    button_1_pend },	/* v1 */
+	{ { release, deliver },	    start },		/* ^1 */
+	{ { release, deliver },	    button_1_down },	/* v2 */
+	{ { release, deliver },	    button_1_down },	/* ^2 */
+	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v3 */
+	{ { release, deliver },	    button_1_down },	/* ^3 */
+	{ { release, deliver },	    button_1_down },	/* vo */
+	{ { release, deliver },	    button_1_down },	/* ^o */
+	{ { deliver, noop },	    button_1_pend },	/* <> */
+	{ { release, deliver },	    button_1_down },	/* <-> */
+	{ { noop, noop },	    button_1_down },	/* k */
+	{ { release, noop },	    button_1_down },	/* ... */
+    },
+    /* button_1_down */
+    {
+	{ { noop, noop },	    button_1_down },	/* v1 */
+	{ { deliver, noop },	    start },		/* ^1 */
+	{ { deliver, noop },	    button_1_down },	/* v2 */
+	{ { deliver, noop },	    button_1_down },	/* ^2 */
+	{ { deliver, noop },	    button_1_down },	/* v3 */
+	{ { deliver, noop },	    button_1_down },	/* ^3 */
+	{ { deliver, noop },	    button_1_down },	/* vo */
+	{ { deliver, noop },	    button_1_down },	/* ^o */
+	{ { deliver, noop },	    button_1_down },	/* <> */
+	{ { deliver, noop },	    button_1_down },	/* <-> */
+	{ { noop, noop },	    button_1_down },	/* k */
+	{ { noop, noop },	    button_1_down },	/* ... */
+    },
+    /* button_2_down */
+    {
+	{ { deliver, noop },	    button_2_down },	/* v1 */
+	{ { deliver, noop },	    button_2_down },	/* ^1 */
+	{ { noop, noop },	    button_2_down },	/* v2 */
+	{ { deliver, noop },	    start },		/* ^2 */
+	{ { deliver, noop },	    button_2_down },	/* v3 */
+	{ { deliver, noop },	    button_2_down },	/* ^3 */
+	{ { deliver, noop },	    button_2_down },	/* vo */
+	{ { deliver, noop },	    button_2_down },	/* ^o */
+	{ { deliver, noop },	    button_2_down },	/* <> */
+	{ { deliver, noop },	    button_2_down },	/* <-> */
+	{ { noop, noop },	    button_2_down },	/* k */
+	{ { noop, noop },	    button_2_down },	/* ... */
+    },
+    /* button_3_pend */
+    {
+	{ { clearto, gen_down_2 },  synth_2_down_13 },	/* v1 */
+	{ { release, deliver },	    button_3_down },	/* ^1 */
+	{ { release, deliver },	    button_3_down },	/* v2 */
+	{ { release, deliver },	    button_3_down },	/* ^2 */
+	{ { release, deliver },	    button_3_down },	/* v3 */
+	{ { release, deliver },	    start },		/* ^3 */
+	{ { release, deliver },	    button_3_down },	/* vo */
+	{ { release, deliver },	    button_3_down },	/* ^o */
+	{ { deliver, noop },	    button_3_pend },	/* <> */
+	{ { release, deliver },	    button_3_down },	/* <-> */
+	{ { release, noop },	    button_3_down },	/* k */
+	{ { release, noop },	    button_3_down },	/* ... */
+    },
+    /* button_3_down */
+    {
+	{ { deliver, noop },	    button_3_down },	/* v1 */
+	{ { deliver, noop },	    button_3_down },	/* ^1 */
+	{ { deliver, noop },	    button_3_down },	/* v2 */
+	{ { deliver, noop },	    button_3_down },	/* ^2 */
+	{ { noop, noop },	    button_3_down },	/* v3 */
+	{ { deliver, noop },	    start },		/* ^3 */
+	{ { deliver, noop },	    button_3_down },	/* vo */
+	{ { deliver, noop },	    button_3_down },	/* ^o */
+	{ { deliver, noop },	    button_3_down },	/* <> */
+	{ { deliver, noop },	    button_3_down },	/* <-> */
+	{ { noop, noop },	    button_3_down },	/* k */
+	{ { noop, noop },	    button_3_down },	/* ... */
+    },
+    /* synthetic_2_down_13 */
+    {
+	{ { noop, noop },	    synth_2_down_13 },	/* v1 */
+	{ { gen_up_2, noop },	    synth_2_down_3 },	/* ^1 */
+	{ { noop, noop },	    synth_2_down_13 },	/* v2 */
+	{ { noop, noop },	    synth_2_down_13 },	/* ^2 */
+	{ { noop, noop },	    synth_2_down_13 },	/* v3 */
+	{ { gen_up_2, noop },	    synth_2_down_1 },	/* ^3 */
+	{ { deliver, noop },	    synth_2_down_13 },	/* vo */
+	{ { deliver, noop },	    synth_2_down_13 },	/* ^o */
+	{ { deliver, noop },	    synth_2_down_13 },	/* <> */
+	{ { deliver, noop },	    synth_2_down_13 },	/* <-> */
+	{ { noop, noop },	    synth_2_down_13 },	/* k */
+	{ { noop, noop },	    synth_2_down_13 },	/* ... */
+    },
+    /* synthetic_2_down_3 */
+    {
+	{ { deliver, noop },	    synth_2_down_3 },	/* v1 */
+	{ { deliver, noop },	    synth_2_down_3 },	/* ^1 */
+	{ { deliver, noop },	    synth_2_down_3 },	/* v2 */
+	{ { deliver, noop },	    synth_2_down_3 },	/* ^2 */
+	{ { noop, noop },	    synth_2_down_3 },	/* v3 */
+	{ { noop, noop },	    start },		/* ^3 */
+	{ { deliver, noop },	    synth_2_down_3 },	/* vo */
+	{ { deliver, noop },	    synth_2_down_3 },	/* ^o */
+	{ { deliver, noop },	    synth_2_down_3 },	/* <> */
+	{ { deliver, noop },	    synth_2_down_3 },	/* <-> */
+	{ { noop, noop },	    synth_2_down_3 },	/* k */
+	{ { noop, noop },	    synth_2_down_3 },	/* ... */
+    },
+    /* synthetic_2_down_1 */
+    {
+	{ { noop, noop },	    synth_2_down_1 },	/* v1 */
+	{ { noop, noop },	    start },		/* ^1 */
+	{ { deliver, noop },	    synth_2_down_1 },	/* v2 */
+	{ { deliver, noop },	    synth_2_down_1 },	/* ^2 */
+	{ { deliver, noop },	    synth_2_down_1 },	/* v3 */
+	{ { deliver, noop },	    synth_2_down_1 },	/* ^3 */
+	{ { deliver, noop },	    synth_2_down_1 },	/* vo */
+	{ { deliver, noop },	    synth_2_down_1 },	/* ^o */
+	{ { deliver, noop },	    synth_2_down_1 },	/* <> */
+	{ { deliver, noop },	    synth_2_down_1 },	/* <-> */
+	{ { noop, noop },	    synth_2_down_1 },	/* k */
+	{ { noop, noop },	    synth_2_down_1 },	/* ... */
+    },
+};
+
+#define EMULATION_WINDOW    10
+#define EMULATION_TIMEOUT   100
+
+static int
+KdInsideEmulationWindow (KdPointerInfo *pi, int x, int y, int z)
+{
+    pi->emulationDx = pi->heldEvent.x - x;
+    pi->emulationDy = pi->heldEvent.y - y;
+
+    return (abs (pi->emulationDx) < EMULATION_WINDOW &&
+	    abs (pi->emulationDy) < EMULATION_WINDOW);
+}
+
+static KdInputClass
+KdClassifyInput (KdPointerInfo *pi, int type, int x, int y, int z, int b)
+{
+    switch (type) {
+    case ButtonPress:
+	switch (b) {
+	case 1: return down_1;
+	case 2: return down_2;
+	case 3: return down_3;
+	default: return down_o;
+	}
+	break;
+    case ButtonRelease:
+	switch (b) {
+	case 1: return up_1;
+	case 2: return up_2;
+	case 3: return up_3;
+	default: return up_o;
+	}
+	break;
+    case MotionNotify:
+	if (pi->eventHeld && !KdInsideEmulationWindow(pi, x, y, z))
+	    return outside_box;
+	else
+	    return motion;
+    default:
+	return keyboard;
+    }
+    return keyboard;
+}
+
+#ifdef DEBUG
+char	*kdStateNames[] = {
+    "start",
+    "button_1_pend",
+    "button_1_down",
+    "button_2_down",
+    "button_3_pend",
+    "button_3_down",
+    "synth_2_down_13",
+    "synth_2_down_3",
+    "synthetic_2_down_1",
+    "num_input_states"
+};
+
+char	*kdClassNames[] = {
+    "down_1", "up_1",
+    "down_2", "up_2",
+    "down_3", "up_3",
+    "motion", "ouside_box",
+    "keyboard", "timeout",
+    "num_input_class"
+};
+
+char *kdActionNames[] = {
+    "noop",
+    "hold",
+    "setto",
+    "deliver",
+    "release",
+    "clearto",
+    "gen_down_2",
+    "gen_up_2",
+};
+#endif /* DEBUG */
+
+static void
+KdQueueEvent (DeviceIntPtr pDev, InternalEvent *ev)
+{
+    KdAssertSigioBlocked ("KdQueueEvent");
+    mieqEnqueue (pDev, ev);
+}
+
+/* We return true if we're stealing the event. */
+static Bool
+KdRunMouseMachine (KdPointerInfo *pi, KdInputClass c, int type, int x, int y,
+                   int z, int b, int absrel)
+{
+    const KdInputTransition *t;
+    int	a;
+
+    c = KdClassifyInput(pi, type, x, y, z, b);
+    t = &kdInputMachine[pi->mouseState][c];
+    for (a = 0; a < MAX_ACTIONS; a++)
+    {
+	switch (t->actions[a]) {
+	case noop:
+	    break;
+	case hold:
+	    pi->eventHeld = TRUE;
+	    pi->emulationDx = 0;
+	    pi->emulationDy = 0;
+	    pi->heldEvent.type = type;
+            pi->heldEvent.x = x;
+            pi->heldEvent.y = y;
+            pi->heldEvent.z = z;
+            pi->heldEvent.flags = b;
+            pi->heldEvent.absrel = absrel;
+            return TRUE;
+	    break;
+	case setto:
+	    pi->emulationTimeout = GetTimeInMillis () + EMULATION_TIMEOUT;
+	    pi->timeoutPending = TRUE;
+	    break;
+	case deliver:
+            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
+                                    pi->heldEvent.y, pi->heldEvent.z,
+                                    pi->heldEvent.flags, pi->heldEvent.absrel,
+                                    TRUE);
+	    break;
+	case release:
+	    pi->eventHeld = FALSE;
+	    pi->timeoutPending = FALSE;
+            _KdEnqueuePointerEvent (pi, pi->heldEvent.type, pi->heldEvent.x,
+                                    pi->heldEvent.y, pi->heldEvent.z,
+                                    pi->heldEvent.flags, pi->heldEvent.absrel,
+                                    TRUE);
+            return TRUE;
+	    break;
+	case clearto:
+	    pi->timeoutPending = FALSE;
+	    break;
+	case gen_down_2:
+            _KdEnqueuePointerEvent (pi, ButtonPress, x, y, z, 2, absrel,
+                                    TRUE);
+	    pi->eventHeld = FALSE;
+            return TRUE;
+	    break;
+	case gen_up_2:
+            _KdEnqueuePointerEvent (pi, ButtonRelease, x, y, z, 2, absrel,
+                                    TRUE);
+            return TRUE;
+	    break;
+	}
+    }
+    pi->mouseState = t->nextState;
+    return FALSE;
+}
+
+static int
+KdHandlePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z, int b,
+                      int absrel)
+{
+    if (pi->emulateMiddleButton)
+        return KdRunMouseMachine (pi, KdClassifyInput(pi, type, x, y, z, b),
+                                  type, x, y, z, b, absrel);
+    return FALSE;
+}
+
+static void
+KdReceiveTimeout (KdPointerInfo *pi)
+{
+    KdRunMouseMachine (pi, timeout, 0, 0, 0, 0, 0, 0);
+}
+
+/*
+ * kdCheckTermination
+ *
+ * This function checks for the key sequence that terminates the server.  When
+ * detected, it sets the dispatchException flag and returns.  The key sequence
+ * is:
+ *	Control-Alt
+ * It's assumed that the server will be waken up by the caller when this
+ * function returns.
+ */
+
+extern int nClients;
+
+void
+KdReleaseAllKeys (void)
+{
+#if 0
+    int	key, nEvents, i;
+    KdKeyboardInfo *ki;
+
+    KdBlockSigio ();
+
+    for (ki = kdKeyboards; ki; ki = ki->next) {
+        for (key = ki->keySyms.minKeyCode; key < ki->keySyms.maxKeyCode;
+             key++) {
+            if (key_is_down(ki->dixdev, key, KEY_POSTED | KEY_PROCESSED)) {
+                KdHandleKeyboardEvent(ki, KeyRelease, key);
+                GetEventList(&kdEvents);
+                nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, KeyRelease, key);
+                for (i = 0; i < nEvents; i++)
+                    KdQueueEvent (ki->dixdev, (kdEvents + i)->event);
+            }
+        }
+    }
+
+    KdUnblockSigio ();
+#endif
+}
+
+static void
+KdCheckLock (void)
+{
+    KeyClassPtr	    keyc = NULL;
+    Bool	    isSet = FALSE, shouldBeSet = FALSE;
+    KdKeyboardInfo     *tmp = NULL;
+
+    for (tmp = kdKeyboards; tmp; tmp = tmp->next) {
+        if (tmp->LockLed && tmp->dixdev && tmp->dixdev->key) {
+            keyc = tmp->dixdev->key;
+            isSet = (tmp->leds & (1 << (tmp->LockLed-1))) != 0;
+            /* FIXME: Just use XKB indicators! */
+            shouldBeSet = !!(XkbStateFieldFromRec(&keyc->xkbInfo->state) & LockMask);
+            if (isSet != shouldBeSet)
+                KdSetLed (tmp, tmp->LockLed, shouldBeSet);
+        }
+    }
+}
+
+void
+KdEnqueueKeyboardEvent(KdKeyboardInfo   *ki,
+                       unsigned char scan_code,
+		       unsigned char is_up)
+{
+    unsigned char key_code;
+    KeyClassPtr	keyc = NULL;
+    KeybdCtrl *ctrl = NULL;
+    int type, nEvents, i;
+
+    if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)
+	return;
+
+    keyc = ki->dixdev->key;
+    ctrl = &ki->dixdev->kbdfeed->ctrl;
+
+    if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode)
+    {
+	key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;
+
+	/*
+	 * Set up this event -- the type may be modified below
+	 */
+	if (is_up)
+	    type = KeyRelease;
+	else
+	    type = KeyPress;
+
+        GetEventList(&kdEvents);
+
+        nEvents = GetKeyboardEvents(kdEvents, ki->dixdev, type, key_code);
+        for (i = 0; i < nEvents; i++)
+            KdQueueEvent(ki->dixdev, (InternalEvent *)((kdEvents + i)->event));
+    }
+    else {
+        ErrorF("driver %s wanted to post scancode %d outside of [%d, %d]!\n",
+               ki->name, scan_code, ki->minScanCode, ki->maxScanCode);
+    }
+}
+
+/*
+ * kdEnqueuePointerEvent
+ *
+ * This function converts hardware mouse event information into X event
+ * information.  A mouse movement event is passed off to MI to generate
+ * a MotionNotify event, if appropriate.  Button events are created and
+ * passed off to MI for enqueueing.
+ */
+
+/* FIXME do something a little more clever to deal with multiple axes here */
+void
+KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
+                      int rz)
+{
+    CARD32        ms;
+    unsigned char buttons;
+    int           x, y, z;
+    int           (*matrix)[3] = kdPointerMatrix.matrix;
+    unsigned long button;
+    int           n;
+    int           dixflags = 0;
+
+    if (!pi)
+	return;
+
+    ms = GetTimeInMillis();
+
+    /* we don't need to transform z, so we don't. */
+    if (flags & KD_MOUSE_DELTA) {
+	if (pi->transformCoordinates) {
+	    x = matrix[0][0] * rx + matrix[0][1] * ry;
+	    y = matrix[1][0] * rx + matrix[1][1] * ry;
+	}
+	else {
+	    x = rx;
+	    y = ry;
+	}
+    }
+    else {
+	if (pi->transformCoordinates) {
+	    x = matrix[0][0] * rx + matrix[0][1] * ry + matrix[0][2];
+	    y = matrix[1][0] * rx + matrix[1][1] * ry + matrix[1][2];
+	}
+	else {
+	    x = rx;
+	    y = ry;
+	}
+    }
+    z = rz;
+
+    if (flags & KD_MOUSE_DELTA)
+    {
+        if (x || y || z)
+        {
+            dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
+        }
+    } else
+    {
+        dixflags = POINTER_ABSOLUTE;
+        if (x != pi->dixdev->last.valuators[0] ||
+            y != pi->dixdev->last.valuators[1])
+            _KdEnqueuePointerEvent(pi, MotionNotify, x, y, z, 0, dixflags, FALSE);
+    }
+
+    buttons = flags;
+
+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
+         button <<= 1, n++) {
+        if (((pi->buttonState & button) ^ (buttons & button)) &&
+           !(buttons & button)) {
+            _KdEnqueuePointerEvent(pi, ButtonRelease, x, y, z, n,
+                                   dixflags, FALSE);
+	}
+    }
+    for (button = KD_BUTTON_1, n = 1; n <= pi->nButtons;
+         button <<= 1, n++) {
+	if (((pi->buttonState & button) ^ (buttons & button)) &&
+	    (buttons & button)) {
+            _KdEnqueuePointerEvent(pi, ButtonPress, x, y, z, n,
+                                   dixflags, FALSE);
+        }
+    }
+
+    pi->buttonState = buttons;
+}
+
+void
+_KdEnqueuePointerEvent (KdPointerInfo *pi, int type, int x, int y, int z,
+                        int b, int absrel, Bool force)
+{
+    int nEvents = 0, i = 0;
+    int valuators[3] = { x, y, z };
+    ValuatorMask mask;
+
+    /* TRUE from KdHandlePointerEvent, means 'we swallowed the event'. */
+    if (!force && KdHandlePointerEvent(pi, type, x, y, z, b, absrel))
+        return;
+
+    valuator_mask_set_range(&mask, 0, 3, valuators);
+
+    GetEventList(&kdEvents);
+    nEvents = GetPointerEvents(kdEvents, pi->dixdev, type, b, absrel, &mask);
+    for (i = 0; i < nEvents; i++)
+        KdQueueEvent(pi->dixdev, (InternalEvent *)((kdEvents + i)->event));
+}
+
+void
+KdBlockHandler (int		screen,
+		pointer		blockData,
+		pointer		timeout,
+		pointer		readmask)
+{
+    KdPointerInfo		    *pi;
+    int myTimeout=0;
+
+    for (pi = kdPointers; pi; pi = pi->next)
+    {
+	if (pi->timeoutPending)
+	{
+	    int	ms;
+
+	    ms = pi->emulationTimeout - GetTimeInMillis ();
+	    if (ms < 1)
+		ms = 1;
+	    if(ms<myTimeout || myTimeout==0)
+		    myTimeout=ms;
+	}
+    }
+    /* if we need to poll for events, do that */
+    if(kdOsFuncs->pollEvents)
+    {
+	    (*kdOsFuncs->pollEvents)();
+	    myTimeout=20;
+    }
+    if(myTimeout>0)
+    	AdjustWaitForDelay (timeout, myTimeout);
+}
+
+void
+KdWakeupHandler (int		screen,
+		 pointer    	data,
+		 unsigned long	lresult,
+		 pointer	readmask)
+{
+    int		result = (int) lresult;
+    fd_set	*pReadmask = (fd_set *) readmask;
+    int		i;
+    KdPointerInfo	*pi;
+
+    if (kdInputEnabled && result > 0)
+    {
+	for (i = 0; i < kdNumInputFds; i++)
+	    if (FD_ISSET (kdInputFds[i].fd, pReadmask))
+	    {
+		KdBlockSigio ();
+		(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
+		KdUnblockSigio ();
+	    }
+    }
+    for (pi = kdPointers; pi; pi = pi->next)
+    {
+	if (pi->timeoutPending)
+	{
+	    if ((long) (GetTimeInMillis () - pi->emulationTimeout) >= 0)
+	    {
+		pi->timeoutPending = FALSE;
+		KdBlockSigio ();
+		KdReceiveTimeout (pi);
+		KdUnblockSigio ();
+	    }
+	}
+    }
+    if (kdSwitchPending)
+	KdProcessSwitch ();
+}
+
+#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))
+
+static Bool
+KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
+{
+    ScreenPtr	pScreen  = *ppScreen;
+    ScreenPtr	pNewScreen;
+    int		n;
+    int		dx, dy;
+    int		best_x, best_y;
+    int		n_best_x, n_best_y;
+    CARD32	ms;
+
+    if (kdDisableZaphod || screenInfo.numScreens <= 1)
+	return FALSE;
+
+    if (0 <= *x && *x < pScreen->width && 0 <= *y && *y < pScreen->height)
+	return FALSE;
+
+    ms = GetTimeInMillis ();
+    if (kdOffScreen && (int) (ms - kdOffScreenTime) < 1000)
+	return FALSE;
+    kdOffScreen = TRUE;
+    kdOffScreenTime = ms;
+    n_best_x = -1;
+    best_x = 32767;
+    n_best_y = -1;
+    best_y = 32767;
+    for (n = 0; n < screenInfo.numScreens; n++)
+    {
+	pNewScreen = screenInfo.screens[n];
+	if (pNewScreen == pScreen)
+	    continue;
+	dx = KdScreenOrigin(pNewScreen)->x - KdScreenOrigin(pScreen)->x;
+	dy = KdScreenOrigin(pNewScreen)->y - KdScreenOrigin(pScreen)->y;
+	if (*x < 0)
+	{
+	    if (dx <= 0 && -dx < best_x)
+	    {
+		best_x = -dx;
+		n_best_x = n;
+	    }
+	}
+	else if (*x >= pScreen->width)
+	{
+	    if (dx >= 0 && dx < best_x)
+	    {
+		best_x = dx;
+		n_best_x = n;
+	    }
+	}
+	if (*y < 0)
+	{
+	    if (dy <= 0 && -dy < best_y)
+	    {
+		best_y = -dy;
+		n_best_y = n;
+	    }
+	}
+	else if (*y >= pScreen->height)
+	{
+	    if (dy >= 0 && dy < best_y)
+	    {
+		best_y = dy;
+		n_best_y = n;
+	    }
+	}
+    }
+    if (best_y < best_x)
+	n_best_x = n_best_y;
+    if (n_best_x == -1)
+	return FALSE;
+    pNewScreen = screenInfo.screens[n_best_x];
+
+    if (*x < 0)
+	*x += pNewScreen->width;
+    if (*y < 0)
+	*y += pNewScreen->height;
+
+    if (*x >= pScreen->width)
+	*x -= pScreen->width;
+    if (*y >= pScreen->height)
+	*y -= pScreen->height;
+
+    *ppScreen = pNewScreen;
+    return TRUE;
+}
+
+static void
+KdCrossScreen(ScreenPtr pScreen, Bool entering)
+{
+#ifndef XIPAQ
+    if (entering)
+	KdEnableScreen (pScreen);
+    else
+	KdDisableScreen (pScreen);
+#endif
+}
+
+int KdCurScreen;	/* current event screen */
+
+static void
+KdWarpCursor (DeviceIntPtr pDev, ScreenPtr pScreen, int x, int y)
+{
+    KdBlockSigio ();
+    KdCurScreen = pScreen->myNum;
+    miPointerWarpCursor(pDev, pScreen, x, y);
+    KdUnblockSigio ();
+}
+
+miPointerScreenFuncRec kdPointerScreenFuncs =
+{
+    KdCursorOffScreen,
+    KdCrossScreen,
+    KdWarpCursor
+};
+
+void
+ProcessInputEvents (void)
+{
+    mieqProcessInputEvents();
+    miPointerUpdateSprite(inputInfo.pointer);
+    if (kdSwitchPending)
+	KdProcessSwitch ();
+    KdCheckLock ();
+}
+
+/* At the moment, absolute/relative is up to the client. */
+int
+SetDeviceMode(register ClientPtr client, DeviceIntPtr pDev, int mode)
+{
+    return BadMatch;
+}
+
+int
+SetDeviceValuators(register ClientPtr client, DeviceIntPtr pDev,
+                   int *valuators, int first_valuator, int num_valuators)
+{
+    return BadMatch;
+}
+
+int
+ChangeDeviceControl(register ClientPtr client, DeviceIntPtr pDev,
+                        xDeviceCtl *control)
+{
+    switch (control->control) {
+    case DEVICE_RESOLUTION:
+        /* FIXME do something more intelligent here */
+        return BadMatch;
+
+    case DEVICE_ABS_CALIB:
+    case DEVICE_ABS_AREA:
+    case DEVICE_CORE:
+        return BadMatch;
+    case DEVICE_ENABLE:
+        return Success;
+
+    default:
+        return BadMatch;
+    }
+
+    /* NOTREACHED */
+    return BadImplementation;
+}
+
+int
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+                      DeviceIntPtr *pdev)
+{
+    InputOption *option = NULL;
+    KdPointerInfo *pi = NULL;
+    KdKeyboardInfo *ki = NULL;
+
+    for (option = options; option; option = option->next) {
+        if (strcmp(option->key, "type") == 0) {
+            if (strcmp(option->value, "pointer") == 0) {
+                pi = KdNewPointer();
+                if (!pi)
+                    return BadAlloc;
+            }
+            else if (strcmp(option->value, "keyboard") == 0) {
+                ki = KdNewKeyboard();
+                if (!ki)
+                    return BadAlloc;
+            }
+            else {
+                ErrorF("unrecognised device type!\n");
+                return BadValue;
+            }
+        }
+#ifdef CONFIG_HAL
+        else if (strcmp(option->key, "_source") == 0 &&
+                 strcmp(option->value, "server/hal") == 0)
+        {
+            ErrorF("Ignoring device from HAL.\n");
+            return BadValue;
+        }
+#endif
+#ifdef CONFIG_UDEV
+        else if (strcmp(option->key, "_source") == 0 &&
+                 strcmp(option->value, "server/udev") == 0)
+        {
+            ErrorF("Ignoring device from udev.\n");
+            return BadValue;
+        }
+#endif
+    }
+
+    if (!ki && !pi) {
+        ErrorF("unrecognised device identifier!\n");
+        return BadValue;
+    }
+
+    /* FIXME: change this code below to use KdParseKbdOptions and
+     * KdParsePointerOptions */
+    for (option = options; option; option = option->next) {
+        if (strcmp(option->key, "device") == 0) {
+            if (pi && option->value)
+                pi->path = strdup(option->value);
+            else if (ki && option->value)
+                ki->path = strdup(option->value);
+        }
+        else if (strcmp(option->key, "driver") == 0) {
+            if (pi) {
+                pi->driver = KdFindPointerDriver(option->value);
+                if (!pi->driver) {
+                    ErrorF("couldn't find driver!\n");
+                    KdFreePointer(pi);
+                    return BadValue;
+                }
+                pi->options = options;
+            }
+            else if (ki) {
+                ki->driver = KdFindKeyboardDriver(option->value);
+                if (!ki->driver) {
+                    ErrorF("couldn't find driver!\n");
+                    KdFreeKeyboard(ki);
+                    return BadValue;
+                }
+                ki->options = options;
+            }
+        }
+    }
+
+    if (pi) {
+        if (KdAddPointer(pi) != Success ||
+            ActivateDevice(pi->dixdev, TRUE) != Success ||
+            EnableDevice(pi->dixdev, TRUE) != TRUE) {
+            ErrorF("couldn't add or enable pointer\n");
+            return BadImplementation;
+        }
+    }
+    else if (ki) {
+        if (KdAddKeyboard(ki) != Success ||
+            ActivateDevice(ki->dixdev, TRUE) != Success ||
+            EnableDevice(ki->dixdev, TRUE) != TRUE) {
+            ErrorF("couldn't add or enable keyboard\n");
+            return BadImplementation;
+        }
+    }
+
+    if (pi) {
+        *pdev = pi->dixdev;
+    } else if(ki) {
+        *pdev = ki->dixdev;
+    }
+
+    return Success;
+}
+
+void
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
+{
+    RemoveDevice(pDev, TRUE);
+}
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index 1a5bf8a1c..399883886 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -983,106 +983,6 @@ xf86SetBlackWhitePixels(ScreenPtr pScreen)
 }
 
 /*
- * xf86SetRootClip --
- *	Enable or disable rendering to the screen by
- *	setting the root clip list and revalidating
- *	all of the windows
- */
-
-static void
-xf86SetRootClip (ScreenPtr pScreen, Bool enable)
-{
-    WindowPtr	pWin = pScreen->root;
-    WindowPtr	pChild;
-    Bool	WasViewable = (Bool)(pWin->viewable);
-    Bool	anyMarked = FALSE;
-    WindowPtr   pLayerWin;
-    BoxRec	box;
-
-    if (WasViewable)
-    {
-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
-	{
-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
-						     pChild,
-						     &pLayerWin);
-	}
-	(*pScreen->MarkWindow) (pWin);
-	anyMarked = TRUE;
-	if (pWin->valdata)
-	{
-	    if (HasBorder (pWin))
-	    {
-		RegionPtr	borderVisible;
-
-		borderVisible = RegionCreate(NullBox, 1);
-		RegionSubtract(borderVisible,
-				&pWin->borderClip, &pWin->winSize);
-		pWin->valdata->before.borderVisible = borderVisible;
-	    }
-	    pWin->valdata->before.resized = TRUE;
-	}
-    }
-
-    /*
-     * Use REGION_BREAK to avoid optimizations in ValidateTree
-     * that assume the root borderClip can't change well, normally
-     * it doesn't...)
-     */
-    if (enable)
-    {
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pScreen->width;
-	box.y2 = pScreen->height;
-	RegionInit(&pWin->winSize, &box, 1);
-	RegionInit(&pWin->borderSize, &box, 1);
-	if (WasViewable)
-	    RegionReset(&pWin->borderClip, &box);
-	pWin->drawable.width = pScreen->width;
-	pWin->drawable.height = pScreen->height;
-        RegionBreak(&pWin->clipList);
-    }
-    else
-    {
-	RegionEmpty(&pWin->borderClip);
-	RegionBreak(&pWin->clipList);
-    }
-
-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
-
-    if (WasViewable)
-    {
-	if (pWin->firstChild)
-	{
-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
-							   pWin->firstChild,
-							   (WindowPtr *)NULL);
-	}
-	else
-	{
-	    (*pScreen->MarkWindow) (pWin);
-	    anyMarked = TRUE;
-	}
-
-
-	if (anyMarked)
-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
-    }
-
-    if (WasViewable)
-    {
-	if (anyMarked)
-	    (*pScreen->HandleExposures)(pWin);
-	if (anyMarked && pScreen->PostValidateTree)
-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
-    }
-    if (pWin->realized)
-	WindowsRestructured ();
-    FlushAllOutput ();
-}
-
-/*
  * Function to enable/disable access to the frame buffer
  *
  * This is used when VT switching and when entering/leaving DGA direct mode.
@@ -1115,7 +1015,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	 * Restore all of the clip lists on the screen
 	 */
 	if (!xf86Resetting)
-	    xf86SetRootClip (pScreen, TRUE);
+	    SetRootClip (pScreen, TRUE);
 
     }
     else
@@ -1123,7 +1023,7 @@ xf86EnableDisableFBAccess(int scrnIndex, Bool enable)
 	/*
 	 * Empty all of the clip lists on the screen
 	 */
-	xf86SetRootClip (pScreen, FALSE);
+	SetRootClip (pScreen, FALSE);
     }
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 4166a1c38..ae22ef268 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1,1409 +1,1411 @@
-/*

- * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>

- *                                                                            

- * 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, and that   the  name of  Frederic   Lepied not  be  used  in

- * advertising or publicity pertaining to distribution of the software without

- * specific,  written      prior  permission.     Frederic  Lepied   makes  no

- * representations about the suitability of this software for any purpose.  It

- * is provided "as is" without express or implied warranty.                   

- *                                                                            

- * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,

- * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO

- * EVENT  SHALL FREDERIC  LEPIED 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.

- *

- */

-/*

- * Copyright (c) 2000-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,

- * OTHER DEALINGS IN THE SOFTWARE.

- *

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

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

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

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

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/Xfuncproto.h>

-#include <X11/Xmd.h>

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

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

-#include <X11/Xatom.h>

-#include "xf86.h"

-#include "xf86Priv.h"

-#include "xf86Config.h"

-#include "xf86Xinput.h"

-#include "xf86Optrec.h"

-#include "mipointer.h"

-#include "extinit.h"

-#include "loaderProcs.h"

-

-#include "exevents.h"	/* AddInputDevice */

-#include "exglobals.h"

-#include "eventstr.h"

-#include "inpututils.h"

-

-#include <string.h>     /* InputClassMatches */

-#ifdef HAVE_FNMATCH_H

-#include <fnmatch.h>

-#endif

-#ifdef HAVE_SYS_UTSNAME_H

-#include <sys/utsname.h>

-#endif

-

-#include <stdarg.h>

-#include <stdint.h>          /* for int64_t */

-

-#include "mi.h"

-

-#include <ptrveloc.h>          /* dix pointer acceleration */

-#include <xserver-properties.h>

-

-#ifdef XFreeXDGA

-#include "dgaproc.h"

-#endif

-

-#include "xkbsrv.h"

-

-/* Valuator verification macro */

-#define XI_VERIFY_VALUATORS(num_valuators)					\

-	if (num_valuators > MAX_VALUATORS) {					\

-		xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"		\

-			" MAX_VALUATORS\n", __FUNCTION__, num_valuators);	\

-		return;								\

-	}

-

-EventListPtr xf86Events = NULL;

-

-static int

-xf86InputDevicePostInit(DeviceIntPtr dev);

-

-/**

- * Eval config and modify DeviceVelocityRec accordingly

- */

-static void

-ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,

-                             DeviceVelocityPtr s)

-{

-    int tempi;

-    float tempf;

-    Atom float_prop = XIGetKnownProperty(XATOM_FLOAT);

-    Atom prop;

-

-    if(!s)

-        return;

-

-    /* common settings (available via device properties) */

-    tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);

-    if (tempf > 1.0) {

-        xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",

-                devname, tempf);

-        prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);

-    if (tempf > 1.0) {

-        xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",

-                devname, tempf);

-        prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    /* select profile by number */

-    tempi = xf86SetIntOption(list, "AccelerationProfile",

-            s->statistics.profile_number);

-

-    prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);

-    if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,

-                               PropModeReplace, 1, &tempi, FALSE) == Success) {

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,

-                tempi);

-    } else {

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",

-                devname, tempi);

-    }

-

-    /* set scaling */

-    tempf = xf86SetRealOption(list, "ExpectedRate", 0);

-    prop = XIGetKnownProperty(ACCEL_PROP_VELOCITY_SCALING);

-    if (tempf > 0) {

-        tempf = 1000.0 / tempf;

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    } else {

-        tempf = xf86SetRealOption(list, "VelocityScale", s->corr_mul);

-        XIChangeDeviceProperty(pDev, prop, float_prop, 32,

-                               PropModeReplace, 1, &tempf, FALSE);

-    }

-

-    tempi = xf86SetIntOption(list, "VelocityTrackerCount", -1);

-    if (tempi > 1)

-	InitTrackers(s, tempi);

-

-    s->initial_range = xf86SetIntOption(list, "VelocityInitialRange",

-                                        s->initial_range);

-

-    s->max_diff = xf86SetRealOption(list, "VelocityAbsDiff", s->max_diff);

-

-    tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);

-    if (tempf >= 0) {

-	xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",

-	        devname, tempf*100.0);

-	s->max_rel_diff = tempf;

-    }

-

-    /*  Configure softening. If const deceleration is used, this is expected

-     *  to provide better subpixel information so we enable

-     *  softening by default only if ConstantDeceleration is not used

-     */

-    s->use_softening = xf86SetBoolOption(list, "Softening",

-                                         s->const_acceleration == 1.0);

-

-    s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging",

-                                         s->average_accel);

-

-    s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);

-}

-

-static void

-ApplyAccelerationSettings(DeviceIntPtr dev){

-    int scheme, i;

-    DeviceVelocityPtr pVel;

-    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;

-    char* schemeStr;

-

-    if (dev->valuator && dev->ptrfeed) {

-	schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");

-

-	scheme = dev->valuator->accelScheme.number;

-

-	if (!xf86NameCmp(schemeStr, "predictable"))

-	    scheme = PtrAccelPredictable;

-

-	if (!xf86NameCmp(schemeStr, "lightweight"))

-	    scheme = PtrAccelLightweight;

-

-	if (!xf86NameCmp(schemeStr, "none"))

-	    scheme = PtrAccelNoOp;

-

-        /* reinit scheme if needed */

-        if (dev->valuator->accelScheme.number != scheme) {

-            if (dev->valuator->accelScheme.AccelCleanupProc) {

-                dev->valuator->accelScheme.AccelCleanupProc(dev);

-            }

-

-            if (InitPointerAccelerationScheme(dev, scheme)) {

-		xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",

-		        pInfo->name, schemeStr, scheme);

-	    } else {

-        	xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",

-		        pInfo->name, schemeStr);

-        	scheme = dev->valuator->accelScheme.number;

-            }

-        } else {

-            xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",

-                    pInfo->name, scheme);

-        }

-

-        free(schemeStr);

-

-        /* process special configuration */

-        switch (scheme) {

-            case PtrAccelPredictable:

-                pVel = GetDevicePredictableAccelData(dev);

-                ProcessVelocityConfiguration (dev, pInfo->name, pInfo->options,

-                                              pVel);

-                break;

-        }

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationNumerator",

-                             dev->ptrfeed->ctrl.num);

-        if (i >= 0)

-            dev->ptrfeed->ctrl.num = i;

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationDenominator",

-                             dev->ptrfeed->ctrl.den);

-        if (i > 0)

-            dev->ptrfeed->ctrl.den = i;

-

-        i = xf86SetIntOption(pInfo->options, "AccelerationThreshold",

-                             dev->ptrfeed->ctrl.threshold);

-        if (i >= 0)

-            dev->ptrfeed->ctrl.threshold = i;

-

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",

-                            pInfo->name, ((float)dev->ptrfeed->ctrl.num)/

-                                         ((float)dev->ptrfeed->ctrl.den));

-        xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",

-                pInfo->name, dev->ptrfeed->ctrl.threshold);

-    }

-}

-

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

- *

- * xf86ProcessCommonOptions --

- * 

- *	Process global options.

- *

- ***********************************************************************

- */

-void

-xf86ProcessCommonOptions(InputInfoPtr pInfo,

-                         pointer	list)

-{

-    if (xf86SetBoolOption(list, "Floating", 0) ||

-        !xf86SetBoolOption(list, "AlwaysCore", 1) ||

-        !xf86SetBoolOption(list, "SendCoreEvents", 1) ||

-        !xf86SetBoolOption(list, "CorePointer", 1) ||

-        !xf86SetBoolOption(list, "CoreKeyboard", 1)) {

-        xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);

-    } else {

-        pInfo->flags |= XI86_ALWAYS_CORE;

-        xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);

-    }

-}

-

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

- *

- * xf86ActivateDevice --

- *

- *	Initialize an input device.

- *

- * Returns TRUE on success, or FALSE otherwise.

- ***********************************************************************

- */

-static DeviceIntPtr

-xf86ActivateDevice(InputInfoPtr pInfo)

-{

-    DeviceIntPtr	dev;

-    Atom		atom;

-

-    dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);

-

-    if (dev == NULL)

-    {

-        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n",

-                pInfo->name);

-        pInfo->dev = NULL;

-        return NULL;

-    }

-

-    atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE);

-    AssignTypeAndName(dev, atom, pInfo->name);

-    dev->public.devicePrivate = pInfo;

-    pInfo->dev = dev;

-

-    dev->coreEvents = pInfo->flags & XI86_ALWAYS_CORE;

-    dev->type = SLAVE;

-    dev->spriteInfo->spriteOwner = FALSE;

-

-    dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);

-

-    if (serverGeneration == 1)

-        xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",

-                pInfo->name, pInfo->type_name);

-

-    return dev;

-}

-

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

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- ***********************************************************************

- */

-

-int

-SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)

-{

-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;

-

-  if (pInfo->switch_mode) {

-    return (*pInfo->switch_mode)(client, dev, mode);

-  }

-  else

-    return BadMatch;

-}

-

-

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

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- ***********************************************************************

- */

-

-int

-SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,

-                    int first_valuator, int num_valuators)

-{

-    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;

-

-    if (pInfo->set_device_valuators)

-	return (*pInfo->set_device_valuators)(pInfo, valuators, first_valuator,

-					      num_valuators);

-

-    return BadMatch;

-}

-

-

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

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- ***********************************************************************

- */

-

-int

-ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)

-{

-  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;

-

-  if (!pInfo->control_proc) {

-      switch (control->control) {

-      case DEVICE_CORE:

-          return BadMatch;

-      case DEVICE_RESOLUTION:

-      case DEVICE_ABS_CALIB:

-      case DEVICE_ABS_AREA:

-      case DEVICE_ENABLE:

-        return Success;

-      default:

-        return BadMatch;

-      }

-  }

-  else {

-      return (*pInfo->control_proc)(pInfo, control);

-  }

-}

-

-/*

- * Get the operating system name from uname and store it statically to avoid

- * repeating the system call each time MatchOS is checked.

- */

-static const char *

-HostOS(void)

-{

-#ifdef HAVE_SYS_UTSNAME_H

-    struct utsname name;

-    static char host_os[sizeof(name.sysname)] = "";

-

-    if (*host_os == '\0') {

-        if (uname(&name) >= 0)

-            strcpy(host_os, name.sysname);

-        else {

-            strncpy(host_os, "unknown", sizeof(host_os));

-            host_os[sizeof(host_os)-1] = '\0';

-        }

-    }

-    return host_os;

-#else

-    return "";

-#endif

-}

-

-static int

-match_substring(const char *attr, const char *pattern)

-{

-    return (strstr(attr, pattern)) ? 0 : -1;

-}

-

-#ifdef HAVE_FNMATCH_H

-static int

-match_pattern(const char *attr, const char *pattern)

-{

-    return fnmatch(pattern, attr, 0);

-}

-#else

-#define match_pattern match_substring

-#endif

-

-#ifdef HAVE_FNMATCH_H

-static int

-match_path_pattern(const char *attr, const char *pattern)

-{

-    return fnmatch(pattern, attr, FNM_PATHNAME);

-}

-#else

-#define match_path_pattern match_substring

-#endif

-

-/*

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

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

- */

-static Bool

-MatchAttrToken(const char *attr, struct list *patterns,

-               int (*compare)(const char *attr, const char *pattern))

-{

-    const xf86MatchGroup *group;

-

-    /* If there are no patterns, accept the match */

-    if (list_is_empty(patterns))

-        return TRUE;

-

-    /* If there are patterns but no attribute, reject the match */

-    if (!attr)

-        return FALSE;

-

-    /*

-     * Otherwise, iterate the list of patterns ensuring each entry has a

-     * match. Each list entry is a separate Match line of the same type.

-     */

-    list_for_each_entry(group, patterns, entry) {

-        char * const *cur;

-        Bool match = FALSE;

-

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

-            if ((*compare)(attr, *cur) == 0) {

-                match = TRUE;

-                break;

-            }

-        if (!match)

-            return FALSE;

-    }

-

-    /* All the entries in the list matched the attribute */

-    return TRUE;

-}

-

-/*

- * Classes without any Match statements match all devices. Otherwise, all

- * statements must match.

- */

-static Bool

-InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,

-                  const InputAttributes *attrs)

-{

-    /* MatchProduct substring */

-    if (!MatchAttrToken(attrs->product, &iclass->match_product, match_substring))

-        return FALSE;

-

-    /* MatchVendor substring */

-    if (!MatchAttrToken(attrs->vendor, &iclass->match_vendor, match_substring))

-        return FALSE;

-

-    /* MatchDevicePath pattern */

-    if (!MatchAttrToken(attrs->device, &iclass->match_device, match_path_pattern))

-        return FALSE;

-

-    /* MatchOS case-insensitive string */

-    if (!MatchAttrToken(HostOS(), &iclass->match_os, strcasecmp))

-        return FALSE;

-

-    /* MatchPnPID pattern */

-    if (!MatchAttrToken(attrs->pnp_id, &iclass->match_pnpid, match_pattern))

-        return FALSE;

-

-    /* MatchUSBID pattern */

-    if (!MatchAttrToken(attrs->usb_id, &iclass->match_usbid, match_pattern))

-        return FALSE;

-

-    /* MatchDriver string */

-    if (!MatchAttrToken(idev->driver, &iclass->match_driver, strcmp))

-        return FALSE;

-

-    /*

-     * MatchTag string

-     * See if any of the device's tags match any of the MatchTag tokens.

-     */

-    if (!list_is_empty(&iclass->match_tag)) {

-        char * const *tag;

-        Bool match;

-

-        if (!attrs->tags)

-            return FALSE;

-        for (tag = attrs->tags, match = FALSE; *tag; tag++) {

-            if (MatchAttrToken(*tag, &iclass->match_tag, strcmp)) {

-                match = TRUE;

-                break;

-            }

-        }

-        if (!match)

-            return FALSE;

-    }

-

-    /* MatchIs* booleans */

-    if (iclass->is_keyboard.set &&

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

-        return FALSE;

-    if (iclass->is_pointer.set &&

-        iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))

-        return FALSE;

-    if (iclass->is_joystick.set &&

-        iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))

-        return FALSE;

-    if (iclass->is_tablet.set &&

-        iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))

-        return FALSE;

-    if (iclass->is_touchpad.set &&

-        iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))

-        return FALSE;

-    if (iclass->is_touchscreen.set &&

-        iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))

-        return FALSE;

-

-    return TRUE;

-}

-

-/*

- * Merge in any InputClass configurations. Options in each InputClass

- * section have more priority than the original device configuration as

- * well as any previous InputClass sections.

- */

-static int

-MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)

-{

-    XF86ConfInputClassPtr cl;

-    XF86OptionPtr classopts;

-

-    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {

-        if (!InputClassMatches(cl, idev, attrs))

-            continue;

-

-        /* Collect class options and driver settings */

-        classopts = xf86optionListDup(cl->option_lst);

-        if (cl->driver) {

-            free(idev->driver);

-            idev->driver = xstrdup(cl->driver);

-            if (!idev->driver) {

-                xf86Msg(X_ERROR, "Failed to allocate memory while merging "

-                        "InputClass configuration");

-                return BadAlloc;

-            }

-            classopts = xf86ReplaceStrOption(classopts, "driver",

-                                             idev->driver);

-        }

-

-        /* Apply options to device with InputClass settings preferred. */

-        xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",

-                idev->name, cl->identifier);

-        idev->options = xf86optionListMerge(idev->options, classopts);

-    }

-

-    return Success;

-}

-

-/*

- * Iterate the list of classes and look for Option "Ignore". Return the

- * value of the last matching class and holler when returning TRUE.

- */

-static Bool

-IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)

-{

-    XF86ConfInputClassPtr cl;

-    Bool ignore = FALSE;

-    const char *ignore_class;

-

-    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {

-        if (!InputClassMatches(cl, idev, attrs))

-            continue;

-        if (xf86findOption(cl->option_lst, "Ignore")) {

-            ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);

-            ignore_class = cl->identifier;

-        }

-    }

-

-    if (ignore)

-        xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",

-                idev->name, ignore_class);

-    return ignore;

-}

-

-InputInfoPtr

-xf86AllocateInput(void)

-{

-    InputInfoPtr pInfo;

-

-    pInfo = calloc(sizeof(*pInfo), 1);

-    if (!pInfo)

-        return NULL;

-

-    pInfo->fd = -1;

-    pInfo->type_name = "UNKNOWN";

-

-    return pInfo;

-}

-

-/* Append InputInfoRec to the tail of xf86InputDevs. */

-static void

-xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)

-{

-    InputInfoPtr *prev = NULL;

-

-    pInfo->drv = drv;

-    pInfo->module = DuplicateModule(drv->module, NULL);

-

-    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)

-        ;

-

-    *prev = pInfo;

-    pInfo->next = NULL;

-

-    xf86CollectInputOptions(pInfo, (const char**)drv->default_options);

-    xf86OptionListReport(pInfo->options);

-    xf86ProcessCommonOptions(pInfo, pInfo->options);

-}

-

-/*

- * Remove an entry from xf86InputDevs and free all the device's information.

- */

-void

-xf86DeleteInput(InputInfoPtr pInp, int flags)

-{

-    /* First check if the inputdev is valid. */

-    if (pInp == NULL)

-	return;

-

-    if (pInp->module)

-	UnloadModule(pInp->module);

-

-    /* This should *really* be handled in drv->UnInit(dev) call instead, but

-     * if the driver forgets about it make sure we free it or at least crash

-     * with flying colors */

-    free(pInp->private);

-

-    FreeInputAttributes(pInp->attrs);

-

-    /* Remove the entry from the list. */

-    if (pInp == xf86InputDevs)

-	xf86InputDevs = pInp->next;

-    else {

-	InputInfoPtr p = xf86InputDevs;

-	while (p && p->next != pInp)

-	    p = p->next;

-	if (p)

-	    p->next = pInp->next;

-	/* Else the entry wasn't in the xf86InputDevs list (ignore this). */

-    }

-

-    free(pInp->driver);

-    free(pInp->name);

-    xf86optionListFree(pInp->options);

-    free(pInp);

-}

-

-/*

- * Apply backend-specific initialization. Invoked after ActiveteDevice(),

- * i.e. after the driver successfully completed DEVICE_INIT and the device

- * is advertised.

- * @param dev the device

- * @return Success or an error code

- */

-static int

-xf86InputDevicePostInit(DeviceIntPtr dev) {

-    ApplyAccelerationSettings(dev);

-    return Success;

-}

-

-/**

- * Create a new input device, activate and enable it.

- *

- * Possible return codes:

- *    BadName .. a bad driver name was supplied.

- *    BadImplementation ... The driver does not have a PreInit function. This

- *                          is a driver bug.

- *    BadMatch .. device initialization failed.

- *    BadAlloc .. too many input devices

- *

- * @param idev The device, already set up with identifier, driver, and the

- * options.

- * @param pdev Pointer to the new device, if Success was reported.

- * @param enable Enable the device after activating it.

- *

- * @return Success or an error code

- */

-_X_INTERNAL int

-xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)

-{

-    InputDriverPtr drv = NULL;

-    DeviceIntPtr dev = NULL;

-    int rval;

-

-    /* Memory leak for every attached device if we don't

-     * test if the module is already loaded first */

-    drv = xf86LookupInputDriver(pInfo->driver);

-    if (!drv)

-        if (xf86LoadOneModule(pInfo->driver, NULL))

-            drv = xf86LookupInputDriver(pInfo->driver);

-    if (!drv) {

-        xf86Msg(X_ERROR, "No input driver matching `%s'\n", pInfo->driver);

-        rval = BadName;

-        goto unwind;

-    }

-

-    if (!drv->PreInit) {

-        xf86Msg(X_ERROR,

-                "Input driver `%s' has no PreInit function (ignoring)\n",

-                drv->driverName);

-        rval = BadImplementation;

-        goto unwind;

-    }

-

-    xf86AddInput(drv, pInfo);

-

-    rval = drv->PreInit(drv, pInfo, 0);

-

-    if (rval != Success) {

-        xf86Msg(X_ERROR, "PreInit returned %d for \"%s\"\n", rval, pInfo->name);

-        goto unwind;

-    }

-

-    if (!(dev = xf86ActivateDevice(pInfo)))

-    {

-        rval = BadAlloc;

-        goto unwind;

-    }

-

-    rval = ActivateDevice(dev, TRUE);

-    if (rval != Success)

-    {

-        xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);

-        RemoveDevice(dev, TRUE);

-        goto unwind;

-    }

-

-    rval = xf86InputDevicePostInit(dev);

-    if (rval != Success)

-    {

-	xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);

-	RemoveDevice(dev, TRUE);

-	goto unwind;

-    }

-

-    /* Enable it if it's properly initialised and we're currently in the VT */

-    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)

-    {

-        OsBlockSignals();

-        EnableDevice(dev, TRUE);

-        if (!dev->enabled)

-        {

-            OsReleaseSignals();

-            xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);

-            rval = BadMatch;

-            goto unwind;

-        }

-        /* send enter/leave event, update sprite window */

-        CheckMotion(NULL, dev);

-        OsReleaseSignals();

-    }

-

-    *pdev = dev;

-    return Success;

-

-unwind:

-    if(pInfo) {

-        if(drv && drv->UnInit)

-            drv->UnInit(drv, pInfo, 0);

-        else

-            xf86DeleteInput(pInfo, 0);

-    }

-    return rval;

-}

-

-int

-NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,

-                       DeviceIntPtr *pdev)

-{

-    InputInfoPtr pInfo = NULL;

-    InputOption *option = NULL;

-    int rval = Success;

-    int is_auto = 0;

-

-    pInfo = xf86AllocateInput();

-    if (!pInfo)

-        return BadAlloc;

-

-    for (option = options; option; option = option->next) {

-        if (strcasecmp(option->key, "driver") == 0) {

-            if (pInfo->driver) {

-                rval = BadRequest;

-                goto unwind;

-            }

-            pInfo->driver = xstrdup(option->value);

-            if (!pInfo->driver) {

-                rval = BadAlloc;

-                goto unwind;

-            }

-        }

-

-        if (strcasecmp(option->key, "name") == 0 ||

-            strcasecmp(option->key, "identifier") == 0) {

-            if (pInfo->name) {

-                rval = BadRequest;

-                goto unwind;

-            }

-            pInfo->name = xstrdup(option->value);

-            if (!pInfo->name) {

-                rval = BadAlloc;

-                goto unwind;

-            }

-        }

-

-        if (strcmp(option->key, "_source") == 0 &&

-            (strcmp(option->value, "server/hal") == 0 ||

-             strcmp(option->value, "server/udev") == 0)) {

-            is_auto = 1;

-            if (!xf86Info.autoAddDevices) {

-                rval = BadMatch;

-                goto unwind;

-            }

-        }

-    }

-

-    for (option = options; option; option = option->next) {

-        /* Steal option key/value strings from the provided list.

-         * We need those strings, the InputOption list doesn't. */

-        pInfo->options = xf86addNewOption(pInfo->options,

-                                               option->key, option->value);

-        option->key = NULL;

-        option->value = NULL;

-    }

-

-    /* Apply InputClass settings */

-    if (attrs) {

-        if (IgnoreInputClass(pInfo, attrs)) {

-            rval = BadIDChoice;

-            goto unwind;

-        }

-

-        rval = MergeInputClasses(pInfo, attrs);

-        if (rval != Success)

-            goto unwind;

-

-        pInfo->attrs = DuplicateInputAttributes(attrs);

-    }

-

-    if (!pInfo->driver || !pInfo->name) {

-        xf86Msg(X_INFO, "No input driver/identifier specified (ignoring)\n");

-        rval = BadRequest;

-        goto unwind;

-    }

-

-    if (!pInfo->name) {

-        xf86Msg(X_ERROR, "No device identifier specified (ignoring)\n");

-        rval = BadMatch;

-        goto unwind;

-    }

-

-    rval = xf86NewInputDevice(pInfo, pdev,

-                (!is_auto || (is_auto && xf86Info.autoEnableDevices)));

-

-    return rval;

-

-unwind:

-    if (is_auto && !xf86Info.autoAddDevices)

-        xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");

-    xf86DeleteInput(pInfo, 0);

-    return rval;

-}

-

-void

-DeleteInputDeviceRequest(DeviceIntPtr pDev)

-{

-    InputInfoPtr pInfo = (InputInfoPtr) pDev->public.devicePrivate;

-    InputDriverPtr drv = NULL;

-    Bool isMaster = IsMaster(pDev);

-

-    if (pInfo) /* need to get these before RemoveDevice */

-        drv = pInfo->drv;

-

-    OsBlockSignals();

-    RemoveDevice(pDev, TRUE);

-

-    if (!isMaster && pInfo != NULL)

-    {

-        if(drv->UnInit)

-            drv->UnInit(drv, pInfo, 0);

-        else

-            xf86DeleteInput(pInfo, 0);

-    }

-    OsReleaseSignals();

-}

-

-/* 

- * convenient functions to post events

- */

-

-void

-xf86PostMotionEvent(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			first_valuator,

-                    int			num_valuators,

-                    ...)

-{

-    va_list var;

-    int i = 0;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-    va_start(var, num_valuators);

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

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostMotionEventM(device, is_absolute, &mask);

-}

-

-void

-xf86PostMotionEventP(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			first_valuator,

-                    int			num_valuators,

-                    const int		*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostMotionEventM(device, is_absolute, &mask);

-}

-

-void

-xf86PostMotionEventM(DeviceIntPtr	device,

-                     int		is_absolute,

-                     const ValuatorMask	*mask)

-{

-    int i = 0, nevents = 0;

-    DeviceEvent *event;

-    int flags = 0;

-

-    if (valuator_mask_num_valuators(mask) > 0)

-    {

-        if (is_absolute)

-            flags = POINTER_ABSOLUTE;

-        else

-            flags = POINTER_RELATIVE | POINTER_ACCELERATE;

-    }

-

-#if XFreeXDGA

-    /* The evdev driver may not always send all axes across. */

-    if (valuator_mask_isset(mask, 0) ||

-        valuator_mask_isset(mask, 1))

-        if (miPointerGetScreen(device)) {

-            int index = miPointerGetScreen(device)->myNum;

-            int dx = 0, dy = 0;

-

-            if (valuator_mask_isset(mask, 0))

-            {

-                dx = valuator_mask_get(mask, 0);

-                if (is_absolute)

-                    dx -= device->last.valuators[0];

-            }

-

-            if (valuator_mask_isset(mask, 1))

-            {

-                dy = valuator_mask_get(mask, 1);

-                if (is_absolute)

-                    dy -= device->last.valuators[1];

-            }

-

-            if (DGAStealMotionEvent(device, index, dx, dy))

-                return;

-        }

-#endif

-

-    nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, flags, mask);

-

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

-        event = (DeviceEvent*)((xf86Events + i)->event);

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-    }

-}

-

-void

-xf86PostProximityEvent(DeviceIntPtr	device,

-                       int		is_in,

-                       int		first_valuator,

-                       int		num_valuators,

-                       ...)

-{

-    va_list var;

-    int i;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-    va_start(var, num_valuators);

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

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostProximityEventM(device, is_in, &mask);

-}

-

-void

-xf86PostProximityEventP(DeviceIntPtr	device,

-                        int		is_in,

-                        int		first_valuator,

-                        int		num_valuators,

-                        const int	*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostProximityEventM(device, is_in, &mask);

-}

-

-void

-xf86PostProximityEventM(DeviceIntPtr	device,

-                        int		is_in,

-                        const ValuatorMask *mask)

-{

-    int i, nevents;

-

-    nevents = GetProximityEvents(xf86Events, device,

-                                 is_in ? ProximityIn : ProximityOut, mask);

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

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-

-}

-

-void

-xf86PostButtonEvent(DeviceIntPtr	device,

-                    int			is_absolute,

-                    int			button,

-                    int			is_down,

-                    int			first_valuator,

-                    int			num_valuators,

-                    ...)

-{

-    va_list var;

-    ValuatorMask mask;

-    int i = 0;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-

-    va_start(var, num_valuators);

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

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);

-}

-

-void

-xf86PostButtonEventP(DeviceIntPtr	device,

-                     int		is_absolute,

-                     int		button,

-                     int		is_down,

-                     int		first_valuator,

-                     int		num_valuators,

-                     const int		*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);

-}

-

-void

-xf86PostButtonEventM(DeviceIntPtr	device,

-                     int		is_absolute,

-                     int		button,

-                     int		is_down,

-                     const ValuatorMask	*mask)

-{

-    int i = 0, nevents = 0;

-    int flags = 0;

-

-    if (valuator_mask_num_valuators(mask) > 0)

-    {

-        if (is_absolute)

-            flags = POINTER_ABSOLUTE;

-        else

-            flags = POINTER_RELATIVE | POINTER_ACCELERATE;

-    }

-

-#if XFreeXDGA

-    if (miPointerGetScreen(device)) {

-        int index = miPointerGetScreen(device)->myNum;

-

-        if (DGAStealButtonEvent(device, index, button, is_down))

-            return;

-    }

-#endif

-

-    nevents = GetPointerEvents(xf86Events, device,

-                               is_down ? ButtonPress : ButtonRelease, button,

-                               flags, mask);

-

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

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-

-}

-

-void

-xf86PostKeyEvent(DeviceIntPtr	device,

-                 unsigned int	key_code,

-                 int		is_down,

-                 int		is_absolute,

-                 int		first_valuator,

-                 int		num_valuators,

-                 ...)

-{

-    va_list var;

-    int i = 0;

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_zero(&mask);

-

-    va_start(var, num_valuators);

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

-        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));

-    va_end(var);

-

-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);

-}

-

-void

-xf86PostKeyEventP(DeviceIntPtr	device,

-                  unsigned int	key_code,

-                  int		is_down,

-                  int		is_absolute,

-                  int		first_valuator,

-                  int		num_valuators,

-                  const int	*valuators)

-{

-    ValuatorMask mask;

-

-    XI_VERIFY_VALUATORS(num_valuators);

-

-    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);

-    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);

-}

-

-void

-xf86PostKeyEventM(DeviceIntPtr	device,

-                  unsigned int	key_code,

-                  int		is_down,

-                  int		is_absolute,

-                  const ValuatorMask *mask)

-{

-    int i = 0, nevents = 0;

-

-#if XFreeXDGA

-    DeviceIntPtr pointer;

-

-    /* Some pointers send key events, paired device is wrong then. */

-    pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);

-    if (miPointerGetScreen(pointer)) {

-        int index = miPointerGetScreen(pointer)->myNum;

-

-        if (DGAStealKeyEvent(device, index, key_code, is_down))

-            return;

-    }

-#endif

-

-    if (is_absolute) {

-        nevents = GetKeyboardValuatorEvents(xf86Events, device,

-                                            is_down ? KeyPress : KeyRelease,

-                                            key_code, mask);

-    }

-    else {

-        nevents = GetKeyboardEvents(xf86Events, device,

-                                    is_down ? KeyPress : KeyRelease,

-                                    key_code);

-    }

-

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

-        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));

-}

-

-void

-xf86PostKeyboardEvent(DeviceIntPtr      device,

-                      unsigned int      key_code,

-                      int               is_down)

-{

-    ValuatorMask mask;

-

-    valuator_mask_zero(&mask);

-    xf86PostKeyEventM(device, key_code, is_down, 0, &mask);

-}

-

-InputInfoPtr

-xf86FirstLocalDevice(void)

-{

-    return xf86InputDevs;

-}

-

-/* 

- * Cx     - raw data from touch screen

- * to_max - scaled highest dimension

- *          (remember, this is of rows - 1 because of 0 origin)

- * to_min  - scaled lowest dimension

- * from_max - highest raw value from touch screen calibration

- * from_min  - lowest raw value from touch screen calibration

- *

- * This function is the same for X or Y coordinates.

- * You may have to reverse the high and low values to compensate for

- * different orgins on the touch screen vs X.

- *

- * e.g. to scale from device coordinates into screen coordinates, call

- * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);

- */

-

-int

-xf86ScaleAxis(int	Cx,

-              int	to_max,

-              int	to_min,

-              int	from_max,

-              int	from_min )

-{

-    int X;

-    int64_t to_width = to_max - to_min;

-    int64_t from_width = from_max - from_min;

-

-    if (from_width) {

-	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);

-    }

-    else {

-	X = 0;

-	ErrorF ("Divide by Zero in xf86ScaleAxis\n");

-    }

-    

-    if (X > to_max)

-	X = to_max;

-    if (X < to_min)

-	X = to_min;

-    

-    return X;

-}

-

-/*

- * This function checks the given screen against the current screen and

- * makes changes if appropriate. It should be called from an XInput driver's

- * ReadInput function before any events are posted, if the device is screen

- * specific like a touch screen.

- */

-void

-xf86XInputSetScreen(InputInfoPtr	pInfo,

-		    int			screen_number,

-		    int			x,

-		    int			y)

-{

-    if (miPointerGetScreen(pInfo->dev) !=

-          screenInfo.screens[screen_number]) {

-	miPointerSetScreen(pInfo->dev, screen_number, x, y);

-    }

-}

-

-

-void

-xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,

-			   int resolution, int min_res, int max_res, int mode)

-{

-    if (!dev || !dev->valuator)

-        return;

-

-    InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,

-			   max_res, mode);

-}

-

-/*

- * Set the valuator values to be in synch with dix/event.c

- * DefineInitialRootWindow().

- */

-void

-xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)

-{

-    if (axnum == 0) {

-	dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;

-        dev->last.valuators[0] = dev->valuator->axisVal[0];

-    }

-    else if (axnum == 1) {

-	dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;

-        dev->last.valuators[1] = dev->valuator->axisVal[1];

-    }

-}

-

-

-/**

- * Deactivate a device. Call this function from the driver if you receive a

- * read error or something else that spoils your day.

- * Device will be moved to the off_devices list, but it will still be there

- * until you really clean up after it.

- * Notifies the client about an inactive device.

- * 

- * @param panic True if device is unrecoverable and needs to be removed.

- */

-void

-xf86DisableDevice(DeviceIntPtr dev, Bool panic)

-{

-    if(!panic)

-    {

-        DisableDevice(dev, TRUE);

-    } else

-    {

-        SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);

-        DeleteInputDeviceRequest(dev);

-    }

-}

-

-/**

- * Reactivate a device. Call this function from the driver if you just found

- * out that the read error wasn't quite that bad after all.

- * Device will be re-activated, and an event sent to the client. 

- */

-void

-xf86EnableDevice(DeviceIntPtr dev)

-{

-    EnableDevice(dev, TRUE);

-}

-

-/* end of xf86Xinput.c */

+/*
+ * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
+ *                                                                            
+ * 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, and that   the  name of  Frederic   Lepied not  be  used  in
+ * advertising or publicity pertaining to distribution of the software without
+ * specific,  written      prior  permission.     Frederic  Lepied   makes  no
+ * representations about the suitability of this software for any purpose.  It
+ * is provided "as is" without express or implied warranty.                   
+ *                                                                            
+ * FREDERIC  LEPIED DISCLAIMS ALL   WARRANTIES WITH REGARD  TO  THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED   WARRANTIES OF MERCHANTABILITY  AND   FITNESS, IN NO
+ * EVENT  SHALL FREDERIC  LEPIED 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.
+ *
+ */
+/*
+ * Copyright (c) 2000-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,
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name of the copyright holder(s)
+ * and author(s) shall not be used in advertising or otherwise to promote
+ * the sale, use or other dealings in this Software without prior written
+ * authorization from the copyright holder(s) and author(s).
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include <X11/Xatom.h>
+#include "xf86.h"
+#include "xf86Priv.h"
+#include "xf86Config.h"
+#include "xf86Xinput.h"
+#include "xf86Optrec.h"
+#include "mipointer.h"
+#include "extinit.h"
+#include "loaderProcs.h"
+
+#include "exevents.h"	/* AddInputDevice */
+#include "exglobals.h"
+#include "eventstr.h"
+#include "inpututils.h"
+
+#include <string.h>     /* InputClassMatches */
+#ifdef HAVE_FNMATCH_H
+#include <fnmatch.h>
+#endif
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+
+#include <stdarg.h>
+#include <stdint.h>          /* for int64_t */
+
+#include "mi.h"
+
+#include <ptrveloc.h>          /* dix pointer acceleration */
+#include <xserver-properties.h>
+
+#ifdef XFreeXDGA
+#include "dgaproc.h"
+#endif
+
+#include "xkbsrv.h"
+
+/* Valuator verification macro */
+#define XI_VERIFY_VALUATORS(num_valuators)					\
+	if (num_valuators > MAX_VALUATORS) {					\
+		xf86Msg(X_ERROR, "%s: num_valuator %d is greater than"		\
+			" MAX_VALUATORS\n", __FUNCTION__, num_valuators);	\
+		return;								\
+	}
+
+EventListPtr xf86Events = NULL;
+
+static int
+xf86InputDevicePostInit(DeviceIntPtr dev);
+
+/**
+ * Eval config and modify DeviceVelocityRec accordingly
+ */
+static void
+ProcessVelocityConfiguration(DeviceIntPtr pDev, char* devname, pointer list,
+                             DeviceVelocityPtr s)
+{
+    int tempi;
+    float tempf;
+    Atom float_prop = XIGetKnownProperty(XATOM_FLOAT);
+    Atom prop;
+
+    if(!s)
+        return;
+
+    /* common settings (available via device properties) */
+    tempf = xf86SetRealOption(list, "ConstantDeceleration", 1.0);
+    if (tempf > 1.0) {
+        xf86Msg(X_CONFIG, "%s: (accel) constant deceleration by %.1f\n",
+                devname, tempf);
+        prop = XIGetKnownProperty(ACCEL_PROP_CONSTANT_DECELERATION);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    tempf = xf86SetRealOption(list, "AdaptiveDeceleration", 1.0);
+    if (tempf > 1.0) {
+        xf86Msg(X_CONFIG, "%s: (accel) adaptive deceleration by %.1f\n",
+                devname, tempf);
+        prop = XIGetKnownProperty(ACCEL_PROP_ADAPTIVE_DECELERATION);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    /* select profile by number */
+    tempi = xf86SetIntOption(list, "AccelerationProfile",
+            s->statistics.profile_number);
+
+    prop = XIGetKnownProperty(ACCEL_PROP_PROFILE_NUMBER);
+    if (XIChangeDeviceProperty(pDev, prop, XA_INTEGER, 32,
+                               PropModeReplace, 1, &tempi, FALSE) == Success) {
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i\n", devname,
+                tempi);
+    } else {
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration profile %i is unknown\n",
+                devname, tempi);
+    }
+
+    /* set scaling */
+    tempf = xf86SetRealOption(list, "ExpectedRate", 0);
+    prop = XIGetKnownProperty(ACCEL_PROP_VELOCITY_SCALING);
+    if (tempf > 0) {
+        tempf = 1000.0 / tempf;
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    } else {
+        tempf = xf86SetRealOption(list, "VelocityScale", s->corr_mul);
+        XIChangeDeviceProperty(pDev, prop, float_prop, 32,
+                               PropModeReplace, 1, &tempf, FALSE);
+    }
+
+    tempi = xf86SetIntOption(list, "VelocityTrackerCount", -1);
+    if (tempi > 1)
+	InitTrackers(s, tempi);
+
+    s->initial_range = xf86SetIntOption(list, "VelocityInitialRange",
+                                        s->initial_range);
+
+    s->max_diff = xf86SetRealOption(list, "VelocityAbsDiff", s->max_diff);
+
+    tempf = xf86SetRealOption(list, "VelocityRelDiff", -1);
+    if (tempf >= 0) {
+	xf86Msg(X_CONFIG, "%s: (accel) max rel. velocity difference: %.1f%%\n",
+	        devname, tempf*100.0);
+	s->max_rel_diff = tempf;
+    }
+
+    /*  Configure softening. If const deceleration is used, this is expected
+     *  to provide better subpixel information so we enable
+     *  softening by default only if ConstantDeceleration is not used
+     */
+    s->use_softening = xf86SetBoolOption(list, "Softening",
+                                         s->const_acceleration == 1.0);
+
+    s->average_accel = xf86SetBoolOption(list, "AccelerationProfileAveraging",
+                                         s->average_accel);
+
+    s->reset_time = xf86SetIntOption(list, "VelocityReset", s->reset_time);
+}
+
+static void
+ApplyAccelerationSettings(DeviceIntPtr dev){
+    int scheme, i;
+    DeviceVelocityPtr pVel;
+    InputInfoPtr pInfo = (InputInfoPtr)dev->public.devicePrivate;
+    char* schemeStr;
+
+    if (dev->valuator && dev->ptrfeed) {
+	schemeStr = xf86SetStrOption(pInfo->options, "AccelerationScheme", "");
+
+	scheme = dev->valuator->accelScheme.number;
+
+	if (!xf86NameCmp(schemeStr, "predictable"))
+	    scheme = PtrAccelPredictable;
+
+	if (!xf86NameCmp(schemeStr, "lightweight"))
+	    scheme = PtrAccelLightweight;
+
+	if (!xf86NameCmp(schemeStr, "none"))
+	    scheme = PtrAccelNoOp;
+
+        /* reinit scheme if needed */
+        if (dev->valuator->accelScheme.number != scheme) {
+            if (dev->valuator->accelScheme.AccelCleanupProc) {
+                dev->valuator->accelScheme.AccelCleanupProc(dev);
+            }
+
+            if (InitPointerAccelerationScheme(dev, scheme)) {
+		xf86Msg(X_CONFIG, "%s: (accel) selected scheme %s/%i\n",
+		        pInfo->name, schemeStr, scheme);
+	    } else {
+        	xf86Msg(X_CONFIG, "%s: (accel) could not init scheme %s\n",
+		        pInfo->name, schemeStr);
+        	scheme = dev->valuator->accelScheme.number;
+            }
+        } else {
+            xf86Msg(X_CONFIG, "%s: (accel) keeping acceleration scheme %i\n",
+                    pInfo->name, scheme);
+        }
+
+        free(schemeStr);
+
+        /* process special configuration */
+        switch (scheme) {
+            case PtrAccelPredictable:
+                pVel = GetDevicePredictableAccelData(dev);
+                ProcessVelocityConfiguration (dev, pInfo->name, pInfo->options,
+                                              pVel);
+                break;
+        }
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationNumerator",
+                             dev->ptrfeed->ctrl.num);
+        if (i >= 0)
+            dev->ptrfeed->ctrl.num = i;
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationDenominator",
+                             dev->ptrfeed->ctrl.den);
+        if (i > 0)
+            dev->ptrfeed->ctrl.den = i;
+
+        i = xf86SetIntOption(pInfo->options, "AccelerationThreshold",
+                             dev->ptrfeed->ctrl.threshold);
+        if (i >= 0)
+            dev->ptrfeed->ctrl.threshold = i;
+
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration factor: %.3f\n",
+                            pInfo->name, ((float)dev->ptrfeed->ctrl.num)/
+                                         ((float)dev->ptrfeed->ctrl.den));
+        xf86Msg(X_CONFIG, "%s: (accel) acceleration threshold: %i\n",
+                pInfo->name, dev->ptrfeed->ctrl.threshold);
+    }
+}
+
+/***********************************************************************
+ *
+ * xf86ProcessCommonOptions --
+ * 
+ *	Process global options.
+ *
+ ***********************************************************************
+ */
+void
+xf86ProcessCommonOptions(InputInfoPtr pInfo,
+                         pointer	list)
+{
+    if (xf86SetBoolOption(list, "Floating", 0) ||
+        !xf86SetBoolOption(list, "AlwaysCore", 1) ||
+        !xf86SetBoolOption(list, "SendCoreEvents", 1) ||
+        !xf86SetBoolOption(list, "CorePointer", 1) ||
+        !xf86SetBoolOption(list, "CoreKeyboard", 1)) {
+        xf86Msg(X_CONFIG, "%s: doesn't report core events\n", pInfo->name);
+    } else {
+        pInfo->flags |= XI86_ALWAYS_CORE;
+        xf86Msg(X_CONFIG, "%s: always reports core events\n", pInfo->name);
+    }
+}
+
+/***********************************************************************
+ *
+ * xf86ActivateDevice --
+ *
+ *	Initialize an input device.
+ *
+ * Returns TRUE on success, or FALSE otherwise.
+ ***********************************************************************
+ */
+static DeviceIntPtr
+xf86ActivateDevice(InputInfoPtr pInfo)
+{
+    DeviceIntPtr	dev;
+    Atom		atom;
+
+    dev = AddInputDevice(serverClient, pInfo->device_control, TRUE);
+
+    if (dev == NULL)
+    {
+        xf86Msg(X_ERROR, "Too many input devices. Ignoring %s\n",
+                pInfo->name);
+        pInfo->dev = NULL;
+        return NULL;
+    }
+
+    atom = MakeAtom(pInfo->type_name, strlen(pInfo->type_name), TRUE);
+    AssignTypeAndName(dev, atom, pInfo->name);
+    dev->public.devicePrivate = pInfo;
+    pInfo->dev = dev;
+
+    dev->coreEvents = pInfo->flags & XI86_ALWAYS_CORE;
+    dev->type = SLAVE;
+    dev->spriteInfo->spriteOwner = FALSE;
+
+    dev->config_info = xf86SetStrOption(pInfo->options, "config_info", NULL);
+
+    if (serverGeneration == 1)
+        xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",
+                pInfo->name, pInfo->type_name);
+
+    return dev;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ ***********************************************************************
+ */
+
+int
+SetDeviceMode (ClientPtr client, DeviceIntPtr dev, int mode)
+{
+  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
+
+  if (pInfo->switch_mode) {
+    return (*pInfo->switch_mode)(client, dev, mode);
+  }
+  else
+    return BadMatch;
+}
+
+
+/***********************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ ***********************************************************************
+ */
+
+int
+SetDeviceValuators (ClientPtr client, DeviceIntPtr dev, int *valuators,
+                    int first_valuator, int num_valuators)
+{
+    InputInfoPtr pInfo = (InputInfoPtr) dev->public.devicePrivate;
+
+    if (pInfo->set_device_valuators)
+	return (*pInfo->set_device_valuators)(pInfo, valuators, first_valuator,
+					      num_valuators);
+
+    return BadMatch;
+}
+
+
+/***********************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ ***********************************************************************
+ */
+
+int
+ChangeDeviceControl (ClientPtr client, DeviceIntPtr dev, xDeviceCtl *control)
+{
+  InputInfoPtr        pInfo = (InputInfoPtr)dev->public.devicePrivate;
+
+  if (!pInfo->control_proc) {
+      switch (control->control) {
+      case DEVICE_CORE:
+      case DEVICE_ABS_CALIB:
+      case DEVICE_ABS_AREA:
+          return BadMatch;
+      case DEVICE_RESOLUTION:
+      case DEVICE_ENABLE:
+        return Success;
+      default:
+        return BadMatch;
+      }
+  }
+  else {
+      return (*pInfo->control_proc)(pInfo, control);
+  }
+}
+
+/*
+ * Get the operating system name from uname and store it statically to avoid
+ * repeating the system call each time MatchOS is checked.
+ */
+static const char *
+HostOS(void)
+{
+#ifdef HAVE_SYS_UTSNAME_H
+    struct utsname name;
+    static char host_os[sizeof(name.sysname)] = "";
+
+    if (*host_os == '\0') {
+        if (uname(&name) >= 0)
+            strcpy(host_os, name.sysname);
+        else {
+            strncpy(host_os, "unknown", sizeof(host_os));
+            host_os[sizeof(host_os)-1] = '\0';
+        }
+    }
+    return host_os;
+#else
+    return "";
+#endif
+}
+
+static int
+match_substring(const char *attr, const char *pattern)
+{
+    return (strstr(attr, pattern)) ? 0 : -1;
+}
+
+#ifdef HAVE_FNMATCH_H
+static int
+match_pattern(const char *attr, const char *pattern)
+{
+    return fnmatch(pattern, attr, 0);
+}
+#else
+#define match_pattern match_substring
+#endif
+
+#ifdef HAVE_FNMATCH_H
+static int
+match_path_pattern(const char *attr, const char *pattern)
+{
+    return fnmatch(pattern, attr, FNM_PATHNAME);
+}
+#else
+#define match_path_pattern match_substring
+#endif
+
+/*
+ * Match an attribute against a list of NULL terminated arrays of patterns.
+ * If a pattern in each list entry is matched, return TRUE.
+ */
+static Bool
+MatchAttrToken(const char *attr, struct list *patterns,
+               int (*compare)(const char *attr, const char *pattern))
+{
+    const xf86MatchGroup *group;
+
+    /* If there are no patterns, accept the match */
+    if (list_is_empty(patterns))
+        return TRUE;
+
+    /* If there are patterns but no attribute, reject the match */
+    if (!attr)
+        return FALSE;
+
+    /*
+     * Otherwise, iterate the list of patterns ensuring each entry has a
+     * match. Each list entry is a separate Match line of the same type.
+     */
+    list_for_each_entry(group, patterns, entry) {
+        char * const *cur;
+        Bool match = FALSE;
+
+        for (cur = group->values; *cur; cur++)
+            if ((*compare)(attr, *cur) == 0) {
+                match = TRUE;
+                break;
+            }
+        if (!match)
+            return FALSE;
+    }
+
+    /* All the entries in the list matched the attribute */
+    return TRUE;
+}
+
+/*
+ * Classes without any Match statements match all devices. Otherwise, all
+ * statements must match.
+ */
+static Bool
+InputClassMatches(const XF86ConfInputClassPtr iclass, const InputInfoPtr idev,
+                  const InputAttributes *attrs)
+{
+    /* MatchProduct substring */
+    if (!MatchAttrToken(attrs->product, &iclass->match_product, match_substring))
+        return FALSE;
+
+    /* MatchVendor substring */
+    if (!MatchAttrToken(attrs->vendor, &iclass->match_vendor, match_substring))
+        return FALSE;
+
+    /* MatchDevicePath pattern */
+    if (!MatchAttrToken(attrs->device, &iclass->match_device, match_path_pattern))
+        return FALSE;
+
+    /* MatchOS case-insensitive string */
+    if (!MatchAttrToken(HostOS(), &iclass->match_os, strcasecmp))
+        return FALSE;
+
+    /* MatchPnPID pattern */
+    if (!MatchAttrToken(attrs->pnp_id, &iclass->match_pnpid, match_pattern))
+        return FALSE;
+
+    /* MatchUSBID pattern */
+    if (!MatchAttrToken(attrs->usb_id, &iclass->match_usbid, match_pattern))
+        return FALSE;
+
+    /* MatchDriver string */
+    if (!MatchAttrToken(idev->driver, &iclass->match_driver, strcmp))
+        return FALSE;
+
+    /*
+     * MatchTag string
+     * See if any of the device's tags match any of the MatchTag tokens.
+     */
+    if (!list_is_empty(&iclass->match_tag)) {
+        char * const *tag;
+        Bool match;
+
+        if (!attrs->tags)
+            return FALSE;
+        for (tag = attrs->tags, match = FALSE; *tag; tag++) {
+            if (MatchAttrToken(*tag, &iclass->match_tag, strcmp)) {
+                match = TRUE;
+                break;
+            }
+        }
+        if (!match)
+            return FALSE;
+    }
+
+    /* MatchIs* booleans */
+    if (iclass->is_keyboard.set &&
+        iclass->is_keyboard.val != !!(attrs->flags & ATTR_KEYBOARD))
+        return FALSE;
+    if (iclass->is_pointer.set &&
+        iclass->is_pointer.val != !!(attrs->flags & ATTR_POINTER))
+        return FALSE;
+    if (iclass->is_joystick.set &&
+        iclass->is_joystick.val != !!(attrs->flags & ATTR_JOYSTICK))
+        return FALSE;
+    if (iclass->is_tablet.set &&
+        iclass->is_tablet.val != !!(attrs->flags & ATTR_TABLET))
+        return FALSE;
+    if (iclass->is_touchpad.set &&
+        iclass->is_touchpad.val != !!(attrs->flags & ATTR_TOUCHPAD))
+        return FALSE;
+    if (iclass->is_touchscreen.set &&
+        iclass->is_touchscreen.val != !!(attrs->flags & ATTR_TOUCHSCREEN))
+        return FALSE;
+
+    return TRUE;
+}
+
+/*
+ * Merge in any InputClass configurations. Options in each InputClass
+ * section have more priority than the original device configuration as
+ * well as any previous InputClass sections.
+ */
+static int
+MergeInputClasses(const InputInfoPtr idev, const InputAttributes *attrs)
+{
+    XF86ConfInputClassPtr cl;
+    XF86OptionPtr classopts;
+
+    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+        if (!InputClassMatches(cl, idev, attrs))
+            continue;
+
+        /* Collect class options and driver settings */
+        classopts = xf86optionListDup(cl->option_lst);
+        if (cl->driver) {
+            free(idev->driver);
+            idev->driver = xstrdup(cl->driver);
+            if (!idev->driver) {
+                xf86Msg(X_ERROR, "Failed to allocate memory while merging "
+                        "InputClass configuration");
+                return BadAlloc;
+            }
+            classopts = xf86ReplaceStrOption(classopts, "driver",
+                                             idev->driver);
+        }
+
+        /* Apply options to device with InputClass settings preferred. */
+        xf86Msg(X_CONFIG, "%s: Applying InputClass \"%s\"\n",
+                idev->name, cl->identifier);
+        idev->options = xf86optionListMerge(idev->options, classopts);
+    }
+
+    return Success;
+}
+
+/*
+ * Iterate the list of classes and look for Option "Ignore". Return the
+ * value of the last matching class and holler when returning TRUE.
+ */
+static Bool
+IgnoreInputClass(const InputInfoPtr idev, const InputAttributes *attrs)
+{
+    XF86ConfInputClassPtr cl;
+    Bool ignore = FALSE;
+    const char *ignore_class;
+
+    for (cl = xf86configptr->conf_inputclass_lst; cl; cl = cl->list.next) {
+        if (!InputClassMatches(cl, idev, attrs))
+            continue;
+        if (xf86findOption(cl->option_lst, "Ignore")) {
+            ignore = xf86CheckBoolOption(cl->option_lst, "Ignore", FALSE);
+            ignore_class = cl->identifier;
+        }
+    }
+
+    if (ignore)
+        xf86Msg(X_CONFIG, "%s: Ignoring device from InputClass \"%s\"\n",
+                idev->name, ignore_class);
+    return ignore;
+}
+
+InputInfoPtr
+xf86AllocateInput(void)
+{
+    InputInfoPtr pInfo;
+
+    pInfo = calloc(sizeof(*pInfo), 1);
+    if (!pInfo)
+        return NULL;
+
+    pInfo->fd = -1;
+    pInfo->type_name = "UNKNOWN";
+
+    return pInfo;
+}
+
+/* Append InputInfoRec to the tail of xf86InputDevs. */
+static void
+xf86AddInput(InputDriverPtr drv, InputInfoPtr pInfo)
+{
+    InputInfoPtr *prev = NULL;
+
+    pInfo->drv = drv;
+    pInfo->module = DuplicateModule(drv->module, NULL);
+
+    for (prev = &xf86InputDevs; *prev; prev = &(*prev)->next)
+        ;
+
+    *prev = pInfo;
+    pInfo->next = NULL;
+
+    xf86CollectInputOptions(pInfo, (const char**)drv->default_options);
+    xf86OptionListReport(pInfo->options);
+    xf86ProcessCommonOptions(pInfo, pInfo->options);
+}
+
+/*
+ * Remove an entry from xf86InputDevs and free all the device's information.
+ */
+void
+xf86DeleteInput(InputInfoPtr pInp, int flags)
+{
+    /* First check if the inputdev is valid. */
+    if (pInp == NULL)
+	return;
+
+    if (pInp->module)
+	UnloadModule(pInp->module);
+
+    /* This should *really* be handled in drv->UnInit(dev) call instead, but
+     * if the driver forgets about it make sure we free it or at least crash
+     * with flying colors */
+    free(pInp->private);
+
+    FreeInputAttributes(pInp->attrs);
+
+    /* Remove the entry from the list. */
+    if (pInp == xf86InputDevs)
+	xf86InputDevs = pInp->next;
+    else {
+	InputInfoPtr p = xf86InputDevs;
+	while (p && p->next != pInp)
+	    p = p->next;
+	if (p)
+	    p->next = pInp->next;
+	/* Else the entry wasn't in the xf86InputDevs list (ignore this). */
+    }
+
+    free(pInp->driver);
+    free(pInp->name);
+    xf86optionListFree(pInp->options);
+    free(pInp);
+}
+
+/*
+ * Apply backend-specific initialization. Invoked after ActiveteDevice(),
+ * i.e. after the driver successfully completed DEVICE_INIT and the device
+ * is advertised.
+ * @param dev the device
+ * @return Success or an error code
+ */
+static int
+xf86InputDevicePostInit(DeviceIntPtr dev) {
+    ApplyAccelerationSettings(dev);
+    return Success;
+}
+
+/**
+ * Create a new input device, activate and enable it.
+ *
+ * Possible return codes:
+ *    BadName .. a bad driver name was supplied.
+ *    BadImplementation ... The driver does not have a PreInit function. This
+ *                          is a driver bug.
+ *    BadMatch .. device initialization failed.
+ *    BadAlloc .. too many input devices
+ *
+ * @param idev The device, already set up with identifier, driver, and the
+ * options.
+ * @param pdev Pointer to the new device, if Success was reported.
+ * @param enable Enable the device after activating it.
+ *
+ * @return Success or an error code
+ */
+_X_INTERNAL int
+xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
+{
+    InputDriverPtr drv = NULL;
+    DeviceIntPtr dev = NULL;
+    int rval;
+
+    /* Memory leak for every attached device if we don't
+     * test if the module is already loaded first */
+    drv = xf86LookupInputDriver(pInfo->driver);
+    if (!drv)
+        if (xf86LoadOneModule(pInfo->driver, NULL))
+            drv = xf86LookupInputDriver(pInfo->driver);
+    if (!drv) {
+        xf86Msg(X_ERROR, "No input driver matching `%s'\n", pInfo->driver);
+        rval = BadName;
+        goto unwind;
+    }
+
+    xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName, pInfo->name);
+
+    if (!drv->PreInit) {
+        xf86Msg(X_ERROR,
+                "Input driver `%s' has no PreInit function (ignoring)\n",
+                drv->driverName);
+        rval = BadImplementation;
+        goto unwind;
+    }
+
+    xf86AddInput(drv, pInfo);
+
+    rval = drv->PreInit(drv, pInfo, 0);
+
+    if (rval != Success) {
+        xf86Msg(X_ERROR, "PreInit returned %d for \"%s\"\n", rval, pInfo->name);
+        goto unwind;
+    }
+
+    if (!(dev = xf86ActivateDevice(pInfo)))
+    {
+        rval = BadAlloc;
+        goto unwind;
+    }
+
+    rval = ActivateDevice(dev, TRUE);
+    if (rval != Success)
+    {
+        xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
+        RemoveDevice(dev, TRUE);
+        goto unwind;
+    }
+
+    rval = xf86InputDevicePostInit(dev);
+    if (rval != Success)
+    {
+	xf86Msg(X_ERROR, "Couldn't post-init device \"%s\"\n", pInfo->name);
+	RemoveDevice(dev, TRUE);
+	goto unwind;
+    }
+
+    /* Enable it if it's properly initialised and we're currently in the VT */
+    if (enable && dev->inited && dev->startup && xf86Screens[0]->vtSema)
+    {
+        OsBlockSignals();
+        EnableDevice(dev, TRUE);
+        if (!dev->enabled)
+        {
+            OsReleaseSignals();
+            xf86Msg(X_ERROR, "Couldn't init device \"%s\"\n", pInfo->name);
+            rval = BadMatch;
+            goto unwind;
+        }
+        /* send enter/leave event, update sprite window */
+        CheckMotion(NULL, dev);
+        OsReleaseSignals();
+    }
+
+    *pdev = dev;
+    return Success;
+
+unwind:
+    if(pInfo) {
+        if(drv && drv->UnInit)
+            drv->UnInit(drv, pInfo, 0);
+        else
+            xf86DeleteInput(pInfo, 0);
+    }
+    return rval;
+}
+
+int
+NewInputDeviceRequest (InputOption *options, InputAttributes *attrs,
+                       DeviceIntPtr *pdev)
+{
+    InputInfoPtr pInfo = NULL;
+    InputOption *option = NULL;
+    int rval = Success;
+    int is_auto = 0;
+
+    pInfo = xf86AllocateInput();
+    if (!pInfo)
+        return BadAlloc;
+
+    for (option = options; option; option = option->next) {
+        if (strcasecmp(option->key, "driver") == 0) {
+            if (pInfo->driver) {
+                rval = BadRequest;
+                goto unwind;
+            }
+            pInfo->driver = xstrdup(option->value);
+            if (!pInfo->driver) {
+                rval = BadAlloc;
+                goto unwind;
+            }
+        }
+
+        if (strcasecmp(option->key, "name") == 0 ||
+            strcasecmp(option->key, "identifier") == 0) {
+            if (pInfo->name) {
+                rval = BadRequest;
+                goto unwind;
+            }
+            pInfo->name = xstrdup(option->value);
+            if (!pInfo->name) {
+                rval = BadAlloc;
+                goto unwind;
+            }
+        }
+
+        if (strcmp(option->key, "_source") == 0 &&
+            (strcmp(option->value, "server/hal") == 0 ||
+             strcmp(option->value, "server/udev") == 0)) {
+            is_auto = 1;
+            if (!xf86Info.autoAddDevices) {
+                rval = BadMatch;
+                goto unwind;
+            }
+        }
+    }
+
+    for (option = options; option; option = option->next) {
+        /* Steal option key/value strings from the provided list.
+         * We need those strings, the InputOption list doesn't. */
+        pInfo->options = xf86addNewOption(pInfo->options,
+                                               option->key, option->value);
+        option->key = NULL;
+        option->value = NULL;
+    }
+
+    /* Apply InputClass settings */
+    if (attrs) {
+        if (IgnoreInputClass(pInfo, attrs)) {
+            rval = BadIDChoice;
+            goto unwind;
+        }
+
+        rval = MergeInputClasses(pInfo, attrs);
+        if (rval != Success)
+            goto unwind;
+
+        pInfo->attrs = DuplicateInputAttributes(attrs);
+    }
+
+    if (!pInfo->driver || !pInfo->name) {
+        xf86Msg(X_INFO, "No input driver/identifier specified (ignoring)\n");
+        rval = BadRequest;
+        goto unwind;
+    }
+
+    if (!pInfo->name) {
+        xf86Msg(X_ERROR, "No device identifier specified (ignoring)\n");
+        rval = BadMatch;
+        goto unwind;
+    }
+
+    rval = xf86NewInputDevice(pInfo, pdev,
+                (!is_auto || (is_auto && xf86Info.autoEnableDevices)));
+
+    return rval;
+
+unwind:
+    if (is_auto && !xf86Info.autoAddDevices)
+        xf86Msg(X_INFO, "AutoAddDevices is off - not adding device.\n");
+    xf86DeleteInput(pInfo, 0);
+    return rval;
+}
+
+void
+DeleteInputDeviceRequest(DeviceIntPtr pDev)
+{
+    InputInfoPtr pInfo = (InputInfoPtr) pDev->public.devicePrivate;
+    InputDriverPtr drv = NULL;
+    Bool isMaster = IsMaster(pDev);
+
+    if (pInfo) /* need to get these before RemoveDevice */
+        drv = pInfo->drv;
+
+    OsBlockSignals();
+    RemoveDevice(pDev, TRUE);
+
+    if (!isMaster && pInfo != NULL)
+    {
+        if(drv->UnInit)
+            drv->UnInit(drv, pInfo, 0);
+        else
+            xf86DeleteInput(pInfo, 0);
+    }
+    OsReleaseSignals();
+}
+
+/* 
+ * convenient functions to post events
+ */
+
+void
+xf86PostMotionEvent(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			first_valuator,
+                    int			num_valuators,
+                    ...)
+{
+    va_list var;
+    int i = 0;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostMotionEventM(device, is_absolute, &mask);
+}
+
+void
+xf86PostMotionEventP(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			first_valuator,
+                    int			num_valuators,
+                    const int		*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostMotionEventM(device, is_absolute, &mask);
+}
+
+void
+xf86PostMotionEventM(DeviceIntPtr	device,
+                     int		is_absolute,
+                     const ValuatorMask	*mask)
+{
+    int i = 0, nevents = 0;
+    DeviceEvent *event;
+    int flags = 0;
+
+    if (valuator_mask_num_valuators(mask) > 0)
+    {
+        if (is_absolute)
+            flags = POINTER_ABSOLUTE;
+        else
+            flags = POINTER_RELATIVE | POINTER_ACCELERATE;
+    }
+
+#if XFreeXDGA
+    /* The evdev driver may not always send all axes across. */
+    if (valuator_mask_isset(mask, 0) ||
+        valuator_mask_isset(mask, 1))
+        if (miPointerGetScreen(device)) {
+            int index = miPointerGetScreen(device)->myNum;
+            int dx = 0, dy = 0;
+
+            if (valuator_mask_isset(mask, 0))
+            {
+                dx = valuator_mask_get(mask, 0);
+                if (is_absolute)
+                    dx -= device->last.valuators[0];
+            }
+
+            if (valuator_mask_isset(mask, 1))
+            {
+                dy = valuator_mask_get(mask, 1);
+                if (is_absolute)
+                    dy -= device->last.valuators[1];
+            }
+
+            if (DGAStealMotionEvent(device, index, dx, dy))
+                return;
+        }
+#endif
+
+    nevents = GetPointerEvents(xf86Events, device, MotionNotify, 0, flags, mask);
+
+    for (i = 0; i < nevents; i++) {
+        event = (DeviceEvent*)((xf86Events + i)->event);
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+    }
+}
+
+void
+xf86PostProximityEvent(DeviceIntPtr	device,
+                       int		is_in,
+                       int		first_valuator,
+                       int		num_valuators,
+                       ...)
+{
+    va_list var;
+    int i;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostProximityEventM(device, is_in, &mask);
+}
+
+void
+xf86PostProximityEventP(DeviceIntPtr	device,
+                        int		is_in,
+                        int		first_valuator,
+                        int		num_valuators,
+                        const int	*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostProximityEventM(device, is_in, &mask);
+}
+
+void
+xf86PostProximityEventM(DeviceIntPtr	device,
+                        int		is_in,
+                        const ValuatorMask *mask)
+{
+    int i, nevents;
+
+    nevents = GetProximityEvents(xf86Events, device,
+                                 is_in ? ProximityIn : ProximityOut, mask);
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+
+}
+
+void
+xf86PostButtonEvent(DeviceIntPtr	device,
+                    int			is_absolute,
+                    int			button,
+                    int			is_down,
+                    int			first_valuator,
+                    int			num_valuators,
+                    ...)
+{
+    va_list var;
+    ValuatorMask mask;
+    int i = 0;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);
+}
+
+void
+xf86PostButtonEventP(DeviceIntPtr	device,
+                     int		is_absolute,
+                     int		button,
+                     int		is_down,
+                     int		first_valuator,
+                     int		num_valuators,
+                     const int		*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostButtonEventM(device, is_absolute, button, is_down, &mask);
+}
+
+void
+xf86PostButtonEventM(DeviceIntPtr	device,
+                     int		is_absolute,
+                     int		button,
+                     int		is_down,
+                     const ValuatorMask	*mask)
+{
+    int i = 0, nevents = 0;
+    int flags = 0;
+
+    if (valuator_mask_num_valuators(mask) > 0)
+    {
+        if (is_absolute)
+            flags = POINTER_ABSOLUTE;
+        else
+            flags = POINTER_RELATIVE | POINTER_ACCELERATE;
+    }
+
+#if XFreeXDGA
+    if (miPointerGetScreen(device)) {
+        int index = miPointerGetScreen(device)->myNum;
+
+        if (DGAStealButtonEvent(device, index, button, is_down))
+            return;
+    }
+#endif
+
+    nevents = GetPointerEvents(xf86Events, device,
+                               is_down ? ButtonPress : ButtonRelease, button,
+                               flags, mask);
+
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+
+}
+
+void
+xf86PostKeyEvent(DeviceIntPtr	device,
+                 unsigned int	key_code,
+                 int		is_down,
+                 int		is_absolute,
+                 int		first_valuator,
+                 int		num_valuators,
+                 ...)
+{
+    va_list var;
+    int i = 0;
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_zero(&mask);
+
+    va_start(var, num_valuators);
+    for (i = 0; i < num_valuators; i++)
+        valuator_mask_set(&mask, first_valuator + i, va_arg(var, int));
+    va_end(var);
+
+    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+}
+
+void
+xf86PostKeyEventP(DeviceIntPtr	device,
+                  unsigned int	key_code,
+                  int		is_down,
+                  int		is_absolute,
+                  int		first_valuator,
+                  int		num_valuators,
+                  const int	*valuators)
+{
+    ValuatorMask mask;
+
+    XI_VERIFY_VALUATORS(num_valuators);
+
+    valuator_mask_set_range(&mask, first_valuator, num_valuators, valuators);
+    xf86PostKeyEventM(device, key_code, is_down, is_absolute, &mask);
+}
+
+void
+xf86PostKeyEventM(DeviceIntPtr	device,
+                  unsigned int	key_code,
+                  int		is_down,
+                  int		is_absolute,
+                  const ValuatorMask *mask)
+{
+    int i = 0, nevents = 0;
+
+#if XFreeXDGA
+    DeviceIntPtr pointer;
+
+    /* Some pointers send key events, paired device is wrong then. */
+    pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
+    if (miPointerGetScreen(pointer)) {
+        int index = miPointerGetScreen(pointer)->myNum;
+
+        if (DGAStealKeyEvent(device, index, key_code, is_down))
+            return;
+    }
+#endif
+
+    if (is_absolute) {
+        nevents = GetKeyboardValuatorEvents(xf86Events, device,
+                                            is_down ? KeyPress : KeyRelease,
+                                            key_code, mask);
+    }
+    else {
+        nevents = GetKeyboardEvents(xf86Events, device,
+                                    is_down ? KeyPress : KeyRelease,
+                                    key_code);
+    }
+
+    for (i = 0; i < nevents; i++)
+        mieqEnqueue(device, (InternalEvent*)((xf86Events + i)->event));
+}
+
+void
+xf86PostKeyboardEvent(DeviceIntPtr      device,
+                      unsigned int      key_code,
+                      int               is_down)
+{
+    ValuatorMask mask;
+
+    valuator_mask_zero(&mask);
+    xf86PostKeyEventM(device, key_code, is_down, 0, &mask);
+}
+
+InputInfoPtr
+xf86FirstLocalDevice(void)
+{
+    return xf86InputDevs;
+}
+
+/* 
+ * Cx     - raw data from touch screen
+ * to_max - scaled highest dimension
+ *          (remember, this is of rows - 1 because of 0 origin)
+ * to_min  - scaled lowest dimension
+ * from_max - highest raw value from touch screen calibration
+ * from_min  - lowest raw value from touch screen calibration
+ *
+ * This function is the same for X or Y coordinates.
+ * You may have to reverse the high and low values to compensate for
+ * different orgins on the touch screen vs X.
+ *
+ * e.g. to scale from device coordinates into screen coordinates, call
+ * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);
+ */
+
+int
+xf86ScaleAxis(int	Cx,
+              int	to_max,
+              int	to_min,
+              int	from_max,
+              int	from_min )
+{
+    int X;
+    int64_t to_width = to_max - to_min;
+    int64_t from_width = from_max - from_min;
+
+    if (from_width) {
+	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);
+    }
+    else {
+	X = 0;
+	ErrorF ("Divide by Zero in xf86ScaleAxis\n");
+    }
+    
+    if (X > to_max)
+	X = to_max;
+    if (X < to_min)
+	X = to_min;
+    
+    return X;
+}
+
+/*
+ * This function checks the given screen against the current screen and
+ * makes changes if appropriate. It should be called from an XInput driver's
+ * ReadInput function before any events are posted, if the device is screen
+ * specific like a touch screen.
+ */
+void
+xf86XInputSetScreen(InputInfoPtr	pInfo,
+		    int			screen_number,
+		    int			x,
+		    int			y)
+{
+    if (miPointerGetScreen(pInfo->dev) !=
+          screenInfo.screens[screen_number]) {
+	miPointerSetScreen(pInfo->dev, screen_number, x, y);
+    }
+}
+
+
+void
+xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval, int maxval,
+			   int resolution, int min_res, int max_res, int mode)
+{
+    if (!dev || !dev->valuator)
+        return;
+
+    InitValuatorAxisStruct(dev, axnum, label, minval, maxval, resolution, min_res,
+			   max_res, mode);
+}
+
+/*
+ * Set the valuator values to be in synch with dix/event.c
+ * DefineInitialRootWindow().
+ */
+void
+xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
+{
+    if (axnum == 0) {
+	dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
+        dev->last.valuators[0] = dev->valuator->axisVal[0];
+    }
+    else if (axnum == 1) {
+	dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
+        dev->last.valuators[1] = dev->valuator->axisVal[1];
+    }
+}
+
+
+/**
+ * Deactivate a device. Call this function from the driver if you receive a
+ * read error or something else that spoils your day.
+ * Device will be moved to the off_devices list, but it will still be there
+ * until you really clean up after it.
+ * Notifies the client about an inactive device.
+ * 
+ * @param panic True if device is unrecoverable and needs to be removed.
+ */
+void
+xf86DisableDevice(DeviceIntPtr dev, Bool panic)
+{
+    if(!panic)
+    {
+        DisableDevice(dev, TRUE);
+    } else
+    {
+        SendDevicePresenceEvent(dev->id, DeviceUnrecoverable);
+        DeleteInputDeviceRequest(dev);
+    }
+}
+
+/**
+ * Reactivate a device. Call this function from the driver if you just found
+ * out that the read error wasn't quite that bad after all.
+ * Device will be re-activated, and an event sent to the client. 
+ */
+void
+xf86EnableDevice(DeviceIntPtr dev)
+{
+    EnableDevice(dev, TRUE);
+}
+
+/* end of xf86Xinput.c */
diff --git a/xorg-server/hw/xfree86/dri/dri.c b/xorg-server/hw/xfree86/dri/dri.c
index 38241f904..bb5482a0b 100644
--- a/xorg-server/hw/xfree86/dri/dri.c
+++ b/xorg-server/hw/xfree86/dri/dri.c
@@ -1,2502 +1,2498 @@
-/**************************************************************************

-

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

-Copyright 2000 VA Linux Systems, Inc.

-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, sub license, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice (including the

-next paragraph) shall be included in all copies or substantial portions

-of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

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

-

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

-

-/*

- * Authors:

- *   Jens Owen <jens@tungstengraphics.com>

- *   Rickard E. (Rik) Faith <faith@valinux.com>

- *

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include "xf86.h"

-#include <sys/time.h>

-#include <unistd.h>

-#include <string.h>

-#include <stdio.h>

-#include <sys/ioctl.h>

-#include <errno.h>

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "xf86drm.h"

-#include "misc.h"

-#include "dixstruct.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#define _XF86DRI_SERVER_

-#include <X11/dri/xf86driproto.h>

-#include "swaprep.h"

-#include "xf86str.h"

-#include "dri.h"

-#include "sarea.h"

-#include "dristruct.h"

-#include "xf86.h"

-#include "xf86drm.h"

-#include "mi.h"

-#include "mipointer.h"

-#include "xf86_OSproc.h"

-#include "inputstr.h"

-#include "xf86VGAarbiter.h"

-

-static int DRIEntPrivIndex = -1;

-static DevPrivateKeyRec DRIScreenPrivKeyRec;

-#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)

-static DevPrivateKeyRec DRIWindowPrivKeyRec;

-#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)

-static unsigned long DRIGeneration = 0;

-static unsigned int DRIDrawableValidationStamp = 0;

-

-static RESTYPE DRIDrawablePrivResType;

-static RESTYPE DRIContextPrivResType;

-static void    DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv);

-

-drmServerInfo DRIDRMServerInfo;

-

-				/* Wrapper just like xf86DrvMsg, but

-				   without the verbosity level checking.

-				   This will make it easy to turn off some

-				   messages later, based on verbosity

-				   level. */

-

-/*

- * Since we're already referencing things from the XFree86 common layer in

- * this file, we'd might as well just call xf86VDrvMsgVerb, and have

- * consistent message formatting.  The verbosity of these messages can be

- * easily changed here.

- */

-#define DRI_MSG_VERBOSITY 1

-static void

-DRIDrvMsg(int scrnIndex, MessageType type, const char *format, ...)

-{

-    va_list     ap;

-

-    va_start(ap, format);

-    xf86VDrvMsgVerb(scrnIndex, type, DRI_MSG_VERBOSITY, format, ap);

-    va_end(ap);

-}

-

-

-static void

-DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv)

-{

-    if (pDRIEntPriv->pLSAREA != NULL) {

-	drmUnmap(pDRIEntPriv->pLSAREA, pDRIEntPriv->sAreaSize);

-	pDRIEntPriv->pLSAREA = NULL;

-    }

-    if (pDRIEntPriv->hLSAREA != 0) {

-	drmRmMap(pDRIEntPriv->drmFD, pDRIEntPriv->hLSAREA);

-    }

-    if (pDRIEntPriv->drmFD >= 0) {

-	drmClose(pDRIEntPriv->drmFD);

-	pDRIEntPriv->drmFD = 0;

-    }

-}

-

-int

-DRIMasterFD(ScrnInfoPtr pScrn)

-{

-    return DRI_ENT_PRIV(pScrn)->drmFD;

-}

-

-void *

-DRIMasterSareaPointer(ScrnInfoPtr pScrn)

-{

-    return DRI_ENT_PRIV(pScrn)->pLSAREA;

-}

-

-drm_handle_t

-DRIMasterSareaHandle(ScrnInfoPtr pScrn)

-{

-    return DRI_ENT_PRIV(pScrn)->hLSAREA;

-}

-

-

-Bool

-DRIOpenDRMMaster(ScrnInfoPtr pScrn,

-		 unsigned long sAreaSize,

-		 const char *busID,

-		 const char *drmDriverName)

-{

-    drmSetVersion saveSv, sv;

-    Bool drmWasAvailable;

-    DRIEntPrivPtr pDRIEntPriv;

-    DRIEntPrivRec tmp;

-    drmVersionPtr drmlibv;

-    int drmlibmajor, drmlibminor;

-    const char *openBusID;

-    int count;

-    int err;

-

-    if (DRIEntPrivIndex == -1)

-	DRIEntPrivIndex = xf86AllocateEntityPrivateIndex();

-

-    pDRIEntPriv = DRI_ENT_PRIV(pScrn);

-

-    if (pDRIEntPriv && pDRIEntPriv->drmFD != -1)

-	return TRUE;

-

-    drmWasAvailable = drmAvailable();

-

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

-

-    /* Check the DRM lib version.

-     * drmGetLibVersion was not supported in version 1.0, so check for

-     * symbol first to avoid possible crash or hang.

-     */

-

-    drmlibmajor = 1;

-    drmlibminor = 0;

-    if (xf86LoaderCheckSymbol("drmGetLibVersion")) {

-	drmlibv = drmGetLibVersion(-1);

-	if (drmlibv != NULL) {

-	    drmlibmajor = drmlibv->version_major;

-	    drmlibminor = drmlibv->version_minor;

-	    drmFreeVersion(drmlibv);

-	}

-    }

-

-    /* Check if the libdrm can handle falling back to loading based on name

-     * if a busid string is passed.

-     */

-    openBusID = (drmlibmajor == 1 && drmlibminor >= 2) ? busID : NULL;

-

-    tmp.drmFD = -1;

-    sv.drm_di_major = 1;

-    sv.drm_di_minor = 1;

-    sv.drm_dd_major = -1;

-

-    saveSv = sv;

-    count = 10;

-    while (count--) {

-	tmp.drmFD = drmOpen(drmDriverName, openBusID);

-

-	if (tmp.drmFD < 0) {

-	    DRIDrvMsg(-1, X_ERROR, "[drm] drmOpen failed.\n");

-	    goto out_err;

-	}

-

-	err = drmSetInterfaceVersion(tmp.drmFD, &sv);

-

-	if (err != -EPERM)

-	    break;

-

-	sv = saveSv;

-	drmClose(tmp.drmFD);

-	tmp.drmFD = -1;

-	usleep(100000);

-    }

-

-    if (tmp.drmFD <= 0) {

-	DRIDrvMsg(-1, X_ERROR, "[drm] DRM was busy with another master.\n");

-	goto out_err;

-    }

-

-    if (!drmWasAvailable) {

-	DRIDrvMsg(-1, X_INFO,

-		  "[drm] loaded kernel module for \"%s\" driver.\n",

-		  drmDriverName);

-    }

-

-    if (err != 0) {

-	sv.drm_di_major = 1;

-	sv.drm_di_minor = 0;

-    }

-

-    DRIDrvMsg(-1, X_INFO, "[drm] DRM interface version %d.%d\n",

-	      sv.drm_di_major, sv.drm_di_minor);

-

-    if (sv.drm_di_major == 1 && sv.drm_di_minor >= 1)

-	err = 0;

-    else

-	err = drmSetBusid(tmp.drmFD, busID);

-

-    if (err) {

-	DRIDrvMsg(-1, X_ERROR, "[drm] Could not set DRM device bus ID.\n");

-	goto out_err;

-    }

-

-    /*

-     * Create a lock-containing sarea.

-     */

-

-    if (drmAddMap( tmp.drmFD, 0, sAreaSize, DRM_SHM,

-		   DRM_CONTAINS_LOCK, &tmp.hLSAREA) < 0) {

-        DRIDrvMsg(-1, X_INFO, "[drm] Could not create SAREA for DRM lock.\n");

-	tmp.hLSAREA = 0;

-	goto out_err;

-    }

-

-    if (drmMap( tmp.drmFD, tmp.hLSAREA, sAreaSize,

-		(drmAddressPtr)(&tmp.pLSAREA)) < 0) {

-        DRIDrvMsg(-1, X_INFO, "[drm] Mapping SAREA for DRM lock failed.\n");

-	tmp.pLSAREA = NULL;

-	goto out_err;

-    }

-

-    memset(tmp.pLSAREA, 0, sAreaSize);

-

-    /*

-     * Reserved contexts are handled by the first opened screen.

-     */

-

-    tmp.resOwner = NULL;

-

-    if (!pDRIEntPriv)

-	pDRIEntPriv = xnfcalloc(sizeof(*pDRIEntPriv), 1);

-

-    if (!pDRIEntPriv) {

-        DRIDrvMsg(-1, X_INFO, "[drm] Failed to allocate memory for "

-		  "DRM device.\n");

-	goto out_err;

-    }

-    *pDRIEntPriv = tmp;

-    xf86GetEntityPrivate((pScrn)->entityList[0],DRIEntPrivIndex)->ptr =

-	pDRIEntPriv;

-

-    DRIDrvMsg(-1, X_INFO, "[drm] DRM open master succeeded.\n");

-    return TRUE;

-

-  out_err:

-

-    DRIOpenDRMCleanup(&tmp);

-    return FALSE;

-}

-

-static void

-DRIClipNotifyAllDrawables(ScreenPtr pScreen);

-

-static void

-dri_crtc_notify(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIClipNotifyAllDrawables(pScreen);

-    xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);

-    xf86_crtc_notify(pScreen);

-    pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify);

-}

-

-Bool

-DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)

-{

-    DRIScreenPrivPtr    pDRIPriv;

-    drm_context_t *       reserved;

-    int                 reserved_count;

-    int                 i;

-    DRIEntPrivPtr       pDRIEntPriv;

-    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];

-    DRIContextFlags	flags    = 0;

-    DRIContextPrivPtr	pDRIContextPriv;

-

-    /* If the DRI extension is disabled, do not initialize the DRI */

-    if (noXFree86DRIExtension) {

-	DRIDrvMsg(pScreen->myNum, X_WARNING,

-		  "Direct rendering has been disabled.\n");

-	return FALSE;

-    }

-

-    if (!xf86VGAarbiterAllowDRI(pScreen)) {

-        DRIDrvMsg(pScreen->myNum, X_WARNING,

-                  "Direct rendering is not supported when VGA arb is necessary for the device\n");

-	return FALSE;

-    }

-

-#ifdef PANORAMIX

-    /*

-     * If Xinerama is on, don't allow DRI to initialise.  It won't be usable

-     * anyway.

-     */

-	if (!noPanoramiXExtension) {

-	    DRIDrvMsg(pScreen->myNum, X_WARNING,

-		"Direct rendering is not supported when Xinerama is enabled\n");

-	    return FALSE;

-	}

-#endif

-

-    if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,

-			  pDRIInfo->busIdString,

-			  pDRIInfo->drmDriverName))

-	return FALSE;

-

-    pDRIEntPriv = DRI_ENT_PRIV(pScrn);

-

-    if (DRIGeneration != serverGeneration)

-	DRIGeneration = serverGeneration;

-

-    if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-    if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))

-	return FALSE;

-

-    pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));

-    if (!pDRIPriv) {

-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-        return FALSE;

-    }

-

-    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);

-    pDRIPriv->drmFD = pDRIEntPriv->drmFD;

-    pDRIPriv->directRenderingSupport = TRUE;

-    pDRIPriv->pDriverInfo = pDRIInfo;

-    pDRIPriv->nrWindows = 0;

-    pDRIPriv->nrWindowsVisible = 0;

-    pDRIPriv->fullscreen = NULL;

-

-    pDRIPriv->createDummyCtx     = pDRIInfo->createDummyCtx;

-    pDRIPriv->createDummyCtxPriv = pDRIInfo->createDummyCtxPriv;

-

-    pDRIPriv->grabbedDRILock = FALSE;

-    pDRIPriv->drmSIGIOHandlerInstalled = FALSE;

-    *pDRMFD = pDRIPriv->drmFD;

-

-    if (pDRIEntPriv->sAreaGrabbed || pDRIInfo->allocSarea) {

-

-	if (drmAddMap( pDRIPriv->drmFD,

-		       0,

-		       pDRIPriv->pDriverInfo->SAREASize,

-		       DRM_SHM,

-		       0,

-		       &pDRIPriv->hSAREA) < 0)

-	{

-	    pDRIPriv->directRenderingSupport = FALSE;

-	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-	    drmClose(pDRIPriv->drmFD);

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] drmAddMap failed\n");

-	    return FALSE;

-	}

-	DRIDrvMsg(pScreen->myNum, X_INFO,

-		  "[drm] added %d byte SAREA at %p\n",

-		  pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);

-

-	/* Backwards compat. */

-	if (drmMap( pDRIPriv->drmFD,

-		    pDRIPriv->hSAREA,

-		    pDRIPriv->pDriverInfo->SAREASize,

-		    (drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)

-	{

-	    pDRIPriv->directRenderingSupport = FALSE;

-	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-	    drmClose(pDRIPriv->drmFD);

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] drmMap failed\n");

-	    return FALSE;

-	}

-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",

-		  pDRIPriv->hSAREA, pDRIPriv->pSAREA);

-	memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);

-    } else {

-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] Using the DRM lock "

-		  "SAREA also for drawables.\n");

-	pDRIPriv->hSAREA = pDRIEntPriv->hLSAREA;

-	pDRIPriv->pSAREA = (XF86DRISAREAPtr) pDRIEntPriv->pLSAREA;

-	pDRIEntPriv->sAreaGrabbed = TRUE;

-    }

-

-    pDRIPriv->hLSAREA = pDRIEntPriv->hLSAREA;

-    pDRIPriv->pLSAREA = pDRIEntPriv->pLSAREA;

-

-    if (!pDRIPriv->pDriverInfo->dontMapFrameBuffer)

-    {

-	if (drmAddMap( pDRIPriv->drmFD,

-		       (uintptr_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress,

-		       pDRIPriv->pDriverInfo->frameBufferSize,

-		       DRM_FRAME_BUFFER,

-		       0,

-		       &pDRIPriv->pDriverInfo->hFrameBuffer) < 0)

-	    {

-		pDRIPriv->directRenderingSupport = FALSE;

-		dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-		drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);

-		drmClose(pDRIPriv->drmFD);

-		DRIDrvMsg(pScreen->myNum, X_INFO,

-			  "[drm] drmAddMap failed\n");

-		return FALSE;

-	    }

-	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",

-		  pDRIPriv->pDriverInfo->hFrameBuffer);

-    } else {

-	DRIDrvMsg(pScreen->myNum, X_INFO,

-		  "[drm] framebuffer mapped by ddx driver\n");

-    }

-

-    if (pDRIEntPriv->resOwner == NULL) {

-	pDRIEntPriv->resOwner = pScreen;

-

-	/* Add tags for reserved contexts */

-	if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,

-						  &reserved_count))) {

-	    int  i;

-	    void *tag;

-

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

-		tag = DRICreateContextPrivFromHandle(pScreen,

-						     reserved[i],

-						     DRI_CONTEXT_RESERVED);

-		drmAddContextTag(pDRIPriv->drmFD, reserved[i], tag);

-	    }

-	    drmFreeReservedContextList(reserved);

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] added %d reserved context%s for kernel\n",

-		      reserved_count, reserved_count > 1 ? "s" : "");

-	}

-    }

-

-    /* validate max drawable table entry set by driver */

-    if ((pDRIPriv->pDriverInfo->maxDrawableTableEntry <= 0) ||

-        (pDRIPriv->pDriverInfo->maxDrawableTableEntry > SAREA_MAX_DRAWABLES)) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "Invalid max drawable table size set by driver: %d\n",

-		      pDRIPriv->pDriverInfo->maxDrawableTableEntry);

-    }

-

-    /* Initialize drawable tables (screen private and SAREA) */

-    for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {

-	pDRIPriv->DRIDrawables[i] = NULL;

-	pDRIPriv->pSAREA->drawableTable[i].stamp = 0;

-	pDRIPriv->pSAREA->drawableTable[i].flags = 0;

-    }

-

-    pDRIPriv->pLockRefCount = &pDRIEntPriv->lockRefCount;

-    pDRIPriv->pLockingContext = &pDRIEntPriv->lockingContext;

-

-    if (!pDRIEntPriv->keepFDOpen)

-	pDRIEntPriv->keepFDOpen = pDRIInfo->keepFDOpen;

-

-    pDRIEntPriv->refCount++;

-

-    /* Set up flags for DRICreateContextPriv */

-    switch (pDRIInfo->driverSwapMethod) {

-    case DRI_KERNEL_SWAP:

-	flags = DRI_CONTEXT_2DONLY;

-	break;

-    case DRI_HIDE_X_CONTEXT:

-	flags = DRI_CONTEXT_PRESERVED;

-	break;

-    }

-

-    if (!(pDRIContextPriv = DRICreateContextPriv(pScreen,

-						 &pDRIPriv->myContext,

-						 flags))) {

-	DRIDrvMsg(pScreen->myNum, X_ERROR,

-		  "failed to create server context\n");

-	return FALSE;

-    }

-    pDRIPriv->myContextPriv = pDRIContextPriv;

-

-    DRIDrvMsg(pScreen->myNum, X_INFO,

-	      "X context handle = %p\n", pDRIPriv->myContext);

-

-    /* Now that we have created the X server's context, we can grab the

-     * hardware lock for the X server.

-     */

-    DRILock(pScreen, 0);

-    pDRIPriv->grabbedDRILock = TRUE;

-

-    /* pointers so that we can prevent memory leaks later */

-    pDRIPriv->hiddenContextStore    = NULL;

-    pDRIPriv->partial3DContextStore = NULL;

-

-    switch(pDRIInfo->driverSwapMethod) {

-    case DRI_HIDE_X_CONTEXT:

-	/* Server will handle 3D swaps, and hide 2D swaps from kernel.

-	 * Register server context as a preserved context.

-	 */

-

-	/* allocate memory for hidden context store */

-	pDRIPriv->hiddenContextStore

-	    = (void *)calloc(1, pDRIInfo->contextSize);

-	if (!pDRIPriv->hiddenContextStore) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "failed to allocate hidden context\n");

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return FALSE;

-	}

-

-	/* allocate memory for partial 3D context store */

-	pDRIPriv->partial3DContextStore

-	    = (void *)calloc(1, pDRIInfo->contextSize);

-	if (!pDRIPriv->partial3DContextStore) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "[DRI] failed to allocate partial 3D context\n");

-	    free(pDRIPriv->hiddenContextStore);

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return FALSE;

-	}

-

-	/* save initial context store */

-	if (pDRIInfo->SwapContext) {

-	    (*pDRIInfo->SwapContext)(

-		pScreen,

-		DRI_NO_SYNC,

-		DRI_2D_CONTEXT,

-		pDRIPriv->hiddenContextStore,

-		DRI_NO_CONTEXT,

-		NULL);

-	}

-	/* fall through */

-

-    case DRI_SERVER_SWAP:

-        /* For swap methods of DRI_SERVER_SWAP and DRI_HIDE_X_CONTEXT

-         * setup signal handler for receiving swap requests from kernel

-	 */

-	if (!(pDRIPriv->drmSIGIOHandlerInstalled =

-	      drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext))) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "[drm] failed to setup DRM signal handler\n");

-	    free(pDRIPriv->hiddenContextStore);

-	    free(pDRIPriv->partial3DContextStore);

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return FALSE;

-	} else {

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] installed DRM signal handler\n");

-	}

-

-    default:

-	break;

-    }

-

-    return TRUE;

-}

-

-Bool

-DRIFinishScreenInit(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr        pDRIInfo = pDRIPriv->pDriverInfo;

-

-    /* Wrap DRI support */

-    if (pDRIInfo->wrap.ValidateTree) {

-	pDRIPriv->wrap.ValidateTree     = pScreen->ValidateTree;

-	pScreen->ValidateTree           = pDRIInfo->wrap.ValidateTree;

-    }

-    if (pDRIInfo->wrap.PostValidateTree) {

-	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;

-	pScreen->PostValidateTree       = pDRIInfo->wrap.PostValidateTree;

-    }

-    if (pDRIInfo->wrap.WindowExposures) {

-	pDRIPriv->wrap.WindowExposures  = pScreen->WindowExposures;

-	pScreen->WindowExposures        = pDRIInfo->wrap.WindowExposures;

-    }

-

-    pDRIPriv->DestroyWindow             = pScreen->DestroyWindow;

-    pScreen->DestroyWindow              = DRIDestroyWindow;

-

-    pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen,

-						       dri_crtc_notify);

-						       

-    if (pDRIInfo->wrap.CopyWindow) {

-	pDRIPriv->wrap.CopyWindow       = pScreen->CopyWindow;

-	pScreen->CopyWindow             = pDRIInfo->wrap.CopyWindow;

-    }

-    if (pDRIInfo->wrap.ClipNotify) {

-	pDRIPriv->wrap.ClipNotify       = pScreen->ClipNotify;

-	pScreen->ClipNotify             = pDRIInfo->wrap.ClipNotify;

-    }

-    if (pDRIInfo->wrap.AdjustFrame) {

-	ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];

-	pDRIPriv->wrap.AdjustFrame      = pScrn->AdjustFrame;

-	pScrn->AdjustFrame              = pDRIInfo->wrap.AdjustFrame;

-    }

-    pDRIPriv->wrapped = TRUE;

-

-    DRIDrvMsg(pScreen->myNum, X_INFO, "[DRI] installation complete\n");

-

-    return TRUE;

-}

-

-void

-DRICloseScreen(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr       pDRIInfo;

-    drm_context_t *    reserved;

-    int              reserved_count;

-    ScrnInfoPtr      pScrn = xf86Screens[pScreen->myNum];

-    DRIEntPrivPtr    pDRIEntPriv = DRI_ENT_PRIV(pScrn);

-    Bool closeMaster;

-

-    if (pDRIPriv) {

-

-        pDRIInfo = pDRIPriv->pDriverInfo;

-

-	if (pDRIPriv->wrapped) {

-	    /* Unwrap DRI Functions */

-	    if (pDRIInfo->wrap.ValidateTree) {

-		pScreen->ValidateTree           = pDRIPriv->wrap.ValidateTree;

-		pDRIPriv->wrap.ValidateTree     = NULL;

-	    }

-	    if (pDRIInfo->wrap.PostValidateTree) {

-		pScreen->PostValidateTree       = pDRIPriv->wrap.PostValidateTree;

-		pDRIPriv->wrap.PostValidateTree = NULL;

-	    }

-	    if (pDRIInfo->wrap.WindowExposures) {

-		pScreen->WindowExposures        = pDRIPriv->wrap.WindowExposures;

-		pDRIPriv->wrap.WindowExposures  = NULL;

-	    }

-	    if (pDRIPriv->DestroyWindow) {

-		pScreen->DestroyWindow          = pDRIPriv->DestroyWindow;

-		pDRIPriv->DestroyWindow         = NULL;

-	    }

-

-	    xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);

-

-	    if (pDRIInfo->wrap.CopyWindow) {

-		pScreen->CopyWindow             = pDRIPriv->wrap.CopyWindow;

-		pDRIPriv->wrap.CopyWindow       = NULL;

-	    }

-	    if (pDRIInfo->wrap.ClipNotify) {

-		pScreen->ClipNotify             = pDRIPriv->wrap.ClipNotify;

-		pDRIPriv->wrap.ClipNotify       = NULL;

-	    }

-	    if (pDRIInfo->wrap.AdjustFrame) {

-		ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];

-		pScrn->AdjustFrame              = pDRIPriv->wrap.AdjustFrame;

-		pDRIPriv->wrap.AdjustFrame      = NULL;

-	    }

-	    

-	    pDRIPriv->wrapped = FALSE;

-	}

-

-	if (pDRIPriv->drmSIGIOHandlerInstalled) {

-	    if (!drmRemoveSIGIOHandler(pDRIPriv->drmFD)) {

-		DRIDrvMsg(pScreen->myNum, X_ERROR,

-			  "[drm] failed to remove DRM signal handler\n");

-	    }

-	}

-

-        if (pDRIPriv->dummyCtxPriv && pDRIPriv->createDummyCtx) {

-	    DRIDestroyDummyContext(pScreen, pDRIPriv->createDummyCtxPriv);

-	}

-

-	if (!DRIDestroyContextPriv(pDRIPriv->myContextPriv)) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "failed to destroy server context\n");

-	}

-

-				/* Remove tags for reserved contexts */

-	if (pDRIEntPriv->resOwner == pScreen) {

-	    pDRIEntPriv->resOwner = NULL;

-

-	    if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,

-						  &reserved_count))) {

-		int  i;

-

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

-		    DRIDestroyContextPriv(drmGetContextTag(pDRIPriv->drmFD,

-							   reserved[i]));

-		}

-		drmFreeReservedContextList(reserved);

-		DRIDrvMsg(pScreen->myNum, X_INFO,

-			  "[drm] removed %d reserved context%s for kernel\n",

-			  reserved_count, reserved_count > 1 ? "s" : "");

-	    }

-	}

-

-	/* Make sure signals get unblocked etc. */

-	drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext);

-	pDRIPriv->pLockRefCount = NULL;

-	closeMaster = (--pDRIEntPriv->refCount == 0) &&

-	    !pDRIEntPriv->keepFDOpen;

-	if (closeMaster || pDRIPriv->hSAREA != pDRIEntPriv->hLSAREA) {

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] unmapping %d bytes of SAREA %p at %p\n",

-		      pDRIInfo->SAREASize,

-		      pDRIPriv->hSAREA,

-		      pDRIPriv->pSAREA);

-	    if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) {

-		DRIDrvMsg(pScreen->myNum, X_ERROR,

-			  "[drm] unable to unmap %d bytes"

-			  " of SAREA %p at %p\n",

-			  pDRIInfo->SAREASize,

-			  pDRIPriv->hSAREA,

-			  pDRIPriv->pSAREA);

-	    }

-	} else {

-	    pDRIEntPriv->sAreaGrabbed = FALSE;

-	}

-

-	if (closeMaster || (pDRIEntPriv->drmFD != pDRIPriv->drmFD)) {

-	    drmClose(pDRIPriv->drmFD);

-	    if (pDRIEntPriv->drmFD == pDRIPriv->drmFD) {

-		DRIDrvMsg(pScreen->myNum, X_INFO,

-			  "[drm] Closed DRM master.\n");

-		pDRIEntPriv->drmFD = -1;

-	    }

-	}

-

-	free(pDRIPriv);

-	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);

-    }

-}

-

-#define DRM_MSG_VERBOSITY 3

-

-static int dri_drm_debug_print(const char *format, va_list ap)

-{

-  xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);

-  return 0;

-}

-

-static void dri_drm_get_perms(gid_t *group, mode_t *mode)

-{

-  *group = xf86ConfigDRI.group;

-  *mode = xf86ConfigDRI.mode;

-}

-

-drmServerInfo DRIDRMServerInfo =  {

-  dri_drm_debug_print,

-  xf86LoadKernelModule,

-  dri_drm_get_perms,

-};

-

-Bool

-DRIExtensionInit(void)

-{

-    if (DRIGeneration != serverGeneration) {

-	return FALSE;

-    }

-

-    DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,

-						   "DRIDrawable");

-    DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete,

-						  "DRIContext");

-

-    if (!DRIDrawablePrivResType || !DRIContextPrivResType)

-	return FALSE;

-

-    RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);

-

-    return TRUE;

-}

-

-void

-DRIReset(void)

-{

-    /*

-     * This stub routine is called when the X Server recycles, resources

-     * allocated by DRIExtensionInit need to be managed here.

-     *

-     * Currently this routine is a stub because all the interesting resources

-     * are managed via the screen init process.

-     */

-}

-

-Bool

-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv)

-	*isCapable = pDRIPriv->directRenderingSupport;

-    else

-	*isCapable = FALSE;

-

-    return TRUE;

-}

-

-Bool

-DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    *hSAREA           = pDRIPriv->hSAREA;

-    *busIdString      = pDRIPriv->pDriverInfo->busIdString;

-

-    return TRUE;

-}

-

-Bool

-DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;

-    return TRUE;

-}

-

-Bool

-DRICloseConnection(ScreenPtr pScreen)

-{

-    return TRUE;

-}

-

-Bool

-DRIGetClientDriverName(ScreenPtr pScreen,

-                       int *ddxDriverMajorVersion,

-                       int *ddxDriverMinorVersion,

-                       int *ddxDriverPatchVersion,

-                       char **clientDriverName)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    *ddxDriverMajorVersion = pDRIPriv->pDriverInfo->ddxDriverMajorVersion;

-    *ddxDriverMinorVersion = pDRIPriv->pDriverInfo->ddxDriverMinorVersion;

-    *ddxDriverPatchVersion = pDRIPriv->pDriverInfo->ddxDriverPatchVersion;

-    *clientDriverName      = pDRIPriv->pDriverInfo->clientDriverName;

-

-    return TRUE;

-}

-

-/* DRICreateContextPriv and DRICreateContextPrivFromHandle are helper

-   functions that layer on drmCreateContext and drmAddContextTag.

-

-   DRICreateContextPriv always creates a kernel drm_context_t and then calls

-   DRICreateContextPrivFromHandle to create a DRIContextPriv structure for

-   DRI tracking.  For the SIGIO handler, the drm_context_t is associated with

-   DRIContextPrivPtr.  Any special flags are stored in the DRIContextPriv

-   area and are passed to the kernel (if necessary).

-

-   DRICreateContextPriv returns a pointer to newly allocated

-   DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */

-

-DRIContextPrivPtr

-DRICreateContextPriv(ScreenPtr pScreen,

-		     drm_context_t * pHWContext,

-		     DRIContextFlags flags)

-{

-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (drmCreateContext(pDRIPriv->drmFD, pHWContext)) {

-	return NULL;

-    }

-

-    return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags);

-}

-

-DRIContextPrivPtr

-DRICreateContextPrivFromHandle(ScreenPtr pScreen,

-			       drm_context_t hHWContext,

-			       DRIContextFlags flags)

-{

-    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIContextPrivPtr pDRIContextPriv;

-    int 	      contextPrivSize;

-

-    contextPrivSize = sizeof(DRIContextPrivRec) +

-			    pDRIPriv->pDriverInfo->contextSize;

-    if (!(pDRIContextPriv = calloc(1, contextPrivSize))) {

-	return NULL;

-    }

-    pDRIContextPriv->pContextStore = (void *)(pDRIContextPriv + 1);

-

-    drmAddContextTag(pDRIPriv->drmFD, hHWContext, pDRIContextPriv);

-

-    pDRIContextPriv->hwContext = hHWContext;

-    pDRIContextPriv->pScreen   = pScreen;

-    pDRIContextPriv->flags     = flags;

-    pDRIContextPriv->valid3D   = FALSE;

-

-    if (flags & DRI_CONTEXT_2DONLY) {

-	if (drmSetContextFlags(pDRIPriv->drmFD,

-			       hHWContext,

-			       DRM_CONTEXT_2DONLY)) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "[drm] failed to set 2D context flag\n");

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return NULL;

-	}

-    }

-    if (flags & DRI_CONTEXT_PRESERVED) {

-	if (drmSetContextFlags(pDRIPriv->drmFD,

-			       hHWContext,

-			       DRM_CONTEXT_PRESERVED)) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "[drm] failed to set preserved flag\n");

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return NULL;

-	}

-    }

-    return pDRIContextPriv;

-}

-

-Bool

-DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv)

-{

-    DRIScreenPrivPtr pDRIPriv;

-

-    if (!pDRIContextPriv) return TRUE;

-

-    pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);

-

-    if (!(pDRIContextPriv->flags & DRI_CONTEXT_RESERVED)) {

-				/* Don't delete reserved contexts from

-                                   kernel area -- the kernel manages its

-                                   reserved contexts itself. */

-	if (drmDestroyContext(pDRIPriv->drmFD, pDRIContextPriv->hwContext))

-	    return FALSE;

-    }

-

-				/* Remove the tag last to prevent a race

-                                   condition where the context has pending

-                                   buffers.  The context can't be re-used

-                                   while in this thread, but buffers can be

-                                   dispatched asynchronously. */

-    drmDelContextTag(pDRIPriv->drmFD, pDRIContextPriv->hwContext);

-    free(pDRIContextPriv);

-    return TRUE;

-}

-

-static Bool

-DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIContextPrivPtr pDRIContextPriv;

-    void *contextStore;

-

-    if (!(pDRIContextPriv =

-	  DRICreateContextPriv(pScreen,

-			       &pDRIPriv->pSAREA->dummy_context, 0))) {

-	return FALSE;

-    }

-

-    contextStore = DRIGetContextStore(pDRIContextPriv);

-    if (pDRIPriv->pDriverInfo->CreateContext && needCtxPriv) {

-	if (!pDRIPriv->pDriverInfo->CreateContext(pScreen, NULL,

-						  pDRIPriv->pSAREA->dummy_context,

-						  NULL,

-						  (DRIContextType)(long)contextStore)) {

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return FALSE;

-	}

-    }

-

-    pDRIPriv->dummyCtxPriv = pDRIContextPriv;

-    return TRUE;

-}

-

-static void

-DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIContextPrivPtr pDRIContextPriv = pDRIPriv->dummyCtxPriv;

-    void *contextStore;

-

-    if (!pDRIContextPriv) return;

-    if (pDRIPriv->pDriverInfo->DestroyContext && hasCtxPriv) {

-	contextStore = DRIGetContextStore(pDRIContextPriv);

-	pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,

-					      pDRIContextPriv->hwContext,

-					      (DRIContextType)(long)contextStore);

-    }

-

-    DRIDestroyContextPriv(pDRIPriv->dummyCtxPriv);

-    pDRIPriv->dummyCtxPriv = NULL;

-}

-

-Bool

-DRICreateContext(ScreenPtr pScreen, VisualPtr visual,

-                 XID context, drm_context_t * pHWContext)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIContextPrivPtr pDRIContextPriv;

-    void *contextStore;

-

-    if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {

-        if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {

-	    DRIDrvMsg(pScreen->myNum, X_INFO,

-		      "[drm] Could not create dummy context\n");

-	    return FALSE;

-	}

-    }

-

-    if (!(pDRIContextPriv = DRICreateContextPriv(pScreen, pHWContext, 0))) {

-	return FALSE;

-    }

-

-    contextStore = DRIGetContextStore(pDRIContextPriv);

-    if (pDRIPriv->pDriverInfo->CreateContext) {

-	if (!((*pDRIPriv->pDriverInfo->CreateContext)(pScreen, NULL,

-		*pHWContext, NULL,

-		(DRIContextType)(long)contextStore))) {

-	    DRIDestroyContextPriv(pDRIContextPriv);

-	    return FALSE;

-	}

-    }

-

-    /* track this in case the client dies before cleanup */

-    AddResource(context, DRIContextPrivResType, (pointer)pDRIContextPriv);

-

-    return TRUE;

-}

-

-Bool

-DRIDestroyContext(ScreenPtr pScreen, XID context)

-{

-    FreeResourceByType(context, DRIContextPrivResType, FALSE);

-

-    return TRUE;

-}

-

-/* DRIContextPrivDelete is called by the resource manager. */

-Bool

-DRIContextPrivDelete(pointer pResource, XID id)

-{

-    DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource;

-    DRIScreenPrivPtr pDRIPriv;

-    void *contextStore;

-

-    pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);

-    if (pDRIPriv->pDriverInfo->DestroyContext) {

-      contextStore = DRIGetContextStore(pDRIContextPriv);

-      pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,

-					    pDRIContextPriv->hwContext,

-					    (DRIContextType)(long)contextStore);

-    }

-    return DRIDestroyContextPriv(pDRIContextPriv);

-}

-

-

-/* This walks the drawable timestamp array and invalidates all of them

- * in the case of transition from private to shared backbuffers.  It's

- * not necessary for correctness, because DRIClipNotify gets called in

- * time to prevent any conflict, but the transition from

- * shared->private is sometimes missed if we don't do this.

- */

-static void

-DRIClipNotifyAllDrawables(ScreenPtr pScreen)

-{

-   int i;

-   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-   for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {

-      pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;

-   }

-}

-

-

-static void

-DRITransitionToSharedBuffers(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;

-

-    DRIClipNotifyAllDrawables( pScreen );

-

-    if (pDRIInfo->TransitionSingleToMulti3D)

-	pDRIInfo->TransitionSingleToMulti3D( pScreen );

-}

-

-

-static void

-DRITransitionToPrivateBuffers(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;

-

-    DRIClipNotifyAllDrawables( pScreen );

-

-    if (pDRIInfo->TransitionMultiToSingle3D)

-	pDRIInfo->TransitionMultiToSingle3D( pScreen );

-}

-

-

-static void

-DRITransitionTo3d(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;

-

-    DRIClipNotifyAllDrawables( pScreen );

-

-    if (pDRIInfo->TransitionTo3d)

-	pDRIInfo->TransitionTo3d( pScreen );

-}

-

-static void

-DRITransitionTo2d(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;

-

-    DRIClipNotifyAllDrawables( pScreen );

-

-    if (pDRIInfo->TransitionTo2d)

-	pDRIInfo->TransitionTo2d( pScreen );

-}

-

-

-static int

-DRIDCNTreeTraversal(WindowPtr pWin, pointer data)

-{

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-    if (pDRIDrawablePriv) {

-	ScreenPtr pScreen = pWin->drawable.pScreen;

-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-	if (RegionNumRects(&pWin->clipList) > 0) {

-	    WindowPtr *pDRIWindows = (WindowPtr*)data;

-	    int i = 0;

-

-	    while (pDRIWindows[i])

-		i++;

-

-	    pDRIWindows[i] = pWin;

-

-	    pDRIPriv->nrWalked++;

-	}

-

-	if (pDRIPriv->nrWindows == pDRIPriv->nrWalked)

-	    return WT_STOPWALKING;

-    }

-

-    return WT_WALKCHILDREN;

-}

-

-static void

-DRIDriverClipNotify(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv->pDriverInfo->ClipNotify) {

-	WindowPtr *pDRIWindows = calloc(sizeof(WindowPtr), pDRIPriv->nrWindows);

-	DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;

-

-	if (pDRIPriv->nrWindows > 0) {

-	    pDRIPriv->nrWalked = 0;

-	    TraverseTree(pScreen->root, DRIDCNTreeTraversal,

-			 (pointer)pDRIWindows);

-	}

-

-	pDRIInfo->ClipNotify(pScreen, pDRIWindows, pDRIPriv->nrWindows);

-

-	free(pDRIWindows);

-    }

-}

-

-static void

-DRIIncreaseNumberVisible(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    switch (++pDRIPriv->nrWindowsVisible) {

-    case 1:

-	DRITransitionTo3d( pScreen );

-	break;

-    case 2:

-	DRITransitionToSharedBuffers( pScreen );

-	break;

-    default:

-	break;

-    }

-

-    DRIDriverClipNotify(pScreen);

-}

-

-static void

-DRIDecreaseNumberVisible(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    switch (--pDRIPriv->nrWindowsVisible) {

-    case 0:

-	DRITransitionTo2d( pScreen );

-	break;

-    case 1:

-	DRITransitionToPrivateBuffers( pScreen );

-	break;

-    default:

-	break;

-    }

-

-    DRIDriverClipNotify(pScreen);

-}

-

-Bool

-DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,

-		  drm_drawable_t * hHWDrawable)

-{

-    DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr	pDRIDrawablePriv;

-    WindowPtr		pWin;

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-	pWin = (WindowPtr)pDrawable;

-	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {

-	    pDRIDrawablePriv->refCount++;

-

-	    if (!pDRIDrawablePriv->hwDrawable) {

-		drmCreateDrawable(pDRIPriv->drmFD, &pDRIDrawablePriv->hwDrawable);

-	    }

-	}

-	else {

-	    /* allocate a DRI Window Private record */

-	    if (!(pDRIDrawablePriv = malloc(sizeof(DRIDrawablePrivRec)))) {

-		return FALSE;

-	    }

-

-	    /* Only create a drm_drawable_t once */

-	    if (drmCreateDrawable(pDRIPriv->drmFD,

-				  &pDRIDrawablePriv->hwDrawable)) {

-		free(pDRIDrawablePriv);

-		return FALSE;

-	    }

-

-	    /* add it to the list of DRI drawables for this screen */

-	    pDRIDrawablePriv->pScreen = pScreen;

-	    pDRIDrawablePriv->refCount = 1;

-	    pDRIDrawablePriv->drawableIndex = -1;

-	    pDRIDrawablePriv->nrects = RegionNumRects(&pWin->clipList);

-

-	    /* save private off of preallocated index */

-	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,

-			  pDRIDrawablePriv);

-	    pDRIPriv->nrWindows++;

-

-	    if (pDRIDrawablePriv->nrects)

-		DRIIncreaseNumberVisible(pScreen);

-	}

-

-	/* track this in case the client dies */

-	AddResource(FakeClientID(client->index), DRIDrawablePrivResType,

-		    (pointer)(intptr_t)pDrawable->id);

-

-	if (pDRIDrawablePriv->hwDrawable) {

-	    drmUpdateDrawableInfo(pDRIPriv->drmFD,

-				  pDRIDrawablePriv->hwDrawable,

-				  DRM_DRAWABLE_CLIPRECTS,

-				  RegionNumRects(&pWin->clipList),

-				  RegionRects(&pWin->clipList));

-	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;

-	}

-    }

-    else if (pDrawable->type != DRAWABLE_PIXMAP) { /* PBuffer */

-	/* NOT_DONE */

-	return FALSE;

-    }

-

-    return TRUE;

-}

-

-static void

-DRIDrawablePrivDestroy(WindowPtr pWin)

-{

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-    ScreenPtr pScreen;

-    DRIScreenPrivPtr pDRIPriv;

-

-    if (!pDRIDrawablePriv)

-	return;

-

-    pScreen = pWin->drawable.pScreen;

-    pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIDrawablePriv->drawableIndex != -1) {

-	/* bump stamp to force outstanding 3D requests to resync */

-	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp

-	    = DRIDrawableValidationStamp++;

-

-	/* release drawable table entry */

-	pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;

-    }

-

-    pDRIPriv->nrWindows--;

-

-    if (pDRIDrawablePriv->nrects)

-	DRIDecreaseNumberVisible(pScreen);

-

-    drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable);

-

-    free(pDRIDrawablePriv);

-    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);

-}

-

-static Bool

-DRIDestroyDrawableCB(pointer value, XID id, pointer data)

-{

-    if (value == data) {

-	/* This calls back DRIDrawablePrivDelete which frees private area */

-	FreeResourceByType(id, DRIDrawablePrivResType, FALSE);

-

-	return TRUE;

-    }

-

-    return FALSE;

-}

-

-Bool

-DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)

-{

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-	LookupClientResourceComplex(client, DRIDrawablePrivResType,

-				    DRIDestroyDrawableCB,

-				    (pointer)(intptr_t)pDrawable->id);

-    }

-    else { /* pixmap (or for GLX 1.3, a PBuffer) */

-	/* NOT_DONE */

-	return FALSE;

-    }

-

-    return TRUE;

-}

-

-Bool

-DRIDrawablePrivDelete(pointer pResource, XID id)

-{

-    WindowPtr pWin;

-    int rc;

-

-    /* For DRIDrawablePrivResType, the XID is the client's fake ID. The

-     * important XID is the value in pResource. */

-    id = (XID)(intptr_t)pResource;

-    rc = dixLookupWindow(&pWin, id, serverClient, DixGetAttrAccess);

-

-    if (rc == Success) {

-	DRIDrawablePrivPtr pDRIDrwPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-	if (!pDRIDrwPriv)

-	    return FALSE;

-

-	if (--pDRIDrwPriv->refCount == 0)

-	    DRIDrawablePrivDestroy(pWin);

-

-	return TRUE;

-    }

-    else { /* pixmap (or for GLX 1.3, a PBuffer) */

-	/* NOT_DONE */

-	return FALSE;

-    }

-}

-

-Bool

-DRIGetDrawableInfo(ScreenPtr pScreen,

-                   DrawablePtr pDrawable,

-                   unsigned int* index,

-                   unsigned int* stamp,

-                   int* X,

-                   int* Y,

-                   int* W,

-                   int* H,

-                   int* numClipRects,

-                   drm_clip_rect_t ** pClipRects,

-                   int* backX,

-                   int* backY,

-                   int* numBackClipRects,

-                   drm_clip_rect_t ** pBackClipRects)

-{

-    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;

-    WindowPtr		pWin, pOldWin;

-    int			i;

-

-#if 0

-    printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);

-#endif

-

-    if (pDrawable->type == DRAWABLE_WINDOW) {

-	pWin = (WindowPtr)pDrawable;

-	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {

-

-	    /* Manage drawable table */

-	    if (pDRIDrawablePriv->drawableIndex == -1) { /* load SAREA table */

-

-		/* Search table for empty entry */

-		i = 0;

-		while (i < pDRIPriv->pDriverInfo->maxDrawableTableEntry) {

-		    if (!(pDRIPriv->DRIDrawables[i])) {

-			pDRIPriv->DRIDrawables[i] = pDrawable;

-			pDRIDrawablePriv->drawableIndex = i;

-			pDRIPriv->pSAREA->drawableTable[i].stamp =

-					    DRIDrawableValidationStamp++;

-			break;

-		    }

-		    i++;

-		}

-

-		/* Search table for oldest entry */

-		if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {

-                    unsigned int oldestStamp = ~0;

-                    int oldestIndex = 0;

-		    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;

-		    while (i--) {

-			if (pDRIPriv->pSAREA->drawableTable[i].stamp <

-								oldestStamp) {

-			    oldestIndex = i;

-			    oldestStamp =

-				pDRIPriv->pSAREA->drawableTable[i].stamp;

-			}

-		    }

-		    pDRIDrawablePriv->drawableIndex = oldestIndex;

-

-		    /* release oldest drawable table entry */

-		    pOldWin = (WindowPtr)pDRIPriv->DRIDrawables[oldestIndex];

-		    pOldDrawPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pOldWin);

-		    pOldDrawPriv->drawableIndex = -1;

-

-		    /* claim drawable table entry */

-		    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;

-

-		    /* validate SAREA entry */

-		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =

-					DRIDrawableValidationStamp++;

-

-		    /* check for stamp wrap around */

-		    if (oldestStamp > DRIDrawableValidationStamp) {

-

-			/* walk SAREA table and invalidate all drawables */

-			for( i=0;

-                             i < pDRIPriv->pDriverInfo->maxDrawableTableEntry;

-                             i++) {

-				pDRIPriv->pSAREA->drawableTable[i].stamp =

-					DRIDrawableValidationStamp++;

-			}

-		    }

-		}

-

-		/* If the driver wants to be notified when the index is

-		 * set for a drawable, let it know now.

-		 */

-		if (pDRIPriv->pDriverInfo->SetDrawableIndex)

-			pDRIPriv->pDriverInfo->SetDrawableIndex(pWin,

-				pDRIDrawablePriv->drawableIndex);

-

-		/* reinit drawable ID if window is visible */

-		if ((pWin->viewable) &&

-		    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS))

-		{

-		    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin,

-			    &pWin->clipList, pDRIDrawablePriv->drawableIndex);

-		}

-	    }

-

-	    *index = pDRIDrawablePriv->drawableIndex;

-	    *stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;

-	    *X = (int)(pWin->drawable.x);

-	    *Y = (int)(pWin->drawable.y);

-#if 0

-	    *W = (int)(pWin->winSize.extents.x2 - pWin->winSize.extents.x1);

-	    *H = (int)(pWin->winSize.extents.y2 - pWin->winSize.extents.y1);

-#endif

-	    *W = (int)(pWin->drawable.width);

-	    *H = (int)(pWin->drawable.height);

-	    *numClipRects = RegionNumRects(&pWin->clipList);

-	    *pClipRects = (drm_clip_rect_t *)RegionRects(&pWin->clipList);

-

-	    if (!*numClipRects && pDRIPriv->fullscreen) {

-				/* use fake full-screen clip rect */

-		pDRIPriv->fullscreen_rect.x1 = *X;

-		pDRIPriv->fullscreen_rect.y1 = *Y;

-		pDRIPriv->fullscreen_rect.x2 = *X + *W;

-		pDRIPriv->fullscreen_rect.y2 = *Y + *H;

-

-		*numClipRects = 1;

-		*pClipRects   = &pDRIPriv->fullscreen_rect;

-	    }

-

-	    *backX = *X;

-	    *backY = *Y;

-

-	    if (pDRIPriv->nrWindowsVisible == 1 && *numClipRects) {

-	       /* Use a single cliprect. */

-

-	       int x0 = *X;

-	       int y0 = *Y;

-	       int x1 = x0 + *W;

-	       int y1 = y0 + *H;

-

-	       if (x0 < 0) x0 = 0;

-	       if (y0 < 0) y0 = 0;

-	       if (x1 > pScreen->width) x1 = pScreen->width;

-	       if (y1 > pScreen->height) y1 = pScreen->height;

-

-	       if (y0 >= y1 || x0 >= x1) {

-		    *numBackClipRects = 0;

-		    *pBackClipRects = NULL;

-	       } else {

-		    pDRIPriv->private_buffer_rect.x1 = x0;

-		    pDRIPriv->private_buffer_rect.y1 = y0;

-		    pDRIPriv->private_buffer_rect.x2 = x1;

-		    pDRIPriv->private_buffer_rect.y2 = y1;

-

-		    *numBackClipRects = 1;

-		    *pBackClipRects = &(pDRIPriv->private_buffer_rect);

-	       }

-	    } else {

-	       /* Use the frontbuffer cliprects for back buffers.  */

-	       *numBackClipRects = 0;

-	       *pBackClipRects = 0;

-	    }

-	}

-	else {

-	    /* Not a DRIDrawable */

-	    return FALSE;

-	}

-    }

-    else { /* pixmap (or for GLX 1.3, a PBuffer) */

-	/* NOT_DONE */

-	return FALSE;

-    }

-

-    return TRUE;

-}

-

-Bool

-DRIGetDeviceInfo(ScreenPtr pScreen,

-                 drm_handle_t * hFrameBuffer,

-                 int* fbOrigin,

-                 int* fbSize,

-                 int* fbStride,

-                 int* devPrivateSize,

-                 void** pDevPrivate)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    *hFrameBuffer = pDRIPriv->pDriverInfo->hFrameBuffer;

-    *fbOrigin = 0;

-    *fbSize = pDRIPriv->pDriverInfo->frameBufferSize;

-    *fbStride = pDRIPriv->pDriverInfo->frameBufferStride;

-    *devPrivateSize = pDRIPriv->pDriverInfo->devPrivateSize;

-    *pDevPrivate = pDRIPriv->pDriverInfo->devPrivate;

-

-    return TRUE;

-}

-

-DRIInfoPtr

-DRICreateInfoRec(void)

-{

-    DRIInfoPtr inforec = (DRIInfoPtr)calloc(1, sizeof(DRIInfoRec));

-    if (!inforec) return NULL;

-

-    /* Initialize defaults */

-    inforec->busIdString = NULL;

-

-    /* Wrapped function defaults */

-    inforec->wrap.WakeupHandler         = DRIDoWakeupHandler;

-    inforec->wrap.BlockHandler          = DRIDoBlockHandler;

-    inforec->wrap.WindowExposures       = DRIWindowExposures;

-    inforec->wrap.CopyWindow            = DRICopyWindow;

-    inforec->wrap.ValidateTree          = DRIValidateTree;

-    inforec->wrap.PostValidateTree      = DRIPostValidateTree;

-    inforec->wrap.ClipNotify            = DRIClipNotify;

-    inforec->wrap.AdjustFrame           = DRIAdjustFrame;

-

-    inforec->TransitionTo2d = 0;

-    inforec->TransitionTo3d = 0;

-    inforec->SetDrawableIndex = 0;

-

-    return inforec;

-}

-

-void

-DRIDestroyInfoRec(DRIInfoPtr DRIInfo)

-{

-    free(DRIInfo->busIdString);

-    free((char*)DRIInfo);

-}

-

-

-void

-DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)

-{

-    int i;

-

-    for (i = 0; i < screenInfo.numScreens; i++) {

-	ScreenPtr        pScreen  = screenInfo.screens[i];

-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-	if (pDRIPriv &&

-	    pDRIPriv->pDriverInfo->wrap.WakeupHandler)

-	    (*pDRIPriv->pDriverInfo->wrap.WakeupHandler)(i, wakeupData,

-							 result, pReadmask);

-    }

-}

-

-void

-DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)

-{

-    int i;

-

-    for (i = 0; i < screenInfo.numScreens; i++) {

-	ScreenPtr        pScreen  = screenInfo.screens[i];

-	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-	if (pDRIPriv &&

-	    pDRIPriv->pDriverInfo->wrap.BlockHandler)

-	    (*pDRIPriv->pDriverInfo->wrap.BlockHandler)(i, blockData,

-							pTimeout, pReadmask);

-    }

-}

-

-void

-DRIDoWakeupHandler(int screenNum, pointer wakeupData,

-                   unsigned long result, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[screenNum];

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    DRILock(pScreen, 0);

-    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {

-	/* hide X context by swapping 2D component here */

-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-					      DRI_3D_SYNC,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->partial3DContextStore,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->hiddenContextStore);

-    }

-}

-

-void

-DRIDoBlockHandler(int screenNum, pointer blockData,

-                  pointer pTimeout, pointer pReadmask)

-{

-    ScreenPtr pScreen = screenInfo.screens[screenNum];

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {

-	/* hide X context by swapping 2D component here */

-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-					      DRI_2D_SYNC,

-					      DRI_NO_CONTEXT,

-					      NULL,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->partial3DContextStore);

-    }

-

-    if (pDRIPriv->windowsTouched)

-        DRM_SPINUNLOCK(&pDRIPriv->pSAREA->drawable_lock, 1);

-    pDRIPriv->windowsTouched = FALSE;

-

-    DRIUnlock(pScreen);

-}

-

-void

-DRISwapContext(int drmFD, void *oldctx, void *newctx)

-{

-    DRIContextPrivPtr oldContext      = (DRIContextPrivPtr)oldctx;

-    DRIContextPrivPtr newContext      = (DRIContextPrivPtr)newctx;

-    ScreenPtr         pScreen         = newContext->pScreen;

-    DRIScreenPrivPtr  pDRIPriv        = DRI_SCREEN_PRIV(pScreen);

-    void*             oldContextStore = NULL;

-    DRIContextType    oldContextType;

-    void*             newContextStore = NULL;

-    DRIContextType    newContextType;

-    DRISyncType       syncType;

-#ifdef DEBUG

-    static int        count = 0;

-

-    if (!newContext) {

-	DRIDrvMsg(pScreen->myNum, X_ERROR,

-		  "[DRI] Context Switch Error: oldContext=%x, newContext=%x\n",

-		  oldContext, newContext);

-	return;

-    }

-

-    /* usefull for debugging, just print out after n context switches */

-    if (!count || !(count % 1)) {

-	DRIDrvMsg(pScreen->myNum, X_INFO,

-		  "[DRI] Context switch %5d from %p/0x%08x (%d)\n",

-		  count,

-		  oldContext,

-		  oldContext ? oldContext->flags : 0,

-		  oldContext ? oldContext->hwContext : -1);

-	DRIDrvMsg(pScreen->myNum, X_INFO,

-		  "[DRI] Context switch %5d to   %p/0x%08x (%d)\n",

-		  count,

-		  newContext,

-		  newContext ? newContext->flags : 0,

-		  newContext ? newContext->hwContext : -1);

-    }

-    ++count;

-#endif

-

-    if (!pDRIPriv->pDriverInfo->SwapContext) {

-	DRIDrvMsg(pScreen->myNum, X_ERROR,

-		  "[DRI] DDX driver missing context swap call back\n");

-	return;

-    }

-

-    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {

-

-        /* only 3D contexts are swapped in this case */

-	if (oldContext) {

-	    oldContextStore     = DRIGetContextStore(oldContext);

-	    oldContext->valid3D = TRUE;

-	    oldContextType      = DRI_3D_CONTEXT;

-	} else {

-	    oldContextType      = DRI_NO_CONTEXT;

-	}

-	newContextStore = DRIGetContextStore(newContext);

-	if ((newContext->valid3D) &&

-	  (newContext->hwContext != pDRIPriv->myContext)) {

-	    newContextType = DRI_3D_CONTEXT;

-	}

-	else {

-	    newContextType = DRI_2D_CONTEXT;

-	}

-	syncType = DRI_3D_SYNC;

-    }

-    else /* default: driverSwapMethod == DRI_SERVER_SWAP */ {

-

-        /* optimize 2D context swaps */

-

-	if (newContext->flags & DRI_CONTEXT_2DONLY) {

-	    /* go from 3D context to 2D context and only save 2D

-             * subset of 3D state

-             */

-	    oldContextStore = DRIGetContextStore(oldContext);

-	    oldContextType = DRI_2D_CONTEXT;

-	    newContextStore = DRIGetContextStore(newContext);

-	    newContextType = DRI_2D_CONTEXT;

-	    syncType = DRI_3D_SYNC;

-	    pDRIPriv->lastPartial3DContext = oldContext;

-	}

-	else if (oldContext->flags & DRI_CONTEXT_2DONLY) {

-	    if (pDRIPriv->lastPartial3DContext == newContext) {

-		/* go from 2D context back to previous 3D context and

-		 * only restore 2D subset of previous 3D state

-		 */

-		oldContextStore = DRIGetContextStore(oldContext);

-		oldContextType = DRI_2D_CONTEXT;

-		newContextStore = DRIGetContextStore(newContext);

-		newContextType = DRI_2D_CONTEXT;

-		syncType = DRI_2D_SYNC;

-	    }

-	    else {

-		/* go from 2D context to a different 3D context */

-

-		/* call DDX driver to do partial restore */

-		oldContextStore = DRIGetContextStore(oldContext);

-		newContextStore =

-			DRIGetContextStore(pDRIPriv->lastPartial3DContext);

-		(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-						      DRI_2D_SYNC,

-						      DRI_2D_CONTEXT,

-						      oldContextStore,

-						      DRI_2D_CONTEXT,

-						      newContextStore);

-

-		/* now setup for a complete 3D swap */

-		oldContextStore = newContextStore;

-		oldContext->valid3D = TRUE;

-		oldContextType = DRI_3D_CONTEXT;

-		newContextStore = DRIGetContextStore(newContext);

-		if ((newContext->valid3D) &&

-		  (newContext->hwContext != pDRIPriv->myContext)) {

-		    newContextType = DRI_3D_CONTEXT;

-		}

-		else {

-		    newContextType = DRI_2D_CONTEXT;

-		}

-		syncType = DRI_NO_SYNC;

-	    }

-	}

-	else {

-	    /* now setup for a complete 3D swap */

-	    oldContextStore = newContextStore;

-	    oldContext->valid3D = TRUE;

-	    oldContextType = DRI_3D_CONTEXT;

-	    newContextStore = DRIGetContextStore(newContext);

-	    if ((newContext->valid3D) &&

-	      (newContext->hwContext != pDRIPriv->myContext)) {

-		newContextType = DRI_3D_CONTEXT;

-	    }

-	    else {

-		newContextType = DRI_2D_CONTEXT;

-	    }

-	    syncType = DRI_3D_SYNC;

-	}

-    }

-

-    /* call DDX driver to perform the swap */

-    (*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-					  syncType,

-					  oldContextType,

-					  oldContextStore,

-					  newContextType,

-					  newContextStore);

-}

-

-void*

-DRIGetContextStore(DRIContextPrivPtr context)

-{

-    return((void *)context->pContextStore);

-}

-

-void

-DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-    if(pDRIDrawablePriv) {

-         (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn,

-                                               pDRIDrawablePriv->drawableIndex);

-    }

-

-    /* call lower wrapped functions */

-    if (pDRIPriv && pDRIPriv->wrap.WindowExposures) {

-

-	/* unwrap */

-	pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;

-

-	/* call lower layers */

-	(*pScreen->WindowExposures)(pWin, prgn, bsreg);

-

-	/* rewrap */

-	pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;

-	pScreen->WindowExposures = DRIWindowExposures;

-    }

-}

-

-

-static int

-DRITreeTraversal(WindowPtr pWin, pointer data)

-{

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-

-    if(pDRIDrawablePriv) {

-        ScreenPtr pScreen = pWin->drawable.pScreen;

-        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-	if(RegionNumRects(&(pWin->clipList)) > 0) {

-	   RegionPtr reg = (RegionPtr)data;

-

-	   RegionUnion(reg, reg, &(pWin->clipList));

-	   pDRIPriv->nrWalked++;

-	}

-

-	if(pDRIPriv->nrWindows == pDRIPriv->nrWalked)

-	   return WT_STOPWALKING;

-    }

-    return WT_WALKCHILDREN;

-}

-

-Bool

-DRIDestroyWindow(WindowPtr pWin)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    Bool retval = TRUE;

-

-    DRIDrawablePrivDestroy(pWin);

-

-    /* call lower wrapped functions */

-    if(pDRIPriv->DestroyWindow) {

-	/* unwrap */

-	pScreen->DestroyWindow = pDRIPriv->DestroyWindow;

-

-	/* call lower layers */

-	retval = (*pScreen->DestroyWindow)(pWin);

-

-	/* rewrap */

-	pDRIPriv->DestroyWindow = pScreen->DestroyWindow;

-	pScreen->DestroyWindow = DRIDestroyWindow;

-    }

-

-    return retval;

-}

-

-void

-DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if(!pDRIPriv) return;

-

-    if(pDRIPriv->nrWindowsVisible > 0) {

-       RegionRec reg;

-

-       RegionNull(&reg);

-       pDRIPriv->nrWalked = 0;

-       TraverseTree(pWin, DRITreeTraversal, (pointer)(&reg));

-

-       if(RegionNotEmpty(&reg)) {

-           RegionTranslate(&reg, ptOldOrg.x - pWin->drawable.x,

-                                        ptOldOrg.y - pWin->drawable.y);

-           RegionIntersect(&reg, &reg, prgnSrc);

-

-           /* The MoveBuffers interface is not ideal */

-           (*pDRIPriv->pDriverInfo->MoveBuffers)(pWin, ptOldOrg, &reg,

-				pDRIPriv->pDriverInfo->ddxDrawableTableEntry);

-       }

-

-       RegionUninit(&reg);

-    }

-

-    /* call lower wrapped functions */

-    if(pDRIPriv->wrap.CopyWindow) {

-	/* unwrap */

-	pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;

-

-	/* call lower layers */

-	(*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);

-

-	/* rewrap */

-	pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;

-	pScreen->CopyWindow = DRICopyWindow;

-    }

-}

-

-static void

-DRIGetSecs(long *secs, long *usecs)

-{

-    struct timeval tv;

-

-    gettimeofday(&tv, NULL);

-

-    *secs  = tv.tv_sec;

-    *usecs = tv.tv_usec;

-}

-

-static unsigned long

-DRIComputeMilliSeconds(unsigned long s_secs, unsigned long s_usecs,

-		       unsigned long f_secs, unsigned long f_usecs)

-{

-    if (f_usecs < s_usecs) {

-	--f_secs;

-	f_usecs += 1000000;

-    }

-    return (f_secs - s_secs) * 1000 + (f_usecs - s_usecs) / 1000;

-}

-

-static void

-DRISpinLockTimeout(drmLock *lock, int val, unsigned long timeout /* in mS */)

-{

-    int  count = 10000;

-#if !defined(__alpha__) && !defined(__powerpc__)

-    char ret;

-#else

-    int ret;

-#endif

-    long s_secs, s_usecs;

-    long f_secs, f_usecs;

-    long msecs;

-    long prev  = 0;

-

-    DRIGetSecs(&s_secs, &s_usecs);

-

-    do {

-	DRM_SPINLOCK_COUNT(lock, val, count, ret);

-	if (!ret) return;	/* Got lock */

-	DRIGetSecs(&f_secs, &f_usecs);

-	msecs = DRIComputeMilliSeconds(s_secs, s_usecs, f_secs, f_usecs);

-	if (msecs - prev < 250) count *= 2; /* Not more than 0.5S */

-    } while (msecs < timeout);

-

-				/* Didn't get lock, so take it.  The worst

-                                   that can happen is that there is some

-                                   garbage written to the wrong part of the

-                                   framebuffer that a refresh will repair.

-                                   That's undesirable, but better than

-                                   locking the server.  This should be a

-                                   very rare event. */

-    DRM_SPINLOCK_TAKE(lock, val);

-}

-

-static void

-DRILockTree(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if(!pDRIPriv) return;

-

-    /* Restore the last known 3D context if the X context is hidden */

-    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {

-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-					      DRI_2D_SYNC,

-					      DRI_NO_CONTEXT,

-					      NULL,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->partial3DContextStore);

-    }

-

-    /* Call kernel to release lock */

-    DRIUnlock(pScreen);

-

-    /* Grab drawable spin lock: a time out between 10 and 30 seconds is

-       appropriate, since this should never time out except in the case of

-       client death while the lock is being held.  The timeout must be

-       greater than any reasonable rendering time. */

-    DRISpinLockTimeout(&pDRIPriv->pSAREA->drawable_lock, 1, 10000); /*10 secs*/

-

-    /* Call kernel flush outstanding buffers and relock */

-    DRILock(pScreen, DRM_LOCK_QUIESCENT|DRM_LOCK_FLUSH_ALL);

-

-    /* Switch back to our 2D context if the X context is hidden */

-    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {

-	/* hide X context by swapping 2D component here */

-	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,

-					      DRI_3D_SYNC,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->partial3DContextStore,

-					      DRI_2D_CONTEXT,

-					      pDRIPriv->hiddenContextStore);

-    }

-}

-

-int

-DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)

-{

-    ScreenPtr pScreen = pParent->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    int returnValue = 1; /* always return 1, not checked by dix/window.c */

-

-    if(!pDRIPriv) return returnValue;

-

-    /* call lower wrapped functions */

-    if(pDRIPriv->wrap.ValidateTree) {

-	/* unwrap */

-	pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;

-

-	/* call lower layers */

-	returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);

-

-	/* rewrap */

-	pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;

-	pScreen->ValidateTree = DRIValidateTree;

-    }

-

-    return returnValue;

-}

-

-void

-DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)

-{

-    ScreenPtr pScreen;

-    DRIScreenPrivPtr pDRIPriv;

-

-    if (pParent) {

-	pScreen = pParent->drawable.pScreen;

-    } else {

-	pScreen = pChild->drawable.pScreen;

-    }

-    if(!(pDRIPriv = DRI_SCREEN_PRIV(pScreen))) return;

-

-    if (pDRIPriv->wrap.PostValidateTree) {

-	/* unwrap */

-	pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;

-

-	/* call lower layers */

-	(*pScreen->PostValidateTree)(pParent, pChild, kind);

-

-	/* rewrap */

-	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;

-	pScreen->PostValidateTree = DRIPostValidateTree;

-    }

-}

-

-void

-DRIClipNotify(WindowPtr pWin, int dx, int dy)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr	pDRIDrawablePriv;

-

-    if(!pDRIPriv) return;

-

-    if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {

-        int nrects = RegionNumRects(&pWin->clipList);

-

-        if(!pDRIPriv->windowsTouched) {

-            DRILockTree(pScreen);

-            pDRIPriv->windowsTouched = TRUE;

-        }

-

-	if (nrects && !pDRIDrawablePriv->nrects)

-	    DRIIncreaseNumberVisible(pScreen);

-	else if (!nrects && pDRIDrawablePriv->nrects)

-	    DRIDecreaseNumberVisible(pScreen);

-	else

-	    DRIDriverClipNotify(pScreen);

-

-	pDRIDrawablePriv->nrects = nrects;

-

-	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp

-	    = DRIDrawableValidationStamp++;

-

-	drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,

-			      DRM_DRAWABLE_CLIPRECTS,

-			      nrects, RegionRects(&pWin->clipList));

-    }

-

-    /* call lower wrapped functions */

-    if(pDRIPriv->wrap.ClipNotify) {

-

-	/* unwrap */

-        pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;

-

-	/* call lower layers */

-        (*pScreen->ClipNotify)(pWin, dx, dy);

-

-	/* rewrap */

-        pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;

-        pScreen->ClipNotify = DRIClipNotify;

-    }

-}

-

-CARD32

-DRIGetDrawableIndex(WindowPtr pWin)

-{

-    ScreenPtr pScreen = pWin->drawable.pScreen;

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);

-    CARD32 index;

-

-    if (pDRIDrawablePriv) {

-	index = pDRIDrawablePriv->drawableIndex;

-    }

-    else {

-	index = pDRIPriv->pDriverInfo->ddxDrawableTableEntry;

-    }

-

-    return index;

-}

-

-unsigned int

-DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    return pDRIPriv->pSAREA->drawableTable[drawable_index].stamp;

-}

-

-

-void

-DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);

-}

-

-void

-DRILock(ScreenPtr pScreen, int flags)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;

-

-    if (!*pDRIPriv->pLockRefCount) {

-        DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext, flags);

-	*pDRIPriv->pLockingContext = pDRIPriv->myContext;

-    } else if (*pDRIPriv->pLockingContext != pDRIPriv->myContext) {

-	DRIDrvMsg(pScreen->myNum, X_ERROR,

-		  "[DRI] Locking deadlock.\n"

-		  "\tAlready locked with context %d,\n"

-		  "\ttrying to lock with context %d.\n",

-		  pDRIPriv->pLockingContext,

-		  pDRIPriv->myContext);

-    }

-    (*pDRIPriv->pLockRefCount)++;

-}

-

-void

-DRIUnlock(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;

-

-    if (*pDRIPriv->pLockRefCount > 0) {

-	if (pDRIPriv->myContext != *pDRIPriv->pLockingContext) {

-	    DRIDrvMsg(pScreen->myNum, X_ERROR,

-		      "[DRI] Unlocking inconsistency:\n"

-		      "\tContext %d trying to unlock lock held by context %d\n",

-		      pDRIPriv->pLockingContext,

-		      pDRIPriv->myContext);

-	}

-	(*pDRIPriv->pLockRefCount)--;

-    } else {

-        DRIDrvMsg(pScreen->myNum, X_ERROR,

-		  "DRIUnlock called when not locked.\n");

-        return;

-    }

-    if (! *pDRIPriv->pLockRefCount)

-        DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext);

-}

-

-void *

-DRIGetSAREAPrivate(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    if (!pDRIPriv) return 0;

-

-    return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));

-}

-

-drm_context_t

-DRIGetContext(ScreenPtr pScreen)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    if (!pDRIPriv) return 0;

-

-    return pDRIPriv->myContext;

-}

-

-void

-DRIGetTexOffsetFuncs(ScreenPtr pScreen,

-		     DRITexOffsetStartProcPtr *texOffsetStartFunc,

-		     DRITexOffsetFinishProcPtr *texOffsetFinishFunc)

-{

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-

-    if (!pDRIPriv) return;

-

-    *texOffsetStartFunc  = pDRIPriv->pDriverInfo->texOffsetStart;

-    *texOffsetFinishFunc = pDRIPriv->pDriverInfo->texOffsetFinish;

-}

-

-/* This lets get at the unwrapped functions so that they can correctly

- * call the lowerlevel functions, and choose whether they will be

- * called at every level of recursion (eg in validatetree).

- */

-DRIWrappedFuncsRec *

-DRIGetWrappedFuncs(ScreenPtr pScreen)

-{

-    return &(DRI_SCREEN_PRIV(pScreen)->wrap);

-}

-

-/* note that this returns the library version, not the protocol version */

-void

-DRIQueryVersion(int *majorVersion,

-                int *minorVersion,

-                int *patchVersion)

-{

-    *majorVersion = DRIINFO_MAJOR_VERSION;

-    *minorVersion = DRIINFO_MINOR_VERSION;

-    *patchVersion = DRIINFO_PATCH_VERSION;

-}

-

-static void

-_DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)

-{

-    pDRIPriv->pSAREA->frame.x      = x;

-    pDRIPriv->pSAREA->frame.y      = y;

-    pDRIPriv->pSAREA->frame.width  = pScrn->frameX1 - x + 1;

-    pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1;

-}

-

-void

-DRIAdjustFrame(int scrnIndex, int x, int y, int flags)

-{

-    ScreenPtr        pScreen  = screenInfo.screens[scrnIndex];

-    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);

-    ScrnInfoPtr      pScrn    = xf86Screens[pScreen->myNum];

-    int              px, py;

-

-    if (!pDRIPriv || !pDRIPriv->pSAREA) {

-	DRIDrvMsg(scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",

-		  pDRIPriv, pDRIPriv ? pDRIPriv->pSAREA : NULL);

-	return;

-    }

-

-    if (pDRIPriv->fullscreen) {

-				/* Fix up frame */

-	pScrn->frameX0 = pDRIPriv->pSAREA->frame.x;

-	pScrn->frameY0 = pDRIPriv->pSAREA->frame.y;

-	pScrn->frameX1 = pScrn->frameX0 + pDRIPriv->pSAREA->frame.width - 1;

-	pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1;

-

-				/* Fix up cursor */

-    miPointerGetPosition(inputInfo.pointer, &px, &py);

-	if (px < pScrn->frameX0) px = pScrn->frameX0;

-	if (px > pScrn->frameX1) px = pScrn->frameX1;

-	if (py < pScrn->frameY0) py = pScrn->frameY0;

-	if (py > pScrn->frameY1) py = pScrn->frameY1;

-	pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);

-	return;

-    }

-

-    if (pDRIPriv->wrap.AdjustFrame) {

-	/* unwrap */

-	pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;

-	/* call lower layers */

-	(*pScrn->AdjustFrame)(scrnIndex, x, y, flags);

-	/* rewrap */

-	pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;

-	pScrn->AdjustFrame         = DRIAdjustFrame;

-    }

-

-    _DRIAdjustFrame(pScrn, pDRIPriv, x, y);

-}

-

-/* 

- * DRIMoveBuffersHelper swaps the regions rects in place leaving you

- * a region with the rects in the order that you need to blit them,

- * but it is possibly (likely) an invalid region afterwards.  If you

- * need to use the region again for anything you have to call 

- * REGION_VALIDATE on it, or better yet, save a copy first.

- */

-

-void

-DRIMoveBuffersHelper(

-   ScreenPtr pScreen, 

-   int dx,

-   int dy,

-   int *xdir, 

-   int *ydir, 

-   RegionPtr reg

-)

-{

-   BoxPtr extents, pbox, firstBox, lastBox;

-   BoxRec tmpBox;

-   int y, nbox;

-

-   extents = RegionExtents(reg);

-   nbox = RegionNumRects(reg);

-   pbox = RegionRects(reg);

-

-   if((dy > 0) && (dy < (extents->y2 - extents->y1))) {

-     *ydir = -1;

-     if(nbox > 1) {

-        firstBox = pbox;

-        lastBox = pbox + nbox - 1;

-        while((unsigned long)firstBox < (unsigned long)lastBox) {

-           tmpBox = *firstBox;

-           *firstBox = *lastBox;

-           *lastBox = tmpBox;

-           firstBox++;

-           lastBox--;

-        }

-     }

-   } else *ydir = 1;

-

-   if((dx > 0) && (dx < (extents->x2 - extents->x1))) {

-     *xdir = -1;

-     if(nbox > 1) {

-        firstBox = lastBox = pbox;

-        y = pbox->y1;

-        while(--nbox) {

-           pbox++;

-           if(pbox->y1 == y) lastBox++;

-           else {

-              while((unsigned long)firstBox < (unsigned long)lastBox) {

-                 tmpBox = *firstBox;

-                 *firstBox = *lastBox;

-                 *lastBox = tmpBox;

-                 firstBox++;

-                 lastBox--;

-              }

-

-              firstBox = lastBox = pbox;

-              y = pbox->y1;

-           }

-         }

-         while((unsigned long)firstBox < (unsigned long)lastBox) {

-           tmpBox = *firstBox;

-           *firstBox = *lastBox;

-           *lastBox = tmpBox;

-           firstBox++;

-           lastBox--;

-        }

-     }

-   } else *xdir = 1;

-

-}

-

-char *

-DRICreatePCIBusID(const struct pci_device * dev)

-{

-    char *busID;

-

-    if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",

-		 dev->domain, dev->bus, dev->dev, dev->func) == -1)

-	return NULL;

-

-    return busID;

-}

-

-static void drmSIGIOHandler(int interrupt, void *closure)

-{

-    unsigned long key;

-    void          *value;

-    ssize_t       count;

-    drm_ctx_t     ctx;

-    typedef void  (*_drmCallback)(int, void *, void *);

-    char          buf[256];

-    drm_context_t    old;

-    drm_context_t    new;

-    void          *oldctx;

-    void          *newctx;

-    char          *pt;

-    drmHashEntry  *entry;

-    void *hash_table;

-

-    hash_table = drmGetHashTable();

-

-    if (!hash_table) return;

-    if (drmHashFirst(hash_table, &key, &value)) {

-	entry = value;

-	do {

-#if 0

-	    fprintf(stderr, "Trying %d\n", entry->fd);

-#endif

-	    if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) {

-		buf[count] = '\0';

-#if 0

-		fprintf(stderr, "Got %s\n", buf);

-#endif

-

-		for (pt = buf; *pt != ' '; ++pt); /* Find first space */

-		++pt;

-		old    = strtol(pt, &pt, 0);

-		new    = strtol(pt, NULL, 0);

-		oldctx = drmGetContextTag(entry->fd, old);

-		newctx = drmGetContextTag(entry->fd, new);

-#if 0

-		fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx);

-#endif

-		((_drmCallback)entry->f)(entry->fd, oldctx, newctx);

-		ctx.handle = new;

-		ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx);

-	    }

-	} while (drmHashNext(hash_table, &key, &value));

-    }

-}

-

-

-int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))

-{

-    drmHashEntry     *entry;

-

-    entry     = drmGetEntry(fd);

-    entry->f  = f;

-

-    return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);

-}

-

-int drmRemoveSIGIOHandler(int fd)

-{

-    drmHashEntry     *entry = drmGetEntry(fd);

-

-    entry->f = NULL;

-

-    return xf86RemoveSIGIOHandler(fd);

-}

+/**************************************************************************
+
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
+Copyright 2000 VA Linux Systems, Inc.
+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, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL 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.
+
+**************************************************************************/
+
+/*
+ * Authors:
+ *   Jens Owen <jens@tungstengraphics.com>
+ *   Rickard E. (Rik) Faith <faith@valinux.com>
+ *
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include "xf86.h"
+#include <sys/time.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "xf86drm.h"
+#include "misc.h"
+#include "dixstruct.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#define _XF86DRI_SERVER_
+#include <X11/dri/xf86driproto.h>
+#include "swaprep.h"
+#include "xf86str.h"
+#include "dri.h"
+#include "sarea.h"
+#include "dristruct.h"
+#include "xf86.h"
+#include "xf86drm.h"
+#include "mi.h"
+#include "mipointer.h"
+#include "xf86_OSproc.h"
+#include "inputstr.h"
+#include "xf86VGAarbiter.h"
+
+static int DRIEntPrivIndex = -1;
+static DevPrivateKeyRec DRIScreenPrivKeyRec;
+#define DRIScreenPrivKey (&DRIScreenPrivKeyRec)
+static DevPrivateKeyRec DRIWindowPrivKeyRec;
+#define DRIWindowPrivKey (&DRIWindowPrivKeyRec)
+static unsigned long DRIGeneration = 0;
+static unsigned int DRIDrawableValidationStamp = 0;
+
+static RESTYPE DRIDrawablePrivResType;
+static RESTYPE DRIContextPrivResType;
+static void    DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv);
+
+drmServerInfo DRIDRMServerInfo;
+
+				/* Wrapper just like xf86DrvMsg, but
+				   without the verbosity level checking.
+				   This will make it easy to turn off some
+				   messages later, based on verbosity
+				   level. */
+
+/*
+ * Since we're already referencing things from the XFree86 common layer in
+ * this file, we'd might as well just call xf86VDrvMsgVerb, and have
+ * consistent message formatting.  The verbosity of these messages can be
+ * easily changed here.
+ */
+#define DRI_MSG_VERBOSITY 1
+static void
+DRIDrvMsg(int scrnIndex, MessageType type, const char *format, ...)
+{
+    va_list     ap;
+
+    va_start(ap, format);
+    xf86VDrvMsgVerb(scrnIndex, type, DRI_MSG_VERBOSITY, format, ap);
+    va_end(ap);
+}
+
+
+static void
+DRIOpenDRMCleanup(DRIEntPrivPtr pDRIEntPriv)
+{
+    if (pDRIEntPriv->pLSAREA != NULL) {
+	drmUnmap(pDRIEntPriv->pLSAREA, pDRIEntPriv->sAreaSize);
+	pDRIEntPriv->pLSAREA = NULL;
+    }
+    if (pDRIEntPriv->hLSAREA != 0) {
+	drmRmMap(pDRIEntPriv->drmFD, pDRIEntPriv->hLSAREA);
+    }
+    if (pDRIEntPriv->drmFD >= 0) {
+	drmClose(pDRIEntPriv->drmFD);
+	pDRIEntPriv->drmFD = 0;
+    }
+}
+
+int
+DRIMasterFD(ScrnInfoPtr pScrn)
+{
+    return DRI_ENT_PRIV(pScrn)->drmFD;
+}
+
+void *
+DRIMasterSareaPointer(ScrnInfoPtr pScrn)
+{
+    return DRI_ENT_PRIV(pScrn)->pLSAREA;
+}
+
+drm_handle_t
+DRIMasterSareaHandle(ScrnInfoPtr pScrn)
+{
+    return DRI_ENT_PRIV(pScrn)->hLSAREA;
+}
+
+
+Bool
+DRIOpenDRMMaster(ScrnInfoPtr pScrn,
+		 unsigned long sAreaSize,
+		 const char *busID,
+		 const char *drmDriverName)
+{
+    drmSetVersion saveSv, sv;
+    Bool drmWasAvailable;
+    DRIEntPrivPtr pDRIEntPriv;
+    DRIEntPrivRec tmp;
+    drmVersionPtr drmlibv;
+    int drmlibmajor, drmlibminor;
+    const char *openBusID;
+    int count;
+    int err;
+
+    if (DRIEntPrivIndex == -1)
+	DRIEntPrivIndex = xf86AllocateEntityPrivateIndex();
+
+    pDRIEntPriv = DRI_ENT_PRIV(pScrn);
+
+    if (pDRIEntPriv && pDRIEntPriv->drmFD != -1)
+	return TRUE;
+
+    drmWasAvailable = drmAvailable();
+
+    memset(&tmp, 0, sizeof(tmp));
+
+    /* Check the DRM lib version.
+     * drmGetLibVersion was not supported in version 1.0, so check for
+     * symbol first to avoid possible crash or hang.
+     */
+
+    drmlibmajor = 1;
+    drmlibminor = 0;
+    if (xf86LoaderCheckSymbol("drmGetLibVersion")) {
+	drmlibv = drmGetLibVersion(-1);
+	if (drmlibv != NULL) {
+	    drmlibmajor = drmlibv->version_major;
+	    drmlibminor = drmlibv->version_minor;
+	    drmFreeVersion(drmlibv);
+	}
+    }
+
+    /* Check if the libdrm can handle falling back to loading based on name
+     * if a busid string is passed.
+     */
+    openBusID = (drmlibmajor == 1 && drmlibminor >= 2) ? busID : NULL;
+
+    tmp.drmFD = -1;
+    sv.drm_di_major = 1;
+    sv.drm_di_minor = 1;
+    sv.drm_dd_major = -1;
+
+    saveSv = sv;
+    count = 10;
+    while (count--) {
+	tmp.drmFD = drmOpen(drmDriverName, openBusID);
+
+	if (tmp.drmFD < 0) {
+	    DRIDrvMsg(-1, X_ERROR, "[drm] drmOpen failed.\n");
+	    goto out_err;
+	}
+
+	err = drmSetInterfaceVersion(tmp.drmFD, &sv);
+
+	if (err != -EPERM)
+	    break;
+
+	sv = saveSv;
+	drmClose(tmp.drmFD);
+	tmp.drmFD = -1;
+	usleep(100000);
+    }
+
+    if (tmp.drmFD <= 0) {
+	DRIDrvMsg(-1, X_ERROR, "[drm] DRM was busy with another master.\n");
+	goto out_err;
+    }
+
+    if (!drmWasAvailable) {
+	DRIDrvMsg(-1, X_INFO,
+		  "[drm] loaded kernel module for \"%s\" driver.\n",
+		  drmDriverName);
+    }
+
+    if (err != 0) {
+	sv.drm_di_major = 1;
+	sv.drm_di_minor = 0;
+    }
+
+    DRIDrvMsg(-1, X_INFO, "[drm] DRM interface version %d.%d\n",
+	      sv.drm_di_major, sv.drm_di_minor);
+
+    if (sv.drm_di_major == 1 && sv.drm_di_minor >= 1)
+	err = 0;
+    else
+	err = drmSetBusid(tmp.drmFD, busID);
+
+    if (err) {
+	DRIDrvMsg(-1, X_ERROR, "[drm] Could not set DRM device bus ID.\n");
+	goto out_err;
+    }
+
+    /*
+     * Create a lock-containing sarea.
+     */
+
+    if (drmAddMap( tmp.drmFD, 0, sAreaSize, DRM_SHM,
+		   DRM_CONTAINS_LOCK, &tmp.hLSAREA) < 0) {
+        DRIDrvMsg(-1, X_INFO, "[drm] Could not create SAREA for DRM lock.\n");
+	tmp.hLSAREA = 0;
+	goto out_err;
+    }
+
+    if (drmMap( tmp.drmFD, tmp.hLSAREA, sAreaSize,
+		(drmAddressPtr)(&tmp.pLSAREA)) < 0) {
+        DRIDrvMsg(-1, X_INFO, "[drm] Mapping SAREA for DRM lock failed.\n");
+	tmp.pLSAREA = NULL;
+	goto out_err;
+    }
+
+    memset(tmp.pLSAREA, 0, sAreaSize);
+
+    /*
+     * Reserved contexts are handled by the first opened screen.
+     */
+
+    tmp.resOwner = NULL;
+
+    if (!pDRIEntPriv)
+	pDRIEntPriv = xnfcalloc(sizeof(*pDRIEntPriv), 1);
+
+    if (!pDRIEntPriv) {
+        DRIDrvMsg(-1, X_INFO, "[drm] Failed to allocate memory for "
+		  "DRM device.\n");
+	goto out_err;
+    }
+    *pDRIEntPriv = tmp;
+    xf86GetEntityPrivate((pScrn)->entityList[0],DRIEntPrivIndex)->ptr =
+	pDRIEntPriv;
+
+    DRIDrvMsg(-1, X_INFO, "[drm] DRM open master succeeded.\n");
+    return TRUE;
+
+  out_err:
+
+    DRIOpenDRMCleanup(&tmp);
+    return FALSE;
+}
+
+static void
+DRIClipNotifyAllDrawables(ScreenPtr pScreen);
+
+static void
+dri_crtc_notify(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIClipNotifyAllDrawables(pScreen);
+    xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);
+    xf86_crtc_notify(pScreen);
+    pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen, dri_crtc_notify);
+}
+
+Bool
+DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
+{
+    DRIScreenPrivPtr    pDRIPriv;
+    drm_context_t *       reserved;
+    int                 reserved_count;
+    int                 i;
+    DRIEntPrivPtr       pDRIEntPriv;
+    ScrnInfoPtr         pScrn = xf86Screens[pScreen->myNum];
+    DRIContextFlags	flags    = 0;
+    DRIContextPrivPtr	pDRIContextPriv;
+
+    /* If the DRI extension is disabled, do not initialize the DRI */
+    if (noXFree86DRIExtension) {
+	DRIDrvMsg(pScreen->myNum, X_WARNING,
+		  "Direct rendering has been disabled.\n");
+	return FALSE;
+    }
+
+    if (!xf86VGAarbiterAllowDRI(pScreen)) {
+        DRIDrvMsg(pScreen->myNum, X_WARNING,
+                  "Direct rendering is not supported when VGA arb is necessary for the device\n");
+	return FALSE;
+    }
+
+#ifdef PANORAMIX
+    /*
+     * If Xinerama is on, don't allow DRI to initialise.  It won't be usable
+     * anyway.
+     */
+	if (!noPanoramiXExtension) {
+	    DRIDrvMsg(pScreen->myNum, X_WARNING,
+		"Direct rendering is not supported when Xinerama is enabled\n");
+	    return FALSE;
+	}
+#endif
+
+    if (!DRIOpenDRMMaster(pScrn, pDRIInfo->SAREASize,
+			  pDRIInfo->busIdString,
+			  pDRIInfo->drmDriverName))
+	return FALSE;
+
+    pDRIEntPriv = DRI_ENT_PRIV(pScrn);
+
+    if (DRIGeneration != serverGeneration)
+	DRIGeneration = serverGeneration;
+
+    if (!dixRegisterPrivateKey(&DRIScreenPrivKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+    if (!dixRegisterPrivateKey(&DRIWindowPrivKeyRec, PRIVATE_WINDOW, 0))
+	return FALSE;
+
+    pDRIPriv = (DRIScreenPrivPtr) calloc(1, sizeof(DRIScreenPrivRec));
+    if (!pDRIPriv) {
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+        return FALSE;
+    }
+
+    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, pDRIPriv);
+    pDRIPriv->drmFD = pDRIEntPriv->drmFD;
+    pDRIPriv->directRenderingSupport = TRUE;
+    pDRIPriv->pDriverInfo = pDRIInfo;
+    pDRIPriv->nrWindows = 0;
+    pDRIPriv->nrWindowsVisible = 0;
+    pDRIPriv->fullscreen = NULL;
+
+    pDRIPriv->createDummyCtx     = pDRIInfo->createDummyCtx;
+    pDRIPriv->createDummyCtxPriv = pDRIInfo->createDummyCtxPriv;
+
+    pDRIPriv->grabbedDRILock = FALSE;
+    pDRIPriv->drmSIGIOHandlerInstalled = FALSE;
+    *pDRMFD = pDRIPriv->drmFD;
+
+    if (pDRIEntPriv->sAreaGrabbed || pDRIInfo->allocSarea) {
+
+	if (drmAddMap( pDRIPriv->drmFD,
+		       0,
+		       pDRIPriv->pDriverInfo->SAREASize,
+		       DRM_SHM,
+		       0,
+		       &pDRIPriv->hSAREA) < 0)
+	{
+	    pDRIPriv->directRenderingSupport = FALSE;
+	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+	    drmClose(pDRIPriv->drmFD);
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] drmAddMap failed\n");
+	    return FALSE;
+	}
+	DRIDrvMsg(pScreen->myNum, X_INFO,
+		  "[drm] added %d byte SAREA at %p\n",
+		  pDRIPriv->pDriverInfo->SAREASize, pDRIPriv->hSAREA);
+
+	/* Backwards compat. */
+	if (drmMap( pDRIPriv->drmFD,
+		    pDRIPriv->hSAREA,
+		    pDRIPriv->pDriverInfo->SAREASize,
+		    (drmAddressPtr)(&pDRIPriv->pSAREA)) < 0)
+	{
+	    pDRIPriv->directRenderingSupport = FALSE;
+	    dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+	    drmClose(pDRIPriv->drmFD);
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] drmMap failed\n");
+	    return FALSE;
+	}
+	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] mapped SAREA %p to %p\n",
+		  pDRIPriv->hSAREA, pDRIPriv->pSAREA);
+	memset(pDRIPriv->pSAREA, 0, pDRIPriv->pDriverInfo->SAREASize);
+    } else {
+	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] Using the DRM lock "
+		  "SAREA also for drawables.\n");
+	pDRIPriv->hSAREA = pDRIEntPriv->hLSAREA;
+	pDRIPriv->pSAREA = (XF86DRISAREAPtr) pDRIEntPriv->pLSAREA;
+	pDRIEntPriv->sAreaGrabbed = TRUE;
+    }
+
+    pDRIPriv->hLSAREA = pDRIEntPriv->hLSAREA;
+    pDRIPriv->pLSAREA = pDRIEntPriv->pLSAREA;
+
+    if (!pDRIPriv->pDriverInfo->dontMapFrameBuffer)
+    {
+	if (drmAddMap( pDRIPriv->drmFD,
+		       (uintptr_t)pDRIPriv->pDriverInfo->frameBufferPhysicalAddress,
+		       pDRIPriv->pDriverInfo->frameBufferSize,
+		       DRM_FRAME_BUFFER,
+		       0,
+		       &pDRIPriv->pDriverInfo->hFrameBuffer) < 0)
+	    {
+		pDRIPriv->directRenderingSupport = FALSE;
+		dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+		drmUnmap(pDRIPriv->pSAREA, pDRIPriv->pDriverInfo->SAREASize);
+		drmClose(pDRIPriv->drmFD);
+		DRIDrvMsg(pScreen->myNum, X_INFO,
+			  "[drm] drmAddMap failed\n");
+		return FALSE;
+	    }
+	DRIDrvMsg(pScreen->myNum, X_INFO, "[drm] framebuffer handle = %p\n",
+		  pDRIPriv->pDriverInfo->hFrameBuffer);
+    } else {
+	DRIDrvMsg(pScreen->myNum, X_INFO,
+		  "[drm] framebuffer mapped by ddx driver\n");
+    }
+
+    if (pDRIEntPriv->resOwner == NULL) {
+	pDRIEntPriv->resOwner = pScreen;
+
+	/* Add tags for reserved contexts */
+	if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
+						  &reserved_count))) {
+	    int  i;
+	    void *tag;
+
+	    for (i = 0; i < reserved_count; i++) {
+		tag = DRICreateContextPrivFromHandle(pScreen,
+						     reserved[i],
+						     DRI_CONTEXT_RESERVED);
+		drmAddContextTag(pDRIPriv->drmFD, reserved[i], tag);
+	    }
+	    drmFreeReservedContextList(reserved);
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] added %d reserved context%s for kernel\n",
+		      reserved_count, reserved_count > 1 ? "s" : "");
+	}
+    }
+
+    /* validate max drawable table entry set by driver */
+    if ((pDRIPriv->pDriverInfo->maxDrawableTableEntry <= 0) ||
+        (pDRIPriv->pDriverInfo->maxDrawableTableEntry > SAREA_MAX_DRAWABLES)) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "Invalid max drawable table size set by driver: %d\n",
+		      pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+    }
+
+    /* Initialize drawable tables (screen private and SAREA) */
+    for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
+	pDRIPriv->DRIDrawables[i] = NULL;
+	pDRIPriv->pSAREA->drawableTable[i].stamp = 0;
+	pDRIPriv->pSAREA->drawableTable[i].flags = 0;
+    }
+
+    pDRIPriv->pLockRefCount = &pDRIEntPriv->lockRefCount;
+    pDRIPriv->pLockingContext = &pDRIEntPriv->lockingContext;
+
+    if (!pDRIEntPriv->keepFDOpen)
+	pDRIEntPriv->keepFDOpen = pDRIInfo->keepFDOpen;
+
+    pDRIEntPriv->refCount++;
+
+    /* Set up flags for DRICreateContextPriv */
+    switch (pDRIInfo->driverSwapMethod) {
+    case DRI_KERNEL_SWAP:
+	flags = DRI_CONTEXT_2DONLY;
+	break;
+    case DRI_HIDE_X_CONTEXT:
+	flags = DRI_CONTEXT_PRESERVED;
+	break;
+    }
+
+    if (!(pDRIContextPriv = DRICreateContextPriv(pScreen,
+						 &pDRIPriv->myContext,
+						 flags))) {
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
+		  "failed to create server context\n");
+	return FALSE;
+    }
+    pDRIPriv->myContextPriv = pDRIContextPriv;
+
+    DRIDrvMsg(pScreen->myNum, X_INFO,
+	      "X context handle = %p\n", pDRIPriv->myContext);
+
+    /* Now that we have created the X server's context, we can grab the
+     * hardware lock for the X server.
+     */
+    DRILock(pScreen, 0);
+    pDRIPriv->grabbedDRILock = TRUE;
+
+    /* pointers so that we can prevent memory leaks later */
+    pDRIPriv->hiddenContextStore    = NULL;
+    pDRIPriv->partial3DContextStore = NULL;
+
+    switch(pDRIInfo->driverSwapMethod) {
+    case DRI_HIDE_X_CONTEXT:
+	/* Server will handle 3D swaps, and hide 2D swaps from kernel.
+	 * Register server context as a preserved context.
+	 */
+
+	/* allocate memory for hidden context store */
+	pDRIPriv->hiddenContextStore
+	    = (void *)calloc(1, pDRIInfo->contextSize);
+	if (!pDRIPriv->hiddenContextStore) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "failed to allocate hidden context\n");
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return FALSE;
+	}
+
+	/* allocate memory for partial 3D context store */
+	pDRIPriv->partial3DContextStore
+	    = (void *)calloc(1, pDRIInfo->contextSize);
+	if (!pDRIPriv->partial3DContextStore) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "[DRI] failed to allocate partial 3D context\n");
+	    free(pDRIPriv->hiddenContextStore);
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return FALSE;
+	}
+
+	/* save initial context store */
+	if (pDRIInfo->SwapContext) {
+	    (*pDRIInfo->SwapContext)(
+		pScreen,
+		DRI_NO_SYNC,
+		DRI_2D_CONTEXT,
+		pDRIPriv->hiddenContextStore,
+		DRI_NO_CONTEXT,
+		NULL);
+	}
+	/* fall through */
+
+    case DRI_SERVER_SWAP:
+        /* For swap methods of DRI_SERVER_SWAP and DRI_HIDE_X_CONTEXT
+         * setup signal handler for receiving swap requests from kernel
+	 */
+	if (!(pDRIPriv->drmSIGIOHandlerInstalled =
+	      drmInstallSIGIOHandler(pDRIPriv->drmFD, DRISwapContext))) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "[drm] failed to setup DRM signal handler\n");
+	    free(pDRIPriv->hiddenContextStore);
+	    free(pDRIPriv->partial3DContextStore);
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return FALSE;
+	} else {
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] installed DRM signal handler\n");
+	}
+
+    default:
+	break;
+    }
+
+    return TRUE;
+}
+
+Bool
+DRIFinishScreenInit(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr        pDRIInfo = pDRIPriv->pDriverInfo;
+
+    /* Wrap DRI support */
+    if (pDRIInfo->wrap.ValidateTree) {
+	pDRIPriv->wrap.ValidateTree     = pScreen->ValidateTree;
+	pScreen->ValidateTree           = pDRIInfo->wrap.ValidateTree;
+    }
+    if (pDRIInfo->wrap.PostValidateTree) {
+	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
+	pScreen->PostValidateTree       = pDRIInfo->wrap.PostValidateTree;
+    }
+    if (pDRIInfo->wrap.WindowExposures) {
+	pDRIPriv->wrap.WindowExposures  = pScreen->WindowExposures;
+	pScreen->WindowExposures        = pDRIInfo->wrap.WindowExposures;
+    }
+
+    pDRIPriv->DestroyWindow             = pScreen->DestroyWindow;
+    pScreen->DestroyWindow              = DRIDestroyWindow;
+
+    pDRIPriv->xf86_crtc_notify = xf86_wrap_crtc_notify(pScreen,
+						       dri_crtc_notify);
+						       
+    if (pDRIInfo->wrap.CopyWindow) {
+	pDRIPriv->wrap.CopyWindow       = pScreen->CopyWindow;
+	pScreen->CopyWindow             = pDRIInfo->wrap.CopyWindow;
+    }
+    if (pDRIInfo->wrap.ClipNotify) {
+	pDRIPriv->wrap.ClipNotify       = pScreen->ClipNotify;
+	pScreen->ClipNotify             = pDRIInfo->wrap.ClipNotify;
+    }
+    if (pDRIInfo->wrap.AdjustFrame) {
+	ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];
+	pDRIPriv->wrap.AdjustFrame      = pScrn->AdjustFrame;
+	pScrn->AdjustFrame              = pDRIInfo->wrap.AdjustFrame;
+    }
+    pDRIPriv->wrapped = TRUE;
+
+    DRIDrvMsg(pScreen->myNum, X_INFO, "[DRI] installation complete\n");
+
+    return TRUE;
+}
+
+void
+DRICloseScreen(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr       pDRIInfo;
+    drm_context_t *    reserved;
+    int              reserved_count;
+    ScrnInfoPtr      pScrn = xf86Screens[pScreen->myNum];
+    DRIEntPrivPtr    pDRIEntPriv = DRI_ENT_PRIV(pScrn);
+    Bool closeMaster;
+
+    if (pDRIPriv) {
+
+        pDRIInfo = pDRIPriv->pDriverInfo;
+
+	if (pDRIPriv->wrapped) {
+	    /* Unwrap DRI Functions */
+	    if (pDRIInfo->wrap.ValidateTree) {
+		pScreen->ValidateTree           = pDRIPriv->wrap.ValidateTree;
+		pDRIPriv->wrap.ValidateTree     = NULL;
+	    }
+	    if (pDRIInfo->wrap.PostValidateTree) {
+		pScreen->PostValidateTree       = pDRIPriv->wrap.PostValidateTree;
+		pDRIPriv->wrap.PostValidateTree = NULL;
+	    }
+	    if (pDRIInfo->wrap.WindowExposures) {
+		pScreen->WindowExposures        = pDRIPriv->wrap.WindowExposures;
+		pDRIPriv->wrap.WindowExposures  = NULL;
+	    }
+	    if (pDRIPriv->DestroyWindow) {
+		pScreen->DestroyWindow          = pDRIPriv->DestroyWindow;
+		pDRIPriv->DestroyWindow         = NULL;
+	    }
+
+	    xf86_unwrap_crtc_notify(pScreen, pDRIPriv->xf86_crtc_notify);
+
+	    if (pDRIInfo->wrap.CopyWindow) {
+		pScreen->CopyWindow             = pDRIPriv->wrap.CopyWindow;
+		pDRIPriv->wrap.CopyWindow       = NULL;
+	    }
+	    if (pDRIInfo->wrap.ClipNotify) {
+		pScreen->ClipNotify             = pDRIPriv->wrap.ClipNotify;
+		pDRIPriv->wrap.ClipNotify       = NULL;
+	    }
+	    if (pDRIInfo->wrap.AdjustFrame) {
+		ScrnInfoPtr pScrn               = xf86Screens[pScreen->myNum];
+		pScrn->AdjustFrame              = pDRIPriv->wrap.AdjustFrame;
+		pDRIPriv->wrap.AdjustFrame      = NULL;
+	    }
+	    
+	    pDRIPriv->wrapped = FALSE;
+	}
+
+	if (pDRIPriv->drmSIGIOHandlerInstalled) {
+	    if (!drmRemoveSIGIOHandler(pDRIPriv->drmFD)) {
+		DRIDrvMsg(pScreen->myNum, X_ERROR,
+			  "[drm] failed to remove DRM signal handler\n");
+	    }
+	}
+
+        if (pDRIPriv->dummyCtxPriv && pDRIPriv->createDummyCtx) {
+	    DRIDestroyDummyContext(pScreen, pDRIPriv->createDummyCtxPriv);
+	}
+
+	if (!DRIDestroyContextPriv(pDRIPriv->myContextPriv)) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "failed to destroy server context\n");
+	}
+
+				/* Remove tags for reserved contexts */
+	if (pDRIEntPriv->resOwner == pScreen) {
+	    pDRIEntPriv->resOwner = NULL;
+
+	    if ((reserved = drmGetReservedContextList(pDRIPriv->drmFD,
+						  &reserved_count))) {
+		int  i;
+
+		for (i = 0; i < reserved_count; i++) {
+		    DRIDestroyContextPriv(drmGetContextTag(pDRIPriv->drmFD,
+							   reserved[i]));
+		}
+		drmFreeReservedContextList(reserved);
+		DRIDrvMsg(pScreen->myNum, X_INFO,
+			  "[drm] removed %d reserved context%s for kernel\n",
+			  reserved_count, reserved_count > 1 ? "s" : "");
+	    }
+	}
+
+	/* Make sure signals get unblocked etc. */
+	drmUnlock(pDRIPriv->drmFD, pDRIPriv->myContext);
+	pDRIPriv->pLockRefCount = NULL;
+	closeMaster = (--pDRIEntPriv->refCount == 0) &&
+	    !pDRIEntPriv->keepFDOpen;
+	if (closeMaster || pDRIPriv->hSAREA != pDRIEntPriv->hLSAREA) {
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] unmapping %d bytes of SAREA %p at %p\n",
+		      pDRIInfo->SAREASize,
+		      pDRIPriv->hSAREA,
+		      pDRIPriv->pSAREA);
+	    if (drmUnmap(pDRIPriv->pSAREA, pDRIInfo->SAREASize)) {
+		DRIDrvMsg(pScreen->myNum, X_ERROR,
+			  "[drm] unable to unmap %d bytes"
+			  " of SAREA %p at %p\n",
+			  pDRIInfo->SAREASize,
+			  pDRIPriv->hSAREA,
+			  pDRIPriv->pSAREA);
+	    }
+	} else {
+	    pDRIEntPriv->sAreaGrabbed = FALSE;
+	}
+
+	if (closeMaster || (pDRIEntPriv->drmFD != pDRIPriv->drmFD)) {
+	    drmClose(pDRIPriv->drmFD);
+	    if (pDRIEntPriv->drmFD == pDRIPriv->drmFD) {
+		DRIDrvMsg(pScreen->myNum, X_INFO,
+			  "[drm] Closed DRM master.\n");
+		pDRIEntPriv->drmFD = -1;
+	    }
+	}
+
+	free(pDRIPriv);
+	dixSetPrivate(&pScreen->devPrivates, DRIScreenPrivKey, NULL);
+    }
+}
+
+#define DRM_MSG_VERBOSITY 3
+
+static int dri_drm_debug_print(const char *format, va_list ap)
+{
+  xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
+  return 0;
+}
+
+static void dri_drm_get_perms(gid_t *group, mode_t *mode)
+{
+  *group = xf86ConfigDRI.group;
+  *mode = xf86ConfigDRI.mode;
+}
+
+drmServerInfo DRIDRMServerInfo =  {
+  dri_drm_debug_print,
+  xf86LoadKernelModule,
+  dri_drm_get_perms,
+};
+
+Bool
+DRIExtensionInit(void)
+{
+    if (DRIGeneration != serverGeneration) {
+	return FALSE;
+    }
+
+    DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete,
+						   "DRIDrawable");
+    DRIContextPrivResType = CreateNewResourceType(DRIContextPrivDelete,
+						  "DRIContext");
+
+    if (!DRIDrawablePrivResType || !DRIContextPrivResType)
+	return FALSE;
+
+    RegisterBlockAndWakeupHandlers(DRIBlockHandler, DRIWakeupHandler, NULL);
+
+    return TRUE;
+}
+
+void
+DRIReset(void)
+{
+    /*
+     * This stub routine is called when the X Server recycles, resources
+     * allocated by DRIExtensionInit need to be managed here.
+     *
+     * Currently this routine is a stub because all the interesting resources
+     * are managed via the screen init process.
+     */
+}
+
+Bool
+DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv)
+	*isCapable = pDRIPriv->directRenderingSupport;
+    else
+	*isCapable = FALSE;
+
+    return TRUE;
+}
+
+Bool
+DRIOpenConnection(ScreenPtr pScreen, drm_handle_t * hSAREA, char **busIdString)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    *hSAREA           = pDRIPriv->hSAREA;
+    *busIdString      = pDRIPriv->pDriverInfo->busIdString;
+
+    return TRUE;
+}
+
+Bool
+DRIAuthConnection(ScreenPtr pScreen, drm_magic_t magic)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
+    return TRUE;
+}
+
+Bool
+DRICloseConnection(ScreenPtr pScreen)
+{
+    return TRUE;
+}
+
+Bool
+DRIGetClientDriverName(ScreenPtr pScreen,
+                       int *ddxDriverMajorVersion,
+                       int *ddxDriverMinorVersion,
+                       int *ddxDriverPatchVersion,
+                       char **clientDriverName)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    *ddxDriverMajorVersion = pDRIPriv->pDriverInfo->ddxDriverMajorVersion;
+    *ddxDriverMinorVersion = pDRIPriv->pDriverInfo->ddxDriverMinorVersion;
+    *ddxDriverPatchVersion = pDRIPriv->pDriverInfo->ddxDriverPatchVersion;
+    *clientDriverName      = pDRIPriv->pDriverInfo->clientDriverName;
+
+    return TRUE;
+}
+
+/* DRICreateContextPriv and DRICreateContextPrivFromHandle are helper
+   functions that layer on drmCreateContext and drmAddContextTag.
+
+   DRICreateContextPriv always creates a kernel drm_context_t and then calls
+   DRICreateContextPrivFromHandle to create a DRIContextPriv structure for
+   DRI tracking.  For the SIGIO handler, the drm_context_t is associated with
+   DRIContextPrivPtr.  Any special flags are stored in the DRIContextPriv
+   area and are passed to the kernel (if necessary).
+
+   DRICreateContextPriv returns a pointer to newly allocated
+   DRIContextPriv, and returns the kernel drm_context_t in pHWContext. */
+
+DRIContextPrivPtr
+DRICreateContextPriv(ScreenPtr pScreen,
+		     drm_context_t * pHWContext,
+		     DRIContextFlags flags)
+{
+    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (drmCreateContext(pDRIPriv->drmFD, pHWContext)) {
+	return NULL;
+    }
+
+    return DRICreateContextPrivFromHandle(pScreen, *pHWContext, flags);
+}
+
+DRIContextPrivPtr
+DRICreateContextPrivFromHandle(ScreenPtr pScreen,
+			       drm_context_t hHWContext,
+			       DRIContextFlags flags)
+{
+    DRIScreenPrivPtr  pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIContextPrivPtr pDRIContextPriv;
+    int 	      contextPrivSize;
+
+    contextPrivSize = sizeof(DRIContextPrivRec) +
+			    pDRIPriv->pDriverInfo->contextSize;
+    if (!(pDRIContextPriv = calloc(1, contextPrivSize))) {
+	return NULL;
+    }
+    pDRIContextPriv->pContextStore = (void *)(pDRIContextPriv + 1);
+
+    drmAddContextTag(pDRIPriv->drmFD, hHWContext, pDRIContextPriv);
+
+    pDRIContextPriv->hwContext = hHWContext;
+    pDRIContextPriv->pScreen   = pScreen;
+    pDRIContextPriv->flags     = flags;
+    pDRIContextPriv->valid3D   = FALSE;
+
+    if (flags & DRI_CONTEXT_2DONLY) {
+	if (drmSetContextFlags(pDRIPriv->drmFD,
+			       hHWContext,
+			       DRM_CONTEXT_2DONLY)) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "[drm] failed to set 2D context flag\n");
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return NULL;
+	}
+    }
+    if (flags & DRI_CONTEXT_PRESERVED) {
+	if (drmSetContextFlags(pDRIPriv->drmFD,
+			       hHWContext,
+			       DRM_CONTEXT_PRESERVED)) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "[drm] failed to set preserved flag\n");
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return NULL;
+	}
+    }
+    return pDRIContextPriv;
+}
+
+Bool
+DRIDestroyContextPriv(DRIContextPrivPtr pDRIContextPriv)
+{
+    DRIScreenPrivPtr pDRIPriv;
+
+    if (!pDRIContextPriv) return TRUE;
+
+    pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);
+
+    if (!(pDRIContextPriv->flags & DRI_CONTEXT_RESERVED)) {
+				/* Don't delete reserved contexts from
+                                   kernel area -- the kernel manages its
+                                   reserved contexts itself. */
+	if (drmDestroyContext(pDRIPriv->drmFD, pDRIContextPriv->hwContext))
+	    return FALSE;
+    }
+
+				/* Remove the tag last to prevent a race
+                                   condition where the context has pending
+                                   buffers.  The context can't be re-used
+                                   while in this thread, but buffers can be
+                                   dispatched asynchronously. */
+    drmDelContextTag(pDRIPriv->drmFD, pDRIContextPriv->hwContext);
+    free(pDRIContextPriv);
+    return TRUE;
+}
+
+static Bool
+DRICreateDummyContext(ScreenPtr pScreen, Bool needCtxPriv)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIContextPrivPtr pDRIContextPriv;
+    void *contextStore;
+
+    if (!(pDRIContextPriv =
+	  DRICreateContextPriv(pScreen,
+			       &pDRIPriv->pSAREA->dummy_context, 0))) {
+	return FALSE;
+    }
+
+    contextStore = DRIGetContextStore(pDRIContextPriv);
+    if (pDRIPriv->pDriverInfo->CreateContext && needCtxPriv) {
+	if (!pDRIPriv->pDriverInfo->CreateContext(pScreen, NULL,
+						  pDRIPriv->pSAREA->dummy_context,
+						  NULL,
+						  (DRIContextType)(long)contextStore)) {
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return FALSE;
+	}
+    }
+
+    pDRIPriv->dummyCtxPriv = pDRIContextPriv;
+    return TRUE;
+}
+
+static void
+DRIDestroyDummyContext(ScreenPtr pScreen, Bool hasCtxPriv)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIContextPrivPtr pDRIContextPriv = pDRIPriv->dummyCtxPriv;
+    void *contextStore;
+
+    if (!pDRIContextPriv) return;
+    if (pDRIPriv->pDriverInfo->DestroyContext && hasCtxPriv) {
+	contextStore = DRIGetContextStore(pDRIContextPriv);
+	pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
+					      pDRIContextPriv->hwContext,
+					      (DRIContextType)(long)contextStore);
+    }
+
+    DRIDestroyContextPriv(pDRIPriv->dummyCtxPriv);
+    pDRIPriv->dummyCtxPriv = NULL;
+}
+
+Bool
+DRICreateContext(ScreenPtr pScreen, VisualPtr visual,
+                 XID context, drm_context_t * pHWContext)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIContextPrivPtr pDRIContextPriv;
+    void *contextStore;
+
+    if (pDRIPriv->createDummyCtx && !pDRIPriv->dummyCtxPriv) {
+        if (!DRICreateDummyContext(pScreen, pDRIPriv->createDummyCtxPriv)) {
+	    DRIDrvMsg(pScreen->myNum, X_INFO,
+		      "[drm] Could not create dummy context\n");
+	    return FALSE;
+	}
+    }
+
+    if (!(pDRIContextPriv = DRICreateContextPriv(pScreen, pHWContext, 0))) {
+	return FALSE;
+    }
+
+    contextStore = DRIGetContextStore(pDRIContextPriv);
+    if (pDRIPriv->pDriverInfo->CreateContext) {
+	if (!((*pDRIPriv->pDriverInfo->CreateContext)(pScreen, NULL,
+		*pHWContext, NULL,
+		(DRIContextType)(long)contextStore))) {
+	    DRIDestroyContextPriv(pDRIContextPriv);
+	    return FALSE;
+	}
+    }
+
+    /* track this in case the client dies before cleanup */
+    AddResource(context, DRIContextPrivResType, (pointer)pDRIContextPriv);
+
+    return TRUE;
+}
+
+Bool
+DRIDestroyContext(ScreenPtr pScreen, XID context)
+{
+    FreeResourceByType(context, DRIContextPrivResType, FALSE);
+
+    return TRUE;
+}
+
+/* DRIContextPrivDelete is called by the resource manager. */
+Bool
+DRIContextPrivDelete(pointer pResource, XID id)
+{
+    DRIContextPrivPtr pDRIContextPriv = (DRIContextPrivPtr)pResource;
+    DRIScreenPrivPtr pDRIPriv;
+    void *contextStore;
+
+    pDRIPriv = DRI_SCREEN_PRIV(pDRIContextPriv->pScreen);
+    if (pDRIPriv->pDriverInfo->DestroyContext) {
+      contextStore = DRIGetContextStore(pDRIContextPriv);
+      pDRIPriv->pDriverInfo->DestroyContext(pDRIContextPriv->pScreen,
+					    pDRIContextPriv->hwContext,
+					    (DRIContextType)(long)contextStore);
+    }
+    return DRIDestroyContextPriv(pDRIContextPriv);
+}
+
+
+/* This walks the drawable timestamp array and invalidates all of them
+ * in the case of transition from private to shared backbuffers.  It's
+ * not necessary for correctness, because DRIClipNotify gets called in
+ * time to prevent any conflict, but the transition from
+ * shared->private is sometimes missed if we don't do this.
+ */
+static void
+DRIClipNotifyAllDrawables(ScreenPtr pScreen)
+{
+   int i;
+   DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+   for( i=0; i < pDRIPriv->pDriverInfo->maxDrawableTableEntry; i++) {
+      pDRIPriv->pSAREA->drawableTable[i].stamp = DRIDrawableValidationStamp++;
+   }
+}
+
+
+static void
+DRITransitionToSharedBuffers(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+    DRIClipNotifyAllDrawables( pScreen );
+
+    if (pDRIInfo->TransitionSingleToMulti3D)
+	pDRIInfo->TransitionSingleToMulti3D( pScreen );
+}
+
+
+static void
+DRITransitionToPrivateBuffers(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+    DRIClipNotifyAllDrawables( pScreen );
+
+    if (pDRIInfo->TransitionMultiToSingle3D)
+	pDRIInfo->TransitionMultiToSingle3D( pScreen );
+}
+
+
+static void
+DRITransitionTo3d(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+    DRIClipNotifyAllDrawables( pScreen );
+
+    if (pDRIInfo->TransitionTo3d)
+	pDRIInfo->TransitionTo3d( pScreen );
+}
+
+static void
+DRITransitionTo2d(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+    DRIClipNotifyAllDrawables( pScreen );
+
+    if (pDRIInfo->TransitionTo2d)
+	pDRIInfo->TransitionTo2d( pScreen );
+}
+
+
+static int
+DRIDCNTreeTraversal(WindowPtr pWin, pointer data)
+{
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+    if (pDRIDrawablePriv) {
+	ScreenPtr pScreen = pWin->drawable.pScreen;
+	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+	if (RegionNumRects(&pWin->clipList) > 0) {
+	    WindowPtr *pDRIWindows = (WindowPtr*)data;
+	    int i = 0;
+
+	    while (pDRIWindows[i])
+		i++;
+
+	    pDRIWindows[i] = pWin;
+
+	    pDRIPriv->nrWalked++;
+	}
+
+	if (pDRIPriv->nrWindows == pDRIPriv->nrWalked)
+	    return WT_STOPWALKING;
+    }
+
+    return WT_WALKCHILDREN;
+}
+
+static void
+DRIDriverClipNotify(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv->pDriverInfo->ClipNotify) {
+	WindowPtr *pDRIWindows = calloc(sizeof(WindowPtr), pDRIPriv->nrWindows);
+	DRIInfoPtr pDRIInfo = pDRIPriv->pDriverInfo;
+
+	if (pDRIPriv->nrWindows > 0) {
+	    pDRIPriv->nrWalked = 0;
+	    TraverseTree(pScreen->root, DRIDCNTreeTraversal,
+			 (pointer)pDRIWindows);
+	}
+
+	pDRIInfo->ClipNotify(pScreen, pDRIWindows, pDRIPriv->nrWindows);
+
+	free(pDRIWindows);
+    }
+}
+
+static void
+DRIIncreaseNumberVisible(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    switch (++pDRIPriv->nrWindowsVisible) {
+    case 1:
+	DRITransitionTo3d( pScreen );
+	break;
+    case 2:
+	DRITransitionToSharedBuffers( pScreen );
+	break;
+    default:
+	break;
+    }
+
+    DRIDriverClipNotify(pScreen);
+}
+
+static void
+DRIDecreaseNumberVisible(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    switch (--pDRIPriv->nrWindowsVisible) {
+    case 0:
+	DRITransitionTo2d( pScreen );
+	break;
+    case 1:
+	DRITransitionToPrivateBuffers( pScreen );
+	break;
+    default:
+	break;
+    }
+
+    DRIDriverClipNotify(pScreen);
+}
+
+Bool
+DRICreateDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable,
+		  drm_drawable_t * hHWDrawable)
+{
+    DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr	pDRIDrawablePriv;
+    WindowPtr		pWin;
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr)pDrawable;
+	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+	    pDRIDrawablePriv->refCount++;
+
+	    if (!pDRIDrawablePriv->hwDrawable) {
+		drmCreateDrawable(pDRIPriv->drmFD, &pDRIDrawablePriv->hwDrawable);
+	    }
+	}
+	else {
+	    /* allocate a DRI Window Private record */
+	    if (!(pDRIDrawablePriv = malloc(sizeof(DRIDrawablePrivRec)))) {
+		return FALSE;
+	    }
+
+	    /* Only create a drm_drawable_t once */
+	    if (drmCreateDrawable(pDRIPriv->drmFD,
+				  &pDRIDrawablePriv->hwDrawable)) {
+		free(pDRIDrawablePriv);
+		return FALSE;
+	    }
+
+	    /* add it to the list of DRI drawables for this screen */
+	    pDRIDrawablePriv->pScreen = pScreen;
+	    pDRIDrawablePriv->refCount = 1;
+	    pDRIDrawablePriv->drawableIndex = -1;
+	    pDRIDrawablePriv->nrects = RegionNumRects(&pWin->clipList);
+
+	    /* save private off of preallocated index */
+	    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey,
+			  pDRIDrawablePriv);
+	    pDRIPriv->nrWindows++;
+
+	    if (pDRIDrawablePriv->nrects)
+		DRIIncreaseNumberVisible(pScreen);
+	}
+
+	/* track this in case the client dies */
+	AddResource(FakeClientID(client->index), DRIDrawablePrivResType,
+		    (pointer)(intptr_t)pDrawable->id);
+
+	if (pDRIDrawablePriv->hwDrawable) {
+	    drmUpdateDrawableInfo(pDRIPriv->drmFD,
+				  pDRIDrawablePriv->hwDrawable,
+				  DRM_DRAWABLE_CLIPRECTS,
+				  RegionNumRects(&pWin->clipList),
+				  RegionRects(&pWin->clipList));
+	    *hHWDrawable = pDRIDrawablePriv->hwDrawable;
+	}
+    }
+    else if (pDrawable->type != DRAWABLE_PIXMAP) { /* PBuffer */
+	/* NOT_DONE */
+	return FALSE;
+    }
+
+    return TRUE;
+}
+
+static void
+DRIDrawablePrivDestroy(WindowPtr pWin)
+{
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+    ScreenPtr pScreen;
+    DRIScreenPrivPtr pDRIPriv;
+
+    if (!pDRIDrawablePriv)
+	return;
+
+    pScreen = pWin->drawable.pScreen;
+    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIDrawablePriv->drawableIndex != -1) {
+	/* bump stamp to force outstanding 3D requests to resync */
+	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
+	    = DRIDrawableValidationStamp++;
+
+	/* release drawable table entry */
+	pDRIPriv->DRIDrawables[pDRIDrawablePriv->drawableIndex] = NULL;
+    }
+
+    pDRIPriv->nrWindows--;
+
+    if (pDRIDrawablePriv->nrects)
+	DRIDecreaseNumberVisible(pScreen);
+
+    drmDestroyDrawable(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable);
+
+    free(pDRIDrawablePriv);
+    dixSetPrivate(&pWin->devPrivates, DRIWindowPrivKey, NULL);
+}
+
+static Bool
+DRIDestroyDrawableCB(pointer value, XID id, pointer data)
+{
+    if (value == data) {
+	/* This calls back DRIDrawablePrivDelete which frees private area */
+	FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
+
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+Bool
+DRIDestroyDrawable(ScreenPtr pScreen, ClientPtr client, DrawablePtr pDrawable)
+{
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+	LookupClientResourceComplex(client, DRIDrawablePrivResType,
+				    DRIDestroyDrawableCB,
+				    (pointer)(intptr_t)pDrawable->id);
+    }
+    else { /* pixmap (or for GLX 1.3, a PBuffer) */
+	/* NOT_DONE */
+	return FALSE;
+    }
+
+    return TRUE;
+}
+
+Bool
+DRIDrawablePrivDelete(pointer pResource, XID id)
+{
+    WindowPtr pWin;
+    int rc;
+
+    /* For DRIDrawablePrivResType, the XID is the client's fake ID. The
+     * important XID is the value in pResource. */
+    id = (XID)(intptr_t)pResource;
+    rc = dixLookupWindow(&pWin, id, serverClient, DixGetAttrAccess);
+
+    if (rc == Success) {
+	DRIDrawablePrivPtr pDRIDrwPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+	if (!pDRIDrwPriv)
+	    return FALSE;
+
+	if (--pDRIDrwPriv->refCount == 0)
+	    DRIDrawablePrivDestroy(pWin);
+
+	return TRUE;
+    }
+    else { /* pixmap (or for GLX 1.3, a PBuffer) */
+	/* NOT_DONE */
+	return FALSE;
+    }
+}
+
+Bool
+DRIGetDrawableInfo(ScreenPtr pScreen,
+                   DrawablePtr pDrawable,
+                   unsigned int* index,
+                   unsigned int* stamp,
+                   int* X,
+                   int* Y,
+                   int* W,
+                   int* H,
+                   int* numClipRects,
+                   drm_clip_rect_t ** pClipRects,
+                   int* backX,
+                   int* backY,
+                   int* numBackClipRects,
+                   drm_clip_rect_t ** pBackClipRects)
+{
+    DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;
+    WindowPtr		pWin, pOldWin;
+    int			i;
+
+#if 0
+    printf("maxDrawableTableEntry = %d\n", pDRIPriv->pDriverInfo->maxDrawableTableEntry);
+#endif
+
+    if (pDrawable->type == DRAWABLE_WINDOW) {
+	pWin = (WindowPtr)pDrawable;
+	if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+
+	    /* Manage drawable table */
+	    if (pDRIDrawablePriv->drawableIndex == -1) { /* load SAREA table */
+
+		/* Search table for empty entry */
+		i = 0;
+		while (i < pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
+		    if (!(pDRIPriv->DRIDrawables[i])) {
+			pDRIPriv->DRIDrawables[i] = pDrawable;
+			pDRIDrawablePriv->drawableIndex = i;
+			pDRIPriv->pSAREA->drawableTable[i].stamp =
+					    DRIDrawableValidationStamp++;
+			break;
+		    }
+		    i++;
+		}
+
+		/* Search table for oldest entry */
+		if (i == pDRIPriv->pDriverInfo->maxDrawableTableEntry) {
+                    unsigned int oldestStamp = ~0;
+                    int oldestIndex = 0;
+		    i = pDRIPriv->pDriverInfo->maxDrawableTableEntry;
+		    while (i--) {
+			if (pDRIPriv->pSAREA->drawableTable[i].stamp <
+								oldestStamp) {
+			    oldestIndex = i;
+			    oldestStamp =
+				pDRIPriv->pSAREA->drawableTable[i].stamp;
+			}
+		    }
+		    pDRIDrawablePriv->drawableIndex = oldestIndex;
+
+		    /* release oldest drawable table entry */
+		    pOldWin = (WindowPtr)pDRIPriv->DRIDrawables[oldestIndex];
+		    pOldDrawPriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pOldWin);
+		    pOldDrawPriv->drawableIndex = -1;
+
+		    /* claim drawable table entry */
+		    pDRIPriv->DRIDrawables[oldestIndex] = pDrawable;
+
+		    /* validate SAREA entry */
+		    pDRIPriv->pSAREA->drawableTable[oldestIndex].stamp =
+					DRIDrawableValidationStamp++;
+
+		    /* check for stamp wrap around */
+		    if (oldestStamp > DRIDrawableValidationStamp) {
+
+			/* walk SAREA table and invalidate all drawables */
+			for( i=0;
+                             i < pDRIPriv->pDriverInfo->maxDrawableTableEntry;
+                             i++) {
+				pDRIPriv->pSAREA->drawableTable[i].stamp =
+					DRIDrawableValidationStamp++;
+			}
+		    }
+		}
+
+		/* If the driver wants to be notified when the index is
+		 * set for a drawable, let it know now.
+		 */
+		if (pDRIPriv->pDriverInfo->SetDrawableIndex)
+			pDRIPriv->pDriverInfo->SetDrawableIndex(pWin,
+				pDRIDrawablePriv->drawableIndex);
+
+		/* reinit drawable ID if window is visible */
+		if ((pWin->viewable) &&
+		    (pDRIPriv->pDriverInfo->bufferRequests != DRI_NO_WINDOWS))
+		{
+		    (*pDRIPriv->pDriverInfo->InitBuffers)(pWin,
+			    &pWin->clipList, pDRIDrawablePriv->drawableIndex);
+		}
+	    }
+
+	    *index = pDRIDrawablePriv->drawableIndex;
+	    *stamp = pDRIPriv->pSAREA->drawableTable[*index].stamp;
+	    *X = (int)(pWin->drawable.x);
+	    *Y = (int)(pWin->drawable.y);
+	    *W = (int)(pWin->drawable.width);
+	    *H = (int)(pWin->drawable.height);
+	    *numClipRects = RegionNumRects(&pWin->clipList);
+	    *pClipRects = (drm_clip_rect_t *)RegionRects(&pWin->clipList);
+
+	    if (!*numClipRects && pDRIPriv->fullscreen) {
+				/* use fake full-screen clip rect */
+		pDRIPriv->fullscreen_rect.x1 = *X;
+		pDRIPriv->fullscreen_rect.y1 = *Y;
+		pDRIPriv->fullscreen_rect.x2 = *X + *W;
+		pDRIPriv->fullscreen_rect.y2 = *Y + *H;
+
+		*numClipRects = 1;
+		*pClipRects   = &pDRIPriv->fullscreen_rect;
+	    }
+
+	    *backX = *X;
+	    *backY = *Y;
+
+	    if (pDRIPriv->nrWindowsVisible == 1 && *numClipRects) {
+	       /* Use a single cliprect. */
+
+	       int x0 = *X;
+	       int y0 = *Y;
+	       int x1 = x0 + *W;
+	       int y1 = y0 + *H;
+
+	       if (x0 < 0) x0 = 0;
+	       if (y0 < 0) y0 = 0;
+	       if (x1 > pScreen->width) x1 = pScreen->width;
+	       if (y1 > pScreen->height) y1 = pScreen->height;
+
+	       if (y0 >= y1 || x0 >= x1) {
+		    *numBackClipRects = 0;
+		    *pBackClipRects = NULL;
+	       } else {
+		    pDRIPriv->private_buffer_rect.x1 = x0;
+		    pDRIPriv->private_buffer_rect.y1 = y0;
+		    pDRIPriv->private_buffer_rect.x2 = x1;
+		    pDRIPriv->private_buffer_rect.y2 = y1;
+
+		    *numBackClipRects = 1;
+		    *pBackClipRects = &(pDRIPriv->private_buffer_rect);
+	       }
+	    } else {
+	       /* Use the frontbuffer cliprects for back buffers.  */
+	       *numBackClipRects = 0;
+	       *pBackClipRects = 0;
+	    }
+	}
+	else {
+	    /* Not a DRIDrawable */
+	    return FALSE;
+	}
+    }
+    else { /* pixmap (or for GLX 1.3, a PBuffer) */
+	/* NOT_DONE */
+	return FALSE;
+    }
+
+    return TRUE;
+}
+
+Bool
+DRIGetDeviceInfo(ScreenPtr pScreen,
+                 drm_handle_t * hFrameBuffer,
+                 int* fbOrigin,
+                 int* fbSize,
+                 int* fbStride,
+                 int* devPrivateSize,
+                 void** pDevPrivate)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    *hFrameBuffer = pDRIPriv->pDriverInfo->hFrameBuffer;
+    *fbOrigin = 0;
+    *fbSize = pDRIPriv->pDriverInfo->frameBufferSize;
+    *fbStride = pDRIPriv->pDriverInfo->frameBufferStride;
+    *devPrivateSize = pDRIPriv->pDriverInfo->devPrivateSize;
+    *pDevPrivate = pDRIPriv->pDriverInfo->devPrivate;
+
+    return TRUE;
+}
+
+DRIInfoPtr
+DRICreateInfoRec(void)
+{
+    DRIInfoPtr inforec = (DRIInfoPtr)calloc(1, sizeof(DRIInfoRec));
+    if (!inforec) return NULL;
+
+    /* Initialize defaults */
+    inforec->busIdString = NULL;
+
+    /* Wrapped function defaults */
+    inforec->wrap.WakeupHandler         = DRIDoWakeupHandler;
+    inforec->wrap.BlockHandler          = DRIDoBlockHandler;
+    inforec->wrap.WindowExposures       = DRIWindowExposures;
+    inforec->wrap.CopyWindow            = DRICopyWindow;
+    inforec->wrap.ValidateTree          = DRIValidateTree;
+    inforec->wrap.PostValidateTree      = DRIPostValidateTree;
+    inforec->wrap.ClipNotify            = DRIClipNotify;
+    inforec->wrap.AdjustFrame           = DRIAdjustFrame;
+
+    inforec->TransitionTo2d = 0;
+    inforec->TransitionTo3d = 0;
+    inforec->SetDrawableIndex = 0;
+
+    return inforec;
+}
+
+void
+DRIDestroyInfoRec(DRIInfoPtr DRIInfo)
+{
+    free(DRIInfo->busIdString);
+    free((char*)DRIInfo);
+}
+
+
+void
+DRIWakeupHandler(pointer wakeupData, int result, pointer pReadmask)
+{
+    int i;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	ScreenPtr        pScreen  = screenInfo.screens[i];
+	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+	if (pDRIPriv &&
+	    pDRIPriv->pDriverInfo->wrap.WakeupHandler)
+	    (*pDRIPriv->pDriverInfo->wrap.WakeupHandler)(i, wakeupData,
+							 result, pReadmask);
+    }
+}
+
+void
+DRIBlockHandler(pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+{
+    int i;
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	ScreenPtr        pScreen  = screenInfo.screens[i];
+	DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+	if (pDRIPriv &&
+	    pDRIPriv->pDriverInfo->wrap.BlockHandler)
+	    (*pDRIPriv->pDriverInfo->wrap.BlockHandler)(i, blockData,
+							pTimeout, pReadmask);
+    }
+}
+
+void
+DRIDoWakeupHandler(int screenNum, pointer wakeupData,
+                   unsigned long result, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[screenNum];
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    DRILock(pScreen, 0);
+    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
+	/* hide X context by swapping 2D component here */
+	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+					      DRI_3D_SYNC,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->partial3DContextStore,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->hiddenContextStore);
+    }
+}
+
+void
+DRIDoBlockHandler(int screenNum, pointer blockData,
+                  pointer pTimeout, pointer pReadmask)
+{
+    ScreenPtr pScreen = screenInfo.screens[screenNum];
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
+	/* hide X context by swapping 2D component here */
+	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+					      DRI_2D_SYNC,
+					      DRI_NO_CONTEXT,
+					      NULL,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->partial3DContextStore);
+    }
+
+    if (pDRIPriv->windowsTouched)
+        DRM_SPINUNLOCK(&pDRIPriv->pSAREA->drawable_lock, 1);
+    pDRIPriv->windowsTouched = FALSE;
+
+    DRIUnlock(pScreen);
+}
+
+void
+DRISwapContext(int drmFD, void *oldctx, void *newctx)
+{
+    DRIContextPrivPtr oldContext      = (DRIContextPrivPtr)oldctx;
+    DRIContextPrivPtr newContext      = (DRIContextPrivPtr)newctx;
+    ScreenPtr         pScreen         = newContext->pScreen;
+    DRIScreenPrivPtr  pDRIPriv        = DRI_SCREEN_PRIV(pScreen);
+    void*             oldContextStore = NULL;
+    DRIContextType    oldContextType;
+    void*             newContextStore = NULL;
+    DRIContextType    newContextType;
+    DRISyncType       syncType;
+#ifdef DEBUG
+    static int        count = 0;
+
+    if (!newContext) {
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
+		  "[DRI] Context Switch Error: oldContext=%x, newContext=%x\n",
+		  oldContext, newContext);
+	return;
+    }
+
+    /* usefull for debugging, just print out after n context switches */
+    if (!count || !(count % 1)) {
+	DRIDrvMsg(pScreen->myNum, X_INFO,
+		  "[DRI] Context switch %5d from %p/0x%08x (%d)\n",
+		  count,
+		  oldContext,
+		  oldContext ? oldContext->flags : 0,
+		  oldContext ? oldContext->hwContext : -1);
+	DRIDrvMsg(pScreen->myNum, X_INFO,
+		  "[DRI] Context switch %5d to   %p/0x%08x (%d)\n",
+		  count,
+		  newContext,
+		  newContext ? newContext->flags : 0,
+		  newContext ? newContext->hwContext : -1);
+    }
+    ++count;
+#endif
+
+    if (!pDRIPriv->pDriverInfo->SwapContext) {
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
+		  "[DRI] DDX driver missing context swap call back\n");
+	return;
+    }
+
+    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
+
+        /* only 3D contexts are swapped in this case */
+	if (oldContext) {
+	    oldContextStore     = DRIGetContextStore(oldContext);
+	    oldContext->valid3D = TRUE;
+	    oldContextType      = DRI_3D_CONTEXT;
+	} else {
+	    oldContextType      = DRI_NO_CONTEXT;
+	}
+	newContextStore = DRIGetContextStore(newContext);
+	if ((newContext->valid3D) &&
+	  (newContext->hwContext != pDRIPriv->myContext)) {
+	    newContextType = DRI_3D_CONTEXT;
+	}
+	else {
+	    newContextType = DRI_2D_CONTEXT;
+	}
+	syncType = DRI_3D_SYNC;
+    }
+    else /* default: driverSwapMethod == DRI_SERVER_SWAP */ {
+
+        /* optimize 2D context swaps */
+
+	if (newContext->flags & DRI_CONTEXT_2DONLY) {
+	    /* go from 3D context to 2D context and only save 2D
+             * subset of 3D state
+             */
+	    oldContextStore = DRIGetContextStore(oldContext);
+	    oldContextType = DRI_2D_CONTEXT;
+	    newContextStore = DRIGetContextStore(newContext);
+	    newContextType = DRI_2D_CONTEXT;
+	    syncType = DRI_3D_SYNC;
+	    pDRIPriv->lastPartial3DContext = oldContext;
+	}
+	else if (oldContext->flags & DRI_CONTEXT_2DONLY) {
+	    if (pDRIPriv->lastPartial3DContext == newContext) {
+		/* go from 2D context back to previous 3D context and
+		 * only restore 2D subset of previous 3D state
+		 */
+		oldContextStore = DRIGetContextStore(oldContext);
+		oldContextType = DRI_2D_CONTEXT;
+		newContextStore = DRIGetContextStore(newContext);
+		newContextType = DRI_2D_CONTEXT;
+		syncType = DRI_2D_SYNC;
+	    }
+	    else {
+		/* go from 2D context to a different 3D context */
+
+		/* call DDX driver to do partial restore */
+		oldContextStore = DRIGetContextStore(oldContext);
+		newContextStore =
+			DRIGetContextStore(pDRIPriv->lastPartial3DContext);
+		(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+						      DRI_2D_SYNC,
+						      DRI_2D_CONTEXT,
+						      oldContextStore,
+						      DRI_2D_CONTEXT,
+						      newContextStore);
+
+		/* now setup for a complete 3D swap */
+		oldContextStore = newContextStore;
+		oldContext->valid3D = TRUE;
+		oldContextType = DRI_3D_CONTEXT;
+		newContextStore = DRIGetContextStore(newContext);
+		if ((newContext->valid3D) &&
+		  (newContext->hwContext != pDRIPriv->myContext)) {
+		    newContextType = DRI_3D_CONTEXT;
+		}
+		else {
+		    newContextType = DRI_2D_CONTEXT;
+		}
+		syncType = DRI_NO_SYNC;
+	    }
+	}
+	else {
+	    /* now setup for a complete 3D swap */
+	    oldContextStore = newContextStore;
+	    oldContext->valid3D = TRUE;
+	    oldContextType = DRI_3D_CONTEXT;
+	    newContextStore = DRIGetContextStore(newContext);
+	    if ((newContext->valid3D) &&
+	      (newContext->hwContext != pDRIPriv->myContext)) {
+		newContextType = DRI_3D_CONTEXT;
+	    }
+	    else {
+		newContextType = DRI_2D_CONTEXT;
+	    }
+	    syncType = DRI_3D_SYNC;
+	}
+    }
+
+    /* call DDX driver to perform the swap */
+    (*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+					  syncType,
+					  oldContextType,
+					  oldContextStore,
+					  newContextType,
+					  newContextStore);
+}
+
+void*
+DRIGetContextStore(DRIContextPrivPtr context)
+{
+    return((void *)context->pContextStore);
+}
+
+void
+DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+    if(pDRIDrawablePriv) {
+         (*pDRIPriv->pDriverInfo->InitBuffers)(pWin, prgn,
+                                               pDRIDrawablePriv->drawableIndex);
+    }
+
+    /* call lower wrapped functions */
+    if (pDRIPriv && pDRIPriv->wrap.WindowExposures) {
+
+	/* unwrap */
+	pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
+
+	/* call lower layers */
+	(*pScreen->WindowExposures)(pWin, prgn, bsreg);
+
+	/* rewrap */
+	pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
+	pScreen->WindowExposures = DRIWindowExposures;
+    }
+}
+
+
+static int
+DRITreeTraversal(WindowPtr pWin, pointer data)
+{
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+
+    if(pDRIDrawablePriv) {
+        ScreenPtr pScreen = pWin->drawable.pScreen;
+        DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+	if(RegionNumRects(&(pWin->clipList)) > 0) {
+	   RegionPtr reg = (RegionPtr)data;
+
+	   RegionUnion(reg, reg, &(pWin->clipList));
+	   pDRIPriv->nrWalked++;
+	}
+
+	if(pDRIPriv->nrWindows == pDRIPriv->nrWalked)
+	   return WT_STOPWALKING;
+    }
+    return WT_WALKCHILDREN;
+}
+
+Bool
+DRIDestroyWindow(WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    Bool retval = TRUE;
+
+    DRIDrawablePrivDestroy(pWin);
+
+    /* call lower wrapped functions */
+    if(pDRIPriv->DestroyWindow) {
+	/* unwrap */
+	pScreen->DestroyWindow = pDRIPriv->DestroyWindow;
+
+	/* call lower layers */
+	retval = (*pScreen->DestroyWindow)(pWin);
+
+	/* rewrap */
+	pDRIPriv->DestroyWindow = pScreen->DestroyWindow;
+	pScreen->DestroyWindow = DRIDestroyWindow;
+    }
+
+    return retval;
+}
+
+void
+DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if(!pDRIPriv) return;
+
+    if(pDRIPriv->nrWindowsVisible > 0) {
+       RegionRec reg;
+
+       RegionNull(&reg);
+       pDRIPriv->nrWalked = 0;
+       TraverseTree(pWin, DRITreeTraversal, (pointer)(&reg));
+
+       if(RegionNotEmpty(&reg)) {
+           RegionTranslate(&reg, ptOldOrg.x - pWin->drawable.x,
+                                        ptOldOrg.y - pWin->drawable.y);
+           RegionIntersect(&reg, &reg, prgnSrc);
+
+           /* The MoveBuffers interface is not ideal */
+           (*pDRIPriv->pDriverInfo->MoveBuffers)(pWin, ptOldOrg, &reg,
+				pDRIPriv->pDriverInfo->ddxDrawableTableEntry);
+       }
+
+       RegionUninit(&reg);
+    }
+
+    /* call lower wrapped functions */
+    if(pDRIPriv->wrap.CopyWindow) {
+	/* unwrap */
+	pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
+
+	/* call lower layers */
+	(*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
+
+	/* rewrap */
+	pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
+	pScreen->CopyWindow = DRICopyWindow;
+    }
+}
+
+static void
+DRIGetSecs(long *secs, long *usecs)
+{
+    struct timeval tv;
+
+    gettimeofday(&tv, NULL);
+
+    *secs  = tv.tv_sec;
+    *usecs = tv.tv_usec;
+}
+
+static unsigned long
+DRIComputeMilliSeconds(unsigned long s_secs, unsigned long s_usecs,
+		       unsigned long f_secs, unsigned long f_usecs)
+{
+    if (f_usecs < s_usecs) {
+	--f_secs;
+	f_usecs += 1000000;
+    }
+    return (f_secs - s_secs) * 1000 + (f_usecs - s_usecs) / 1000;
+}
+
+static void
+DRISpinLockTimeout(drmLock *lock, int val, unsigned long timeout /* in mS */)
+{
+    int  count = 10000;
+#if !defined(__alpha__) && !defined(__powerpc__)
+    char ret;
+#else
+    int ret;
+#endif
+    long s_secs, s_usecs;
+    long f_secs, f_usecs;
+    long msecs;
+    long prev  = 0;
+
+    DRIGetSecs(&s_secs, &s_usecs);
+
+    do {
+	DRM_SPINLOCK_COUNT(lock, val, count, ret);
+	if (!ret) return;	/* Got lock */
+	DRIGetSecs(&f_secs, &f_usecs);
+	msecs = DRIComputeMilliSeconds(s_secs, s_usecs, f_secs, f_usecs);
+	if (msecs - prev < 250) count *= 2; /* Not more than 0.5S */
+    } while (msecs < timeout);
+
+				/* Didn't get lock, so take it.  The worst
+                                   that can happen is that there is some
+                                   garbage written to the wrong part of the
+                                   framebuffer that a refresh will repair.
+                                   That's undesirable, but better than
+                                   locking the server.  This should be a
+                                   very rare event. */
+    DRM_SPINLOCK_TAKE(lock, val);
+}
+
+static void
+DRILockTree(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if(!pDRIPriv) return;
+
+    /* Restore the last known 3D context if the X context is hidden */
+    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
+	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+					      DRI_2D_SYNC,
+					      DRI_NO_CONTEXT,
+					      NULL,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->partial3DContextStore);
+    }
+
+    /* Call kernel to release lock */
+    DRIUnlock(pScreen);
+
+    /* Grab drawable spin lock: a time out between 10 and 30 seconds is
+       appropriate, since this should never time out except in the case of
+       client death while the lock is being held.  The timeout must be
+       greater than any reasonable rendering time. */
+    DRISpinLockTimeout(&pDRIPriv->pSAREA->drawable_lock, 1, 10000); /*10 secs*/
+
+    /* Call kernel flush outstanding buffers and relock */
+    DRILock(pScreen, DRM_LOCK_QUIESCENT|DRM_LOCK_FLUSH_ALL);
+
+    /* Switch back to our 2D context if the X context is hidden */
+    if (pDRIPriv->pDriverInfo->driverSwapMethod == DRI_HIDE_X_CONTEXT) {
+	/* hide X context by swapping 2D component here */
+	(*pDRIPriv->pDriverInfo->SwapContext)(pScreen,
+					      DRI_3D_SYNC,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->partial3DContextStore,
+					      DRI_2D_CONTEXT,
+					      pDRIPriv->hiddenContextStore);
+    }
+}
+
+int
+DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
+{
+    ScreenPtr pScreen = pParent->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    int returnValue = 1; /* always return 1, not checked by dix/window.c */
+
+    if(!pDRIPriv) return returnValue;
+
+    /* call lower wrapped functions */
+    if(pDRIPriv->wrap.ValidateTree) {
+	/* unwrap */
+	pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
+
+	/* call lower layers */
+	returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
+
+	/* rewrap */
+	pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
+	pScreen->ValidateTree = DRIValidateTree;
+    }
+
+    return returnValue;
+}
+
+void
+DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
+{
+    ScreenPtr pScreen;
+    DRIScreenPrivPtr pDRIPriv;
+
+    if (pParent) {
+	pScreen = pParent->drawable.pScreen;
+    } else {
+	pScreen = pChild->drawable.pScreen;
+    }
+    if(!(pDRIPriv = DRI_SCREEN_PRIV(pScreen))) return;
+
+    if (pDRIPriv->wrap.PostValidateTree) {
+	/* unwrap */
+	pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
+
+	/* call lower layers */
+	(*pScreen->PostValidateTree)(pParent, pChild, kind);
+
+	/* rewrap */
+	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
+	pScreen->PostValidateTree = DRIPostValidateTree;
+    }
+}
+
+void
+DRIClipNotify(WindowPtr pWin, int dx, int dy)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr	pDRIDrawablePriv;
+
+    if(!pDRIPriv) return;
+
+    if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
+        int nrects = RegionNumRects(&pWin->clipList);
+
+        if(!pDRIPriv->windowsTouched) {
+            DRILockTree(pScreen);
+            pDRIPriv->windowsTouched = TRUE;
+        }
+
+	if (nrects && !pDRIDrawablePriv->nrects)
+	    DRIIncreaseNumberVisible(pScreen);
+	else if (!nrects && pDRIDrawablePriv->nrects)
+	    DRIDecreaseNumberVisible(pScreen);
+	else
+	    DRIDriverClipNotify(pScreen);
+
+	pDRIDrawablePriv->nrects = nrects;
+
+	pDRIPriv->pSAREA->drawableTable[pDRIDrawablePriv->drawableIndex].stamp
+	    = DRIDrawableValidationStamp++;
+
+	drmUpdateDrawableInfo(pDRIPriv->drmFD, pDRIDrawablePriv->hwDrawable,
+			      DRM_DRAWABLE_CLIPRECTS,
+			      nrects, RegionRects(&pWin->clipList));
+    }
+
+    /* call lower wrapped functions */
+    if(pDRIPriv->wrap.ClipNotify) {
+
+	/* unwrap */
+        pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
+
+	/* call lower layers */
+        (*pScreen->ClipNotify)(pWin, dx, dy);
+
+	/* rewrap */
+        pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
+        pScreen->ClipNotify = DRIClipNotify;
+    }
+}
+
+CARD32
+DRIGetDrawableIndex(WindowPtr pWin)
+{
+    ScreenPtr pScreen = pWin->drawable.pScreen;
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
+    CARD32 index;
+
+    if (pDRIDrawablePriv) {
+	index = pDRIDrawablePriv->drawableIndex;
+    }
+    else {
+	index = pDRIPriv->pDriverInfo->ddxDrawableTableEntry;
+    }
+
+    return index;
+}
+
+unsigned int
+DRIGetDrawableStamp(ScreenPtr pScreen, CARD32 drawable_index)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    return pDRIPriv->pSAREA->drawableTable[drawable_index].stamp;
+}
+
+
+void
+DRIPrintDrawableLock(ScreenPtr pScreen, char *msg)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    ErrorF("%s: %d\n", msg,  pDRIPriv->pSAREA->drawable_lock.lock);
+}
+
+void
+DRILock(ScreenPtr pScreen, int flags)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;
+
+    if (!*pDRIPriv->pLockRefCount) {
+        DRM_LOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext, flags);
+	*pDRIPriv->pLockingContext = pDRIPriv->myContext;
+    } else if (*pDRIPriv->pLockingContext != pDRIPriv->myContext) {
+	DRIDrvMsg(pScreen->myNum, X_ERROR,
+		  "[DRI] Locking deadlock.\n"
+		  "\tAlready locked with context %d,\n"
+		  "\ttrying to lock with context %d.\n",
+		  pDRIPriv->pLockingContext,
+		  pDRIPriv->myContext);
+    }
+    (*pDRIPriv->pLockRefCount)++;
+}
+
+void
+DRIUnlock(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if(!pDRIPriv || !pDRIPriv->pLockRefCount) return;
+
+    if (*pDRIPriv->pLockRefCount > 0) {
+	if (pDRIPriv->myContext != *pDRIPriv->pLockingContext) {
+	    DRIDrvMsg(pScreen->myNum, X_ERROR,
+		      "[DRI] Unlocking inconsistency:\n"
+		      "\tContext %d trying to unlock lock held by context %d\n",
+		      pDRIPriv->pLockingContext,
+		      pDRIPriv->myContext);
+	}
+	(*pDRIPriv->pLockRefCount)--;
+    } else {
+        DRIDrvMsg(pScreen->myNum, X_ERROR,
+		  "DRIUnlock called when not locked.\n");
+        return;
+    }
+    if (! *pDRIPriv->pLockRefCount)
+        DRM_UNLOCK(pDRIPriv->drmFD, pDRIPriv->pLSAREA, pDRIPriv->myContext);
+}
+
+void *
+DRIGetSAREAPrivate(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    if (!pDRIPriv) return 0;
+
+    return (void *)(((char*)pDRIPriv->pSAREA)+sizeof(XF86DRISAREARec));
+}
+
+drm_context_t
+DRIGetContext(ScreenPtr pScreen)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    if (!pDRIPriv) return 0;
+
+    return pDRIPriv->myContext;
+}
+
+void
+DRIGetTexOffsetFuncs(ScreenPtr pScreen,
+		     DRITexOffsetStartProcPtr *texOffsetStartFunc,
+		     DRITexOffsetFinishProcPtr *texOffsetFinishFunc)
+{
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+
+    if (!pDRIPriv) return;
+
+    *texOffsetStartFunc  = pDRIPriv->pDriverInfo->texOffsetStart;
+    *texOffsetFinishFunc = pDRIPriv->pDriverInfo->texOffsetFinish;
+}
+
+/* This lets get at the unwrapped functions so that they can correctly
+ * call the lowerlevel functions, and choose whether they will be
+ * called at every level of recursion (eg in validatetree).
+ */
+DRIWrappedFuncsRec *
+DRIGetWrappedFuncs(ScreenPtr pScreen)
+{
+    return &(DRI_SCREEN_PRIV(pScreen)->wrap);
+}
+
+/* note that this returns the library version, not the protocol version */
+void
+DRIQueryVersion(int *majorVersion,
+                int *minorVersion,
+                int *patchVersion)
+{
+    *majorVersion = DRIINFO_MAJOR_VERSION;
+    *minorVersion = DRIINFO_MINOR_VERSION;
+    *patchVersion = DRIINFO_PATCH_VERSION;
+}
+
+static void
+_DRIAdjustFrame(ScrnInfoPtr pScrn, DRIScreenPrivPtr pDRIPriv, int x, int y)
+{
+    pDRIPriv->pSAREA->frame.x      = x;
+    pDRIPriv->pSAREA->frame.y      = y;
+    pDRIPriv->pSAREA->frame.width  = pScrn->frameX1 - x + 1;
+    pDRIPriv->pSAREA->frame.height = pScrn->frameY1 - y + 1;
+}
+
+void
+DRIAdjustFrame(int scrnIndex, int x, int y, int flags)
+{
+    ScreenPtr        pScreen  = screenInfo.screens[scrnIndex];
+    DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
+    ScrnInfoPtr      pScrn    = xf86Screens[pScreen->myNum];
+    int              px, py;
+
+    if (!pDRIPriv || !pDRIPriv->pSAREA) {
+	DRIDrvMsg(scrnIndex, X_ERROR, "[DRI] No SAREA (%p %p)\n",
+		  pDRIPriv, pDRIPriv ? pDRIPriv->pSAREA : NULL);
+	return;
+    }
+
+    if (pDRIPriv->fullscreen) {
+				/* Fix up frame */
+	pScrn->frameX0 = pDRIPriv->pSAREA->frame.x;
+	pScrn->frameY0 = pDRIPriv->pSAREA->frame.y;
+	pScrn->frameX1 = pScrn->frameX0 + pDRIPriv->pSAREA->frame.width - 1;
+	pScrn->frameY1 = pScrn->frameY0 + pDRIPriv->pSAREA->frame.height - 1;
+
+				/* Fix up cursor */
+    miPointerGetPosition(inputInfo.pointer, &px, &py);
+	if (px < pScrn->frameX0) px = pScrn->frameX0;
+	if (px > pScrn->frameX1) px = pScrn->frameX1;
+	if (py < pScrn->frameY0) py = pScrn->frameY0;
+	if (py > pScrn->frameY1) py = pScrn->frameY1;
+	pScreen->SetCursorPosition(inputInfo.pointer, pScreen, px, py, TRUE);
+	return;
+    }
+
+    if (pDRIPriv->wrap.AdjustFrame) {
+	/* unwrap */
+	pScrn->AdjustFrame = pDRIPriv->wrap.AdjustFrame;
+	/* call lower layers */
+	(*pScrn->AdjustFrame)(scrnIndex, x, y, flags);
+	/* rewrap */
+	pDRIPriv->wrap.AdjustFrame = pScrn->AdjustFrame;
+	pScrn->AdjustFrame         = DRIAdjustFrame;
+    }
+
+    _DRIAdjustFrame(pScrn, pDRIPriv, x, y);
+}
+
+/* 
+ * DRIMoveBuffersHelper swaps the regions rects in place leaving you
+ * a region with the rects in the order that you need to blit them,
+ * but it is possibly (likely) an invalid region afterwards.  If you
+ * need to use the region again for anything you have to call 
+ * REGION_VALIDATE on it, or better yet, save a copy first.
+ */
+
+void
+DRIMoveBuffersHelper(
+   ScreenPtr pScreen, 
+   int dx,
+   int dy,
+   int *xdir, 
+   int *ydir, 
+   RegionPtr reg
+)
+{
+   BoxPtr extents, pbox, firstBox, lastBox;
+   BoxRec tmpBox;
+   int y, nbox;
+
+   extents = RegionExtents(reg);
+   nbox = RegionNumRects(reg);
+   pbox = RegionRects(reg);
+
+   if((dy > 0) && (dy < (extents->y2 - extents->y1))) {
+     *ydir = -1;
+     if(nbox > 1) {
+        firstBox = pbox;
+        lastBox = pbox + nbox - 1;
+        while((unsigned long)firstBox < (unsigned long)lastBox) {
+           tmpBox = *firstBox;
+           *firstBox = *lastBox;
+           *lastBox = tmpBox;
+           firstBox++;
+           lastBox--;
+        }
+     }
+   } else *ydir = 1;
+
+   if((dx > 0) && (dx < (extents->x2 - extents->x1))) {
+     *xdir = -1;
+     if(nbox > 1) {
+        firstBox = lastBox = pbox;
+        y = pbox->y1;
+        while(--nbox) {
+           pbox++;
+           if(pbox->y1 == y) lastBox++;
+           else {
+              while((unsigned long)firstBox < (unsigned long)lastBox) {
+                 tmpBox = *firstBox;
+                 *firstBox = *lastBox;
+                 *lastBox = tmpBox;
+                 firstBox++;
+                 lastBox--;
+              }
+
+              firstBox = lastBox = pbox;
+              y = pbox->y1;
+           }
+         }
+         while((unsigned long)firstBox < (unsigned long)lastBox) {
+           tmpBox = *firstBox;
+           *firstBox = *lastBox;
+           *lastBox = tmpBox;
+           firstBox++;
+           lastBox--;
+        }
+     }
+   } else *xdir = 1;
+
+}
+
+char *
+DRICreatePCIBusID(const struct pci_device * dev)
+{
+    char *busID;
+
+    if (asprintf(&busID, "pci:%04x:%02x:%02x.%d",
+		 dev->domain, dev->bus, dev->dev, dev->func) == -1)
+	return NULL;
+
+    return busID;
+}
+
+static void drmSIGIOHandler(int interrupt, void *closure)
+{
+    unsigned long key;
+    void          *value;
+    ssize_t       count;
+    drm_ctx_t     ctx;
+    typedef void  (*_drmCallback)(int, void *, void *);
+    char          buf[256];
+    drm_context_t    old;
+    drm_context_t    new;
+    void          *oldctx;
+    void          *newctx;
+    char          *pt;
+    drmHashEntry  *entry;
+    void *hash_table;
+
+    hash_table = drmGetHashTable();
+
+    if (!hash_table) return;
+    if (drmHashFirst(hash_table, &key, &value)) {
+	entry = value;
+	do {
+#if 0
+	    fprintf(stderr, "Trying %d\n", entry->fd);
+#endif
+	    if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) {
+		buf[count] = '\0';
+#if 0
+		fprintf(stderr, "Got %s\n", buf);
+#endif
+
+		for (pt = buf; *pt != ' '; ++pt); /* Find first space */
+		++pt;
+		old    = strtol(pt, &pt, 0);
+		new    = strtol(pt, NULL, 0);
+		oldctx = drmGetContextTag(entry->fd, old);
+		newctx = drmGetContextTag(entry->fd, new);
+#if 0
+		fprintf(stderr, "%d %d %p %p\n", old, new, oldctx, newctx);
+#endif
+		((_drmCallback)entry->f)(entry->fd, oldctx, newctx);
+		ctx.handle = new;
+		ioctl(entry->fd, DRM_IOCTL_NEW_CTX, &ctx);
+	    }
+	} while (drmHashNext(hash_table, &key, &value));
+    }
+}
+
+
+int drmInstallSIGIOHandler(int fd, void (*f)(int, void *, void *))
+{
+    drmHashEntry     *entry;
+
+    entry     = drmGetEntry(fd);
+    entry->f  = f;
+
+    return xf86InstallSIGIOHandler(fd, drmSIGIOHandler, 0);
+}
+
+int drmRemoveSIGIOHandler(int fd)
+{
+    drmHashEntry     *entry = drmGetEntry(fd);
+
+    entry->f = NULL;
+
+    return xf86RemoveSIGIOHandler(fd);
+}
diff --git a/xorg-server/hw/xquartz/applewm.c b/xorg-server/hw/xquartz/applewm.c
index d81032aa9..2f26e61d9 100644
--- a/xorg-server/hw/xquartz/applewm.c
+++ b/xorg-server/hw/xquartz/applewm.c
@@ -1,736 +1,736 @@
-/**************************************************************************

-

-Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.

-Copyright (c) 2003 Torrey T. Lyons. 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, sub license, and/or sell copies of the Software, and to

-permit persons to whom the Software is furnished to do so, subject to

-the following conditions:

-

-The above copyright notice and this permission notice (including the

-next paragraph) shall be included in all copies or substantial portions

-of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.

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

-

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

-

-#include "sanitizedCarbon.h"

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include "quartzCommon.h"

-

-#include "misc.h"

-#include "dixstruct.h"

-#include "globals.h"

-#include "extnsionst.h"

-#include "colormapst.h"

-#include "cursorstr.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-#include "servermd.h"

-#include "swaprep.h"

-#include "propertyst.h"

-#include <X11/Xatom.h>

-#include "darwin.h"

-#define _APPLEWM_SERVER_

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

-#include "applewmExt.h"

-#include "X11Application.h"

-#include "protocol-versions.h"

-

-#define DEFINE_ATOM_HELPER(func,atom_name)                      \

-static Atom func (void) {                                       \

-    static int generation;                                      \

-    static Atom atom;                                           \

-    if (generation != serverGeneration) {                       \

-        generation = serverGeneration;                          \

-        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \

-    }                                                           \

-    return atom;                                                \

-}

-

-DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")

-DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")

-

-static AppleWMProcsPtr appleWMProcs;

-

-static int WMErrorBase;

-

-

-static unsigned char WMReqCode = 0;

-static int WMEventBase = 0;

-

-static RESTYPE ClientType, EventType; /* resource types for event masks */

-static XID eventResource;

-

-/* Currently selected events */

-static unsigned int eventMask = 0;

-

-static int WMFreeClient (pointer data, XID id);

-static int WMFreeEvents (pointer data, XID id);

-static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);

-

-typedef struct _WMEvent *WMEventPtr;

-typedef struct _WMEvent {

-    WMEventPtr      next;

-    ClientPtr       client;

-    XID             clientResource;

-    unsigned int    mask;

-} WMEventRec;

-

-static inline BoxRec

-make_box (int x, int y, int w, int h)

-{

-    BoxRec r;

-    r.x1 = x;

-    r.y1 = y;

-    r.x2 = x + w;

-    r.y2 = y + h;

-    return r;

-}

-

-/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */

-void

-AppleWMSetScreenOrigin(

-    WindowPtr pWin

-)

-{

-    int32_t data[2];

-

-    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;

-    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;

-

-    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),

-			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);

-}

-

-/* Window managers can set the _APPLE_NO_ORDER_IN property on windows

-   that are being genie-restored from the Dock. We want them to

-   be mapped but remain ordered-out until the animation

-   completes (when the Dock will order them in). */

-Bool

-AppleWMDoReorderWindow(

-    WindowPtr pWin

-)

-{

-    Atom atom;

-    PropertyPtr prop;

-    int rc;

-

-    atom = xa_apple_no_order_in();

-    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);

-    

-    if(Success == rc && prop->type == atom)

-	return 0;

-    

-    return 1;

-}

-

-

-static int

-ProcAppleWMQueryVersion(

-    register ClientPtr client

-)

-{

-    xAppleWMQueryVersionReply rep;

-    register int n;

-

-    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;

-    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;

-    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;

-    if (client->swapped) {

-        swaps(&rep.sequenceNumber, n);

-        swapl(&rep.length, n);

-    }

-    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);

-    return Success;

-}

-

-

-/* events */

-

-static inline void

-updateEventMask (WMEventPtr *pHead)

-{

-    WMEventPtr pCur;

-

-    eventMask = 0;

-    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)

-        eventMask |= pCur->mask;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeClient (pointer data, XID id) {

-    WMEventPtr   pEvent;

-    WMEventPtr   *pHead, pCur, pPrev;

-    int i;

-

-    pEvent = (WMEventPtr) data;

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);

-    if (i == Success && pHead) {

-        pPrev = 0;

-        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)

-            pPrev = pCur;

-        if (pCur) {

-            if (pPrev)

-                pPrev->next = pEvent->next;

-            else

-                *pHead = pEvent->next;

-        }

-        updateEventMask (pHead);

-    }

-    free((pointer) pEvent);

-    return 1;

-}

-

-/*ARGSUSED*/

-static int

-WMFreeEvents (pointer data, XID id) {

-    WMEventPtr   *pHead, pCur, pNext;

-

-    pHead = (WMEventPtr *) data;

-    for (pCur = *pHead; pCur; pCur = pNext) {

-        pNext = pCur->next;

-        FreeResource (pCur->clientResource, ClientType);

-        free((pointer) pCur);

-    }

-    free((pointer) pHead);

-    eventMask = 0;

-    return 1;

-}

-

-static int

-ProcAppleWMSelectInput (register ClientPtr client)

-{

-    REQUEST(xAppleWMSelectInputReq);

-    WMEventPtr      pEvent, pNewEvent, *pHead;

-    XID             clientResource;

-    int             i;

-

-    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);

-    if (stuff->mask != 0) {

-        if (i == Success && pHead) {

-            /* check for existing entry. */

-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)

-            {

-                if (pEvent->client == client)

-                {

-                    pEvent->mask = stuff->mask;

-                    updateEventMask (pHead);

-                    return Success;

-                }

-            }

-        }

-

-        /* build the entry */

-        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));

-        if (!pNewEvent)

-            return BadAlloc;

-        pNewEvent->next = 0;

-        pNewEvent->client = client;

-        pNewEvent->mask = stuff->mask;

-        /*

-         * add a resource that will be deleted when

-         * the client goes away

-         */

-        clientResource = FakeClientID (client->index);

-        pNewEvent->clientResource = clientResource;

-        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))

-            return BadAlloc;

-        /*

-         * create a resource to contain a pointer to the list

-         * of clients selecting input.  This must be indirect as

-         * the list may be arbitrarily rearranged which cannot be

-         * done through the resource database.

-         */

-        if (i != Success || !pHead)

-        {

-            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));

-            if (!pHead ||

-                !AddResource (eventResource, EventType, (pointer)pHead))

-            {

-                FreeResource (clientResource, RT_NONE);

-                return BadAlloc;

-            }

-            *pHead = 0;

-        }

-        pNewEvent->next = *pHead;

-        *pHead = pNewEvent;

-        updateEventMask (pHead);

-    } else if (stuff->mask == 0) {

-        /* delete the interest */

-        if (i == Success && pHead) {

-            pNewEvent = 0;

-            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {

-                if (pEvent->client == client)

-                    break;

-                pNewEvent = pEvent;

-            }

-            if (pEvent) {

-                FreeResource (pEvent->clientResource, ClientType);

-                if (pNewEvent)

-                    pNewEvent->next = pEvent->next;

-                else

-                    *pHead = pEvent->next;

-                free(pEvent);

-                updateEventMask (pHead);

-            }

-        }

-    } else {

-        client->errorValue = stuff->mask;

-        return BadValue;

-    }

-    return Success;

-}

-

-/*

- * deliver the event

- */

-

-void

-AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {

-    WMEventPtr      *pHead, pEvent;

-    xAppleWMNotifyEvent se;

-    int             i;

-

-    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);

-    if (i != Success || !pHead)

-        return;

-    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {

-        if ((pEvent->mask & mask) == 0)

-            continue;

-        se.type = type + WMEventBase;

-        se.kind = which;

-        se.arg = arg;

-        se.time = currentTime.milliseconds;

-        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);

-    }

-}

-

-/* Safe to call from any thread. */

-unsigned int

-AppleWMSelectedEvents (void)

-{

-    return eventMask;

-}

-

-

-/* general utility functions */

-

-static int

-ProcAppleWMDisableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);

-

-    appleWMProcs->DisableUpdate();

-

-    return Success;

-}

-

-static int

-ProcAppleWMReenableUpdate(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);

-

-    appleWMProcs->EnableUpdate();

-

-    return Success;

-}

-

-

-/* window functions */

-

-static int

-ProcAppleWMSetWindowMenu(

-    register ClientPtr client

-)

-{

-    const char *bytes, **items;

-    char *shortcuts;

-    int max_len, nitems, i, j;

-    REQUEST(xAppleWMSetWindowMenuReq);

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);

-

-    nitems = stuff->nitems;

-    items = malloc(sizeof (char *) * nitems);

-    shortcuts = malloc(sizeof (char) * nitems);

-

-    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);

-    bytes = (char *) &stuff[1];

-

-    for (i = j = 0; i < max_len && j < nitems;)

-    {

-        shortcuts[j] = bytes[i++];

-        items[j++] = bytes + i;

-

-        while (i < max_len)

-        {

-            if (bytes[i++] == 0)

-                break;

-        }

-    }

-    X11ApplicationSetWindowMenu (nitems, items, shortcuts);

-    free(items);

-    free(shortcuts);

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowMenuCheck(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetWindowMenuCheckReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);

-    X11ApplicationSetWindowMenuCheck(stuff->index);

-    return Success;

-}

-

-static int

-ProcAppleWMSetFrontProcess(

-    register ClientPtr client

-)

-{

-    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);

-

-    X11ApplicationSetFrontProcess();

-    return Success;

-}

-

-static int

-ProcAppleWMSetWindowLevel(register ClientPtr client)

-{

-    REQUEST(xAppleWMSetWindowLevelReq);

-    WindowPtr pWin;

-    int err;

-

-    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    if (stuff->level < 0 || stuff->level >= AppleWMNumWindowLevels) {

-        return BadValue;

-    }

-

-     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);

-     if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSendPSN(register ClientPtr client)

-{

-    REQUEST(xAppleWMSendPSNReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);

-    

-    if(!appleWMProcs->SendPSN)

-        return BadRequest;

-

-    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMAttachTransient(register ClientPtr client)

-{

-    WindowPtr pWinChild, pWinParent;

-    REQUEST(xAppleWMAttachTransientReq);

-    int err;

-    

-    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);

-    

-    if(!appleWMProcs->AttachTransient)

-        return BadRequest;

-

-    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))

-        return BadValue;

-

-    if(stuff->parent) {

-        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))

-            return BadValue;

-    } else {

-        pWinParent = NULL;

-    }

-

-    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);

-    if (err != Success) {

-        return err;

-    }

-

-    return Success;

-}

-

-static int

-ProcAppleWMSetCanQuit(

-    register ClientPtr client

-)

-{

-    REQUEST(xAppleWMSetCanQuitReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);

-

-    X11ApplicationSetCanQuit(stuff->state);

-    return Success;

-}

-

-

-/* frame functions */

-

-static int

-ProcAppleWMFrameGetRect(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameGetRectReply rep;

-    BoxRec ir, or, rr;

-    REQUEST(xAppleWMFrameGetRectReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameGetRect(stuff->frame_rect,

-                                   stuff->frame_class,

-                                   &or, &ir, &rr) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.x = rr.x1;

-    rep.y = rr.y1;

-    rep.w = rr.x2 - rr.x1;

-    rep.h = rr.y2 - rr.y1;

-

-    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcAppleWMFrameHitTest(

-    register ClientPtr client

-)

-{

-    xAppleWMFrameHitTestReply rep;

-    BoxRec ir, or;

-    int ret;

-    REQUEST(xAppleWMFrameHitTestReq);

-

-    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);

-    rep.type = X_Reply;

-    rep.length = 0;

-    rep.sequenceNumber = client->sequence;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,

-                                   stuff->py, &or, &ir, &ret) != Success)

-    {

-        return BadValue;

-    }

-

-    rep.ret = ret;

-

-    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);

-    return Success;

-}

-

-static int

-ProcAppleWMFrameDraw(

-    register ClientPtr client

-)

-{

-    BoxRec ir, or;

-    unsigned int title_length, title_max;

-    unsigned char *title_bytes;

-    REQUEST(xAppleWMFrameDrawReq);

-    WindowPtr pWin;

-

-    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);

-

-    if (Success != dixLookupWindow(&pWin, stuff->window, client,

-				   DixReadAccess))

-        return BadValue;

-

-    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);

-    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);

-

-    title_length = stuff->title_length;

-    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);

-

-    if (title_max < title_length)

-        return BadValue;

-

-    title_bytes = (unsigned char *) &stuff[1];

-

-    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,

-                                    stuff->frame_attr, &or, &ir,

-                                    title_length, title_bytes);

-    if (errno != Success) {

-        return errno;

-    }

-

-    return Success;

-}

-

-

-/* dispatch */

-

-static int

-ProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return ProcAppleWMQueryVersion(client);

-    }

-

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

-    switch (stuff->data)

-    {

-    case X_AppleWMSelectInput:

-        return ProcAppleWMSelectInput(client);

-    case X_AppleWMDisableUpdate:

-        return ProcAppleWMDisableUpdate(client);

-    case X_AppleWMReenableUpdate:

-        return ProcAppleWMReenableUpdate(client);

-    case X_AppleWMSetWindowMenu:

-        return ProcAppleWMSetWindowMenu(client);

-    case X_AppleWMSetWindowMenuCheck:

-        return ProcAppleWMSetWindowMenuCheck(client);

-    case X_AppleWMSetFrontProcess:

-        return ProcAppleWMSetFrontProcess(client);

-    case X_AppleWMSetWindowLevel:

-        return ProcAppleWMSetWindowLevel(client);

-    case X_AppleWMSetCanQuit:

-        return ProcAppleWMSetCanQuit(client);

-    case X_AppleWMFrameGetRect:

-        return ProcAppleWMFrameGetRect(client);

-    case X_AppleWMFrameHitTest:

-        return ProcAppleWMFrameHitTest(client);

-    case X_AppleWMFrameDraw:

-        return ProcAppleWMFrameDraw(client);

-    case X_AppleWMSendPSN:

-        return ProcAppleWMSendPSN(client);

-    case X_AppleWMAttachTransient:

-        return ProcAppleWMAttachTransient(client);

-    default:

-        return BadRequest;

-    }

-}

-

-static void

-SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to) {

-    to->type = from->type;

-    to->kind = from->kind;

-    cpswaps (from->sequenceNumber, to->sequenceNumber);

-    cpswapl (from->time, to->time);

-    cpswapl (from->arg, to->arg);

-}

-

-static int

-SProcAppleWMQueryVersion(

-    register ClientPtr  client

-)

-{

-    register int n;

-    REQUEST(xAppleWMQueryVersionReq);

-    swaps(&stuff->length, n);

-    return ProcAppleWMQueryVersion(client);

-}

-

-static int

-SProcAppleWMDispatch (

-    register ClientPtr  client

-)

-{

-    REQUEST(xReq);

-

-    /* It is bound to be non-local when there is byte swapping */

-    if (!LocalClient(client))

-        return WMErrorBase + AppleWMClientNotLocal;

-

-    /* only local clients are allowed WM access */

-    switch (stuff->data)

-    {

-    case X_AppleWMQueryVersion:

-        return SProcAppleWMQueryVersion(client);

-    default:

-        return BadRequest;

-    }

-}

-

-void

-AppleWMExtensionInit(

-    AppleWMProcsPtr procsPtr)

-{

-    ExtensionEntry* extEntry;

-

-    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");

-    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");

-    eventResource = FakeClientID(0);

-

-    if (ClientType && EventType &&

-        (extEntry = AddExtension(APPLEWMNAME,

-                                 AppleWMNumberEvents,

-                                 AppleWMNumberErrors,

-                                 ProcAppleWMDispatch,

-                                 SProcAppleWMDispatch,

-                                 NULL,

-                                 StandardMinorOpcode)))

-    {

-        WMReqCode = (unsigned char)extEntry->base;

-        WMErrorBase = extEntry->errorBase;

-        WMEventBase = extEntry->eventBase;

-        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;

-        appleWMProcs = procsPtr;

-    }

-}

+/**************************************************************************
+
+Copyright (c) 2002-2007 Apple Inc. All Rights Reserved.
+Copyright (c) 2003 Torrey T. Lyons. 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, sub license, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice (including the
+next paragraph) shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+IN NO EVENT SHALL 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.
+
+**************************************************************************/
+
+#include "sanitizedCarbon.h"
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include "quartzCommon.h"
+
+#include "misc.h"
+#include "dixstruct.h"
+#include "globals.h"
+#include "extnsionst.h"
+#include "colormapst.h"
+#include "cursorstr.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+#include "servermd.h"
+#include "swaprep.h"
+#include "propertyst.h"
+#include <X11/Xatom.h>
+#include "darwin.h"
+#define _APPLEWM_SERVER_
+#include <X11/extensions/applewmproto.h>
+#include "applewmExt.h"
+#include "X11Application.h"
+#include "protocol-versions.h"
+
+#define DEFINE_ATOM_HELPER(func,atom_name)                      \
+static Atom func (void) {                                       \
+    static int generation;                                      \
+    static Atom atom;                                           \
+    if (generation != serverGeneration) {                       \
+        generation = serverGeneration;                          \
+        atom = MakeAtom (atom_name, strlen (atom_name), TRUE);  \
+    }                                                           \
+    return atom;                                                \
+}
+
+DEFINE_ATOM_HELPER(xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
+DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
+
+static AppleWMProcsPtr appleWMProcs;
+
+static int WMErrorBase;
+
+
+static unsigned char WMReqCode = 0;
+static int WMEventBase = 0;
+
+static RESTYPE ClientType, EventType; /* resource types for event masks */
+static XID eventResource;
+
+/* Currently selected events */
+static unsigned int eventMask = 0;
+
+static int WMFreeClient (pointer data, XID id);
+static int WMFreeEvents (pointer data, XID id);
+static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
+
+typedef struct _WMEvent *WMEventPtr;
+typedef struct _WMEvent {
+    WMEventPtr      next;
+    ClientPtr       client;
+    XID             clientResource;
+    unsigned int    mask;
+} WMEventRec;
+
+static inline BoxRec
+make_box (int x, int y, int w, int h)
+{
+    BoxRec r;
+    r.x1 = x;
+    r.y1 = y;
+    r.x2 = x + w;
+    r.y2 = y + h;
+    return r;
+}
+
+/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
+void
+AppleWMSetScreenOrigin(
+    WindowPtr pWin
+)
+{
+    int32_t data[2];
+
+    data[0] = pWin->drawable.pScreen->x + darwinMainScreenX;
+    data[1] = pWin->drawable.pScreen->y + darwinMainScreenY;
+
+    dixChangeWindowProperty(serverClient, pWin, xa_native_screen_origin(),
+			    XA_INTEGER, 32, PropModeReplace, 2, data, TRUE);
+}
+
+/* Window managers can set the _APPLE_NO_ORDER_IN property on windows
+   that are being genie-restored from the Dock. We want them to
+   be mapped but remain ordered-out until the animation
+   completes (when the Dock will order them in). */
+Bool
+AppleWMDoReorderWindow(
+    WindowPtr pWin
+)
+{
+    Atom atom;
+    PropertyPtr prop;
+    int rc;
+
+    atom = xa_apple_no_order_in();
+    rc = dixLookupProperty(&prop, pWin, atom, serverClient, DixReadAccess);
+    
+    if(Success == rc && prop->type == atom)
+	return 0;
+    
+    return 1;
+}
+
+
+static int
+ProcAppleWMQueryVersion(
+    register ClientPtr client
+)
+{
+    xAppleWMQueryVersionReply rep;
+    register int n;
+
+    REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+    rep.majorVersion = SERVER_APPLEWM_MAJOR_VERSION;
+    rep.minorVersion = SERVER_APPLEWM_MINOR_VERSION;
+    rep.patchVersion = SERVER_APPLEWM_PATCH_VERSION;
+    if (client->swapped) {
+        swaps(&rep.sequenceNumber, n);
+        swapl(&rep.length, n);
+    }
+    WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
+    return Success;
+}
+
+
+/* events */
+
+static inline void
+updateEventMask (WMEventPtr *pHead)
+{
+    WMEventPtr pCur;
+
+    eventMask = 0;
+    for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
+        eventMask |= pCur->mask;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeClient (pointer data, XID id) {
+    WMEventPtr   pEvent;
+    WMEventPtr   *pHead, pCur, pPrev;
+    int i;
+
+    pEvent = (WMEventPtr) data;
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess | DixWriteAccess | DixDestroyAccess);
+    if (i == Success && pHead) {
+        pPrev = 0;
+        for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
+            pPrev = pCur;
+        if (pCur) {
+            if (pPrev)
+                pPrev->next = pEvent->next;
+            else
+                *pHead = pEvent->next;
+        }
+        updateEventMask (pHead);
+    }
+    free((pointer) pEvent);
+    return 1;
+}
+
+/*ARGSUSED*/
+static int
+WMFreeEvents (pointer data, XID id) {
+    WMEventPtr   *pHead, pCur, pNext;
+
+    pHead = (WMEventPtr *) data;
+    for (pCur = *pHead; pCur; pCur = pNext) {
+        pNext = pCur->next;
+        FreeResource (pCur->clientResource, ClientType);
+        free((pointer) pCur);
+    }
+    free((pointer) pHead);
+    eventMask = 0;
+    return 1;
+}
+
+static int
+ProcAppleWMSelectInput (register ClientPtr client)
+{
+    REQUEST(xAppleWMSelectInputReq);
+    WMEventPtr      pEvent, pNewEvent, *pHead;
+    XID             clientResource;
+    int             i;
+
+    REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, client, DixWriteAccess);
+    if (stuff->mask != 0) {
+        if (i == Success && pHead) {
+            /* check for existing entry. */
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
+            {
+                if (pEvent->client == client)
+                {
+                    pEvent->mask = stuff->mask;
+                    updateEventMask (pHead);
+                    return Success;
+                }
+            }
+        }
+
+        /* build the entry */
+        pNewEvent = (WMEventPtr) malloc(sizeof (WMEventRec));
+        if (!pNewEvent)
+            return BadAlloc;
+        pNewEvent->next = 0;
+        pNewEvent->client = client;
+        pNewEvent->mask = stuff->mask;
+        /*
+         * add a resource that will be deleted when
+         * the client goes away
+         */
+        clientResource = FakeClientID (client->index);
+        pNewEvent->clientResource = clientResource;
+        if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
+            return BadAlloc;
+        /*
+         * create a resource to contain a pointer to the list
+         * of clients selecting input.  This must be indirect as
+         * the list may be arbitrarily rearranged which cannot be
+         * done through the resource database.
+         */
+        if (i != Success || !pHead)
+        {
+            pHead = (WMEventPtr *) malloc(sizeof (WMEventPtr));
+            if (!pHead ||
+                !AddResource (eventResource, EventType, (pointer)pHead))
+            {
+                FreeResource (clientResource, RT_NONE);
+                return BadAlloc;
+            }
+            *pHead = 0;
+        }
+        pNewEvent->next = *pHead;
+        *pHead = pNewEvent;
+        updateEventMask (pHead);
+    } else if (stuff->mask == 0) {
+        /* delete the interest */
+        if (i == Success && pHead) {
+            pNewEvent = 0;
+            for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+                if (pEvent->client == client)
+                    break;
+                pNewEvent = pEvent;
+            }
+            if (pEvent) {
+                FreeResource (pEvent->clientResource, ClientType);
+                if (pNewEvent)
+                    pNewEvent->next = pEvent->next;
+                else
+                    *pHead = pEvent->next;
+                free(pEvent);
+                updateEventMask (pHead);
+            }
+        }
+    } else {
+        client->errorValue = stuff->mask;
+        return BadValue;
+    }
+    return Success;
+}
+
+/*
+ * deliver the event
+ */
+
+void
+AppleWMSendEvent (int type, unsigned int mask, int which, int arg) {
+    WMEventPtr      *pHead, pEvent;
+    xAppleWMNotifyEvent se;
+    int             i;
+
+    i = dixLookupResourceByType((pointer *)&pHead, eventResource, EventType, serverClient, DixReadAccess);
+    if (i != Success || !pHead)
+        return;
+    for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
+        if ((pEvent->mask & mask) == 0)
+            continue;
+        se.type = type + WMEventBase;
+        se.kind = which;
+        se.arg = arg;
+        se.time = currentTime.milliseconds;
+        WriteEventsToClient (pEvent->client, 1, (xEvent *) &se);
+    }
+}
+
+/* Safe to call from any thread. */
+unsigned int
+AppleWMSelectedEvents (void)
+{
+    return eventMask;
+}
+
+
+/* general utility functions */
+
+static int
+ProcAppleWMDisableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);
+
+    appleWMProcs->DisableUpdate();
+
+    return Success;
+}
+
+static int
+ProcAppleWMReenableUpdate(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);
+
+    appleWMProcs->EnableUpdate();
+
+    return Success;
+}
+
+
+/* window functions */
+
+static int
+ProcAppleWMSetWindowMenu(
+    register ClientPtr client
+)
+{
+    const char *bytes, **items;
+    char *shortcuts;
+    int max_len, nitems, i, j;
+    REQUEST(xAppleWMSetWindowMenuReq);
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
+
+    nitems = stuff->nitems;
+    items = malloc(sizeof (char *) * nitems);
+    shortcuts = malloc(sizeof (char) * nitems);
+
+    max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
+    bytes = (char *) &stuff[1];
+
+    for (i = j = 0; i < max_len && j < nitems;)
+    {
+        shortcuts[j] = bytes[i++];
+        items[j++] = bytes + i;
+
+        while (i < max_len)
+        {
+            if (bytes[i++] == 0)
+                break;
+        }
+    }
+    X11ApplicationSetWindowMenu (nitems, items, shortcuts);
+    free(items);
+    free(shortcuts);
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowMenuCheck(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetWindowMenuCheckReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
+    X11ApplicationSetWindowMenuCheck(stuff->index);
+    return Success;
+}
+
+static int
+ProcAppleWMSetFrontProcess(
+    register ClientPtr client
+)
+{
+    REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
+
+    X11ApplicationSetFrontProcess();
+    return Success;
+}
+
+static int
+ProcAppleWMSetWindowLevel(register ClientPtr client)
+{
+    REQUEST(xAppleWMSetWindowLevelReq);
+    WindowPtr pWin;
+    int err;
+
+    REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    if (stuff->level >= AppleWMNumWindowLevels) {
+        return BadValue;
+    }
+
+     err = appleWMProcs->SetWindowLevel(pWin, stuff->level);
+     if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSendPSN(register ClientPtr client)
+{
+    REQUEST(xAppleWMSendPSNReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMSendPSNReq);
+    
+    if(!appleWMProcs->SendPSN)
+        return BadRequest;
+
+    err = appleWMProcs->SendPSN(stuff->psn_hi, stuff->psn_lo);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMAttachTransient(register ClientPtr client)
+{
+    WindowPtr pWinChild, pWinParent;
+    REQUEST(xAppleWMAttachTransientReq);
+    int err;
+    
+    REQUEST_SIZE_MATCH(xAppleWMAttachTransientReq);
+    
+    if(!appleWMProcs->AttachTransient)
+        return BadRequest;
+
+    if (Success != dixLookupWindow(&pWinChild, stuff->child, client, DixReadAccess))
+        return BadValue;
+
+    if(stuff->parent) {
+        if(Success != dixLookupWindow(&pWinParent, stuff->parent, client, DixReadAccess))
+            return BadValue;
+    } else {
+        pWinParent = NULL;
+    }
+
+    err = appleWMProcs->AttachTransient(pWinChild, pWinParent);
+    if (err != Success) {
+        return err;
+    }
+
+    return Success;
+}
+
+static int
+ProcAppleWMSetCanQuit(
+    register ClientPtr client
+)
+{
+    REQUEST(xAppleWMSetCanQuitReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);
+
+    X11ApplicationSetCanQuit(stuff->state);
+    return Success;
+}
+
+
+/* frame functions */
+
+static int
+ProcAppleWMFrameGetRect(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameGetRectReply rep;
+    BoxRec ir, or, rr;
+    REQUEST(xAppleWMFrameGetRectReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameGetRect(stuff->frame_rect,
+                                   stuff->frame_class,
+                                   &or, &ir, &rr) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.x = rr.x1;
+    rep.y = rr.y1;
+    rep.w = rr.x2 - rr.x1;
+    rep.h = rr.y2 - rr.y1;
+
+    WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameHitTest(
+    register ClientPtr client
+)
+{
+    xAppleWMFrameHitTestReply rep;
+    BoxRec ir, or;
+    int ret;
+    REQUEST(xAppleWMFrameHitTestReq);
+
+    REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
+    rep.type = X_Reply;
+    rep.length = 0;
+    rep.sequenceNumber = client->sequence;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    if (appleWMProcs->FrameHitTest(stuff->frame_class, stuff->px,
+                                   stuff->py, &or, &ir, &ret) != Success)
+    {
+        return BadValue;
+    }
+
+    rep.ret = ret;
+
+    WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
+    return Success;
+}
+
+static int
+ProcAppleWMFrameDraw(
+    register ClientPtr client
+)
+{
+    BoxRec ir, or;
+    unsigned int title_length, title_max;
+    unsigned char *title_bytes;
+    REQUEST(xAppleWMFrameDrawReq);
+    WindowPtr pWin;
+
+    REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
+
+    if (Success != dixLookupWindow(&pWin, stuff->window, client,
+				   DixReadAccess))
+        return BadValue;
+
+    ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
+    or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
+
+    title_length = stuff->title_length;
+    title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);
+
+    if (title_max < title_length)
+        return BadValue;
+
+    title_bytes = (unsigned char *) &stuff[1];
+
+    errno = appleWMProcs->FrameDraw(pWin, stuff->frame_class,
+                                    stuff->frame_attr, &or, &ir,
+                                    title_length, title_bytes);
+    if (errno != Success) {
+        return errno;
+    }
+
+    return Success;
+}
+
+
+/* dispatch */
+
+static int
+ProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return ProcAppleWMQueryVersion(client);
+    }
+
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    switch (stuff->data)
+    {
+    case X_AppleWMSelectInput:
+        return ProcAppleWMSelectInput(client);
+    case X_AppleWMDisableUpdate:
+        return ProcAppleWMDisableUpdate(client);
+    case X_AppleWMReenableUpdate:
+        return ProcAppleWMReenableUpdate(client);
+    case X_AppleWMSetWindowMenu:
+        return ProcAppleWMSetWindowMenu(client);
+    case X_AppleWMSetWindowMenuCheck:
+        return ProcAppleWMSetWindowMenuCheck(client);
+    case X_AppleWMSetFrontProcess:
+        return ProcAppleWMSetFrontProcess(client);
+    case X_AppleWMSetWindowLevel:
+        return ProcAppleWMSetWindowLevel(client);
+    case X_AppleWMSetCanQuit:
+        return ProcAppleWMSetCanQuit(client);
+    case X_AppleWMFrameGetRect:
+        return ProcAppleWMFrameGetRect(client);
+    case X_AppleWMFrameHitTest:
+        return ProcAppleWMFrameHitTest(client);
+    case X_AppleWMFrameDraw:
+        return ProcAppleWMFrameDraw(client);
+    case X_AppleWMSendPSN:
+        return ProcAppleWMSendPSN(client);
+    case X_AppleWMAttachTransient:
+        return ProcAppleWMAttachTransient(client);
+    default:
+        return BadRequest;
+    }
+}
+
+static void
+SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to) {
+    to->type = from->type;
+    to->kind = from->kind;
+    cpswaps (from->sequenceNumber, to->sequenceNumber);
+    cpswapl (from->time, to->time);
+    cpswapl (from->arg, to->arg);
+}
+
+static int
+SProcAppleWMQueryVersion(
+    register ClientPtr  client
+)
+{
+    register int n;
+    REQUEST(xAppleWMQueryVersionReq);
+    swaps(&stuff->length, n);
+    return ProcAppleWMQueryVersion(client);
+}
+
+static int
+SProcAppleWMDispatch (
+    register ClientPtr  client
+)
+{
+    REQUEST(xReq);
+
+    /* It is bound to be non-local when there is byte swapping */
+    if (!LocalClient(client))
+        return WMErrorBase + AppleWMClientNotLocal;
+
+    /* only local clients are allowed WM access */
+    switch (stuff->data)
+    {
+    case X_AppleWMQueryVersion:
+        return SProcAppleWMQueryVersion(client);
+    default:
+        return BadRequest;
+    }
+}
+
+void
+AppleWMExtensionInit(
+    AppleWMProcsPtr procsPtr)
+{
+    ExtensionEntry* extEntry;
+
+    ClientType = CreateNewResourceType(WMFreeClient, "WMClient");
+    EventType = CreateNewResourceType(WMFreeEvents, "WMEvent");
+    eventResource = FakeClientID(0);
+
+    if (ClientType && EventType &&
+        (extEntry = AddExtension(APPLEWMNAME,
+                                 AppleWMNumberEvents,
+                                 AppleWMNumberErrors,
+                                 ProcAppleWMDispatch,
+                                 SProcAppleWMDispatch,
+                                 NULL,
+                                 StandardMinorOpcode)))
+    {
+        WMReqCode = (unsigned char)extEntry->base;
+        WMErrorBase = extEntry->errorBase;
+        WMEventBase = extEntry->eventBase;
+        EventSwapVector[WMEventBase] = (EventSwapPtr) SNotifyEvent;
+        appleWMProcs = procsPtr;
+    }
+}
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 56021ed0a..3b6f0a29e 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -1,881 +1,769 @@
-/**************************************************************

- *

- * Xquartz initialization code

- *

- * Copyright (c) 2007-2008 Apple Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. 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 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 ABOVE LISTED COPYRIGHT HOLDER(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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "os.h"

-#include "servermd.h"

-#include "inputstr.h"

-#include "scrnintstr.h"

-#include "mibstore.h"		// mi backing store implementation

-#include "mipointer.h"		// mi software cursor

-#include "micmap.h"		// mi colormap code

-#include "fb.h"			// fb framebuffer code

-#include "site.h"

-#include "globals.h"

-#include "dix.h"

-#include "xkbsrv.h"

-

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

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

-#include "exevents.h"

-#include "extinit.h"

-

-#include "xserver-properties.h"

-

-#include <sys/types.h>

-#include <sys/time.h>

-#include <sys/syslimits.h>

-#include <stdio.h>

-#include <fcntl.h>

-#include <unistd.h>

-

-#define HAS_UTSNAME 1

-#include <sys/utsname.h>

-

-#define NO_CFPLUGIN

-#include <IOKit/hidsystem/IOHIDLib.h>

-

-#ifdef MITSHM

-#include "shmint.h"

-#endif

-

-#include "darwin.h"

-#include "darwinEvents.h"

-#include "quartzKeyboard.h"

-#include "quartz.h"

-

-#ifdef ENABLE_DEBUG_LOG

-FILE *debug_log_fp = NULL;

-#endif

-

-/*

- * X server shared global variables

- */

-int                     darwinScreensFound = 0;

-DevPrivateKeyRec        darwinScreenKeyRec;

-io_connect_t            darwinParamConnect = 0;

-int                     darwinEventReadFD = -1;

-int                     darwinEventWriteFD = -1;

-// int                     darwinMouseAccelChange = 1;

-int                     darwinFakeButtons = 0;

-

-// location of X11's (0,0) point in global screen coordinates

-int                     darwinMainScreenX = 0;

-int                     darwinMainScreenY = 0;

-

-// parameters read from the command line or user preferences

-int                     darwinDesiredDepth = -1;

-int                     darwinSyncKeymap = FALSE;

-

-// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)

-#ifdef NX_DEVICELCMDKEYMASK

-int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;

-int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;

-#else

-int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;

-int                     darwinFakeMouse3Mask = NX_COMMANDMASK;

-#endif

-

-// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu

-unsigned int            darwinAppKitModMask = 0; // Any of these bits

-

-// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)

-unsigned int            windowItemModMask = NX_COMMANDMASK;

-

-// devices

-DeviceIntPtr            darwinKeyboard = NULL;

-DeviceIntPtr            darwinPointer = NULL;

-DeviceIntPtr            darwinTabletCurrent = NULL;

-DeviceIntPtr            darwinTabletStylus = NULL;

-DeviceIntPtr            darwinTabletCursor = NULL;

-DeviceIntPtr            darwinTabletEraser = NULL;

-

-// Common pixmap formats

-static PixmapFormatRec formats[] = {

-        { 1,    1,      BITMAP_SCANLINE_PAD },

-        { 4,    8,      BITMAP_SCANLINE_PAD },

-        { 8,    8,      BITMAP_SCANLINE_PAD },

-        { 15,   16,     BITMAP_SCANLINE_PAD },

-        { 16,   16,     BITMAP_SCANLINE_PAD },

-        { 24,   32,     BITMAP_SCANLINE_PAD },

-        { 32,   32,     BITMAP_SCANLINE_PAD }

-};

-const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);

-

-#ifndef OSNAME

-#define OSNAME " Darwin"

-#endif

-#ifndef OSVENDOR

-#define OSVENDOR ""

-#endif

-#ifndef PRE_RELEASE

-#define PRE_RELEASE XORG_VERSION_SNAP

-#endif

-#ifndef BUILD_DATE

-#define BUILD_DATE ""

-#endif

-#ifndef XORG_RELEASE

-#define XORG_RELEASE "?"

-#endif

-

-void

-DarwinPrintBanner(void)

-{ 

-  // this should change depending on which specific server we are building

-  ErrorF("Xquartz starting:\n");

-  ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );

-}

-

-

-/*

- * DarwinSaveScreen

- *  X screensaver support. Not implemented.

- */

-static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)

-{

-    // FIXME

-    if (on == SCREEN_SAVER_FORCER) {

-    } else if (on == SCREEN_SAVER_ON) {

-    } else {

-    }

-    return TRUE;

-}

-

-/*

- * DarwinScreenInit

- *  This is a callback from dix during AddScreen() from InitOutput().

- *  Initialize the screen and communicate information about it back to dix.

- */

-static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {

-    int         dpi;

-    static int  foundIndex = 0;

-    Bool        ret;

-    DarwinFramebufferPtr dfb;

-

-    if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    // reset index of found screens for each server generation

-    if (index == 0) {

-        foundIndex = 0;

-

-        // reset the visual list

-        miClearVisualTypes();

-    }

-

-    // allocate space for private per screen storage

-    dfb = malloc(sizeof(DarwinFramebufferRec));

-

-    // SCREEN_PRIV(pScreen) = dfb;

-    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);

-

-    // setup hardware/mode specific details

-    ret = QuartzAddScreen(foundIndex, pScreen);

-    foundIndex++;

-    if (! ret)

-        return FALSE;

-

-    // setup a single visual appropriate for our pixel type

-    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,

-                                 dfb->preferredCVC, dfb->redMask,

-                                 dfb->greenMask, dfb->blueMask)) {

-        return FALSE;

-    }

-  

-// TODO: Make PseudoColor visuals not suck in TrueColor mode  

-//    if(dfb->depth > 8)

-//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);

-    if(dfb->depth > 15)

-        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));

-    if(dfb->depth > 24)

-        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));

-

-    miSetPixmapDepths();

-

-    // machine independent screen init

-    // setup _Screen structure in pScreen

-    if (monitorResolution)

-        dpi = monitorResolution;

-    else

-        dpi = 96;

-

-    // initialize fb

-    if (! fbScreenInit(pScreen,

-                dfb->framebuffer,                 // pointer to screen bitmap

-                dfb->width, dfb->height,          // screen size in pixels

-                dpi, dpi,                         // dots per inch

-                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer

-                dfb->bitsPerPixel))               // bits per pixel for screen

-    {

-        return FALSE;

-    }

-

-    if (! fbPictureInit(pScreen, 0, 0)) {

-        return FALSE;

-    }

-

-#ifdef MITSHM

-    ShmRegisterFbFuncs(pScreen);

-#endif

-

-    // this must be initialized (why doesn't X have a default?)

-    pScreen->SaveScreen = DarwinSaveScreen;

-

-    // finish mode dependent screen setup including cursor support

-    if (!QuartzSetupScreen(index, pScreen)) {

-        return FALSE;

-    }

-

-    // create and install the default colormap and

-    // set pScreen->blackPixel / pScreen->white

-    if (!miCreateDefColormap( pScreen )) {

-        return FALSE;

-    }

-

-    pScreen->x = dfb->x;

-    pScreen->y = dfb->y;

-

-    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",

-	  index, dfb->width, dfb->height, dfb->x, dfb->y); */

-

-    return TRUE;

-}

-

-/*

- =============================================================================

-

- mouse and keyboard callbacks

-

- =============================================================================

-*/

-

-/*

- * DarwinMouseProc: Handle the initialization, etc. of a mouse

- */

-static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 7

-#define NAXES 2

-	// 7 buttons: left, right, middle, then four scroll wheel "buttons"

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);

-            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);

-            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);

-            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);

-

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitAbsoluteClassDeviceStruct(pPointer);

-//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {

-#define NBUTTONS 3

-#define NAXES 5

-    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};

-    Atom btn_labels[NBUTTONS] = {0};

-    Atom axes_labels[NAXES] = {0};

-

-    switch (what) {

-        case DEVICE_INIT:

-            pPointer->public.on = FALSE;

-

-            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);

-            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);

-            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);

-

-            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);

-            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);

-            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);

-            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);

-            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);

-

-            // Set button map.

-            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,

-                                    btn_labels,

-                                    (PtrCtrlProcPtr)NoopDDA,

-                                    GetMotionHistorySize(), NAXES,

-                                    axes_labels);

-            InitProximityClassDeviceStruct(pPointer);

-			InitAbsoluteClassDeviceStruct(pPointer);

-

-            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);

-//          pPointer->use = IsXExtensionDevice;

-            break;

-        case DEVICE_ON:

-            pPointer->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            return Success;

-        case DEVICE_CLOSE:

-        case DEVICE_OFF:

-            pPointer->public.on = FALSE;

-            RemoveEnabledDevice(darwinEventReadFD);

-            return Success;

-    }

-    return Success;

-#undef NBUTTONS

-#undef NAXES

-}

-

-/*

- * DarwinKeybdProc

- *  Callback from X

- */

-static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )

-{

-    switch ( onoff ) {

-        case DEVICE_INIT:

-            DarwinKeyboardInit( pDev );

-            break;

-        case DEVICE_ON:

-            pDev->public.on = TRUE;

-            AddEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_OFF:

-            pDev->public.on = FALSE;

-            RemoveEnabledDevice( darwinEventReadFD );

-            break;

-        case DEVICE_CLOSE:

-            break;

-    }

-

-    return Success;

-}

-

-/*

-===========================================================================

-

- Utility routines

-

-===========================================================================

-*/

-

-/*

- * DarwinParseModifierList

- *  Parse a list of modifier names and return a corresponding modifier mask

- */

-int DarwinParseModifierList(const char *constmodifiers, int separatelr)

-{

-    int result = 0;

-

-    if (constmodifiers) {

-        char *modifiers = strdup(constmodifiers);

-        char *modifier;

-        int nxkey;

-        char *p = modifiers;

-

-        while (p) {

-            modifier = strsep(&p, " ,+&|/"); // allow lots of separators

-            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);

-            if(nxkey)

-                result |= nxkey;

-            else

-                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);

-        }

-        free(modifiers);

-    }

-    return result;

-}

-

-/*

-===========================================================================

-

- Functions needed to link against device independent X

-

-===========================================================================

-*/

-

-/*

- * InitInput

- *  Register the keyboard and mouse devices

- */

-void InitInput( int argc, char **argv )

-{

-    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",

-                          .variant = NULL, .options = NULL };

-    /* We need to really have rules... or something... */

-    XkbSetRulesDflts(&rmlvo);

-

-    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);

-    darwinKeyboard->name = strdup("keyboard");

-

-    /* here's the snippet from the current gdk sources:

-    if (!strcmp (tmp_name, "pointer"))

-        gdkdev->info.source = GDK_SOURCE_MOUSE;

-    else if (!strcmp (tmp_name, "wacom") ||

-             !strcmp (tmp_name, "pen"))

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    else if (!strcmp (tmp_name, "eraser"))

-        gdkdev->info.source = GDK_SOURCE_ERASER;

-    else if (!strcmp (tmp_name, "cursor"))

-        gdkdev->info.source = GDK_SOURCE_CURSOR;

-    else

-        gdkdev->info.source = GDK_SOURCE_PEN;

-    */

-

-    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);

-    darwinPointer->name = strdup("pointer");

-

-    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletStylus->name = strdup("pen");

-

-    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletCursor->name = strdup("cursor");

-

-    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);

-    darwinTabletEraser->name = strdup("eraser");

-

-    darwinTabletCurrent = darwinTabletStylus;

-

-    DarwinEQInit();

-

-    QuartzInitInput(argc, argv);

-}

-

-

-/*

- * DarwinAdjustScreenOrigins

- *  Shift all screens so the X11 (0, 0) coordinate is at the top

- *  left of the global screen coordinates.

- *

- *  Screens can be arranged so the top left isn't on any screen, so

- *  instead use the top left of the leftmost screen as (0,0). This

- *  may mean some screen space is in -y, but it's better that (0,0)

- *  be onscreen, or else default xterms disappear. It's better that

- *  -y be used than -x, because when popup menus are forced

- *  "onscreen" by dumb window managers like twm, they'll shift the

- *  menus down instead of left, which still looks funny but is an

- *  easier target to hit.

- */

-void

-DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)

-{

-    int i, left, top;

-

-    left = pScreenInfo->screens[0]->x;

-    top  = pScreenInfo->screens[0]->y;

-

-    /* Find leftmost screen. If there's a tie, take the topmost of the two. */

-    for (i = 1; i < pScreenInfo->numScreens; i++) {

-        if (pScreenInfo->screens[i]->x < left  ||

-            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))

-        {

-            left = pScreenInfo->screens[i]->x;

-            top = pScreenInfo->screens[i]->y;

-        }

-    }

-

-    darwinMainScreenX = left;

-    darwinMainScreenY = top;

-    

-    DEBUG_LOG("top = %d, left=%d\n", top, left);

-

-    /* Shift all screens so that there is a screen whose top left

-     * is at X11 (0,0) and at global screen coordinate

-     * (darwinMainScreenX, darwinMainScreenY).

-     */

-

-    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {

-        for (i = 0; i < pScreenInfo->numScreens; i++) {

-            pScreenInfo->screens[i]->x -= darwinMainScreenX;

-            pScreenInfo->screens[i]->y -= darwinMainScreenY;

-            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",

-                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);

-        }

-    }

-}

-

-

-/*

- * InitOutput

- *  Initialize screenInfo for all actually accessible framebuffers.

- *

- *  The display mode dependent code gets called three times. The mode

- *  specific InitOutput routines are expected to discover the number

- *  of potentially useful screens and cache routes to them internally.

- *  Inside DarwinScreenInit are two other mode specific calls.

- *  A mode specific AddScreen routine is called for each screen to

- *  actually initialize the screen with the ScreenPtr structure.

- *  After other screen setup has been done, a mode specific

- *  SetupScreen function can be called to finalize screen setup.

- */

-void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )

-{

-    int i;

-

-    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;

-    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;

-    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;

-    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;

-

-    // List how we want common pixmap formats to be padded

-    pScreenInfo->numPixmapFormats = NUMFORMATS;

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

-        pScreenInfo->formats[i] = formats[i];

-

-    // Discover screens and do mode specific initialization

-    QuartzInitOutput(argc, argv);

-

-    // Add screens

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

-        AddScreen(DarwinScreenInit, argc, argv);

-    }

-

-    DarwinAdjustScreenOrigins(pScreenInfo);

-}

-

-

-/*

- * OsVendorFatalError

- */

-void OsVendorFatalError( void )

-{

-    ErrorF( "   OsVendorFatalError\n" );

-}

-

-

-/*

- * OsVendorInit

- *  Initialization of Darwin OS support.

- */

-void OsVendorInit(void)

-{

-    if (serverGeneration == 1) {

-        DarwinPrintBanner();

-#ifdef ENABLE_DEBUG_LOG

-	{

-	  char *home_dir=NULL, *log_file_path=NULL;

-	  home_dir = getenv("HOME");

-	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);

-	  if (log_file_path) {

-	    if (!access(log_file_path, F_OK)) {

-	      debug_log_fp = fopen(log_file_path, "a");

-	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);

-	    }

-	    free(log_file_path);

-	  }

-	}

-#endif

-    }

-}

-

-

-/*

- * ddxProcessArgument

- *  Process device-dependent command line args. Returns 0 if argument is

- *  not device dependent, otherwise Count of number of elements of argv

- *  that are part of a device dependent commandline option.

- */

-int ddxProcessArgument( int argc, char *argv[], int i )

-{

-//    if ( !strcmp( argv[i], "-fullscreen" ) ) {

-//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );

-//        return 1;

-//    }

-

-//    if ( !strcmp( argv[i], "-rootless" ) ) {

-//        ErrorF( "Running rootless inside Mac OS X window server.\n" );

-//        return 1;

-//    }

-

-    // This command line arg is passed when launched from the Aqua GUI.

-    if ( !strncmp( argv[i], "-psn_", 5 ) ) {

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-fakebuttons" ) ) {

-        darwinFakeButtons = TRUE;

-        ErrorF( "Faking a three button mouse\n" );

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {

-        darwinFakeButtons = FALSE;

-        ErrorF( "Not faking a three button mouse\n" );

-        return 1;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse2" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse2 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse2Mask = 0;

-        else

-            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",

-               darwinFakeMouse2Mask);

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-fakemouse3" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-fakemouse3 must be followed by a modifer list\n" );

-        }

-        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))

-            darwinFakeMouse3Mask = 0;

-        else

-            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);

-        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",

-               darwinFakeMouse3Mask);

-        return 2;

-    }

-

-    if ( !strcmp( argv[i], "+synckeymap" ) ) {

-        darwinSyncKeymap = TRUE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-synckeymap" ) ) {

-        darwinSyncKeymap = FALSE;

-        return 1;

-    }

-

-    if ( !strcmp( argv[i], "-depth" ) ) {

-        if ( i == argc-1 ) {

-            FatalError( "-depth must be followed by a number\n" );

-        }

-        darwinDesiredDepth = atoi( argv[i+1] );

-        if(darwinDesiredDepth != -1 &&

-           darwinDesiredDepth != 8 &&

-           darwinDesiredDepth != 15 &&

-           darwinDesiredDepth != 24) {

-            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );

-        }

-

-        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );

-        return 2;

-    }

-

-    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {

-        DarwinPrintBanner();

-        exit(0);

-    }

-

-    return 0;

-}

-

-

-/*

- * ddxUseMsg --

- *  Print out correct use of device dependent commandline options.

- *  Maybe the user now knows what really to do ...

- */

-void ddxUseMsg( void )

-{

-    ErrorF("\n");

-    ErrorF("\n");

-    ErrorF("Device Dependent Usage:\n");

-    ErrorF("\n");

-    ErrorF("-depth <8,15,24> : use this bit depth.\n");

-    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");

-    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");

-    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");

-    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");

-    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");

-    ErrorF("-version : show the server version.\n");

-    ErrorF("\n");

-}

-

-

-/*

- * ddxGiveUp --

- *      Device dependent cleanup. Called by dix before normal server death.

- */

-void ddxGiveUp( void )

-{

-    ErrorF( "Quitting Xquartz\n" );

-}

-

-

-/*

- * AbortDDX --

- *      DDX - specific abort routine.  Called by AbortServer(). The attempt is

- *      made to restore all original setting of the displays. Also all devices

- *      are closed.

- */

-void AbortDDX( void )

-{

-    ErrorF( "   AbortDDX\n" );

-    OsAbort();

-}

-

-#include "mivalidate.h" // for union _Validate used by windowstr.h

-#include "windowstr.h"  // for struct _Window

-#include "scrnintstr.h" // for struct _Screen

-

-// This is copied from Xserver/hw/xfree86/common/xf86Helper.c.

-// Quartz mode uses this when switching in and out of Quartz.

-// Quartz or IOKit can use this when waking from sleep.

-// Copyright (c) 1997-1998 by The XFree86 Project, Inc.

-

-/*

- * xf86SetRootClip --

- *	Enable or disable rendering to the screen by

- *	setting the root clip list and revalidating

- *	all of the windows

- */

-

-void

-xf86SetRootClip (ScreenPtr pScreen, int enable)

-{

-    WindowPtr	pWin = pScreen->root;

-    WindowPtr	pChild;

-    Bool	WasViewable = (Bool)(pWin->viewable);

-    Bool	anyMarked = TRUE;

-    RegionPtr	pOldClip = NULL;

-    WindowPtr   pLayerWin;

-    BoxRec	box;

-

-    if (WasViewable)

-    {

-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)

-	{

-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,

-						     pChild,

-						     &pLayerWin);

-	}

-	(*pScreen->MarkWindow) (pWin);

-	anyMarked = TRUE;

-	if (pWin->valdata)

-	{

-	    if (HasBorder (pWin))

-	    {

-		RegionPtr	borderVisible;

-

-		borderVisible = RegionCreate(NullBox, 1);

-		RegionSubtract(borderVisible,

-				&pWin->borderClip, &pWin->winSize);

-		pWin->valdata->before.borderVisible = borderVisible;

-	    }

-	    pWin->valdata->before.resized = TRUE;

-	}

-    }

-

-    /*

-     * Use REGION_BREAK to avoid optimizations in ValidateTree

-     * that assume the root borderClip can't change well, normally

-     * it doesn't...)

-     */

-    if (enable)

-    {

-	box.x1 = 0;

-	box.y1 = 0;

-	box.x2 = pScreen->width;

-	box.y2 = pScreen->height;

-	RegionReset(&pWin->borderClip, &box);

-	RegionBreak(&pWin->clipList);

-    }

-    else

-    {

-	RegionEmpty(&pWin->borderClip);

-	RegionBreak(&pWin->clipList);

-    }

-

-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

-

-    if (WasViewable)

-    {

-	if (pWin->backStorage)

-	{

-	    pOldClip = RegionCreate(NullBox, 1);

-	    RegionCopy(pOldClip, &pWin->clipList);

-	}

-

-	if (pWin->firstChild)

-	{

-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,

-							   pWin->firstChild,

-							   (WindowPtr *)NULL);

-	}

-	else

-	{

-	    (*pScreen->MarkWindow) (pWin);

-	    anyMarked = TRUE;

-	}

-

-

-	if (anyMarked)

-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);

-    }

-

-    if (WasViewable)

-    {

-	if (anyMarked)

-	    (*pScreen->HandleExposures)(pWin);

-	if (anyMarked && pScreen->PostValidateTree)

-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);

-    }

-    if (pWin->realized)

-	WindowsRestructured ();

-    FlushAllOutput ();

-}

+/**************************************************************
+ *
+ * Xquartz initialization code
+ *
+ * Copyright (c) 2007-2008 Apple Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. 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 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 ABOVE LISTED COPYRIGHT HOLDER(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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include "os.h"
+#include "servermd.h"
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include "mibstore.h"		// mi backing store implementation
+#include "mipointer.h"		// mi software cursor
+#include "micmap.h"		// mi colormap code
+#include "fb.h"			// fb framebuffer code
+#include "site.h"
+#include "globals.h"
+#include "dix.h"
+#include "xkbsrv.h"
+
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "exevents.h"
+#include "extinit.h"
+
+#include "xserver-properties.h"
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/syslimits.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#define HAS_UTSNAME 1
+#include <sys/utsname.h>
+
+#define NO_CFPLUGIN
+#include <IOKit/hidsystem/IOHIDLib.h>
+
+#ifdef MITSHM
+#include "shmint.h"
+#endif
+
+#include "darwin.h"
+#include "darwinEvents.h"
+#include "quartzKeyboard.h"
+#include "quartz.h"
+
+#ifdef ENABLE_DEBUG_LOG
+FILE *debug_log_fp = NULL;
+#endif
+
+/*
+ * X server shared global variables
+ */
+int                     darwinScreensFound = 0;
+DevPrivateKeyRec        darwinScreenKeyRec;
+io_connect_t            darwinParamConnect = 0;
+int                     darwinEventReadFD = -1;
+int                     darwinEventWriteFD = -1;
+// int                     darwinMouseAccelChange = 1;
+int                     darwinFakeButtons = 0;
+
+// location of X11's (0,0) point in global screen coordinates
+int                     darwinMainScreenX = 0;
+int                     darwinMainScreenY = 0;
+
+// parameters read from the command line or user preferences
+int                     darwinDesiredDepth = -1;
+int                     darwinSyncKeymap = FALSE;
+
+// modifier masks for faking mouse buttons - ANY of these bits trigger it  (not all)
+#ifdef NX_DEVICELCMDKEYMASK
+int                     darwinFakeMouse2Mask = NX_DEVICELALTKEYMASK | NX_DEVICERALTKEYMASK;
+int                     darwinFakeMouse3Mask = NX_DEVICELCMDKEYMASK | NX_DEVICERCMDKEYMASK;
+#else
+int                     darwinFakeMouse2Mask = NX_ALTERNATEMASK;
+int                     darwinFakeMouse3Mask = NX_COMMANDMASK;
+#endif
+
+// Modifier mask for overriding event delivery to appkit (might be useful to set this to rcommand for input menu
+unsigned int            darwinAppKitModMask = 0; // Any of these bits
+
+// Modifier mask for items in the Window menu (0 and -1 cause shortcuts to be disabled)
+unsigned int            windowItemModMask = NX_COMMANDMASK;
+
+// devices
+DeviceIntPtr            darwinKeyboard = NULL;
+DeviceIntPtr            darwinPointer = NULL;
+DeviceIntPtr            darwinTabletCurrent = NULL;
+DeviceIntPtr            darwinTabletStylus = NULL;
+DeviceIntPtr            darwinTabletCursor = NULL;
+DeviceIntPtr            darwinTabletEraser = NULL;
+
+// Common pixmap formats
+static PixmapFormatRec formats[] = {
+        { 1,    1,      BITMAP_SCANLINE_PAD },
+        { 4,    8,      BITMAP_SCANLINE_PAD },
+        { 8,    8,      BITMAP_SCANLINE_PAD },
+        { 15,   16,     BITMAP_SCANLINE_PAD },
+        { 16,   16,     BITMAP_SCANLINE_PAD },
+        { 24,   32,     BITMAP_SCANLINE_PAD },
+        { 32,   32,     BITMAP_SCANLINE_PAD }
+};
+const int NUMFORMATS = sizeof(formats)/sizeof(formats[0]);
+
+#ifndef OSNAME
+#define OSNAME " Darwin"
+#endif
+#ifndef OSVENDOR
+#define OSVENDOR ""
+#endif
+#ifndef PRE_RELEASE
+#define PRE_RELEASE XORG_VERSION_SNAP
+#endif
+#ifndef BUILD_DATE
+#define BUILD_DATE ""
+#endif
+#ifndef XORG_RELEASE
+#define XORG_RELEASE "?"
+#endif
+
+void
+DarwinPrintBanner(void)
+{ 
+  // this should change depending on which specific server we are building
+  ErrorF("Xquartz starting:\n");
+  ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );
+}
+
+
+/*
+ * DarwinSaveScreen
+ *  X screensaver support. Not implemented.
+ */
+static Bool DarwinSaveScreen(ScreenPtr pScreen, int on)
+{
+    // FIXME
+    if (on == SCREEN_SAVER_FORCER) {
+    } else if (on == SCREEN_SAVER_ON) {
+    } else {
+    }
+    return TRUE;
+}
+
+/*
+ * DarwinScreenInit
+ *  This is a callback from dix during AddScreen() from InitOutput().
+ *  Initialize the screen and communicate information about it back to dix.
+ */
+static Bool DarwinScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) {
+    int         dpi;
+    static int  foundIndex = 0;
+    Bool        ret;
+    DarwinFramebufferPtr dfb;
+
+    if (!dixRegisterPrivateKey(&darwinScreenKeyRec, PRIVATE_SCREEN, 0))
+	return FALSE;
+
+    // reset index of found screens for each server generation
+    if (index == 0) {
+        foundIndex = 0;
+
+        // reset the visual list
+        miClearVisualTypes();
+    }
+
+    // allocate space for private per screen storage
+    dfb = malloc(sizeof(DarwinFramebufferRec));
+
+    // SCREEN_PRIV(pScreen) = dfb;
+    dixSetPrivate(&pScreen->devPrivates, darwinScreenKey, dfb);
+
+    // setup hardware/mode specific details
+    ret = QuartzAddScreen(foundIndex, pScreen);
+    foundIndex++;
+    if (! ret)
+        return FALSE;
+
+    // setup a single visual appropriate for our pixel type
+    if(!miSetVisualTypesAndMasks(dfb->depth, dfb->visuals, dfb->bitsPerRGB,
+                                 dfb->preferredCVC, dfb->redMask,
+                                 dfb->greenMask, dfb->blueMask)) {
+        return FALSE;
+    }
+  
+// TODO: Make PseudoColor visuals not suck in TrueColor mode  
+//    if(dfb->depth > 8)
+//        miSetVisualTypesAndMasks(8, PseudoColorMask, 8, PseudoColor, 0, 0, 0);
+    if(dfb->depth > 15)
+        miSetVisualTypesAndMasks(15, TrueColorMask, 5, TrueColor, RM_ARGB(0,5,5,5), GM_ARGB(0,5,5,5), BM_ARGB(0,5,5,5));
+    if(dfb->depth > 24)
+        miSetVisualTypesAndMasks(24, TrueColorMask, 8, TrueColor, RM_ARGB(0,8,8,8), GM_ARGB(0,8,8,8), BM_ARGB(0,8,8,8));
+
+    miSetPixmapDepths();
+
+    // machine independent screen init
+    // setup _Screen structure in pScreen
+    if (monitorResolution)
+        dpi = monitorResolution;
+    else
+        dpi = 96;
+
+    // initialize fb
+    if (! fbScreenInit(pScreen,
+                dfb->framebuffer,                 // pointer to screen bitmap
+                dfb->width, dfb->height,          // screen size in pixels
+                dpi, dpi,                         // dots per inch
+                dfb->pitch/(dfb->bitsPerPixel/8), // pixel width of framebuffer
+                dfb->bitsPerPixel))               // bits per pixel for screen
+    {
+        return FALSE;
+    }
+
+    if (! fbPictureInit(pScreen, 0, 0)) {
+        return FALSE;
+    }
+
+#ifdef MITSHM
+    ShmRegisterFbFuncs(pScreen);
+#endif
+
+    // this must be initialized (why doesn't X have a default?)
+    pScreen->SaveScreen = DarwinSaveScreen;
+
+    // finish mode dependent screen setup including cursor support
+    if (!QuartzSetupScreen(index, pScreen)) {
+        return FALSE;
+    }
+
+    // create and install the default colormap and
+    // set pScreen->blackPixel / pScreen->white
+    if (!miCreateDefColormap( pScreen )) {
+        return FALSE;
+    }
+
+    pScreen->x = dfb->x;
+    pScreen->y = dfb->y;
+
+    /*    ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",
+	  index, dfb->width, dfb->height, dfb->x, dfb->y); */
+
+    return TRUE;
+}
+
+/*
+ =============================================================================
+
+ mouse and keyboard callbacks
+
+ =============================================================================
+*/
+
+/*
+ * DarwinMouseProc: Handle the initialization, etc. of a mouse
+ */
+static int DarwinMouseProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 7
+#define NAXES 2
+	// 7 buttons: left, right, middle, then four scroll wheel "buttons"
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3, 4, 5, 6, 7};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+            btn_labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+            btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+            btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+            btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+//            InitValuatorAxisStruct(pPointer, 0, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+//            InitValuatorAxisStruct(pPointer, 1, 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+static int DarwinTabletProc(DeviceIntPtr pPointer, int what) {
+#define NBUTTONS 3
+#define NAXES 5
+    CARD8 map[NBUTTONS + 1] = {0, 1, 2, 3};
+    Atom btn_labels[NBUTTONS] = {0};
+    Atom axes_labels[NAXES] = {0};
+
+    switch (what) {
+        case DEVICE_INIT:
+            pPointer->public.on = FALSE;
+
+            btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+            btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+            btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+            axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+            axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+            axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+            axes_labels[3] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_X);
+            axes_labels[4] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_TILT_Y);
+
+            // Set button map.
+            InitPointerDeviceStruct((DevicePtr)pPointer, map, NBUTTONS,
+                                    btn_labels,
+                                    (PtrCtrlProcPtr)NoopDDA,
+                                    GetMotionHistorySize(), NAXES,
+                                    axes_labels);
+            InitProximityClassDeviceStruct(pPointer);
+
+            InitValuatorAxisStruct(pPointer, 0, axes_labels[0], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 1, axes_labels[1], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 2, axes_labels[2], 0, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 3, axes_labels[3], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+            InitValuatorAxisStruct(pPointer, 4, axes_labels[4], -XQUARTZ_VALUATOR_LIMIT, XQUARTZ_VALUATOR_LIMIT, 1, 0, 1, Absolute);
+//          pPointer->use = IsXExtensionDevice;
+            break;
+        case DEVICE_ON:
+            pPointer->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            return Success;
+        case DEVICE_CLOSE:
+        case DEVICE_OFF:
+            pPointer->public.on = FALSE;
+            RemoveEnabledDevice(darwinEventReadFD);
+            return Success;
+    }
+    return Success;
+#undef NBUTTONS
+#undef NAXES
+}
+
+/*
+ * DarwinKeybdProc
+ *  Callback from X
+ */
+static int DarwinKeybdProc( DeviceIntPtr pDev, int onoff )
+{
+    switch ( onoff ) {
+        case DEVICE_INIT:
+            DarwinKeyboardInit( pDev );
+            break;
+        case DEVICE_ON:
+            pDev->public.on = TRUE;
+            AddEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_OFF:
+            pDev->public.on = FALSE;
+            RemoveEnabledDevice( darwinEventReadFD );
+            break;
+        case DEVICE_CLOSE:
+            break;
+    }
+
+    return Success;
+}
+
+/*
+===========================================================================
+
+ Utility routines
+
+===========================================================================
+*/
+
+/*
+ * DarwinParseModifierList
+ *  Parse a list of modifier names and return a corresponding modifier mask
+ */
+int DarwinParseModifierList(const char *constmodifiers, int separatelr)
+{
+    int result = 0;
+
+    if (constmodifiers) {
+        char *modifiers = strdup(constmodifiers);
+        char *modifier;
+        int nxkey;
+        char *p = modifiers;
+
+        while (p) {
+            modifier = strsep(&p, " ,+&|/"); // allow lots of separators
+            nxkey = DarwinModifierStringToNXMask(modifier, separatelr);
+            if(nxkey)
+                result |= nxkey;
+            else
+                ErrorF("fakebuttons: Unknown modifier \"%s\"\n", modifier);
+        }
+        free(modifiers);
+    }
+    return result;
+}
+
+/*
+===========================================================================
+
+ Functions needed to link against device independent X
+
+===========================================================================
+*/
+
+/*
+ * InitInput
+ *  Register the keyboard and mouse devices
+ */
+void InitInput( int argc, char **argv )
+{
+    XkbRMLVOSet rmlvo = { .rules = "base", .model = "empty", .layout = "empty",
+                          .variant = NULL, .options = NULL };
+    /* We need to really have rules... or something... */
+    XkbSetRulesDflts(&rmlvo);
+
+    darwinKeyboard = AddInputDevice(serverClient, DarwinKeybdProc, TRUE);
+    darwinKeyboard->name = strdup("keyboard");
+
+    /* here's the snippet from the current gdk sources:
+    if (!strcmp (tmp_name, "pointer"))
+        gdkdev->info.source = GDK_SOURCE_MOUSE;
+    else if (!strcmp (tmp_name, "wacom") ||
+             !strcmp (tmp_name, "pen"))
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    else if (!strcmp (tmp_name, "eraser"))
+        gdkdev->info.source = GDK_SOURCE_ERASER;
+    else if (!strcmp (tmp_name, "cursor"))
+        gdkdev->info.source = GDK_SOURCE_CURSOR;
+    else
+        gdkdev->info.source = GDK_SOURCE_PEN;
+    */
+
+    darwinPointer = AddInputDevice(serverClient, DarwinMouseProc, TRUE);
+    darwinPointer->name = strdup("pointer");
+
+    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletStylus->name = strdup("pen");
+
+    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletCursor->name = strdup("cursor");
+
+    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
+    darwinTabletEraser->name = strdup("eraser");
+
+    darwinTabletCurrent = darwinTabletStylus;
+
+    DarwinEQInit();
+
+    QuartzInitInput(argc, argv);
+}
+
+
+/*
+ * DarwinAdjustScreenOrigins
+ *  Shift all screens so the X11 (0, 0) coordinate is at the top
+ *  left of the global screen coordinates.
+ *
+ *  Screens can be arranged so the top left isn't on any screen, so
+ *  instead use the top left of the leftmost screen as (0,0). This
+ *  may mean some screen space is in -y, but it's better that (0,0)
+ *  be onscreen, or else default xterms disappear. It's better that
+ *  -y be used than -x, because when popup menus are forced
+ *  "onscreen" by dumb window managers like twm, they'll shift the
+ *  menus down instead of left, which still looks funny but is an
+ *  easier target to hit.
+ */
+void
+DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo)
+{
+    int i, left, top;
+
+    left = pScreenInfo->screens[0]->x;
+    top  = pScreenInfo->screens[0]->y;
+
+    /* Find leftmost screen. If there's a tie, take the topmost of the two. */
+    for (i = 1; i < pScreenInfo->numScreens; i++) {
+        if (pScreenInfo->screens[i]->x < left  ||
+            (pScreenInfo->screens[i]->x == left && pScreenInfo->screens[i]->y < top))
+        {
+            left = pScreenInfo->screens[i]->x;
+            top = pScreenInfo->screens[i]->y;
+        }
+    }
+
+    darwinMainScreenX = left;
+    darwinMainScreenY = top;
+    
+    DEBUG_LOG("top = %d, left=%d\n", top, left);
+
+    /* Shift all screens so that there is a screen whose top left
+     * is at X11 (0,0) and at global screen coordinate
+     * (darwinMainScreenX, darwinMainScreenY).
+     */
+
+    if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {
+        for (i = 0; i < pScreenInfo->numScreens; i++) {
+            pScreenInfo->screens[i]->x -= darwinMainScreenX;
+            pScreenInfo->screens[i]->y -= darwinMainScreenY;
+            DEBUG_LOG("Screen %d placed at X11 coordinate (%d,%d).\n",
+                      i, pScreenInfo->screens[i]->x, pScreenInfo->screens[i]->y);
+        }
+    }
+}
+
+
+/*
+ * InitOutput
+ *  Initialize screenInfo for all actually accessible framebuffers.
+ *
+ *  The display mode dependent code gets called three times. The mode
+ *  specific InitOutput routines are expected to discover the number
+ *  of potentially useful screens and cache routes to them internally.
+ *  Inside DarwinScreenInit are two other mode specific calls.
+ *  A mode specific AddScreen routine is called for each screen to
+ *  actually initialize the screen with the ScreenPtr structure.
+ *  After other screen setup has been done, a mode specific
+ *  SetupScreen function can be called to finalize screen setup.
+ */
+void InitOutput( ScreenInfo *pScreenInfo, int argc, char **argv )
+{
+    int i;
+
+    pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
+    pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
+    pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
+    pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
+
+    // List how we want common pixmap formats to be padded
+    pScreenInfo->numPixmapFormats = NUMFORMATS;
+    for (i = 0; i < NUMFORMATS; i++)
+        pScreenInfo->formats[i] = formats[i];
+
+    // Discover screens and do mode specific initialization
+    QuartzInitOutput(argc, argv);
+
+    // Add screens
+    for (i = 0; i < darwinScreensFound; i++) {
+        AddScreen(DarwinScreenInit, argc, argv);
+    }
+
+    DarwinAdjustScreenOrigins(pScreenInfo);
+}
+
+
+/*
+ * OsVendorFatalError
+ */
+void OsVendorFatalError( void )
+{
+    ErrorF( "   OsVendorFatalError\n" );
+}
+
+
+/*
+ * OsVendorInit
+ *  Initialization of Darwin OS support.
+ */
+void OsVendorInit(void)
+{
+    if (serverGeneration == 1) {
+        DarwinPrintBanner();
+#ifdef ENABLE_DEBUG_LOG
+	{
+	  char *home_dir=NULL, *log_file_path=NULL;
+	  home_dir = getenv("HOME");
+	  if (home_dir) asprintf(&log_file_path, "%s/%s", home_dir, DEBUG_LOG_NAME);
+	  if (log_file_path) {
+	    if (!access(log_file_path, F_OK)) {
+	      debug_log_fp = fopen(log_file_path, "a");
+	      if (debug_log_fp) ErrorF("Debug logging enabled to %s\n", log_file_path);
+	    }
+	    free(log_file_path);
+	  }
+	}
+#endif
+    }
+}
+
+
+/*
+ * ddxProcessArgument
+ *  Process device-dependent command line args. Returns 0 if argument is
+ *  not device dependent, otherwise Count of number of elements of argv
+ *  that are part of a device dependent commandline option.
+ */
+int ddxProcessArgument( int argc, char *argv[], int i )
+{
+//    if ( !strcmp( argv[i], "-fullscreen" ) ) {
+//        ErrorF( "Running full screen in parallel with Mac OS X Quartz window server.\n" );
+//        return 1;
+//    }
+
+//    if ( !strcmp( argv[i], "-rootless" ) ) {
+//        ErrorF( "Running rootless inside Mac OS X window server.\n" );
+//        return 1;
+//    }
+
+    // This command line arg is passed when launched from the Aqua GUI.
+    if ( !strncmp( argv[i], "-psn_", 5 ) ) {
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-fakebuttons" ) ) {
+        darwinFakeButtons = TRUE;
+        ErrorF( "Faking a three button mouse\n" );
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-nofakebuttons" ) ) {
+        darwinFakeButtons = FALSE;
+        ErrorF( "Not faking a three button mouse\n" );
+        return 1;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse2" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse2 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse2Mask = 0;
+        else
+            darwinFakeMouse2Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 2 = 0x%x\n",
+               darwinFakeMouse2Mask);
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-fakemouse3" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-fakemouse3 must be followed by a modifer list\n" );
+        }
+        if (!strcasecmp(argv[i+1], "none") || !strcmp(argv[i+1], ""))
+            darwinFakeMouse3Mask = 0;
+        else
+            darwinFakeMouse3Mask = DarwinParseModifierList(argv[i+1], 1);
+        ErrorF("Modifier mask to fake mouse button 3 = 0x%x\n",
+               darwinFakeMouse3Mask);
+        return 2;
+    }
+
+    if ( !strcmp( argv[i], "+synckeymap" ) ) {
+        darwinSyncKeymap = TRUE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-synckeymap" ) ) {
+        darwinSyncKeymap = FALSE;
+        return 1;
+    }
+
+    if ( !strcmp( argv[i], "-depth" ) ) {
+        if ( i == argc-1 ) {
+            FatalError( "-depth must be followed by a number\n" );
+        }
+        darwinDesiredDepth = atoi( argv[i+1] );
+        if(darwinDesiredDepth != -1 &&
+           darwinDesiredDepth != 8 &&
+           darwinDesiredDepth != 15 &&
+           darwinDesiredDepth != 24) {
+            FatalError( "Unsupported pixel depth. Use 8, 15, or 24 bits\n" );
+        }
+
+        ErrorF( "Attempting to use pixel depth of %i\n", darwinDesiredDepth );
+        return 2;
+    }
+
+    if (!strcmp( argv[i], "-showconfig" ) || !strcmp( argv[i], "-version" )) {
+        DarwinPrintBanner();
+        exit(0);
+    }
+
+    return 0;
+}
+
+
+/*
+ * ddxUseMsg --
+ *  Print out correct use of device dependent commandline options.
+ *  Maybe the user now knows what really to do ...
+ */
+void ddxUseMsg( void )
+{
+    ErrorF("\n");
+    ErrorF("\n");
+    ErrorF("Device Dependent Usage:\n");
+    ErrorF("\n");
+    ErrorF("-depth <8,15,24> : use this bit depth.\n");
+    ErrorF("-fakebuttons : fake a three button mouse with Command and Option keys.\n");
+    ErrorF("-nofakebuttons : don't fake a three button mouse.\n");
+    ErrorF("-fakemouse2 <modifiers> : fake middle mouse button with modifier keys.\n");
+    ErrorF("-fakemouse3 <modifiers> : fake right mouse button with modifier keys.\n");
+    ErrorF("  ex: -fakemouse2 \"option,shift\" = option-shift-click is middle button.\n");
+    ErrorF("-version : show the server version.\n");
+    ErrorF("\n");
+}
+
+
+/*
+ * ddxGiveUp --
+ *      Device dependent cleanup. Called by dix before normal server death.
+ */
+void ddxGiveUp( void )
+{
+    ErrorF( "Quitting Xquartz\n" );
+}
+
+
+/*
+ * AbortDDX --
+ *      DDX - specific abort routine.  Called by AbortServer(). The attempt is
+ *      made to restore all original setting of the displays. Also all devices
+ *      are closed.
+ */
+void AbortDDX( void )
+{
+    ErrorF( "   AbortDDX\n" );
+    OsAbort();
+}
+
diff --git a/xorg-server/hw/xquartz/darwin.h b/xorg-server/hw/xquartz/darwin.h
index 7cd4336cd..e874af24c 100644
--- a/xorg-server/hw/xquartz/darwin.h
+++ b/xorg-server/hw/xquartz/darwin.h
@@ -1,92 +1,91 @@
-/*

- * Copyright (C) 2008 Apple, Inc.

- * Copyright (c) 2001-2004 Torrey T. Lyons. 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 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 ABOVE LISTED COPYRIGHT HOLDER(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(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-

-#ifndef _DARWIN_H

-#define _DARWIN_H

-

-#include <IOKit/IOTypes.h>

-#include "inputstr.h"

-#include "scrnintstr.h"

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

-#include <assert.h>

-

-#include "threadSafety.h"

-

-#include "darwinfb.h"

-

-// From darwin.c

-void DarwinPrintBanner(void);

-int DarwinParseModifierList(const char *constmodifiers, int separatelr);

-void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);

-void xf86SetRootClip (ScreenPtr pScreen, int enable);

-

-#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \

-    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))

-

-/*

- * Global variables from darwin.c

- */

-extern DevPrivateKeyRec darwinScreenKeyRec;

-#define darwinScreenKey (&darwinScreenKeyRec)

-extern int              darwinScreensFound;

-extern io_connect_t     darwinParamConnect;

-extern int              darwinEventReadFD;

-extern int              darwinEventWriteFD;

-extern DeviceIntPtr     darwinPointer;

-extern DeviceIntPtr     darwinTabletCurrent;

-extern DeviceIntPtr     darwinTabletCursor;

-extern DeviceIntPtr     darwinTabletStylus;

-extern DeviceIntPtr     darwinTabletEraser;

-extern DeviceIntPtr     darwinKeyboard;

-

-// User preferences

-extern int              darwinMouseAccelChange;

-extern int              darwinFakeButtons;

-extern int              darwinFakeMouse2Mask;

-extern int              darwinFakeMouse3Mask;

-extern unsigned int     darwinAppKitModMask;

-extern unsigned int     windowItemModMask;

-extern int              darwinSyncKeymap;

-extern int              darwinDesiredDepth;

-

-// location of X11's (0,0) point in global screen coordinates

-extern int              darwinMainScreenX;

-extern int              darwinMainScreenY;

-

-#define ENABLE_DEBUG_LOG 1

-

-#ifdef ENABLE_DEBUG_LOG

-extern FILE *debug_log_fp;

-#define DEBUG_LOG_NAME "x11-debug.txt"

-#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%s:%d " msg, threadSafetyID(pthread_self()), __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);

-#else

-#define DEBUG_LOG(msg, args...) 

-#endif

-

-#define TRACE() DEBUG_LOG("\n")

-

-#endif  /* _DARWIN_H */

+/*
+ * Copyright (C) 2008 Apple, Inc.
+ * Copyright (c) 2001-2004 Torrey T. Lyons. 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 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 ABOVE LISTED COPYRIGHT HOLDER(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(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+
+#ifndef _DARWIN_H
+#define _DARWIN_H
+
+#include <IOKit/IOTypes.h>
+#include "inputstr.h"
+#include "scrnintstr.h"
+#include <X11/extensions/XKB.h>
+#include <assert.h>
+
+#include "threadSafety.h"
+
+#include "darwinfb.h"
+
+// From darwin.c
+void DarwinPrintBanner(void);
+int DarwinParseModifierList(const char *constmodifiers, int separatelr);
+void DarwinAdjustScreenOrigins(ScreenInfo *pScreenInfo);
+
+#define SCREEN_PRIV(pScreen) ((DarwinFramebufferPtr) \
+    dixLookupPrivate(&pScreen->devPrivates, darwinScreenKey))
+
+/*
+ * Global variables from darwin.c
+ */
+extern DevPrivateKeyRec darwinScreenKeyRec;
+#define darwinScreenKey (&darwinScreenKeyRec)
+extern int              darwinScreensFound;
+extern io_connect_t     darwinParamConnect;
+extern int              darwinEventReadFD;
+extern int              darwinEventWriteFD;
+extern DeviceIntPtr     darwinPointer;
+extern DeviceIntPtr     darwinTabletCurrent;
+extern DeviceIntPtr     darwinTabletCursor;
+extern DeviceIntPtr     darwinTabletStylus;
+extern DeviceIntPtr     darwinTabletEraser;
+extern DeviceIntPtr     darwinKeyboard;
+
+// User preferences
+extern int              darwinMouseAccelChange;
+extern int              darwinFakeButtons;
+extern int              darwinFakeMouse2Mask;
+extern int              darwinFakeMouse3Mask;
+extern unsigned int     darwinAppKitModMask;
+extern unsigned int     windowItemModMask;
+extern int              darwinSyncKeymap;
+extern int              darwinDesiredDepth;
+
+// location of X11's (0,0) point in global screen coordinates
+extern int              darwinMainScreenX;
+extern int              darwinMainScreenY;
+
+#define ENABLE_DEBUG_LOG 1
+
+#ifdef ENABLE_DEBUG_LOG
+extern FILE *debug_log_fp;
+#define DEBUG_LOG_NAME "x11-debug.txt"
+#define DEBUG_LOG(msg, args...) if (debug_log_fp) fprintf(debug_log_fp, "%s:%s:%s:%d " msg, threadSafetyID(pthread_self()), __FILE__, __FUNCTION__, __LINE__, ##args ); fflush(debug_log_fp);
+#else
+#define DEBUG_LOG(msg, args...) 
+#endif
+
+#define TRACE() DEBUG_LOG("\n")
+
+#endif  /* _DARWIN_H */
diff --git a/xorg-server/hw/xquartz/darwinXinput.c b/xorg-server/hw/xquartz/darwinXinput.c
index 527c5bcff..3ef34fec0 100644
--- a/xorg-server/hw/xquartz/darwinXinput.c
+++ b/xorg-server/hw/xquartz/darwinXinput.c
@@ -1,166 +1,156 @@
-/*

- * X server support of the XINPUT extension for xquartz

- *

- * This is currently a copy of Xi/stubs.c, but eventually this

- * should include more complete XINPUT support.

- */

-

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

-

-Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.

-

-			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 Hewlett-Packard not be

-used in advertising or publicity pertaining to distribution of the

-software without specific, written prior permission.

-

-HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING

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

-HEWLETT-PACKARD 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 "inputstr.h"

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

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

-#include "XIstubs.h"

-#include "darwin.h"

-

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

- *

- * Caller:	ProcXSetDeviceMode

- *

- * Change the mode of an extension device.

- * This function is used to change the mode of a device from reporting

- * relative motion to reporting absolute positional information, and

- * vice versa.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)

-{

-  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);

-    return BadMatch;

-}

-

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

- *

- * Caller:	ProcXSetDeviceValuators

- *

- * Set the value of valuators on an extension input device.

- * This function is used to set the initial value of valuators on

- * those input devices that are capable of reporting either relative

- * motion or an absolute position, and allow an initial position to be set.

- * The default implementation below is that no such devices are supported.

- *

- */

-

-int

-SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,

-		   int *valuators, int first_valuator, int num_valuators)

-{

-  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,

-	    dev, valuators, first_valuator, num_valuators);

-  return BadMatch;

-}

-

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

- *

- * Caller:	ProcXChangeDeviceControl

- *

- * Change the specified device controls on an extension input device.

- *

- */

-

-int

-ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,

-		    xDeviceCtl * control)

-{

-

-  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);

-    switch (control->control) {

-    case DEVICE_RESOLUTION:

-	return BadMatch;

-    case DEVICE_ABS_CALIB:

-    case DEVICE_ABS_AREA:

-        return BadMatch;

-    case DEVICE_CORE:

-        return BadMatch;

-    default:

-	return BadMatch;

-    }

-}

-

-

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

- *

- * Caller: configAddDevice (and others)

- *

- * Add a new device with the specified options.

- *

- */

-int

-NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,

-                      DeviceIntPtr *pdev)

-{

-  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);

-  return BadValue;

-}

-

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

- *

- * Caller: configRemoveDevice (and others)

- *

- * Remove the specified device previously added.

- *

- */

-void

-DeleteInputDeviceRequest(DeviceIntPtr dev)

-{

-  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);

-}

-

-void

-CloseInput (void)

-{

-}

-

+/*
+ * X server support of the XINPUT extension for xquartz
+ *
+ * This is currently a copy of Xi/stubs.c, but eventually this
+ * should include more complete XINPUT support.
+ */
+
+/************************************************************
+
+Copyright 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 1989 by Hewlett-Packard Company, Palo Alto, California.
+
+			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 Hewlett-Packard not be
+used in advertising or publicity pertaining to distribution of the
+software without specific, written prior permission.
+
+HEWLETT-PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+HEWLETT-PACKARD 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 "inputstr.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
+#include "XIstubs.h"
+#include "darwin.h"
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceMode
+ *
+ * Change the mode of an extension device.
+ * This function is used to change the mode of a device from reporting
+ * relative motion to reporting absolute positional information, and
+ * vice versa.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceMode(ClientPtr client, DeviceIntPtr dev, int mode)
+{
+  DEBUG_LOG("SetDeviceMode(%p, %p, %d)\n", client, dev, mode);
+    return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXSetDeviceValuators
+ *
+ * Set the value of valuators on an extension input device.
+ * This function is used to set the initial value of valuators on
+ * those input devices that are capable of reporting either relative
+ * motion or an absolute position, and allow an initial position to be set.
+ * The default implementation below is that no such devices are supported.
+ *
+ */
+
+int
+SetDeviceValuators(ClientPtr client, DeviceIntPtr dev,
+		   int *valuators, int first_valuator, int num_valuators)
+{
+  DEBUG_LOG("SetDeviceValuators(%p, %p, %p, %d, %d)\n", client,
+	    dev, valuators, first_valuator, num_valuators);
+  return BadMatch;
+}
+
+/****************************************************************************
+ *
+ * Caller:	ProcXChangeDeviceControl
+ *
+ * Change the specified device controls on an extension input device.
+ *
+ */
+
+int
+ChangeDeviceControl(ClientPtr client, DeviceIntPtr dev,
+		    xDeviceCtl * control)
+{
+
+  DEBUG_LOG("ChangeDeviceControl(%p, %p, %p)\n", client, dev, control);
+  return BadMatch;
+}
+
+
+/****************************************************************************
+ *
+ * Caller: configAddDevice (and others)
+ *
+ * Add a new device with the specified options.
+ *
+ */
+int
+NewInputDeviceRequest(InputOption *options, InputAttributes *attrs,
+                      DeviceIntPtr *pdev)
+{
+  DEBUG_LOG("NewInputDeviceRequest(%p, %p)\n", options, pdev);
+  return BadValue;
+}
+
+/****************************************************************************
+ *
+ * Caller: configRemoveDevice (and others)
+ *
+ * Remove the specified device previously added.
+ *
+ */
+void
+DeleteInputDeviceRequest(DeviceIntPtr dev)
+{
+  DEBUG_LOG("DeleteInputDeviceRequest(%p)\n", dev);
+}
+
+void
+CloseInput (void)
+{
+}
+
diff --git a/xorg-server/hw/xquartz/quartz.c b/xorg-server/hw/xquartz/quartz.c
index 11e5a74d7..4b72a89d3 100644
--- a/xorg-server/hw/xquartz/quartz.c
+++ b/xorg-server/hw/xquartz/quartz.c
@@ -442,7 +442,7 @@ void QuartzSetRootClip(
 
     for (i = 0; i < screenInfo.numScreens; i++) {
         if (screenInfo.screens[i]) {
-            xf86SetRootClip(screenInfo.screens[i], enable);
+            SetRootClip(screenInfo.screens[i], enable);
         }
     }
 }
diff --git a/xorg-server/hw/xquartz/threadSafety.h b/xorg-server/hw/xquartz/threadSafety.h
index 7b009103a..3ff9eaf7e 100644
--- a/xorg-server/hw/xquartz/threadSafety.h
+++ b/xorg-server/hw/xquartz/threadSafety.h
@@ -53,4 +53,4 @@ const char *threadSafetyID(pthread_t tid);
 #define TA_APPKIT() 
 #endif
 
-#endif _XQ_THREAD_SAFETY_H_
+#endif /* _XQ_THREAD_SAFETY_H_ */
diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index 972278b75..f6a712906 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -326,7 +326,9 @@ xprAddScreen(int index, ScreenPtr pScreen)
 #endif
     }
     
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
 have_depth:
+#endif
     switch(depth) {
         case 8: // pseudo-working
             dfb->visuals = PseudoColorMask;
diff --git a/xorg-server/hw/xwin/winrandr.c b/xorg-server/hw/xwin/winrandr.c
index 248404800..c58119360 100644
--- a/xorg-server/hw/xwin/winrandr.c
+++ b/xorg-server/hw/xwin/winrandr.c
@@ -63,106 +63,6 @@ winRandRGetInfo (ScreenPtr pScreen, Rotation *pRotations)
   return TRUE;
 }
 
-
-/*
-  Copied from the xfree86 DDX
-
-  Why can't this be in DIX?
-  Does union _Validate vary depending on DDX??
- */
-static void
-xf86SetRootClip (ScreenPtr pScreen, Bool enable)
-{
-    WindowPtr	pWin = pScreen->root;
-    WindowPtr	pChild;
-    Bool	WasViewable = (Bool)(pWin->viewable);
-    Bool	anyMarked = FALSE;
-    WindowPtr   pLayerWin;
-    BoxRec	box;
-
-    if (WasViewable)
-    {
-	for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib)
-	{
-	    (void) (*pScreen->MarkOverlappedWindows)(pChild,
-						     pChild,
-						     &pLayerWin);
-	}
-	(*pScreen->MarkWindow) (pWin);
-	anyMarked = TRUE;
-	if (pWin->valdata)
-	{
-	    if (HasBorder (pWin))
-	    {
-		RegionPtr	borderVisible;
-
-		borderVisible = REGION_CREATE(pScreen, NullBox, 1);
-		REGION_SUBTRACT(pScreen, borderVisible,
-				&pWin->borderClip, &pWin->winSize);
-		pWin->valdata->before.borderVisible = borderVisible;
-	    }
-	    pWin->valdata->before.resized = TRUE;
-	}
-    }
-
-    /*
-     * Use REGION_BREAK to avoid optimizations in ValidateTree
-     * that assume the root borderClip can't change well, normally
-     * it doesn't...)
-     */
-    if (enable)
-    {
-	box.x1 = 0;
-	box.y1 = 0;
-	box.x2 = pScreen->width;
-	box.y2 = pScreen->height;
-	REGION_INIT (pScreen, &pWin->winSize, &box, 1);
-	REGION_INIT (pScreen, &pWin->borderSize, &box, 1);
-	if (WasViewable)
-	    REGION_RESET(pScreen, &pWin->borderClip, &box);
-	pWin->drawable.width = pScreen->width;
-	pWin->drawable.height = pScreen->height;
-        REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);
-    }
-    else
-    {
-	REGION_EMPTY(pScreen, &pWin->borderClip);
-	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);
-    }
-
-    ResizeChildrenWinSize (pWin, 0, 0, 0, 0);
-
-    if (WasViewable)
-    {
-	if (pWin->firstChild)
-	{
-	    anyMarked |= (*pScreen->MarkOverlappedWindows)(pWin->firstChild,
-							   pWin->firstChild,
-							   (WindowPtr *)NULL);
-	}
-	else
-	{
-	    (*pScreen->MarkWindow) (pWin);
-	    anyMarked = TRUE;
-	}
-
-
-	if (anyMarked)
-	    (*pScreen->ValidateTree)(pWin, NullWindow, VTOther);
-    }
-
-    if (WasViewable)
-    {
-	if (anyMarked)
-	    (*pScreen->HandleExposures)(pWin);
-	if (anyMarked && pScreen->PostValidateTree)
-	    (*pScreen->PostValidateTree)(pWin, NullWindow, VTOther);
-    }
-    if (pWin->realized)
-	WindowsRestructured ();
-    FlushAllOutput ();
-}
-
 /*
 
 */
@@ -178,7 +78,7 @@ winDoRandRScreenSetSize (ScreenPtr  pScreen,
   WindowPtr pRoot = pScreen->root;
 
   // Prevent screen updates while we change things around
-  xf86SetRootClip(pScreen, FALSE);
+  SetRootClip(pScreen, FALSE);
 
   /* Update the screen size as requested */
   pScreenInfo->dwWidth = width;
@@ -205,7 +105,7 @@ winDoRandRScreenSetSize (ScreenPtr  pScreen,
   // does this emit a ConfigureNotify??
 
   // Restore the ability to update screen, now with new dimensions
-  xf86SetRootClip(pScreen, TRUE);
+  SetRootClip(pScreen, TRUE);
 
   // and arrange for it to be repainted
   miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index fc93f3ec1..fd9ecced2 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -444,6 +444,9 @@
 /* Define to 1 if you have the `ffs' function. */
 #undef HAVE_FFS
 
+/* If the compiler supports a TLS storage class define it to that here */
+#undef TLS
+
 /* Correctly set _XSERVER64 for OSX fat binaries */
 #ifdef __APPLE__
 #include "dix-config-apple-verbatim.h"
diff --git a/xorg-server/include/input.h b/xorg-server/include/input.h
index ec915b37e..2bb85ffaa 100644
--- a/xorg-server/include/input.h
+++ b/xorg-server/include/input.h
@@ -1,593 +1,596 @@
-/************************************************************

-

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

-

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

-

-#ifndef INPUT_H

-#define INPUT_H

-

-#include "misc.h"

-#include "screenint.h"

-#include <X11/Xmd.h>

-#include <X11/Xproto.h>

-#include <stdint.h>

-#include "window.h"     /* for WindowPtr */

-#include "xkbrules.h"

-#include "events.h"

-

-#define DEVICE_INIT	0

-#define DEVICE_ON	1

-#define DEVICE_OFF	2

-#define DEVICE_CLOSE	3

-

-#define POINTER_RELATIVE (1 << 1)

-#define POINTER_ABSOLUTE (1 << 2)

-#define POINTER_ACCELERATE (1 << 3)

-#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */

-

-/*int constants for pointer acceleration schemes*/

-#define PtrAccelNoOp            0

-#define PtrAccelPredictable     1

-#define PtrAccelLightweight     2

-#define PtrAccelDefault         PtrAccelPredictable

-

-#define MAX_VALUATORS 36

-/* Maximum number of valuators, divided by six, rounded up, to get number

- * of events. */

-#define MAX_VALUATOR_EVENTS 6

-#define MAX_BUTTONS 256 /* completely arbitrarily chosen */

-

-#define NO_AXIS_LIMITS -1

-

-#define MAP_LENGTH	256

-#define DOWN_LENGTH	32	/* 256/8 => number of bytes to hold 256 bits */

-#define NullGrab ((GrabPtr)NULL)

-#define PointerRootWin ((WindowPtr)PointerRoot)

-#define NoneWin ((WindowPtr)None)

-#define NullDevice ((DevicePtr)NULL)

-

-#ifndef FollowKeyboard

-#define FollowKeyboard 		3

-#endif

-#ifndef FollowKeyboardWin

-#define FollowKeyboardWin  ((WindowPtr) FollowKeyboard)

-#endif

-#ifndef RevertToFollowKeyboard

-#define RevertToFollowKeyboard	3

-#endif

-

-typedef unsigned long Leds;

-typedef struct _OtherClients *OtherClientsPtr;

-typedef struct _InputClients *InputClientsPtr;

-typedef struct _DeviceIntRec *DeviceIntPtr;

-typedef struct _ClassesRec *ClassesPtr;

-typedef struct _SpriteRec *SpritePtr;

-typedef union _GrabMask GrabMask;

-

-typedef struct _ValuatorMask ValuatorMask;

-

-typedef struct _EventList {

-    xEvent* event;

-    int evlen; /* length of allocated memory for event in bytes.  This is not

-                  the actual length of the event. The event's actual length is

-                  32 for standard events or 32 +

-                  ((xGenericEvent*)event)->length * 4 for GenericEvents.

-                  For events in the EQ, the length is

-                  ((InternalEvent*)event)->u.any.length */

-} EventList, *EventListPtr;

-

-/* The DIX stores incoming input events in this list */

-extern EventListPtr InputEventList;

-extern int InputEventListLen;

-

-typedef int (*DeviceProc)(

-    DeviceIntPtr /*device*/,

-    int /*what*/);

-

-typedef void (*ProcessInputProc)(

-    InternalEvent * /*event*/,

-    DeviceIntPtr /*device*/);

-

-typedef Bool (*DeviceHandleProc)(

-    DeviceIntPtr /*device*/,

-    void* /*data*/

-    );

-

-typedef void (*DeviceUnwrapProc)(

-    DeviceIntPtr /*device*/,

-    DeviceHandleProc /*proc*/,

-    void* /*data*/

-    );

-

-/* pointer acceleration handling */

-typedef void (*PointerAccelSchemeProc)(

-    DeviceIntPtr /*device*/,

-    ValuatorMask* /*valuators*/,

-    CARD32 /*evtime*/);

-

-typedef void (*DeviceCallbackProc)(

-              DeviceIntPtr /*pDev*/);

-

-struct _ValuatorAccelerationRec;

-typedef Bool (*PointerAccelSchemeInitProc)(

-              DeviceIntPtr /*dev*/,

-              struct _ValuatorAccelerationRec* /*protoScheme*/);

-

-typedef struct _DeviceRec {

-    pointer	devicePrivate;

-    ProcessInputProc processInputProc;	/* current */

-    ProcessInputProc realInputProc;	/* deliver */

-    ProcessInputProc enqueueInputProc;	/* enqueue */

-    Bool	on;			/* used by DDX to keep state */

-} DeviceRec, *DevicePtr;

-

-typedef struct {

-    int			click, bell, bell_pitch, bell_duration;

-    Bool		autoRepeat;

-    unsigned char	autoRepeats[32];

-    Leds		leds;

-    unsigned char	id;

-} KeybdCtrl;

-

-typedef struct {

-    KeySym  *map;

-    KeyCode minKeyCode,

-	    maxKeyCode;

-    int     mapWidth;

-} KeySymsRec, *KeySymsPtr;

-

-typedef struct {

-    int		num, den, threshold;

-    unsigned char id;

-} PtrCtrl;

-

-typedef struct {

-    int         resolution, min_value, max_value;

-    int         integer_displayed;

-    unsigned char id;

-} IntegerCtrl;

-

-typedef struct {

-    int         max_symbols, num_symbols_supported;

-    int         num_symbols_displayed;

-    KeySym      *symbols_supported;

-    KeySym      *symbols_displayed;

-    unsigned char id;

-} StringCtrl;

-

-typedef struct {

-    int         percent, pitch, duration;

-    unsigned char id;

-} BellCtrl;

-

-typedef struct {

-    Leds        led_values;

-    Mask        led_mask;

-    unsigned char id;

-} LedCtrl;

-

-extern _X_EXPORT KeybdCtrl	defaultKeyboardControl;

-extern _X_EXPORT PtrCtrl	defaultPointerControl;

-

-typedef struct _InputOption {

-    char                *key;

-    char                *value;

-    struct _InputOption *next;

-} InputOption;

-

-typedef struct _InputAttributes {

-    char                *product;

-    char                *vendor;

-    char                *device;

-    char                *pnp_id;

-    char                *usb_id;

-    char                **tags; /* null-terminated */

-    uint32_t            flags;

-} InputAttributes;

-

-#define ATTR_KEYBOARD (1<<0)

-#define ATTR_POINTER (1<<1)

-#define ATTR_JOYSTICK (1<<2)

-#define ATTR_TABLET (1<<3)

-#define ATTR_TOUCHPAD (1<<4)

-#define ATTR_TOUCHSCREEN (1<<5)

-

-/* Key/Button has been run through all input processing and events sent to clients. */

-#define KEY_PROCESSED 1

-#define BUTTON_PROCESSED 1

-/* Key/Button has not been fully processed, no events have been sent. */

-#define KEY_POSTED 2

-#define BUTTON_POSTED 2

-

-extern void set_key_down(DeviceIntPtr pDev, int key_code, int type);

-extern void set_key_up(DeviceIntPtr pDev, int key_code, int type);

-extern int key_is_down(DeviceIntPtr pDev, int key_code, int type);

-extern void set_button_down(DeviceIntPtr pDev, int button, int type);

-extern void set_button_up(DeviceIntPtr pDev, int button, int type);

-extern int button_is_down(DeviceIntPtr pDev, int button, int type);

-

-extern void InitCoreDevices(void);

-extern void InitXTestDevices(void);

-

-extern _X_EXPORT DeviceIntPtr AddInputDevice(

-    ClientPtr /*client*/,

-    DeviceProc /*deviceProc*/,

-    Bool /*autoStart*/);

-

-extern _X_EXPORT Bool EnableDevice(

-    DeviceIntPtr /*device*/,

-    BOOL /* sendevent */);

-

-extern _X_EXPORT Bool ActivateDevice(

-    DeviceIntPtr /*device*/,

-    BOOL /* sendevent */);

-

-extern _X_EXPORT Bool DisableDevice(

-    DeviceIntPtr /*device*/,

-    BOOL /* sendevent */);

-

-extern int InitAndStartDevices(void);

-

-extern void CloseDownDevices(void);

-

-extern void UndisplayDevices(void);

-

-extern _X_EXPORT int RemoveDevice(

-    DeviceIntPtr /*dev*/,

-    BOOL /* sendevent */);

-

-extern _X_EXPORT int NumMotionEvents(void);

-

-extern _X_EXPORT int dixLookupDevice(

-    DeviceIntPtr *         /* dev */,

-    int                    /* id */,

-    ClientPtr              /* client */,

-    Mask                   /* access_mode */);

-

-extern _X_EXPORT void QueryMinMaxKeyCodes(

-    KeyCode* /*minCode*/,

-    KeyCode* /*maxCode*/);

-

-extern _X_EXPORT Bool SetKeySymsMap(

-    KeySymsPtr /*dst*/,

-    KeySymsPtr /*src*/);

-

-extern _X_EXPORT Bool InitButtonClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    int /*numButtons*/,

-    Atom* /* labels */,

-    CARD8* /*map*/);

-

-extern _X_EXPORT Bool InitValuatorClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    int /*numAxes*/,

-    Atom* /* labels */,

-    int /*numMotionEvents*/,

-    int /*mode*/);

-

-extern _X_EXPORT Bool InitPointerAccelerationScheme(

-    DeviceIntPtr /*dev*/,

-    int /*scheme*/);

-

-extern _X_EXPORT Bool InitAbsoluteClassDeviceStruct(

-    DeviceIntPtr /*device*/);

-

-extern _X_EXPORT Bool InitFocusClassDeviceStruct(

-    DeviceIntPtr /*device*/);

-

-typedef void (*BellProcPtr)(

-    int /*percent*/,

-    DeviceIntPtr /*device*/,

-    pointer /*ctrl*/,

-    int);

-

-typedef void (*KbdCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    KeybdCtrl * /*ctrl*/);

-

-typedef void (*PtrCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    PtrCtrl * /*ctrl*/);

-

-extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    PtrCtrlProcPtr /*controlProc*/);

-

-typedef void (*StringCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    StringCtrl * /*ctrl*/);

-

-extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    StringCtrlProcPtr /*controlProc*/,

-    int /*max_symbols*/,

-    int /*num_symbols_supported*/,

-    KeySym* /*symbols*/);

-

-typedef void (*BellCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    BellCtrl * /*ctrl*/);

-

-extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    BellProcPtr /*bellProc*/,

-    BellCtrlProcPtr /*controlProc*/);

-

-typedef void (*LedCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    LedCtrl * /*ctrl*/);

-

-extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    LedCtrlProcPtr /*controlProc*/);

-

-typedef void (*IntegerCtrlProcPtr)(

-    DeviceIntPtr /*device*/,

-    IntegerCtrl * /*ctrl*/);

-

-

-extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(

-    DeviceIntPtr /*device*/,

-    IntegerCtrlProcPtr /*controlProc*/);

-

-extern _X_EXPORT Bool InitPointerDeviceStruct(

-    DevicePtr /*device*/,

-    CARD8* /*map*/,

-    int /*numButtons*/,

-    Atom* /* btn_labels */,

-    PtrCtrlProcPtr /*controlProc*/,

-    int /*numMotionEvents*/,

-    int /*numAxes*/,

-    Atom* /* axes_labels */);

-

-extern _X_EXPORT Bool InitKeyboardDeviceStruct(

-    DeviceIntPtr /*device*/,

-    XkbRMLVOSet * /*rmlvo*/,

-    BellProcPtr /*bellProc*/,

-    KbdCtrlProcPtr /*controlProc*/);

-

-extern int ApplyPointerMapping(

-    DeviceIntPtr /* pDev */,

-    CARD8 *      /* map */,

-    int          /* len */,

-    ClientPtr	/* client */);

-

-extern Bool BadDeviceMap(

-    BYTE* /*buff*/,

-    int /*length*/,

-    unsigned /*low*/,

-    unsigned /*high*/,

-    XID* /*errval*/);

-

-extern void NoteLedState(

-    DeviceIntPtr /*keybd*/,

-    int /*led*/,

-    Bool /*on*/);

-

-extern void MaybeStopHint(

-    DeviceIntPtr /*device*/,

-    ClientPtr /*client*/);

-

-extern void ProcessPointerEvent(

-    InternalEvent* /* ev */,

-    DeviceIntPtr /*mouse*/);

-

-extern void ProcessKeyboardEvent(

-    InternalEvent* /*ev*/,

-    DeviceIntPtr   /*keybd*/);

-

-extern Bool LegalModifier(

-    unsigned int /*key*/, 

-    DeviceIntPtr /*pDev*/);

-

-extern _X_EXPORT void ProcessInputEvents(void);

-

-extern _X_EXPORT void InitInput(

-    int  /*argc*/,

-    char ** /*argv*/);

-extern _X_EXPORT void CloseInput(void);

-

-extern _X_EXPORT int GetMaximumEventsNum(void);

-

-extern _X_EXPORT int GetEventList(EventListPtr* list);

-extern _X_EXPORT EventListPtr InitEventList(int num_events);

-extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events);

-

-extern void CreateClassesChangedEvent(EventListPtr event,

-                                      DeviceIntPtr master,

-                                      DeviceIntPtr slave,

-                                      int type);

-extern EventListPtr UpdateFromMaster(

-    EventListPtr events,

-    DeviceIntPtr pDev,

-    int type,

-    int *num_events);

-

-extern _X_EXPORT int GetPointerEvents(

-    EventListPtr events,

-    DeviceIntPtr pDev,

-    int type,

-    int buttons,

-    int flags,

-    const ValuatorMask *mask);

-

-extern _X_EXPORT int GetKeyboardEvents(

-    EventListPtr events,

-    DeviceIntPtr pDev,

-    int type,

-    int key_code);

-

-extern int GetKeyboardValuatorEvents(

-    EventListPtr events,

-    DeviceIntPtr pDev,

-    int type,

-    int key_code,

-    const ValuatorMask *mask);

-

-extern int GetProximityEvents(

-    EventListPtr events,

-    DeviceIntPtr pDev,

-    int type,

-    const ValuatorMask *mask);

-

-extern void PostSyntheticMotion(

-    DeviceIntPtr pDev,

-    int x,

-    int y,

-    int screen,

-    unsigned long time);

-

-extern _X_EXPORT int GetMotionHistorySize(

-    void);

-

-extern _X_EXPORT void AllocateMotionHistory(

-    DeviceIntPtr pDev);

-

-extern _X_EXPORT int GetMotionHistory(

-    DeviceIntPtr pDev,

-    xTimecoord **buff,

-    unsigned long start,

-    unsigned long stop,

-    ScreenPtr pScreen,

-    BOOL core);

-

-extern int AttachDevice(ClientPtr client,

-                        DeviceIntPtr slave,

-                        DeviceIntPtr master);

-

-extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);

-extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);

-

-extern _X_EXPORT int AllocDevicePair(ClientPtr client,

-                             char* name,

-                             DeviceIntPtr* ptr,

-                             DeviceIntPtr* keybd,

-                             DeviceProc ptr_proc,

-                             DeviceProc keybd_proc,

-                             Bool master);

-extern void DeepCopyDeviceClasses(DeviceIntPtr from,

-                                  DeviceIntPtr to,

-                                  DeviceChangedEvent *dce);

-

-/* Helper functions. */

-extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,

-                              KeyCode **modkeymap, int *max_keys_per_mod);

-extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,

-                         int max_keys_per_mod);

-extern int AllocXTestDevice(ClientPtr client,

-                             char* name,

-                             DeviceIntPtr* ptr,

-                             DeviceIntPtr* keybd,

-                             DeviceIntPtr master_ptr,

-                             DeviceIntPtr master_keybd);

-extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);

-extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);

-extern void SendDevicePresenceEvent(int deviceid, int type);

-extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes *attrs);

-extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);

-

-/* misc event helpers */

-extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);

-extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);

-extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev);

-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);

-/**

- * Masks specifying the type of event to deliver for an InternalEvent; used

- * by EventIsDeliverable.

- * @defgroup EventIsDeliverable return flags

- * @{

- */

-#define EVENT_XI1_MASK                (1 << 0) /**< XI1.x event */

-#define EVENT_CORE_MASK               (1 << 1) /**< Core event */

-#define EVENT_DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set */

-#define EVENT_XI2_MASK                (1 << 3) /**< XI2 mask set on window */

-/* @} */

-

-/* Implemented by the DDX. */

-extern _X_EXPORT int NewInputDeviceRequest(

-    InputOption *options,

-    InputAttributes *attrs,

-    DeviceIntPtr *dev);

-extern  _X_EXPORT void DeleteInputDeviceRequest(

-    DeviceIntPtr dev);

-

-extern _X_EXPORT void DDXRingBell(

-    int volume,

-    int pitch,

-    int duration);

-

-#define VALUATOR_MODE_ALL_AXES -1

-extern _X_HIDDEN int valuator_get_mode(DeviceIntPtr dev, int axis);

-extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);

-

-/* Set to TRUE by default - os/utils.c sets it to FALSE on user request,

-   xfixes/cursor.c uses it to determine if the cursor is enabled */

-extern Bool EnableCursor;

-

-extern _X_EXPORT ValuatorMask  *valuator_mask_new(int num_valuators);

-extern _X_EXPORT void valuator_mask_free(ValuatorMask **mask);

-extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,

-                                       int first_valuator, int num_valuators,

-                                       const int* valuators);

-extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,

-                                        int valuator,

-                                        int data);

-extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);

-extern _X_EXPORT int valuator_mask_size(const ValuatorMask *mask);

-extern _X_EXPORT int valuator_mask_isset(const ValuatorMask *mask, int bit);

-extern _X_EXPORT void valuator_mask_unset(ValuatorMask *mask, int bit);

-extern _X_EXPORT int valuator_mask_num_valuators(const ValuatorMask *mask);

-extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest,

-                                         const ValuatorMask *src);

-extern _X_EXPORT int valuator_mask_get(const ValuatorMask *mask, int valnum);

-

-#endif /* INPUT_H */

+/************************************************************
+
+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.
+
+********************************************************/
+
+#ifndef INPUT_H
+#define INPUT_H
+
+#include "misc.h"
+#include "screenint.h"
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <stdint.h>
+#include "window.h"     /* for WindowPtr */
+#include "xkbrules.h"
+#include "events.h"
+
+#define DEVICE_INIT	0
+#define DEVICE_ON	1
+#define DEVICE_OFF	2
+#define DEVICE_CLOSE	3
+
+#define POINTER_RELATIVE (1 << 1)
+#define POINTER_ABSOLUTE (1 << 2)
+#define POINTER_ACCELERATE (1 << 3)
+#define POINTER_SCREEN (1 << 4) /* Data in screen coordinates */
+
+/*int constants for pointer acceleration schemes*/
+#define PtrAccelNoOp            0
+#define PtrAccelPredictable     1
+#define PtrAccelLightweight     2
+#define PtrAccelDefault         PtrAccelPredictable
+
+#define MAX_VALUATORS 36
+/* Maximum number of valuators, divided by six, rounded up, to get number
+ * of events. */
+#define MAX_VALUATOR_EVENTS 6
+#define MAX_BUTTONS 256 /* completely arbitrarily chosen */
+
+#define NO_AXIS_LIMITS -1
+
+#define MAP_LENGTH	256
+#define DOWN_LENGTH	32	/* 256/8 => number of bytes to hold 256 bits */
+#define NullGrab ((GrabPtr)NULL)
+#define PointerRootWin ((WindowPtr)PointerRoot)
+#define NoneWin ((WindowPtr)None)
+#define NullDevice ((DevicePtr)NULL)
+
+#ifndef FollowKeyboard
+#define FollowKeyboard 		3
+#endif
+#ifndef FollowKeyboardWin
+#define FollowKeyboardWin  ((WindowPtr) FollowKeyboard)
+#endif
+#ifndef RevertToFollowKeyboard
+#define RevertToFollowKeyboard	3
+#endif
+
+typedef unsigned long Leds;
+typedef struct _OtherClients *OtherClientsPtr;
+typedef struct _InputClients *InputClientsPtr;
+typedef struct _DeviceIntRec *DeviceIntPtr;
+typedef struct _ClassesRec *ClassesPtr;
+typedef struct _SpriteRec *SpritePtr;
+typedef union _GrabMask GrabMask;
+
+typedef struct _ValuatorMask ValuatorMask;
+
+typedef struct _EventList {
+    xEvent* event;
+    int evlen; /* length of allocated memory for event in bytes.  This is not
+                  the actual length of the event. The event's actual length is
+                  32 for standard events or 32 +
+                  ((xGenericEvent*)event)->length * 4 for GenericEvents.
+                  For events in the EQ, the length is
+                  ((InternalEvent*)event)->u.any.length */
+} EventList, *EventListPtr;
+
+/* The DIX stores incoming input events in this list */
+extern EventListPtr InputEventList;
+extern int InputEventListLen;
+
+typedef int (*DeviceProc)(
+    DeviceIntPtr /*device*/,
+    int /*what*/);
+
+typedef void (*ProcessInputProc)(
+    InternalEvent * /*event*/,
+    DeviceIntPtr /*device*/);
+
+typedef Bool (*DeviceHandleProc)(
+    DeviceIntPtr /*device*/,
+    void* /*data*/
+    );
+
+typedef void (*DeviceUnwrapProc)(
+    DeviceIntPtr /*device*/,
+    DeviceHandleProc /*proc*/,
+    void* /*data*/
+    );
+
+/* pointer acceleration handling */
+typedef void (*PointerAccelSchemeProc)(
+    DeviceIntPtr /*device*/,
+    ValuatorMask* /*valuators*/,
+    CARD32 /*evtime*/);
+
+typedef void (*DeviceCallbackProc)(
+              DeviceIntPtr /*pDev*/);
+
+struct _ValuatorAccelerationRec;
+typedef Bool (*PointerAccelSchemeInitProc)(
+              DeviceIntPtr /*dev*/,
+              struct _ValuatorAccelerationRec* /*protoScheme*/);
+
+typedef struct _DeviceRec {
+    pointer	devicePrivate;
+    ProcessInputProc processInputProc;	/* current */
+    ProcessInputProc realInputProc;	/* deliver */
+    ProcessInputProc enqueueInputProc;	/* enqueue */
+    Bool	on;			/* used by DDX to keep state */
+} DeviceRec, *DevicePtr;
+
+typedef struct {
+    int			click, bell, bell_pitch, bell_duration;
+    Bool		autoRepeat;
+    unsigned char	autoRepeats[32];
+    Leds		leds;
+    unsigned char	id;
+} KeybdCtrl;
+
+typedef struct {
+    KeySym  *map;
+    KeyCode minKeyCode,
+	    maxKeyCode;
+    int     mapWidth;
+} KeySymsRec, *KeySymsPtr;
+
+typedef struct {
+    int		num, den, threshold;
+    unsigned char id;
+} PtrCtrl;
+
+typedef struct {
+    int         resolution, min_value, max_value;
+    int         integer_displayed;
+    unsigned char id;
+} IntegerCtrl;
+
+typedef struct {
+    int         max_symbols, num_symbols_supported;
+    int         num_symbols_displayed;
+    KeySym      *symbols_supported;
+    KeySym      *symbols_displayed;
+    unsigned char id;
+} StringCtrl;
+
+typedef struct {
+    int         percent, pitch, duration;
+    unsigned char id;
+} BellCtrl;
+
+typedef struct {
+    Leds        led_values;
+    Mask        led_mask;
+    unsigned char id;
+} LedCtrl;
+
+extern _X_EXPORT KeybdCtrl	defaultKeyboardControl;
+extern _X_EXPORT PtrCtrl	defaultPointerControl;
+
+typedef struct _InputOption {
+    char                *key;
+    char                *value;
+    struct _InputOption *next;
+} InputOption;
+
+typedef struct _InputAttributes {
+    char                *product;
+    char                *vendor;
+    char                *device;
+    char                *pnp_id;
+    char                *usb_id;
+    char                **tags; /* null-terminated */
+    uint32_t            flags;
+} InputAttributes;
+
+#define ATTR_KEYBOARD (1<<0)
+#define ATTR_POINTER (1<<1)
+#define ATTR_JOYSTICK (1<<2)
+#define ATTR_TABLET (1<<3)
+#define ATTR_TOUCHPAD (1<<4)
+#define ATTR_TOUCHSCREEN (1<<5)
+
+/* Key/Button has been run through all input processing and events sent to clients. */
+#define KEY_PROCESSED 1
+#define BUTTON_PROCESSED 1
+/* Key/Button has not been fully processed, no events have been sent. */
+#define KEY_POSTED 2
+#define BUTTON_POSTED 2
+
+extern void set_key_down(DeviceIntPtr pDev, int key_code, int type);
+extern void set_key_up(DeviceIntPtr pDev, int key_code, int type);
+extern int key_is_down(DeviceIntPtr pDev, int key_code, int type);
+extern void set_button_down(DeviceIntPtr pDev, int button, int type);
+extern void set_button_up(DeviceIntPtr pDev, int button, int type);
+extern int button_is_down(DeviceIntPtr pDev, int button, int type);
+
+extern void InitCoreDevices(void);
+extern void InitXTestDevices(void);
+
+extern _X_EXPORT DeviceIntPtr AddInputDevice(
+    ClientPtr /*client*/,
+    DeviceProc /*deviceProc*/,
+    Bool /*autoStart*/);
+
+extern _X_EXPORT Bool EnableDevice(
+    DeviceIntPtr /*device*/,
+    BOOL /* sendevent */);
+
+extern _X_EXPORT Bool ActivateDevice(
+    DeviceIntPtr /*device*/,
+    BOOL /* sendevent */);
+
+extern _X_EXPORT Bool DisableDevice(
+    DeviceIntPtr /*device*/,
+    BOOL /* sendevent */);
+
+extern int InitAndStartDevices(void);
+
+extern void CloseDownDevices(void);
+
+extern void UndisplayDevices(void);
+
+extern _X_EXPORT int RemoveDevice(
+    DeviceIntPtr /*dev*/,
+    BOOL /* sendevent */);
+
+extern _X_EXPORT int NumMotionEvents(void);
+
+extern _X_EXPORT int dixLookupDevice(
+    DeviceIntPtr *         /* dev */,
+    int                    /* id */,
+    ClientPtr              /* client */,
+    Mask                   /* access_mode */);
+
+extern _X_EXPORT void QueryMinMaxKeyCodes(
+    KeyCode* /*minCode*/,
+    KeyCode* /*maxCode*/);
+
+extern _X_EXPORT Bool SetKeySymsMap(
+    KeySymsPtr /*dst*/,
+    KeySymsPtr /*src*/);
+
+extern _X_EXPORT Bool InitButtonClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    int /*numButtons*/,
+    Atom* /* labels */,
+    CARD8* /*map*/);
+
+extern _X_EXPORT Bool InitValuatorClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    int /*numAxes*/,
+    Atom* /* labels */,
+    int /*numMotionEvents*/,
+    int /*mode*/);
+
+extern _X_EXPORT Bool InitPointerAccelerationScheme(
+    DeviceIntPtr /*dev*/,
+    int /*scheme*/);
+
+/**
+ * This is not implemented and just returns FALSE.
+ */
+extern _X_EXPORT _X_DEPRECATED Bool InitAbsoluteClassDeviceStruct(
+    DeviceIntPtr /*device*/);
+
+extern _X_EXPORT Bool InitFocusClassDeviceStruct(
+    DeviceIntPtr /*device*/);
+
+typedef void (*BellProcPtr)(
+    int /*percent*/,
+    DeviceIntPtr /*device*/,
+    pointer /*ctrl*/,
+    int);
+
+typedef void (*KbdCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    KeybdCtrl * /*ctrl*/);
+
+typedef void (*PtrCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    PtrCtrl * /*ctrl*/);
+
+extern _X_EXPORT Bool InitPtrFeedbackClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    PtrCtrlProcPtr /*controlProc*/);
+
+typedef void (*StringCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    StringCtrl * /*ctrl*/);
+
+extern _X_EXPORT Bool InitStringFeedbackClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    StringCtrlProcPtr /*controlProc*/,
+    int /*max_symbols*/,
+    int /*num_symbols_supported*/,
+    KeySym* /*symbols*/);
+
+typedef void (*BellCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    BellCtrl * /*ctrl*/);
+
+extern _X_EXPORT Bool InitBellFeedbackClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    BellProcPtr /*bellProc*/,
+    BellCtrlProcPtr /*controlProc*/);
+
+typedef void (*LedCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    LedCtrl * /*ctrl*/);
+
+extern _X_EXPORT Bool InitLedFeedbackClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    LedCtrlProcPtr /*controlProc*/);
+
+typedef void (*IntegerCtrlProcPtr)(
+    DeviceIntPtr /*device*/,
+    IntegerCtrl * /*ctrl*/);
+
+
+extern _X_EXPORT Bool InitIntegerFeedbackClassDeviceStruct(
+    DeviceIntPtr /*device*/,
+    IntegerCtrlProcPtr /*controlProc*/);
+
+extern _X_EXPORT Bool InitPointerDeviceStruct(
+    DevicePtr /*device*/,
+    CARD8* /*map*/,
+    int /*numButtons*/,
+    Atom* /* btn_labels */,
+    PtrCtrlProcPtr /*controlProc*/,
+    int /*numMotionEvents*/,
+    int /*numAxes*/,
+    Atom* /* axes_labels */);
+
+extern _X_EXPORT Bool InitKeyboardDeviceStruct(
+    DeviceIntPtr /*device*/,
+    XkbRMLVOSet * /*rmlvo*/,
+    BellProcPtr /*bellProc*/,
+    KbdCtrlProcPtr /*controlProc*/);
+
+extern int ApplyPointerMapping(
+    DeviceIntPtr /* pDev */,
+    CARD8 *      /* map */,
+    int          /* len */,
+    ClientPtr	/* client */);
+
+extern Bool BadDeviceMap(
+    BYTE* /*buff*/,
+    int /*length*/,
+    unsigned /*low*/,
+    unsigned /*high*/,
+    XID* /*errval*/);
+
+extern void NoteLedState(
+    DeviceIntPtr /*keybd*/,
+    int /*led*/,
+    Bool /*on*/);
+
+extern void MaybeStopHint(
+    DeviceIntPtr /*device*/,
+    ClientPtr /*client*/);
+
+extern void ProcessPointerEvent(
+    InternalEvent* /* ev */,
+    DeviceIntPtr /*mouse*/);
+
+extern void ProcessKeyboardEvent(
+    InternalEvent* /*ev*/,
+    DeviceIntPtr   /*keybd*/);
+
+extern Bool LegalModifier(
+    unsigned int /*key*/, 
+    DeviceIntPtr /*pDev*/);
+
+extern _X_EXPORT void ProcessInputEvents(void);
+
+extern _X_EXPORT void InitInput(
+    int  /*argc*/,
+    char ** /*argv*/);
+extern _X_EXPORT void CloseInput(void);
+
+extern _X_EXPORT int GetMaximumEventsNum(void);
+
+extern _X_EXPORT int GetEventList(EventListPtr* list);
+extern _X_EXPORT EventListPtr InitEventList(int num_events);
+extern _X_EXPORT void FreeEventList(EventListPtr list, int num_events);
+
+extern void CreateClassesChangedEvent(EventListPtr event,
+                                      DeviceIntPtr master,
+                                      DeviceIntPtr slave,
+                                      int type);
+extern EventListPtr UpdateFromMaster(
+    EventListPtr events,
+    DeviceIntPtr pDev,
+    int type,
+    int *num_events);
+
+extern _X_EXPORT int GetPointerEvents(
+    EventListPtr events,
+    DeviceIntPtr pDev,
+    int type,
+    int buttons,
+    int flags,
+    const ValuatorMask *mask);
+
+extern _X_EXPORT int GetKeyboardEvents(
+    EventListPtr events,
+    DeviceIntPtr pDev,
+    int type,
+    int key_code);
+
+extern int GetKeyboardValuatorEvents(
+    EventListPtr events,
+    DeviceIntPtr pDev,
+    int type,
+    int key_code,
+    const ValuatorMask *mask);
+
+extern int GetProximityEvents(
+    EventListPtr events,
+    DeviceIntPtr pDev,
+    int type,
+    const ValuatorMask *mask);
+
+extern void PostSyntheticMotion(
+    DeviceIntPtr pDev,
+    int x,
+    int y,
+    int screen,
+    unsigned long time);
+
+extern _X_EXPORT int GetMotionHistorySize(
+    void);
+
+extern _X_EXPORT void AllocateMotionHistory(
+    DeviceIntPtr pDev);
+
+extern _X_EXPORT int GetMotionHistory(
+    DeviceIntPtr pDev,
+    xTimecoord **buff,
+    unsigned long start,
+    unsigned long stop,
+    ScreenPtr pScreen,
+    BOOL core);
+
+extern int AttachDevice(ClientPtr client,
+                        DeviceIntPtr slave,
+                        DeviceIntPtr master);
+
+extern _X_EXPORT DeviceIntPtr GetPairedDevice(DeviceIntPtr kbd);
+extern DeviceIntPtr GetMaster(DeviceIntPtr dev, int type);
+
+extern _X_EXPORT int AllocDevicePair(ClientPtr client,
+                             char* name,
+                             DeviceIntPtr* ptr,
+                             DeviceIntPtr* keybd,
+                             DeviceProc ptr_proc,
+                             DeviceProc keybd_proc,
+                             Bool master);
+extern void DeepCopyDeviceClasses(DeviceIntPtr from,
+                                  DeviceIntPtr to,
+                                  DeviceChangedEvent *dce);
+
+/* Helper functions. */
+extern _X_EXPORT int generate_modkeymap(ClientPtr client, DeviceIntPtr dev,
+                              KeyCode **modkeymap, int *max_keys_per_mod);
+extern int change_modmap(ClientPtr client, DeviceIntPtr dev, KeyCode *map,
+                         int max_keys_per_mod);
+extern int AllocXTestDevice(ClientPtr client,
+                             char* name,
+                             DeviceIntPtr* ptr,
+                             DeviceIntPtr* keybd,
+                             DeviceIntPtr master_ptr,
+                             DeviceIntPtr master_keybd);
+extern BOOL IsXTestDevice(DeviceIntPtr dev, DeviceIntPtr master);
+extern DeviceIntPtr GetXTestDevice(DeviceIntPtr master);
+extern void SendDevicePresenceEvent(int deviceid, int type);
+extern _X_EXPORT InputAttributes *DuplicateInputAttributes(InputAttributes *attrs);
+extern _X_EXPORT void FreeInputAttributes(InputAttributes *attrs);
+
+/* misc event helpers */
+extern Mask GetEventMask(DeviceIntPtr dev, xEvent* ev, InputClientsPtr clients);
+extern Mask GetEventFilter(DeviceIntPtr dev, xEvent *event);
+extern Mask GetWindowXI2Mask(DeviceIntPtr dev, WindowPtr win, xEvent* ev);
+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);
+/**
+ * Masks specifying the type of event to deliver for an InternalEvent; used
+ * by EventIsDeliverable.
+ * @defgroup EventIsDeliverable return flags
+ * @{
+ */
+#define EVENT_XI1_MASK                (1 << 0) /**< XI1.x event */
+#define EVENT_CORE_MASK               (1 << 1) /**< Core event */
+#define EVENT_DONT_PROPAGATE_MASK     (1 << 2) /**< DontPropagate mask set */
+#define EVENT_XI2_MASK                (1 << 3) /**< XI2 mask set on window */
+/* @} */
+
+/* Implemented by the DDX. */
+extern _X_EXPORT int NewInputDeviceRequest(
+    InputOption *options,
+    InputAttributes *attrs,
+    DeviceIntPtr *dev);
+extern  _X_EXPORT void DeleteInputDeviceRequest(
+    DeviceIntPtr dev);
+
+extern _X_EXPORT void DDXRingBell(
+    int volume,
+    int pitch,
+    int duration);
+
+#define VALUATOR_MODE_ALL_AXES -1
+extern _X_HIDDEN int valuator_get_mode(DeviceIntPtr dev, int axis);
+extern _X_HIDDEN void valuator_set_mode(DeviceIntPtr dev, int axis, int mode);
+
+/* Set to TRUE by default - os/utils.c sets it to FALSE on user request,
+   xfixes/cursor.c uses it to determine if the cursor is enabled */
+extern Bool EnableCursor;
+
+extern _X_EXPORT ValuatorMask  *valuator_mask_new(int num_valuators);
+extern _X_EXPORT void valuator_mask_free(ValuatorMask **mask);
+extern _X_EXPORT void valuator_mask_set_range(ValuatorMask *mask,
+                                       int first_valuator, int num_valuators,
+                                       const int* valuators);
+extern _X_EXPORT void valuator_mask_set(ValuatorMask *mask,
+                                        int valuator,
+                                        int data);
+extern _X_EXPORT void valuator_mask_zero(ValuatorMask *mask);
+extern _X_EXPORT int valuator_mask_size(const ValuatorMask *mask);
+extern _X_EXPORT int valuator_mask_isset(const ValuatorMask *mask, int bit);
+extern _X_EXPORT void valuator_mask_unset(ValuatorMask *mask, int bit);
+extern _X_EXPORT int valuator_mask_num_valuators(const ValuatorMask *mask);
+extern _X_EXPORT void valuator_mask_copy(ValuatorMask *dest,
+                                         const ValuatorMask *src);
+extern _X_EXPORT int valuator_mask_get(const ValuatorMask *mask, int valnum);
+
+#endif /* INPUT_H */
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h
index 8509eb024..f63df8087 100644
--- a/xorg-server/include/inputstr.h
+++ b/xorg-server/include/inputstr.h
@@ -317,27 +317,6 @@ typedef struct _ProximityClassRec {
     char	in_proximity;
 } ProximityClassRec, *ProximityClassPtr;
 
-typedef struct _AbsoluteClassRec {
-    int         sourceid;
-    /* Calibration. */
-    int         min_x;
-    int         max_x;
-    int         min_y;
-    int         max_y;
-    int         flip_x;
-    int         flip_y;
-    int		rotation;
-    int         button_threshold;
-
-    /* Area. */
-    int         offset_x;
-    int         offset_y;
-    int         width;
-    int         height;
-    int         screen;
-    XID		following;
-} AbsoluteClassRec, *AbsoluteClassPtr;
-
 typedef struct _KbdFeedbackClassRec *KbdFeedbackPtr;
 typedef struct _PtrFeedbackClassRec *PtrFeedbackPtr;
 typedef struct _IntegerFeedbackClassRec *IntegerFeedbackPtr;
@@ -392,7 +371,7 @@ typedef struct _ClassesRec {
     ButtonClassPtr	button;
     FocusClassPtr	focus;
     ProximityClassPtr	proximity;
-    AbsoluteClassPtr    absolute;
+    void*               _pad0; /* keep ABI during AbsoluteClass removal */
     KbdFeedbackPtr	kbdfeed;
     PtrFeedbackPtr	ptrfeed;
     IntegerFeedbackPtr	intfeed;
@@ -517,7 +496,7 @@ typedef struct _DeviceIntRec {
     ButtonClassPtr	button;
     FocusClassPtr	focus;
     ProximityClassPtr	proximity;
-    AbsoluteClassPtr    absolute;
+    void*               _pad0;          /* keep ABI, was pointer to abs class */
     KbdFeedbackPtr	kbdfeed;
     PtrFeedbackPtr	ptrfeed;
     IntegerFeedbackPtr	intfeed;
diff --git a/xorg-server/include/window.h b/xorg-server/include/window.h
index 6fb2f8c18..1e4e9bfa4 100644
--- a/xorg-server/include/window.h
+++ b/xorg-server/include/window.h
@@ -266,4 +266,5 @@ extern _X_EXPORT void DisableMapUnmapEvents(
 extern _X_EXPORT void EnableMapUnmapEvents(
     WindowPtr /* pWin */ );
 
+extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable);
 #endif /* WINDOW_H */
diff --git a/xorg-server/os/client.c b/xorg-server/os/client.c
index 1311855d5..b5349778b 100644
--- a/xorg-server/os/client.c
+++ b/xorg-server/os/client.c
@@ -140,10 +140,9 @@ void DetermineClientCmd(pid_t pid, const char **cmdname, const char **cmdargs)
     /* Read the contents of /proc/pid/cmdline. It should contain the
      * process name and arguments. */
     totsize = read(fd, path, sizeof(path));
+    close(fd);
     if (totsize <= 0)
         return;
-    if (close(fd) < 0)
-        return;
     path[totsize - 1] = '\0';
 
     /* Contruct the process name without arguments. */
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am
index ea886a961..f3265b788 100644
--- a/xorg-server/test/Makefile.am
+++ b/xorg-server/test/Makefile.am
@@ -1,46 +1,46 @@
-if ENABLE_UNIT_TESTS

-if HAVE_GLIB

-if HAVE_LD_WRAP

-SUBDIRS= . xi2

-check_PROGRAMS = xkb input xtest list

-check_LTLIBRARIES = libxservertest.la

-

-TESTS=$(check_PROGRAMS)

-

-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@

-INCLUDES = @XORG_INCS@

-TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)

-

-if SPECIAL_DTRACE_OBJECTS

-TEST_LDADD += $(OS_LIB) $(DIX_LIB)

-endif

-

-xkb_LDADD=$(TEST_LDADD)

-input_LDADD=$(TEST_LDADD)

-xtest_LDADD=$(TEST_LDADD)

-list_LDADD=$(TEST_LDADD)

-

-libxservertest_la_LIBADD = \

-            $(XSERVER_LIBS) \

-            $(top_builddir)/hw/xfree86/loader/libloader.la \

-            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \

-            $(top_builddir)/hw/xfree86/common/libcommon.la \

-            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \

-            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \

-            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \

-            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \

-            $(top_builddir)/hw/xfree86/ddc/libddc.la \

-            $(top_builddir)/hw/xfree86/i2c/libi2c.la \

-            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \

-            $(top_builddir)/hw/xfree86/libxorg.la \

-            $(top_builddir)/mi/libmi.la \

-            $(top_builddir)/os/libos.la \

-            @XORG_LIBS@

-endif

-endif

-endif

-

-CLEANFILES=libxservertest.c

-

-libxservertest.c:

-	touch $@

+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+if HAVE_LD_WRAP
+SUBDIRS= . xi2
+noinst_PROGRAMS = xkb input xtest list
+check_LTLIBRARIES = libxservertest.la
+
+TESTS=$(noinst_PROGRAMS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@
+TEST_LDADD=libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+xkb_LDADD=$(TEST_LDADD)
+input_LDADD=$(TEST_LDADD)
+xtest_LDADD=$(TEST_LDADD)
+list_LDADD=$(TEST_LDADD)
+
+libxservertest_la_LIBADD = \
+            $(XSERVER_LIBS) \
+            $(top_builddir)/hw/xfree86/loader/libloader.la \
+            $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
+            $(top_builddir)/hw/xfree86/common/libcommon.la \
+            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+            $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
+            $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
+            $(top_builddir)/hw/xfree86/ramdac/libramdac.la \
+            $(top_builddir)/hw/xfree86/ddc/libddc.la \
+            $(top_builddir)/hw/xfree86/i2c/libi2c.la \
+            $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \
+            $(top_builddir)/hw/xfree86/libxorg.la \
+            $(top_builddir)/mi/libmi.la \
+            $(top_builddir)/os/libos.la \
+            @XORG_LIBS@
+endif
+endif
+endif
+
+CLEANFILES=libxservertest.c
+
+libxservertest.c:
+	touch $@
diff --git a/xorg-server/test/xi2/Makefile.am b/xorg-server/test/xi2/Makefile.am
index b7948b151..1b9bfe08e 100644
--- a/xorg-server/test/xi2/Makefile.am
+++ b/xorg-server/test/xi2/Makefile.am
@@ -1,55 +1,55 @@
-if ENABLE_UNIT_TESTS

-if HAVE_GLIB

-if HAVE_LD_WRAP

-check_PROGRAMS =  \

-	protocol-xiqueryversion \

-	protocol-xiquerydevice \

-	protocol-xiselectevents \

-	protocol-xigetselectedevents \

-        protocol-xisetclientpointer \

-        protocol-xigetclientpointer \

-        protocol-xiquerypointer \

-        protocol-xiwarppointer \

-        protocol-eventconvert

-

-TESTS=$(check_PROGRAMS)

-

-AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@

-INCLUDES = @XORG_INCS@

-TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)

-COMMON_SOURCES=protocol-common.h protocol-common.c

-

-if SPECIAL_DTRACE_OBJECTS

-TEST_LDADD += $(OS_LIB) $(DIX_LIB)

-endif

-

-protocol_xiqueryversion_LDADD=$(TEST_LDADD)

-protocol_xiquerydevice_LDADD=$(TEST_LDADD)

-protocol_xiselectevents_LDADD=$(TEST_LDADD)

-protocol_xigetselectedevents_LDADD=$(TEST_LDADD)

-protocol_xisetclientpointer_LDADD=$(TEST_LDADD)

-protocol_xigetclientpointer_LDADD=$(TEST_LDADD)

-protocol_xiquerypointer_LDADD=$(TEST_LDADD)

-protocol_xiwarppointer_LDADD=$(TEST_LDADD)

-protocol_eventconvert_LDADD=$(TEST_LDADD)

-

-protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

-protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient

-protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask

-protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource

-protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient

-protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient

-protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

-protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow

-

-protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c

-protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c

-protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c

-protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c

-protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c

-protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c

-protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c

-protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c

-endif

-endif

-endif

+if ENABLE_UNIT_TESTS
+if HAVE_GLIB
+if HAVE_LD_WRAP
+noinst_PROGRAMS =  \
+	protocol-xiqueryversion \
+	protocol-xiquerydevice \
+	protocol-xiselectevents \
+	protocol-xigetselectedevents \
+        protocol-xisetclientpointer \
+        protocol-xigetclientpointer \
+        protocol-xiquerypointer \
+        protocol-xiwarppointer \
+        protocol-eventconvert
+
+TESTS=$(noinst_PROGRAMS)
+
+AM_CFLAGS = $(DIX_CFLAGS) $(GLIB_CFLAGS) @XORG_CFLAGS@
+INCLUDES = @XORG_INCS@
+TEST_LDADD=../libxservertest.la $(XORG_SYS_LIBS) $(XSERVER_SYS_LIBS) $(GLIB_LIBS)
+COMMON_SOURCES=protocol-common.h protocol-common.c
+
+if SPECIAL_DTRACE_OBJECTS
+TEST_LDADD += $(OS_LIB) $(DIX_LIB)
+endif
+
+protocol_xiqueryversion_LDADD=$(TEST_LDADD)
+protocol_xiquerydevice_LDADD=$(TEST_LDADD)
+protocol_xiselectevents_LDADD=$(TEST_LDADD)
+protocol_xigetselectedevents_LDADD=$(TEST_LDADD)
+protocol_xisetclientpointer_LDADD=$(TEST_LDADD)
+protocol_xigetclientpointer_LDADD=$(TEST_LDADD)
+protocol_xiquerypointer_LDADD=$(TEST_LDADD)
+protocol_xiwarppointer_LDADD=$(TEST_LDADD)
+protocol_eventconvert_LDADD=$(TEST_LDADD)
+
+protocol_xiqueryversion_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
+protocol_xiquerydevice_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient
+protocol_xiselectevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupWindow -Wl,-wrap,XISetEventMask
+protocol_xigetselectedevents_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow -Wl,-wrap,AddResource
+protocol_xisetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,dixLookupClient
+protocol_xigetclientpointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupClient
+protocol_xiquerypointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
+protocol_xiwarppointer_LDFLAGS=$(AM_LDFLAGS) -Wl,-wrap,WriteToClient -Wl,-wrap,dixLookupWindow
+
+protocol_xiqueryversion_SOURCES=$(COMMON_SOURCES) protocol-xiqueryversion.c
+protocol_xiquerydevice_SOURCES=$(COMMON_SOURCES) protocol-xiquerydevice.c
+protocol_xiselectevents_SOURCES=$(COMMON_SOURCES) protocol-xiselectevents.c
+protocol_xigetselectedevents_SOURCES=$(COMMON_SOURCES) protocol-xigetselectedevents.c
+protocol_xisetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xisetclientpointer.c
+protocol_xigetclientpointer_SOURCES=$(COMMON_SOURCES) protocol-xigetclientpointer.c
+protocol_xiquerypointer_SOURCES=$(COMMON_SOURCES) protocol-xiquerypointer.c
+protocol_xiwarppointer_SOURCES=$(COMMON_SOURCES) protocol-xiwarppointer.c
+endif
+endif
+endif
diff --git a/xorg-server/xkeyboard-config/NEWS b/xorg-server/xkeyboard-config/NEWS
index c6411f6f0..b3c2bf6dc 100644
--- a/xorg-server/xkeyboard-config/NEWS
+++ b/xorg-server/xkeyboard-config/NEWS
@@ -1,3 +1,6 @@
+2.1.99	Prerelease for 2.2. Major changes in descriptions: for GNOME3 release
+	Some new layouts and models. Translations are not updated.
+	Checking runtime dependencies at build time
 2.1	Bugfixes (13). Updated/new translations. Some new layouts and models.
 2.0	Bugfixes (17). Updated/new translations. Some new layouts and models.
 1.9	Bugfixes (27). Updated/new translations. Some new layouts and models.
diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index 24233e41f..dfc308f0d 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(xkeyboard-config, 2.1)
+AC_INIT(xkeyboard-config, 2.1.99)
 AC_CONFIG_SRCDIR(rules/base.xml.in)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
diff --git a/xorg-server/xkeyboard-config/rules/base.xml.in b/xorg-server/xkeyboard-config/rules/base.xml.in
index 2d3df0126..429eadd12 100644
--- a/xorg-server/xkeyboard-config/rules/base.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.xml.in
@@ -1243,8 +1243,8 @@
     <layout>
       <configItem>
         <name>us</name>
-        <_shortDescription>USA</_shortDescription>
-        <_description>USA</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (US)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -1253,7 +1253,8 @@
         <variant>
           <configItem>
             <name>chr</name>
-            <_description>USA - Cherokee</_description>
+            <_shortDescription>chr</_shortDescription>
+            <_description>Cherokee</_description>
             <languageList>
               <iso639Id>chr</iso639Id>
             </languageList>
@@ -1262,73 +1263,74 @@
         <variant>
           <configItem>
             <name>euro</name>
-            <_description>USA - With EuroSign on 5</_description>
+            <_description>English (US, with euro on 5)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>USA - International (with dead keys)</_description>
+            <_description>English (US, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt-intl</name>
-            <_description>USA - Alternative international</_description>
+            <_description>English (US, alternative international)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>USA - Colemak</_description>
+            <_description>English (Colemak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>USA - Dvorak</_description>
+            <_description>English (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>USA - Dvorak international (with dead keys)</_description>
+            <_description>English (Dvorak international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-alt-intl</name>
-            <_description>USA - Dvorak alternative international (no dead keys)</_description>
+            <_description>English (Dvorak alternative international no dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-l</name>
-            <_description>USA - Left handed Dvorak</_description>
+            <_description>English (left handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-r</name>
-            <_description>USA - Right handed Dvorak</_description>
+            <_description>English (right handed Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-classic</name>
-            <_description>USA - Classic Dvorak</_description>
+            <_description>English (classic Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>USA - Programmer Dvorak</_description>
+            <_description>English (programmer Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>USA - Russian phonetic</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (US, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -1337,13 +1339,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>USA - Macintosh</_description>
+            <_description>English (Macintosh)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>altgr-intl</name>
-            <_description>USA - International (AltGr dead keys)</_description>
+            <_description>English (international AltGr dead keys)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>fra</iso639Id>
                           <iso639Id>ger</iso639Id></languageList>
@@ -1352,13 +1354,13 @@
         <variant>
           <configItem>
             <name>olpc2</name>
-            <_description>USA - Layout toggle on multiply/divide key</_description>
+            <_description>English (layout toggle on multiply/divide key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>hbs</name>
-            <_description>USA - Serbo-Croatian</_description>
+            <_description>Serbo-Croatian (US)</_description>
             <languageList><iso639Id>eng</iso639Id>
                           <iso639Id>bos</iso639Id>
                           <iso639Id>hbs</iso639Id>
@@ -1371,8 +1373,8 @@
     <layout>
       <configItem>
         <name>ad</name>
-        <_shortDescription>And</_shortDescription>
-        <_description>Andorra</_description>
+        <_shortDescription>ca</_shortDescription>
+        <_description>Catalan</_description>
         <languageList>
           <iso639Id>cat</iso639Id>
         </languageList>
@@ -1383,13 +1385,14 @@
       <configItem>
         <name>af</name>
         <_shortDescription>Afg</_shortDescription>
-        <_description>Afghanistan</_description>
+        <_description>Afghani</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ps</name>
-            <_description>Afghanistan - Pashto</_description>
+            <_shortDescription>ps</_shortDescription>
+            <_description>Pashto</_description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1398,7 +1401,8 @@
         <variant>
           <configItem>
             <name>uz</name>
-            <_description>Afghanistan - Southern Uzbek</_description>
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan)</_description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1407,7 +1411,8 @@
         <variant>
           <configItem>
             <name>olpc-ps</name>
-            <_description>Afghanistan - OLPC Pashto</_description>
+            <_shortDescription>ps</_shortDescription>
+            <_description>Pashto (Afghanistan, OLPC)</_description>
             <languageList>
               <iso639Id>pus</iso639Id>
             </languageList>
@@ -1416,13 +1421,15 @@
         <variant>
           <configItem>
             <name>fa-olpc</name>
-            <_description>Afghanistan - OLPC Dari</_description>
+            <_shortDescription>fa</_shortDescription>
+            <_description>Persian (Afghanistan, Dari OLPC)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>uz-olpc</name>
-            <_description>Afghanistan - OLPC Southern Uzbek</_description>
+            <_shortDescription>uz</_shortDescription>
+            <_description>Uzbek (Afghanistan, OLPC)</_description>
             <languageList>
               <iso639Id>uzb</iso639Id>
             </languageList>
@@ -1433,7 +1440,7 @@
     <layout>
       <configItem>
         <name>ara</name>
-        <_shortDescription>Ara</_shortDescription>
+        <_shortDescription>ar</_shortDescription>
         <_description>Arabic</_description>
         <countryList>
           <iso3166Id>AE</iso3166Id>
@@ -1464,37 +1471,37 @@
         <variant>
           <configItem>
             <name>azerty</name>
-            <_description>Arabic - azerty</_description>
+            <_description>Arabic (azerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>azerty_digits</name>
-            <_description>Arabic - azerty/digits</_description>
+            <_description>Arabic (azerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>digits</name>
-            <_description>Arabic - digits</_description>
+            <_description>Arabic (digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Arabic - qwerty</_description>
+            <_description>Arabic (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_digits</name>
-            <_description>Arabic - qwerty/digits</_description>
+            <_description>Arabic (qwerty/digits)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>buckwalter</name>
-            <_description>Arabic - Buckwalter</_description>
+            <_description>Arabic (Buckwalter)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1502,8 +1509,8 @@
     <layout>
       <configItem>
         <name>al</name>
-        <_shortDescription>Alb</_shortDescription>
-        <_description>Albania</_description>
+        <_shortDescription>sq</_shortDescription>
+        <_description>Albanian</_description>
         <languageList>
           <iso639Id>alb</iso639Id>
         </languageList>
@@ -1513,8 +1520,8 @@
     <layout>
       <configItem>
         <name>am</name>
-        <_shortDescription>Arm</_shortDescription>
-        <_description>Armenia</_description>
+        <_shortDescription>hy</_shortDescription>
+        <_description>Armenian</_description>
         <languageList>
           <iso639Id>hye</iso639Id>
         </languageList>
@@ -1523,31 +1530,31 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Armenia - Phonetic</_description>
+            <_description>Armenian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic-alt</name>
-            <_description>Armenia - Alternative Phonetic</_description>
+            <_description>Armenian (alternative phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern</name>
-            <_description>Armenia - Eastern</_description>
+            <_description>Armenian (eastern)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>western</name>
-            <_description>Armenia - Western</_description>
+            <_description>Armenian (western)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eastern-alt</name>
-            <_description>Armenia - Alternative Eastern</_description>
+            <_description>Armenian (alternative eastern)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1555,8 +1562,8 @@
     <layout>
       <configItem>
         <name>at</name>
-        <_shortDescription>Aut</_shortDescription>
-        <_description>Austria</_description>
+        <_shortDescription>de</_shortDescription>
+        <_description>German (Austria)</_description>
         <languageList>
           <iso639Id>ger</iso639Id>
         </languageList>
@@ -1565,19 +1572,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Austria - Eliminate dead keys</_description>
+            <_description>German (Austria, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Austria - Sun dead keys</_description>
+            <_description>German (Austria, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Austria - Macintosh</_description>
+            <_description>German (Austria, Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1585,8 +1592,8 @@
     <layout>
       <configItem>
         <name>az</name>
-        <_shortDescription>Aze</_shortDescription>
-        <_description>Azerbaijan</_description>
+        <_shortDescription>az</_shortDescription>
+        <_description>Azerbaijani</_description>
         <languageList>
           <iso639Id>aze</iso639Id>
         </languageList>
@@ -1595,7 +1602,7 @@
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Azerbaijan - Cyrillic</_description>
+            <_description>Azerbaijan (Cyrillic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1603,8 +1610,8 @@
     <layout>
       <configItem>
         <name>by</name>
-        <_shortDescription>Blr</_shortDescription>
-        <_description>Belarus</_description>
+        <_shortDescription>be</_shortDescription>
+        <_description>Belarusian</_description>
         <languageList>
           <iso639Id>bel</iso639Id>
         </languageList>
@@ -1613,13 +1620,13 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Belarus - Legacy</_description>
+            <_description>Belarusian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Belarus - Latin</_description>
+            <_description>Belarusian (Latin)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1627,8 +1634,8 @@
     <layout>
       <configItem>
         <name>be</name>
-        <_shortDescription>Bel</_shortDescription>
-        <_description>Belgium</_description>
+        <_shortDescription>be</_shortDescription>
+        <_description>Belgian</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>nld</iso639Id>
                       <iso639Id>fra</iso639Id></languageList>
@@ -1637,43 +1644,43 @@
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>Belgium - Alternative</_description>
+            <_description>Belgian (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>Belgium - Alternative, latin-9 only</_description>
+            <_description>Belgian (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>Belgium - Alternative, Sun dead keys</_description>
+            <_description>Belgian (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>iso-alternate</name>
-            <_description>Belgium - ISO Alternate</_description>
+            <_description>Belgian (ISO alternate)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Belgium - Eliminate dead keys</_description>
+            <_description>Belgian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Belgium - Sun dead keys</_description>
+            <_description>Belgian (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>wang</name>
-            <_description>Belgium - Wang model 724 azerty</_description>
+            <_description>Belgian (Wang model 724 azerty)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1681,8 +1688,8 @@
     <layout>
       <configItem>
         <name>bd</name>
-        <_shortDescription>Bgd</_shortDescription>
-        <_description>Bangladesh</_description>
+        <_shortDescription>bn</_shortDescription>
+        <_description>Bengali</_description>
         <languageList>
           <iso639Id>ben</iso639Id>
         </languageList>
@@ -1691,7 +1698,7 @@
         <variant>
           <configItem>
             <name>probhat</name>
-            <_description>Bangladesh - Probhat</_description>
+            <_description>Bengali (Probhat)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1699,14 +1706,15 @@
     <layout>
       <configItem>
         <name>in</name>
-        <_shortDescription>Ind</_shortDescription>
-        <_description>India</_description>
+        <_shortDescription>in</_shortDescription>
+        <_description>Indian</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>ben</name>
-            <_description>India - Bengali</_description>
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1715,7 +1723,8 @@
         <variant>
           <configItem>
             <name>ben_probhat</name>
-            <_description>India - Bengali Probhat</_description>
+            <_shortDescription>bn</_shortDescription>
+            <_description>Bengali (Probhat)</_description>
             <languageList>
               <iso639Id>ben</iso639Id>
             </languageList>
@@ -1724,7 +1733,8 @@
         <variant>
           <configItem>
             <name>guj</name>
-            <_description>India - Gujarati</_description>
+            <_shortDescription>gu</_shortDescription>
+            <_description>Gujarati</_description>
             <languageList>
               <iso639Id>guj</iso639Id>
             </languageList>
@@ -1733,7 +1743,8 @@
         <variant>
           <configItem>
             <name>guru</name>
-            <_description>India - Gurmukhi</_description>
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi)</_description>
             <languageList>
               <iso639Id>pan</iso639Id>
             </languageList>
@@ -1742,7 +1753,8 @@
         <variant>
           <configItem>
             <name>jhelum</name>
-            <_description>India - Gurmukhi Jhelum</_description>
+            <_shortDescription>pa</_shortDescription>
+            <_description>Punjabi (Gurmukhi Jhelum)</_description>
             <languageList>
               <iso639Id>pan</iso639Id>
             </languageList>
@@ -1751,7 +1763,8 @@
         <variant>
           <configItem>
             <name>kan</name>
-            <_description>India - Kannada</_description>
+            <_shortDescription>kn</_shortDescription>
+            <_description>Kannada</_description>
             <languageList>
               <iso639Id>kan</iso639Id>
             </languageList>
@@ -1760,7 +1773,8 @@
         <variant>
           <configItem>
             <name>mal</name>
-            <_description>India - Malayalam</_description>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam</_description>
             <languageList>
               <iso639Id>mal</iso639Id>
             </languageList>
@@ -1769,7 +1783,8 @@
         <variant>
           <configItem>
             <name>mal_lalitha</name>
-            <_description>India - Malayalam Lalitha</_description>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (Lalitha)</_description>
             <languageList>
               <iso639Id>mal</iso639Id>
             </languageList>
@@ -1777,15 +1792,17 @@
         </variant>
         <variant>
           <configItem>
-             <name>mal_enhanced</name>
-             <_description>India - Malayalam enhanced Inscript with Rupee Sign</_description>
-             <languageList><iso639Id>mal</iso639Id></languageList>
+            <name>mal_enhanced</name>
+            <_shortDescription>ml</_shortDescription>
+            <_description>Malayalam (enhanced Inscript with Rupee Sign)</_description>
+            <languageList><iso639Id>mal</iso639Id></languageList>
           </configItem>
          </variant>
          <variant>
            <configItem>
             <name>ori</name>
-            <_description>India - Oriya</_description>
+            <_shortDescription>or</_shortDescription>
+            <_description> Oriya</_description>
             <languageList>
               <iso639Id>ori</iso639Id>
             </languageList>
@@ -1794,7 +1811,8 @@
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>India - Tamil Unicode</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Unicode)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1803,7 +1821,8 @@
         <variant>
           <configItem>
             <name>tam_keyboard_with_numerals</name>
-            <_description>India - Tamil Keyboard with Numerals</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (keyboard with numerals)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1812,7 +1831,8 @@
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>India - Tamil TAB Typewriter</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TAB typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1821,7 +1841,8 @@
         <variant>
           <configItem>
             <name>tam_TSCII</name>
-            <_description>India - Tamil TSCII Typewriter</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (TSCII typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1830,7 +1851,8 @@
         <variant>
           <configItem>
             <name>tam</name>
-            <_description>India - Tamil</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -1839,7 +1861,8 @@
         <variant>
           <configItem>
             <name>tel</name>
-            <_description>India - Telugu</_description>
+            <_shortDescription>te</_shortDescription>
+            <_description>Telugu</_description>
             <languageList>
               <iso639Id>tel</iso639Id>
             </languageList>
@@ -1848,7 +1871,8 @@
         <variant>
           <configItem>
             <name>urd-phonetic</name>
-            <_description>India - Urdu, Phonetic</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (phonetic)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1857,7 +1881,8 @@
         <variant>
           <configItem>
             <name>urd-phonetic3</name>
-            <_description>India - Urdu, Alternative phonetic</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (alternative phonetic)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1866,7 +1891,8 @@
         <variant>
           <configItem>
             <name>urd-winkeys</name>
-            <_description>India - Urdu, Winkeys</_description>
+            <_shortDescription>ur</_shortDescription>
+            <_description>Urdu (WinKeys)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -1875,7 +1901,8 @@
         <variant>
           <configItem>
             <name>bolnagri</name>
-            <_description>India - Hindi Bolnagri</_description>
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Bolnagri)</_description>
             <languageList>
               <iso639Id>hin</iso639Id>
             </languageList>
@@ -1884,7 +1911,8 @@
         <variant>
           <configItem>
             <name>hin-wx</name>
-            <_description>India - Hindi Wx</_description>
+            <_shortDescription>hi</_shortDescription>
+            <_description>Hindi (Wx)</_description>
             <languageList>
               <iso639Id>hin</iso639Id>
             </languageList>
@@ -1893,7 +1921,8 @@
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>India - English with RupeeSign</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (India, with RupeeSign)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
             </languageList>
@@ -1904,8 +1933,8 @@
     <layout>
       <configItem>
         <name>ba</name>
-        <_shortDescription>Bih</_shortDescription>
-        <_description>Bosnia and Herzegovina</_description>
+        <_shortDescription>bs</_shortDescription>
+        <_description>Bosnian</_description>
         <languageList>
           <iso639Id>bos</iso639Id>
         </languageList>
@@ -1914,25 +1943,25 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Bosnia and Herzegovina -  Use guillemets for quotes</_description>
+            <_description>Bosnian (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Bosnia and Herzegovina - Use Bosnian digraphs</_description>
+            <_description>Bosnian (use Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>Bosnia and Herzegovina - US keyboard with Bosnian digraphs</_description>
+            <_description>Bosnian (US keyboard with Bosnian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Bosnia and Herzegovina - US keyboard with Bosnian letters</_description>
+            <_description>Bosnian (US keyboard with Bosnian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -1940,8 +1969,8 @@
     <layout>
       <configItem>
         <name>br</name>
-        <_shortDescription>Bra</_shortDescription>
-        <_description>Brazil</_description>
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese (Brazil)</_description>
         <languageList>
           <iso639Id>por</iso639Id>
         </languageList>
@@ -1950,31 +1979,31 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Brazil - Eliminate dead keys</_description>
+            <_description>Portuguese (Brazil, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Brazil - Dvorak</_description>
+            <_description>Portuguese (Brazil, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Brazil - Nativo</_description>
+            <_description>Portuguese (Brazil, nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Brazil - Nativo for USA keyboards</_description>
+            <_description>Portuguese (Brazil, nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Brazil - Nativo for Esperanto</_description>
+            <_description>Portuguese (Brazil, nativo for Esperanto)</_description>
             <languageList>
               <iso639Id>epo</iso639Id>
             </languageList>
@@ -1985,8 +2014,8 @@
     <layout>
       <configItem>
         <name>bg</name>
-        <_shortDescription>Bgr</_shortDescription>
-        <_description>Bulgaria</_description>
+        <_shortDescription>bg</_shortDescription>
+        <_description>Bulgarian</_description>
         <languageList>
           <iso639Id>bul</iso639Id>
         </languageList>
@@ -1995,13 +2024,13 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Bulgaria - Traditional phonetic</_description>
+            <_description>Bulgarian (traditional phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bas_phonetic</name>
-            <_description>Bulgaria - New phonetic</_description>
+            <_description>Bulgarian (new phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2009,13 +2038,15 @@
     <layout>
       <configItem>
         <name>ma</name>
-        <_description>Morocco</_description>
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Morocco)</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>french</name>
-            <_description>Morocco - French</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Morocco)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -2024,7 +2055,8 @@
         <variant>
           <configItem>
             <name>tifinagh</name>
-            <_description>Morocco - Tifinagh</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2033,7 +2065,8 @@
         <variant>
           <configItem>
             <name>tifinagh-alt</name>
-            <_description>Morocco - Tifinagh alternative</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2042,7 +2075,8 @@
         <variant>
           <configItem>
             <name>tifinagh-alt-phonetic</name>
-            <_description>Morocco - Tifinagh alternative phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh alternative phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2051,7 +2085,8 @@
         <variant>
           <configItem>
             <name>tifinagh-extended</name>
-            <_description>Morocco - Tifinagh extended</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2060,7 +2095,8 @@
         <variant>
           <configItem>
             <name>tifinagh-phonetic</name>
-            <_description>Morocco - Tifinagh phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2069,7 +2105,8 @@
         <variant>
           <configItem>
             <name>tifinagh-extended-phonetic</name>
-            <_description>Morocco - Tifinagh extended phonetic</_description>
+            <_shortDescription>ber</_shortDescription>
+            <_description>Berber (Morocco, Tifinagh extended phonetic)</_description>
             <languageList>
               <iso639Id>ber</iso639Id>
             </languageList>
@@ -2080,8 +2117,8 @@
     <layout>
       <configItem>
         <name>mm</name>
-        <_shortDescription>Mmr</_shortDescription>
-        <_description>Myanmar</_description>
+        <_shortDescription>my</_shortDescription>
+        <_description>Burmese</_description>
         <languageList>
           <iso639Id>mya</iso639Id>
         </languageList>
@@ -2091,8 +2128,8 @@
     <layout>
       <configItem>
         <name>ca</name>
-        <_shortDescription>Can</_shortDescription>
-        <_description>Canada</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Canada)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2101,37 +2138,40 @@
         <variant>
           <configItem>
             <name>fr-dvorak</name>
-            <_description>Canada - French Dvorak</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr-legacy</name>
-            <_description>Canada - French (legacy)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Canada, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multix</name>
-            <_description>Canada - Multilingual</_description>
+            <_description>Canadian Multilingual</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi</name>
-            <_description>Canada - Multilingual, first part</_description>
+            <_description>Canadian Multilingual (first part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>multi-2gr</name>
-            <_description>Canada - Multilingual, second part</_description>
+            <_description>Canadian Multilingual (second part)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ike</name>
-            <_description>Canada - Inuktitut</_description>
+            <_shortDescription>ike</_shortDescription>
+            <_description>Inuktitut</_description>
             <languageList>
               <iso639Id>iku</iso639Id>
             </languageList>
@@ -2140,19 +2180,22 @@
         <variant>
           <configItem>
             <name>shs</name>
-            <_description>Canada - Secwepemctsin</_description>
+            <_shortDescription>shs</_shortDescription>
+            <_description>Secwepemctsin</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kut</name>
-            <_description>Canada - Ktunaxa</_description>
+            <_shortDescription>kut</_shortDescription>
+            <_description>Kutenai</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>eng</name>
-            <_description>Canada - English</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Canada)</_description>
             <languageList>
               <iso639Id>eng</iso639Id>
             </languageList>
@@ -2163,8 +2206,8 @@
     <layout>
       <configItem>
         <name>cd</name>
-        <_shortDescription>COD</_shortDescription>
-        <_description>Congo, Democratic Republic of the</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Democratic Republic of the Congo)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2174,8 +2217,8 @@
     <layout>
       <configItem>
         <name>cn</name>
-        <_shortDescription>Chn</_shortDescription>
-        <_description>China</_description>
+        <_shortDescription>zh</_shortDescription>
+        <_description>Chinese</_description>
         <languageList>
           <iso639Id>chi</iso639Id>
         </languageList>
@@ -2184,7 +2227,7 @@
         <variant>
           <configItem>
             <name>tib</name>
-            <_description>China - Tibetan</_description>
+            <_description>Chinese (Tibetan)</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2193,7 +2236,7 @@
         <variant>
           <configItem>
             <name>tib_asciinum</name>
-            <_description>China - Tibetan (with ASCII numerals)</_description>
+            <_description>Chinese (Tibetan with ASCII numerals)</_description>
             <languageList>
               <iso639Id>tib</iso639Id>
             </languageList>
@@ -2202,7 +2245,7 @@
         <variant>
           <configItem>
             <name>uig</name>
-            <_description>China - Uyghur</_description>
+            <_description>Chinese (Uyghur)</_description>
             <languageList>
               <iso639Id>uig</iso639Id>
             </languageList>
@@ -2213,8 +2256,8 @@
     <layout>
       <configItem>
         <name>hr</name>
-        <_shortDescription>Hrv</_shortDescription>
-        <_description>Croatia</_description>
+        <_shortDescription>hr</_shortDescription>
+        <_description>Croatian</_description>
         <languageList>
           <iso639Id>scr</iso639Id>
         </languageList>
@@ -2223,25 +2266,25 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Croatia - Use guillemets for quotes</_description>
+            <_description>Croatian (Use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicode</name>
-            <_description>Croatia - Use Croatian digraphs</_description>
+            <_description>Croatian (Use Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unicodeus</name>
-            <_description>Croatia - US keyboard with Croatian digraphs</_description>
+            <_description>Croatian (US keyboard with Croatian digraphs)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Croatia - US keyboard with Croatian letters</_description>
+            <_description>Croatian (US keyboard with Croatian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2249,8 +2292,8 @@
     <layout>
       <configItem>
         <name>cz</name>
-        <_shortDescription>Cze</_shortDescription>
-        <_description>Czechia</_description>
+        <_shortDescription>cs</_shortDescription>
+        <_description>Czech</_description>
         <languageList>
           <iso639Id>cze</iso639Id>
         </languageList>
@@ -2259,31 +2302,31 @@
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Czechia - With &lt;\|&gt; key</_description>
+            <_description>Czech (With &lt;\|&gt; key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Czechia - qwerty</_description>
+            <_description>Czech (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>Czechia - qwerty, extended Backslash</_description>
+            <_description>Czech (qwerty, extended Backslash)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ucw</name>
-            <_description>Czechia - UCW layout (accented letters only)</_description>
+            <_description>Czech (UCW layout accented letters only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak-ucw</name>
-            <_description>Czechia - US Dvorak with CZ UCW support</_description>
+            <_description>Czech (US Dvorak with CZ UCW support)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2291,8 +2334,8 @@
     <layout>
       <configItem>
         <name>dk</name>
-        <_shortDescription>Dnk</_shortDescription>
-        <_description>Denmark</_description>
+        <_shortDescription>da</_shortDescription>
+        <_description>Danish</_description>
         <languageList>
           <iso639Id>dan</iso639Id>
         </languageList>
@@ -2301,25 +2344,25 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Denmark - Eliminate dead keys</_description>
+            <_description>Danish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Denmark - Macintosh</_description>
+            <_description>Danish (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Denmark - Macintosh, eliminate dead keys</_description>
+            <_description>Danish (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Denmark - Dvorak</_description>
+            <_description>Danish (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2327,8 +2370,8 @@
     <layout>
       <configItem>
         <name>nl</name>
-        <_shortDescription>Nld</_shortDescription>
-        <_description>Netherlands</_description>
+        <_shortDescription>nl</_shortDescription>
+        <_description>Dutch</_description>
         <languageList>
           <iso639Id>nld</iso639Id>
         </languageList>
@@ -2337,19 +2380,19 @@
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Netherlands - Sun dead keys</_description>
+            <_description>Dutch (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Netherlands - Macintosh</_description>
+            <_description>Dutch (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Netherlands - Standard</_description>
+            <_description>Dutch (standard)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2357,8 +2400,8 @@
     <layout>
       <configItem>
         <name>bt</name>
-        <_shortDescription>Btn</_shortDescription>
-        <_description>Bhutan</_description>
+        <_shortDescription>dz</_shortDescription>
+        <_description>Dzongkha</_description>
         <languageList>
           <iso639Id>dzo</iso639Id>
         </languageList>
@@ -2367,8 +2410,8 @@
     <layout>
       <configItem>
         <name>ee</name>
-        <_shortDescription>Est</_shortDescription>
-        <_description>Estonia</_description>
+        <_shortDescription>et</_shortDescription>
+        <_description>Estonian</_description>
         <languageList>
           <iso639Id>est</iso639Id>
         </languageList>
@@ -2377,19 +2420,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Estonia - Eliminate dead keys</_description>
+            <_description>Estonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Estonia - Dvorak</_description>
+            <_description>Estonian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Estonia - US keyboard with Estonian letters</_description>
+            <_description>Estonian (US keyboard with Estonian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2397,8 +2440,8 @@
     <layout>
       <configItem>
         <name>ir</name>
-        <_shortDescription>Irn</_shortDescription>
-        <_description>Iran</_description>
+        <_shortDescription>fa</_shortDescription>
+        <_description>Persian</_description>
         <languageList>
           <iso639Id>per</iso639Id>
         </languageList>
@@ -2407,13 +2450,14 @@
         <variant>
           <configItem>
             <name>pes_keypad</name>
-            <_description>Iran - Persian, with Persian Keypad</_description>
+            <_description>Persian (with Persian Keypad)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Iran - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2422,7 +2466,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Iran - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2431,7 +2476,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Iran - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, latin alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2440,7 +2486,8 @@
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Iran - Kurdish, Arabic-Latin</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iran, Arabic-Latin)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2451,8 +2498,8 @@
     <layout>
       <configItem>
         <name>iq</name>
-        <_shortDescription>Irq</_shortDescription>
-        <_description>Iraq</_description>
+        <_shortDescription>irq</_shortDescription>
+        <_description>Iraqi</_description>
         <languageList><iso639Id>ara</iso639Id>
                       <iso639Id>kur</iso639Id></languageList>
       </configItem>
@@ -2460,7 +2507,8 @@
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Iraq - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2469,7 +2517,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Iraq - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2478,7 +2527,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Iraq - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2487,7 +2537,8 @@
         <variant>
           <configItem>
             <name>ku_ara</name>
-            <_description>Iraq - Kurdish, Arabic-Latin</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Iraq, Arabic-Latin)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -2498,8 +2549,8 @@
     <layout>
       <configItem>
         <name>fo</name>
-        <_shortDescription>Fro</_shortDescription>
-        <_description>Faroe Islands</_description>
+        <_shortDescription>fo</_shortDescription>
+        <_description>Faroese</_description>
         <languageList>
           <iso639Id>fao</iso639Id>
         </languageList>
@@ -2508,7 +2559,7 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Faroe Islands - Eliminate dead keys</_description>
+            <_description>Faroese (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2516,8 +2567,8 @@
     <layout>
       <configItem>
         <name>fi</name>
-        <_shortDescription>Fin</_shortDescription>
-        <_description>Finland</_description>
+        <_shortDescription>fi</_shortDescription>
+        <_description>Finnish</_description>
         <languageList>
           <iso639Id>fin</iso639Id>
         </languageList>
@@ -2526,19 +2577,19 @@
         <variant>
           <configItem>
             <name>classic</name>
-            <_description>Finland - Classic</_description>
+            <_description>Finnish (classic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Finland - Classic, eliminate dead keys</_description>
+            <_description>Finnish (classic, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Finland - Northern Saami</_description>
+            <_description>Finnish (northern Saami)</_description>
             <languageList><iso639Id>smi</iso639Id>
                           <iso639Id>sme</iso639Id></languageList>
           </configItem>
@@ -2546,7 +2597,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Finland - Macintosh</_description>
+            <_description>Finnish (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2554,8 +2605,8 @@
     <layout>
       <configItem>
         <name>fr</name>
-        <_shortDescription>Fra</_shortDescription>
-        <_description>France</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2564,91 +2615,91 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>France - Eliminate dead keys</_description>
+            <_description>French (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>France - Sun dead keys</_description>
+            <_description>French (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss</name>
-            <_description>France - Alternative</_description>
+            <_description>French (alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_latin9</name>
-            <_description>France - Alternative, latin-9 only</_description>
+            <_description>French (alternative, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_nodeadkeys</name>
-            <_description>France - Alternative, eliminate dead keys</_description>
+            <_description>French (alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oss_sundeadkeys</name>
-            <_description>France - Alternative, Sun dead keys</_description>
+            <_description>French (alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9</name>
-            <_description>France - (Legacy) Alternative</_description>
+            <_description>French (legacy alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_nodeadkeys</name>
-            <_description>France - (Legacy) Alternative, eliminate dead keys</_description>
+            <_description>French (legacy, alternative, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin9_sundeadkeys</name>
-            <_description>France - (Legacy) Alternative, Sun dead keys</_description>
+            <_description>French (legacy, alternative, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo</name>
-            <_description>France - Bepo, ergonomic, Dvorak way</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bepo_latin9</name>
-            <_description>France - Bepo, ergonomic, Dvorak way, latin-9 only</_description>
+            <_description>French (Bepo, ergonomic, Dvorak way, latin-9 only)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>France - Dvorak</_description>
+            <_description>French (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>France - Macintosh</_description>
+            <_description>French (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>bre</name>
-            <_description>France - Breton</_description>
+            <_description>French (Breton)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>oci</name>
-            <_description>France - Occitan</_description>
+            <_description>French (Occitan)</_description>
             <languageList>
               <iso639Id>oci</iso639Id>
             </languageList>
@@ -2657,7 +2708,7 @@
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>France - Georgian AZERTY Tskapo</_description>
+            <_description>French (Georgian AZERTY Tskapo)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -2668,8 +2719,8 @@
     <layout>
       <configItem>
         <name>gh</name>
-        <_shortDescription>Gha</_shortDescription>
-        <_description>Ghana</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Ghana)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -2678,13 +2729,14 @@
         <variant>
           <configItem>
             <name>generic</name>
-            <_description>Ghana - Multilingual</_description>
+            <_description>English (Ghana, multilingual)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>akan</name>
-            <_description>Ghana - Akan</_description>
+            <_shortDescription>ak</_shortDescription>
+            <_description>Akan</_description>
             <languageList>
               <iso639Id>aka</iso639Id>
             </languageList>
@@ -2693,7 +2745,8 @@
         <variant>
           <configItem>
             <name>ewe</name>
-            <_description>Ghana - Ewe</_description>
+            <_shortDescription>ee</_shortDescription>
+            <_description>Ewe</_description>
             <languageList>
               <iso639Id>ewe</iso639Id>
             </languageList>
@@ -2702,7 +2755,8 @@
         <variant>
           <configItem>
             <name>fula</name>
-            <_description>Ghana - Fula</_description>
+            <_shortDescription>ff</_shortDescription>
+            <_description>Fula</_description>
             <languageList>
               <iso639Id>ful</iso639Id>
             </languageList>
@@ -2711,7 +2765,8 @@
         <variant>
           <configItem>
             <name>ga</name>
-            <_description>Ghana - Ga</_description>
+            <_shortDescription>gaa</_shortDescription>
+            <_description>Ga</_description>
             <languageList>
               <iso639Id>gaa</iso639Id>
             </languageList>
@@ -2720,7 +2775,8 @@
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Ghana - Hausa</_description>
+            <_shortDescription>ha</_shortDescription>
+            <_description>Hausa</_description>
             <languageList>
               <iso639Id>hau</iso639Id>
             </languageList>
@@ -2729,7 +2785,8 @@
         <variant>
           <configItem>
             <name>avn</name>
-            <_description>Ghana - Avatime</_description>
+            <_shortDescription>avn</_shortDescription>
+            <_description>Avatime</_description>
             <languageList>
               <iso639Id>avn</iso639Id>
             </languageList>
@@ -2738,7 +2795,7 @@
         <variant>
           <configItem>
             <name>gillbt</name>
-            <_description>Ghana - GILLBT</_description>
+            <_description>English (Ghana, GILLBT)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2746,8 +2803,8 @@
     <layout>
       <configItem>
         <name>gn</name>
-        <_shortDescription>Gin</_shortDescription>
-        <_description>Guinea</_description>
+        <_shortDescription>fr</_shortDescription>
+        <_description>French (Guinea)</_description>
         <languageList>
           <iso639Id>fra</iso639Id>
         </languageList>
@@ -2757,8 +2814,8 @@
     <layout>
       <configItem>
         <name>ge</name>
-        <_shortDescription>Geo</_shortDescription>
-        <_description>Georgia</_description>
+        <_shortDescription>ka</_shortDescription>
+        <_description>Georgian</_description>
         <languageList>
           <iso639Id>geo</iso639Id>
         </languageList>
@@ -2767,19 +2824,20 @@
         <variant>
           <configItem>
             <name>ergonomic</name>
-            <_description>Georgia - Ergonomic</_description>
+            <_description>Georgian (ergonomic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mess</name>
-            <_description>Georgia - MESS</_description>
+            <_description>Georgian (MESS)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Georgia - Russian</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Georgia)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -2788,7 +2846,7 @@
         <variant>
           <configItem>
             <name>os</name>
-            <_description>Georgia - Ossetian</_description>
+            <_description>Georgian (Ossetian)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -2799,8 +2857,8 @@
     <layout>
       <configItem>
         <name>de</name>
-        <_shortDescription>Deu</_shortDescription>
-        <_description>Germany</_description>
+        <_shortDescription>de</_shortDescription>
+        <_description>German</_description>
         <languageList>
           <iso639Id>ger</iso639Id>
         </languageList>
@@ -2809,67 +2867,67 @@
         <variant>
           <configItem>
             <name>deadacute</name>
-            <_description>Germany - Dead acute</_description>
+            <_description>German (dead acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadgraveacute</name>
-            <_description>Germany - Dead grave acute</_description>
+            <_description>German (dead grave acute)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Germany - Eliminate dead keys</_description>
+            <_description>German (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro</name>
-            <_description>Germany - Romanian keyboard with German letters</_description>
+            <_description>German (Romanian keyboard with German letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ro_nodeadkeys</name>
-            <_description>Germany - Romanian keyboard with German letters, eliminate dead keys</_description>
+            <_description>German (Romanian keyboard with German letters, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Germany - Dvorak</_description>
+            <_description>German (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Germany - Sun dead keys</_description>
+            <_description>German (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>neo</name>
-            <_description>Germany - Neo 2</_description>
+            <_description>German (Neo 2)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Germany - Macintosh</_description>
+            <_description>German (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Germany - Macintosh, eliminate dead keys</_description>
+            <_description>German (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dsb</name>
-            <_description>Germany - Lower Sorbian</_description>
+            <_description>German (lower Sorbian)</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -2878,7 +2936,7 @@
         <variant>
           <configItem>
             <name>dsb_qwertz</name>
-            <_description>Germany - Lower Sorbian (qwertz)</_description>
+            <_description>German (lower Sorbian qwertz)</_description>
             <languageList>
               <iso639Id>dsb</iso639Id>
             </languageList>
@@ -2887,13 +2945,13 @@
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Germany - qwerty</_description>
+            <_description>German (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ru</name>
-            <_description>Germany - Russian phonetic</_description>
+            <_description>Russian (Germany, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -2904,8 +2962,8 @@
     <layout>
       <configItem>
         <name>gr</name>
-        <_shortDescription>Grc</_shortDescription>
-        <_description>Greece</_description>
+        <_shortDescription>gr</_shortDescription>
+        <_description>Greek</_description>
         <languageList>
           <iso639Id>gre</iso639Id>
         </languageList>
@@ -2914,25 +2972,25 @@
         <variant>
           <configItem>
             <name>simple</name>
-            <_description>Greece - Simple</_description>
+            <_description>Greek (simple)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>extended</name>
-            <_description>Greece - Extended</_description>
+            <_description>Greek (extended)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Greece - Eliminate dead keys</_description>
+            <_description>Greek (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>polytonic</name>
-            <_description>Greece - Polytonic</_description>
+            <_description>Greek (polytonic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -2940,8 +2998,8 @@
     <layout>
       <configItem>
         <name>hu</name>
-        <_shortDescription>Hun</_shortDescription>
-        <_description>Hungary</_description>
+        <_shortDescription>hu</_shortDescription>
+        <_description>Hungarian</_description>
         <languageList>
           <iso639Id>hun</iso639Id>
         </languageList>
@@ -2950,115 +3008,115 @@
         <variant>
           <configItem>
             <name>standard</name>
-            <_description>Hungary - Standard</_description>
+            <_description>Hungarian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Hungary - Eliminate dead keys</_description>
+            <_description>Hungarian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Hungary - qwerty</_description>
+            <_description>Hungarian (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_dead</name>
-            <_description>Hungary - 101/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_comma_nodead</name>
-            <_description>Hungary - 101/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_dead</name>
-            <_description>Hungary - 101/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwertz_dot_nodead</name>
-            <_description>Hungary - 101/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_dead</name>
-            <_description>Hungary - 101/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_comma_nodead</name>
-            <_description>Hungary - 101/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_dead</name>
-            <_description>Hungary - 101/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>101_qwerty_dot_nodead</name>
-            <_description>Hungary - 101/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (101/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_dead</name>
-            <_description>Hungary - 102/qwertz/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_comma_nodead</name>
-            <_description>Hungary - 102/qwertz/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_dead</name>
-            <_description>Hungary - 102/qwertz/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwertz_dot_nodead</name>
-            <_description>Hungary - 102/qwertz/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwertz/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_dead</name>
-            <_description>Hungary - 102/qwerty/comma/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_comma_nodead</name>
-            <_description>Hungary - 102/qwerty/comma/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/comma/eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_dead</name>
-            <_description>Hungary - 102/qwerty/dot/Dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>102_qwerty_dot_nodead</name>
-            <_description>Hungary - 102/qwerty/dot/Eliminate dead keys</_description>
+            <_description>Hungarian (102/qwerty/dot/eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3066,8 +3124,8 @@
     <layout>
       <configItem>
         <name>is</name>
-        <_shortDescription>Isl</_shortDescription>
-        <_description>Iceland</_description>
+        <_shortDescription>is</_shortDescription>
+        <_description>Icelandic</_description>
         <languageList>
           <iso639Id>ice</iso639Id>
         </languageList>
@@ -3076,25 +3134,25 @@
         <variant>
           <configItem>
             <name>Sundeadkeys</name>
-            <_description>Iceland - Sun dead keys</_description>
+            <_description>Icelandic (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Iceland - Eliminate dead keys</_description>
+            <_description>Icelandic (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Iceland - Macintosh</_description>
+            <_description>Icelandic (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Iceland - Dvorak</_description>
+            <_description>Icelandic (Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3102,8 +3160,8 @@
     <layout>
       <configItem>
         <name>il</name>
-        <_shortDescription>Isr</_shortDescription>
-        <_description>Israel</_description>
+        <_shortDescription>he</_shortDescription>
+        <_description>Hebrew</_description>
         <languageList>
           <iso639Id>heb</iso639Id>
         </languageList>
@@ -3112,19 +3170,19 @@
         <variant>
           <configItem>
             <name>lyx</name>
-            <_description>Israel - lyx</_description>
+            <_description>Hebrew (lyx)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Israel - Phonetic</_description>
+            <_description>Hebrew (Phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>biblical</name>
-            <_description>Israel - Biblical Hebrew (Tiro)</_description>
+            <_description>Hebrew (Tiro)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3132,8 +3190,8 @@
     <layout>
       <configItem>
         <name>it</name>
-        <_shortDescription>Ita</_shortDescription>
-        <_description>Italy</_description>
+        <_shortDescription>it</_shortDescription>
+        <_description>Italian</_description>
         <languageList>
           <iso639Id>ita</iso639Id>
         </languageList>
@@ -3142,25 +3200,25 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Italy - Eliminate dead keys</_description>
+            <_description>Italian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Italy - Macintosh</_description>
+            <_description>Italian (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Italy - US keyboard with Italian letters</_description>
+            <_description>Italian (US keyboard with Italian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>geo</name>
-            <_description>Italy - Georgian</_description>
+            <_description>Italian (Georgian)</_description>
             <languageList>
               <iso639Id>geo</iso639Id>
             </languageList>
@@ -3171,8 +3229,8 @@
     <layout>
       <configItem>
         <name>jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan</_description>
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese</_description>
         <languageList>
           <iso639Id>jpn</iso639Id>
         </languageList>
@@ -3181,25 +3239,25 @@
         <variant>
           <configItem>
             <name>kana</name>
-            <_description>Japan - Kana</_description>
+            <_description>Japanese (Kana)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>kana86</name>
-            <_description>Japan - Kana 86</_description>
+            <_description>Japanese (Kana 86)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>OADG109A</name>
-            <_description>Japan - OADG 109A</_description>
+            <_description>Japanese (OADG 109A)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Japan - Macintosh</_description>
+            <_description>Japanese (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3207,8 +3265,8 @@
     <layout>
       <configItem>
         <name>kg</name>
-        <_shortDescription>Kgz</_shortDescription>
-        <_description>Kyrgyzstan</_description>
+        <_shortDescription>ki</_shortDescription>
+        <_description>Kyrgyz</_description>
         <languageList>
           <iso639Id>kir</iso639Id>
         </languageList>
@@ -3217,7 +3275,7 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Kyrgyzstan - Phonetic</_description>
+            <_description>Kyrgyz (phonetic)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3225,8 +3283,8 @@
     <layout>
       <configItem>
         <name>kh</name>
-        <_shortDescription>Khm</_shortDescription>
-        <_description>Cambodia</_description>
+        <_shortDescription>km</_shortDescription>
+        <_description>Khmer (Cambodian)</_description>
         <languageList>
           <iso639Id>khm</iso639Id>
         </languageList>
@@ -3236,8 +3294,8 @@
     <layout>
       <configItem>
         <name>kz</name>
-        <_shortDescription>Kaz</_shortDescription>
-        <_description>Kazakhstan</_description>
+        <_shortDescription>kk</_shortDescription>
+        <_description>Kazakh</_description>
         <languageList>
           <iso639Id>kaz</iso639Id>
         </languageList>
@@ -3246,7 +3304,8 @@
         <variant>
           <configItem>
             <name>ruskaz</name>
-            <_description>Kazakhstan - Russian with Kazakh</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Kazakhstan, with Kazakh)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
           </configItem>
@@ -3254,7 +3313,7 @@
         <variant>
           <configItem>
             <name>kazrus</name>
-            <_description>Kazakhstan - Kazakh with Russian</_description>
+            <_description>Kazakh (with Russian)</_description>
             <languageList><iso639Id>kaz</iso639Id>
                           <iso639Id>rus</iso639Id></languageList>
           </configItem>
@@ -3264,8 +3323,8 @@
     <layout>
       <configItem>
         <name>la</name>
-        <_shortDescription>Lao</_shortDescription>
-        <_description>Laos</_description>
+        <_shortDescription>lo</_shortDescription>
+        <_description>Lao</_description>
         <languageList>
           <iso639Id>lao</iso639Id>
         </languageList>
@@ -3274,7 +3333,7 @@
         <variant>
           <configItem>
             <name>stea</name>
-            <_description>Laos - STEA (proposed standard layout)</_description>
+            <_description>Lao (STEA proposed standard layout)</_description>
             <languageList><iso639Id>lao</iso639Id>
             </languageList>
           </configItem>
@@ -3284,8 +3343,8 @@
     <layout>
       <configItem>
         <name>latam</name>
-        <_shortDescription>Esp</_shortDescription>
-        <_description>Latin American</_description>
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish (Latin American)</_description>
         <countryList>
           <iso3166Id>AR</iso3166Id>
           <iso3166Id>BO</iso3166Id>
@@ -3317,19 +3376,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Latin American - Eliminate dead keys</_description>
+            <_description>Spanish (Latin American, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Latin American - Include dead tilde</_description>
+            <_description>Spanish (Latin American, include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Latin American - Sun dead keys</_description>
+            <_description>Spanish (Latin American, sun dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3337,8 +3396,8 @@
     <layout>
       <configItem>
         <name>lt</name>
-        <_shortDescription>Ltu</_shortDescription>
-        <_description>Lithuania</_description>
+        <_shortDescription>lt</_shortDescription>
+        <_description>Lithuanian</_description>
         <languageList>
           <iso639Id>lit</iso639Id>
         </languageList>
@@ -3347,31 +3406,31 @@
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Lithuania - Standard</_description>
+            <_description>Lithuanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Lithuania - US keyboard with Lithuanian letters</_description>
+            <_description>Lithuanian (US keyboard with Lithuanian letters)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ibm</name>
-            <_description>Lithuania - IBM (LST 1205-92)</_description>
+            <_description>Lithuanian (IBM LST 1205-92)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekp</name>
-            <_description>Lithuania - LEKP</_description>
+            <_description>Lithuanian (LEKP)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>lekpa</name>
-            <_description>Lithuania - LEKPa</_description>
+            <_description>Lithuanian (LEKPa)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3379,8 +3438,8 @@
     <layout>
       <configItem>
         <name>lv</name>
-        <_shortDescription>Lva</_shortDescription>
-        <_description>Latvia</_description>
+        <_shortDescription>lv</_shortDescription>
+        <_description>Latvian</_description>
         <languageList>
           <iso639Id>lav</iso639Id>
         </languageList>
@@ -3389,19 +3448,19 @@
         <variant>
           <configItem>
             <name>apostrophe</name>
-            <_description>Latvia - Apostrophe (') variant</_description>
+            <_description>Latvian (Apostrophe ' variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tilde</name>
-            <_description>Latvia - Tilde (~) variant</_description>
+            <_description>Latvian (Tilde ~ variant)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fkey</name>
-            <_description>Latvia - F-letter (F) variant</_description>
+            <_description>Latvian (F variant)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3409,8 +3468,8 @@
     <layout>
       <configItem>
         <name>mao</name>
-        <_shortDescription>Mao</_shortDescription>
-        <_description>Maori</_description>
+        <_shortDescription>mi</_shortDescription>
+        <_description>Māori</_description>
         <languageList>
           <iso639Id>mao</iso639Id>
         </languageList>
@@ -3420,8 +3479,8 @@
     <layout>
       <configItem>
         <name>me</name>
-        <_shortDescription>MNE</_shortDescription>
-        <_description>Montenegro</_description>
+        <_shortDescription>srp</_shortDescription>
+        <_description>Montenegrin</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -3430,43 +3489,43 @@
         <variant>
           <configItem>
             <name>cyrillic</name>
-            <_description>Montenegro - Cyrillic</_description>
+            <_description>Montenegrin (Cyrillic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicyz</name>
-            <_description>Montenegro - Cyrillic, Z and ZHE swapped</_description>
+            <_description>Montenegrin (Cyrillic, Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Montenegro - Latin unicode</_description>
+            <_description>Montenegrin (Latin unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Montenegro - Latin qwerty</_description>
+            <_description>Montenegrin (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Montenegro - Latin unicode qwerty</_description>
+            <_description>Montenegrin (Latin unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>cyrillicalternatequotes</name>
-            <_description>Montenegro - Cyrillic with guillemets</_description>
+            <_description>Montenegrin (Cyrillic with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Montenegro - Latin with guillemets</_description>
+            <_description>Montenegrin (Latin with guillemets)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3474,8 +3533,8 @@
     <layout>
       <configItem>
         <name>mk</name>
-        <_shortDescription>Mkd</_shortDescription>
-        <_description>Macedonia</_description>
+        <_shortDescription>mk</_shortDescription>
+        <_description>Macedonian</_description>
         <languageList>
           <iso639Id>mkd</iso639Id>
         </languageList>
@@ -3484,7 +3543,7 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Macedonia - Eliminate dead keys</_description>
+            <_description>Macedonian (eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3492,8 +3551,8 @@
     <layout>
       <configItem>
         <name>mt</name>
-        <_shortDescription>Mlt</_shortDescription>
-        <_description>Malta</_description>
+        <_shortDescription>mt</_shortDescription>
+        <_description>Maltese</_description>
         <languageList>
           <iso639Id>mlt</iso639Id>
         </languageList>
@@ -3502,7 +3561,7 @@
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Malta - Maltese keyboard with US layout</_description>
+            <_description>Maltese (with US layout)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3510,8 +3569,8 @@
     <layout>
       <configItem>
         <name>mn</name>
-        <_shortDescription>Mng</_shortDescription>
-        <_description>Mongolia</_description>
+        <_shortDescription>mn</_shortDescription>
+        <_description>Mongolian</_description>
         <languageList>
           <iso639Id>mng</iso639Id>
         </languageList>
@@ -3521,8 +3580,8 @@
     <layout>
       <configItem>
         <name>no</name>
-        <_shortDescription>Nor</_shortDescription>
-        <_description>Norway</_description>
+        <_shortDescription>no</_shortDescription>
+        <_description>Norwegian</_description>
         <languageList>
           <iso639Id>nor</iso639Id>
         </languageList>
@@ -3531,19 +3590,19 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Norway - Eliminate dead keys</_description>
+            <_description>Norwegian (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Norway - Dvorak</_description>
+            <_description>Norwegian (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Norway - Northern Saami</_description>
+            <_description>Norwegian (Northern Saami</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -3552,7 +3611,7 @@
         <variant>
           <configItem>
             <name>smi_nodeadkeys</name>
-            <_description>Norway - Northern Saami, eliminate dead keys</_description>
+            <_description>Norwegian (northern Saami, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -3561,13 +3620,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Norway - Macintosh</_description>
+            <_description>Norwegian (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Norway - Macintosh, eliminate dead keys</_description>
+            <_description>Norwegian (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3575,8 +3634,8 @@
     <layout>
       <configItem>
         <name>pl</name>
-        <_shortDescription>Pol</_shortDescription>
-        <_description>Poland</_description>
+        <_shortDescription>pl</_shortDescription>
+        <_description>Polish</_description>
         <languageList>
           <iso639Id>pol</iso639Id>
         </languageList>
@@ -3585,31 +3644,31 @@
         <variant>
           <configItem>
             <name>qwertz</name>
-            <_description>Poland - qwertz</_description>
+            <_description>Polish (qwertz)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Poland - Dvorak</_description>
+            <_description>Polish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_quotes</name>
-            <_description>Poland - Dvorak, Polish quotes on quotemark key</_description>
+            <_description>Polish (Dvorak, polish quotes on quotemark key)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak_altquotes</name>
-            <_description>Poland - Dvorak, Polish quotes on key 1</_description>
+            <_description>Polish (Dvorak, polish quotes on key 1)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>csb</name>
-            <_description>Poland - Kashubian</_description>
+            <_description>Polish (Kashubian)</_description>
             <languageList>
               <iso639Id>csb</iso639Id>
             </languageList>
@@ -3618,7 +3677,8 @@
         <variant>
           <configItem>
             <name>ru_phonetic_dvorak</name>
-            <_description>Poland - Russian phonetic Dvorak</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Poland, phonetic Dvorak)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -3627,7 +3687,7 @@
         <variant>
           <configItem>
             <name>dvp</name>
-            <_description>Poland - Programmer Dvorak</_description>
+            <_description>Polish (programmer Dvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -3635,8 +3695,8 @@
     <layout>
       <configItem>
         <name>pt</name>
-        <_shortDescription>Prt</_shortDescription>
-        <_description>Portugal</_description>
+        <_shortDescription>pt</_shortDescription>
+        <_description>Portuguese</_description>
         <languageList>
           <iso639Id>por</iso639Id>
         </languageList>
@@ -3645,49 +3705,49 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Portugal - Eliminate dead keys</_description>
+            <_description>Portuguese (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Portugal - Sun dead keys</_description>
+            <_description>Portuguese (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Portugal - Macintosh</_description>
+            <_description>Portuguese (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_nodeadkeys</name>
-            <_description>Portugal - Macintosh, eliminate dead keys</_description>
+            <_description>Portuguese (Mac, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_sundeadkeys</name>
-            <_description>Portugal - Macintosh, Sun dead keys</_description>
+            <_description>Portuguese (Mac, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo</name>
-            <_description>Portugal - Nativo</_description>
+            <_description>Portuguese (Nativo)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-us</name>
-            <_description>Portugal - Nativo for USA keyboards</_description>
+            <_description>Portuguese (Nativo for USA keyboards)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>nativo-epo</name>
-            <_description>Portugal - Nativo for Esperanto</_description>
+            <_description>Portuguese (Nativo for Esperanto)</_description>
             <languageList>
               <iso639Id>epo</iso639Id>
             </languageList>
@@ -3698,8 +3758,8 @@
     <layout>
       <configItem>
         <name>ro</name>
-        <_shortDescription>Rou</_shortDescription>
-        <_description>Romania</_description>
+        <_shortDescription>ro</_shortDescription>
+        <_description>Romanian</_description>
         <languageList>
           <iso639Id>rum</iso639Id>
         </languageList>
@@ -3708,31 +3768,31 @@
         <variant>
           <configItem>
             <name>cedilla</name>
-            <_description>Romania - Cedilla</_description>
+            <_description>Romanian (cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std</name>
-            <_description>Romania - Standard</_description>
+            <_description>Romanian (standard)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>std_cedilla</name>
-            <_description>Romania - Standard (Cedilla)</_description>
+            <_description>Romanian (standard cedilla)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Romania - Winkeys</_description>
+            <_description>Romanian (WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Romania - Crimean Tatar (Turkish F)</_description>
+            <_description>Romanian (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3741,7 +3801,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Romania - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Romanian (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3750,7 +3810,7 @@
         <variant>
           <configItem>
             <name>crh_dobruca1</name>
-            <_description>Romania - Crimean Tatar (Dobruca-1 Q)</_description>
+            <_description>Romanian (Crimean Tatar Dobruca-1 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3759,7 +3819,7 @@
         <variant>
           <configItem>
             <name>crh_dobruca2</name>
-            <_description>Romania - Crimean Tatar (Dobruca-2 Q)</_description>
+            <_description>Romanian (Crimean Tatar Dobruca-2 Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -3770,8 +3830,8 @@
     <layout>
       <configItem>
         <name>ru</name>
-        <_shortDescription>Rus</_shortDescription>
-        <_description>Russia</_description>
+        <_shortDescription>ru</_shortDescription>
+        <_description>Russian</_description>
         <languageList>
           <iso639Id>rus</iso639Id>
         </languageList>
@@ -3780,37 +3840,37 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Russia - Phonetic</_description>
+            <_description>Russian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>phonetic_winkeys</name>
-            <_description>Russia - Phonetic Winkeys</_description>
+            <_description>Russian (phonetic WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Russia - Typewriter</_description>
+            <_description>Russian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Russia - Legacy</_description>
+            <_description>Russian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter-legacy</name>
-            <_description>Russia - Typewriter, legacy</_description>
+            <_description>Russian (typewriter, legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>tt</name>
-            <_description>Russia - Tatar</_description>
+            <_description>Russian (Tatar)</_description>
             <languageList>
               <iso639Id>tat</iso639Id>
             </languageList>
@@ -3819,7 +3879,7 @@
         <variant>
           <configItem>
             <name>os_legacy</name>
-            <_description>Russia - Ossetian, legacy</_description>
+            <_description>Russian (Ossetian, legacy)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -3828,7 +3888,7 @@
         <variant>
           <configItem>
             <name>os_winkeys</name>
-            <_description>Russia - Ossetian, Winkeys</_description>
+            <_description>Russian (Ossetian, WinKeys)</_description>
             <languageList>
               <iso639Id>oss</iso639Id>
             </languageList>
@@ -3837,7 +3897,7 @@
         <variant>
           <configItem>
             <name>cv</name>
-            <_description>Russia - Chuvash</_description>
+            <_description>Russian (Chuvash)</_description>
             <languageList>
               <iso639Id>chv</iso639Id>
             </languageList>
@@ -3846,7 +3906,7 @@
         <variant>
           <configItem>
             <name>cv_latin</name>
-            <_description>Russia - Chuvash Latin</_description>
+            <_description>Russian (Chuvash Latin)</_description>
             <languageList>
               <iso639Id>chv</iso639Id>
             </languageList>
@@ -3855,7 +3915,7 @@
         <variant>
           <configItem>
             <name>udm</name>
-            <_description>Russia - Udmurt</_description>
+            <_description>Russian (Udmurt)</_description>
             <languageList>
               <iso639Id>udm</iso639Id>
             </languageList>
@@ -3864,7 +3924,7 @@
         <variant>
           <configItem>
             <name>kom</name>
-            <_description>Russia - Komi</_description>
+            <_description>Russian (Komi)</_description>
             <languageList>
               <iso639Id>kom</iso639Id>
             </languageList>
@@ -3873,7 +3933,7 @@
         <variant>
           <configItem>
             <name>sah</name>
-            <_description>Russia - Yakut</_description>
+            <_description>Russian (Yakut)</_description>
             <languageList>
               <iso639Id>sah</iso639Id>
             </languageList>
@@ -3882,7 +3942,7 @@
         <variant>
           <configItem>
             <name>xal</name>
-            <_description>Russia - Kalmyk</_description>
+            <_description>Russian (Kalmyk)</_description>
             <languageList>
               <iso639Id>xal</iso639Id>
             </languageList>
@@ -3891,13 +3951,13 @@
         <variant>
           <configItem>
             <name>dos</name>
-            <_description>Russia - DOS</_description>
+            <_description>Russian (DOS)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>srp</name>
-            <_description>Russia - Serbian</_description>
+            <_description>Russian (Serbian)</_description>
             <languageList><iso639Id>rus</iso639Id>
                           <iso639Id>srp</iso639Id></languageList>
           </configItem>
@@ -3905,7 +3965,7 @@
         <variant>
           <configItem>
             <name>bak</name>
-            <_description>Russia - Bashkirian</_description>
+            <_description>Russian (Bashkirian)</_description>
             <languageList>
               <iso639Id>bak</iso639Id>
             </languageList>
@@ -3914,7 +3974,7 @@
         <variant>
           <configItem>
             <name>chm</name>
-            <_description>Russia - Mari</_description>
+            <_description>Russian (Mari)</_description>
             <languageList>
               <iso639Id>chm</iso639Id>
             </languageList>
@@ -3925,8 +3985,8 @@
     <layout>
       <configItem>
         <name>rs</name>
-        <_shortDescription>Srb</_shortDescription>
-        <_description>Serbia</_description>
+        <_shortDescription>sr</_shortDescription>
+        <_description>Serbian</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -3935,49 +3995,49 @@
         <variant>
           <configItem>
             <name>yz</name>
-            <_description>Serbia - Z and ZHE swapped</_description>
+            <_description>Serbian (Z and ZHE swapped)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Serbia - Latin</_description>
+            <_description>Serbian (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicode</name>
-            <_description>Serbia - Latin Unicode</_description>
+            <_description>Serbian (Latin Unicode)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinyz</name>
-            <_description>Serbia - Latin qwerty</_description>
+            <_description>Serbian (Latin qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinunicodeyz</name>
-            <_description>Serbia - Latin Unicode qwerty</_description>
+            <_description>Serbian (Latin Unicode qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Serbia - With guillemets</_description>
+            <_description>Serbian (with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>latinalternatequotes</name>
-            <_description>Serbia - Latin with guillemets</_description>
+            <_description>Serbian (Latin with guillemets)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rue</name>
-            <_description>Serbia - Pannonian Rusyn Homophonic</_description>
+            <_description>Serbian (Pannonian Rusyn Homophonic)</_description>
             <languageList>
               <iso639Id>rue</iso639Id>
             </languageList>
@@ -3988,8 +4048,8 @@
     <layout>
       <configItem>
         <name>si</name>
-        <_shortDescription>Svn</_shortDescription>
-        <_description>Slovenia</_description>
+        <_shortDescription>sl</_shortDescription>
+        <_description>Slovene</_description>
         <languageList>
           <iso639Id>slv</iso639Id>
         </languageList>
@@ -3998,13 +4058,13 @@
         <variant>
           <configItem>
             <name>alternatequotes</name>
-            <_description>Slovenia - Use guillemets for quotes</_description>
+            <_description>Slovene (use guillemets for quotes)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us</name>
-            <_description>Slovenia - US keyboard with Slovenian letters</_description>
+            <_description>Slovene (US keyboard with Slovenian letters)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4012,8 +4072,8 @@
     <layout>
       <configItem>
         <name>sk</name>
-        <_shortDescription>Svk</_shortDescription>
-        <_description>Slovakia</_description>
+        <_shortDescription>sk</_shortDescription>
+        <_description>Slovak</_description>
         <languageList>
           <iso639Id>slo</iso639Id>
         </languageList>
@@ -4022,19 +4082,19 @@
         <variant>
           <configItem>
             <name>bksl</name>
-            <_description>Slovakia - Extended Backslash</_description>
+            <_description>Slovak (extended Backslash)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty</name>
-            <_description>Slovakia - qwerty</_description>
+            <_description>Slovak (qwerty)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>qwerty_bksl</name>
-            <_description>Slovakia - qwerty, extended Backslash</_description>
+            <_description>Slovak (qwerty, extended Backslash)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4042,8 +4102,8 @@
     <layout>
       <configItem>
         <name>es</name>
-        <_shortDescription>Esp</_shortDescription>
-        <_description>Spain</_description>
+        <_shortDescription>es</_shortDescription>
+        <_description>Spanish</_description>
         <languageList>
           <iso639Id>spa</iso639Id>
         </languageList>
@@ -4052,31 +4112,31 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Spain - Eliminate dead keys</_description>
+            <_description>Spanish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>deadtilde</name>
-            <_description>Spain - Include dead tilde</_description>
+            <_description>Spanish (include dead tilde)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Spain - Sun dead keys</_description>
+            <_description>Spanish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Spain - Dvorak</_description>
+            <_description>Spanish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ast</name>
-            <_description>Spain - Asturian variant with bottom-dot H and bottom-dot L</_description>
+            <_description>Spanish (Asturian variant with bottom-dot H and bottom-dot L)</_description>
             <languageList>
               <iso639Id>ast</iso639Id>
             </languageList>
@@ -4085,7 +4145,7 @@
         <variant>
           <configItem>
             <name>cat</name>
-            <_description>Spain - Catalan variant with middle-dot L</_description>
+            <_description>Spanish (Catalan variant with middle-dot L)</_description>
             <languageList>
               <iso639Id>cat</iso639Id>
             </languageList>
@@ -4094,7 +4154,7 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Spain - Macintosh</_description>
+            <_description>Spanish (Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4102,8 +4162,8 @@
     <layout>
       <configItem>
         <name>se</name>
-        <_shortDescription>Swe</_shortDescription>
-        <_description>Sweden</_description>
+        <_shortDescription>sv</_shortDescription>
+        <_description>Swedish</_description>
         <languageList>
           <iso639Id>swe</iso639Id>
         </languageList>
@@ -4112,19 +4172,20 @@
         <variant>
           <configItem>
             <name>nodeadkeys</name>
-            <_description>Sweden - Eliminate dead keys</_description>
+            <_description>Swedish (eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Sweden - Dvorak</_description>
+            <_description>Swedish (Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rus</name>
-            <_description>Sweden - Russian phonetic</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -4133,7 +4194,8 @@
         <variant>
           <configItem>
             <name>rus_nodeadkeys</name>
-            <_description>Sweden - Russian phonetic, eliminate dead keys</_description>
+            <_shortDescription>ru</_shortDescription>
+            <_description>Russian (Sweden, phonetic, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>rus</iso639Id>
             </languageList>
@@ -4142,7 +4204,7 @@
         <variant>
           <configItem>
             <name>smi</name>
-            <_description>Sweden - Northern Saami</_description>
+            <_description>Swedish (northern Saami)</_description>
             <languageList>
               <iso639Id>sme</iso639Id>
             </languageList>
@@ -4151,13 +4213,13 @@
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>Sweden - Macintosh</_description>
+            <_description>Swedish (Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>svdvorak</name>
-            <_description>Sweden - Svdvorak</_description>
+            <_description>Swedish (Svdvorak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4165,8 +4227,8 @@
     <layout>
       <configItem>
         <name>ch</name>
-        <_shortDescription>Che</_shortDescription>
-        <_description>Switzerland</_description>
+        <_shortDescription>che</_shortDescription>
+        <_description>Swiss</_description>
         <languageList><iso639Id>ger</iso639Id>
                       <iso639Id>gsw</iso639Id></languageList>
       </configItem>
@@ -4174,25 +4236,28 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Switzerland - Legacy</_description>
+            <_description>Swiss (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_nodeadkeys</name>
-            <_description>Switzerland - German, eliminate dead keys</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, eliminate dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>de_sundeadkeys</name>
-            <_description>Switzerland - German, Sun dead keys</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>fr</name>
-            <_description>Switzerland - French</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4201,7 +4266,8 @@
         <variant>
           <configItem>
             <name>fr_nodeadkeys</name>
-            <_description>Switzerland - French, eliminate dead keys</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, eliminate dead keys)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4210,7 +4276,8 @@
         <variant>
           <configItem>
             <name>fr_sundeadkeys</name>
-            <_description>Switzerland - French, Sun dead keys</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Sun dead keys)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4219,7 +4286,8 @@
         <variant>
           <configItem>
             <name>fr_mac</name>
-            <_description>Switzerland - French (Macintosh)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Switzerland, Mac)</_description>
             <languageList>
               <iso639Id>fra</iso639Id>
             </languageList>
@@ -4228,7 +4296,8 @@
         <variant>
           <configItem>
             <name>de_mac</name>
-            <_description>Switzerland - German (Macintosh)</_description>
+            <_shortDescription>de</_shortDescription>
+            <_description>German (Switzerland, Mac)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4236,8 +4305,8 @@
     <layout>
       <configItem>
         <name>sy</name>
-        <_shortDescription>Syr</_shortDescription>
-        <_description>Syria</_description>
+        <_shortDescription>ar</_shortDescription>
+        <_description>Arabic (Syria)</_description>
         <languageList>
           <iso639Id>syr</iso639Id>
         </languageList>
@@ -4246,19 +4315,22 @@
         <variant>
           <configItem>
             <name>syc</name>
-            <_description>Syria - Syriac</_description>
+            <_shortDescription>syc</_shortDescription>
+            <_description>Syriac</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>syc_phonetic</name>
-            <_description>Syria - Syriac phonetic</_description>
+            <_shortDescription>syc</_shortDescription>
+            <_description>Syriac (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Syria - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4267,7 +4339,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Syria - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4276,7 +4349,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Syria - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Syria, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4287,8 +4361,8 @@
     <layout>
       <configItem>
         <name>tj</name>
-        <_shortDescription>Tjk</_shortDescription>
-        <_description>Tajikistan</_description>
+        <_shortDescription>tg</_shortDescription>
+        <_description>Tajik</_description>
         <languageList>
           <iso639Id>tgk</iso639Id>
         </languageList>
@@ -4297,7 +4371,7 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Tajikistan - Legacy</_description>
+            <_description>Tajik (legacy)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4305,8 +4379,8 @@
     <layout>
       <configItem>
         <name>lk</name>
-        <_shortDescription>Lka</_shortDescription>
-        <_description>Sri Lanka</_description>
+        <_shortDescription>si</_shortDescription>
+        <_description>Sinhala</_description>
         <languageList>
           <iso639Id>sin</iso639Id>
         </languageList>
@@ -4315,7 +4389,8 @@
         <variant>
           <configItem>
             <name>tam_unicode</name>
-            <_description>Sri Lanka - Tamil Unicode</_description>
+            <_shortDescription>ta</_shortDescription>
+            <_description>Tamil (Sri Lanka, Unicode)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -4324,7 +4399,7 @@
         <variant>
           <configItem>
             <name>tam_TAB</name>
-            <_description>Sri Lanka - Tamil TAB Typewriter</_description>
+            <_description>Tamil (Sri Lanka, TAB Typewriter)</_description>
             <languageList>
               <iso639Id>tam</iso639Id>
             </languageList>
@@ -4335,8 +4410,8 @@
     <layout>
       <configItem>
         <name>th</name>
-        <_shortDescription>Tha</_shortDescription>
-        <_description>Thailand</_description>
+        <_shortDescription>th</_shortDescription>
+        <_description>Thai</_description>
         <languageList>
           <iso639Id>tha</iso639Id>
         </languageList>
@@ -4345,13 +4420,13 @@
         <variant>
           <configItem>
             <name>tis</name>
-            <_description>Thailand - TIS-820.2538</_description>
+            <_description>Thai (TIS-820.2538)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>pat</name>
-            <_description>Thailand - Pattachote</_description>
+            <_description>Thai (Pattachote)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4359,8 +4434,8 @@
     <layout>
       <configItem>
         <name>tr</name>
-        <_shortDescription>Tur</_shortDescription>
-        <_description>Turkey</_description>
+        <_shortDescription>tr</_shortDescription>
+        <_description>Turkish</_description>
         <languageList>
           <iso639Id>tur</iso639Id>
         </languageList>
@@ -4369,25 +4444,26 @@
         <variant>
           <configItem>
             <name>f</name>
-            <_description>Turkey - (F)</_description>
+            <_description>Turkish (F)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Turkey - Alt-Q</_description>
+            <_description>Turkish (Alt-Q)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sundeadkeys</name>
-            <_description>Turkey - Sun dead keys</_description>
+            <_description>Turkish (Sun dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ku</name>
-            <_description>Turkey - Kurdish, Latin Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4396,7 +4472,8 @@
         <variant>
           <configItem>
             <name>ku_f</name>
-            <_description>Turkey - Kurdish, (F)</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, F)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4405,7 +4482,8 @@
         <variant>
           <configItem>
             <name>ku_alt</name>
-            <_description>Turkey - Kurdish, Latin Alt-Q</_description>
+            <_shortDescription>ku</_shortDescription>
+            <_description>Kurdish (Turkey, Latin Alt-Q)</_description>
             <languageList>
               <iso639Id>kur</iso639Id>
             </languageList>
@@ -4414,13 +4492,13 @@
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>Turkey - International (with dead keys)</_description>
+            <_description>Turkish (international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Turkey - Crimean Tatar (Turkish Q)</_description>
+            <_description>Turkish (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4429,7 +4507,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Turkey - Crimean Tatar (Turkish F)</_description>
+            <_description>Turkish (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4438,7 +4516,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Turkey - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Turkish (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4449,8 +4527,8 @@
     <layout>
       <configItem>
         <name>tw</name>
-        <_shortDescription>Twn</_shortDescription>
-        <_description>Taiwan</_description>
+        <_shortDescription>twn</_shortDescription>
+        <_description>Taiwanese</_description>
         <languageList>
           <iso639Id>trv</iso639Id>
         </languageList>
@@ -4459,7 +4537,7 @@
         <variant>
           <configItem>
             <name>indigenous</name>
-            <_description>Taiwan - Indigenous</_description>
+            <_description>Taiwanese (indigenous)</_description>
             <languageList>
               <iso639Id>ami</iso639Id>
               <iso639Id>tay</iso639Id>
@@ -4478,9 +4556,10 @@
         <variant>
           <configItem>
             <name>saisiyat</name>
-            <_description>Taiwan - Saisiyat</_description>
+            <_shortDescription>xsy</_shortDescription>
+            <_description>Saisiyat (Taiwan)</_description>
             <languageList>
-              <iso639Id>xsf</iso639Id>
+              <iso639Id>xsy</iso639Id>
             </languageList>
           </configItem>
         </variant>
@@ -4489,8 +4568,8 @@
     <layout>
       <configItem>
         <name>ua</name>
-        <_shortDescription>Ukr</_shortDescription>
-        <_description>Ukraine</_description>
+        <_shortDescription>uk</_shortDescription>
+        <_description>Ukrainian</_description>
         <languageList>
           <iso639Id>ukr</iso639Id>
         </languageList>
@@ -4499,49 +4578,49 @@
         <variant>
           <configItem>
             <name>phonetic</name>
-            <_description>Ukraine - Phonetic</_description>
+            <_description>Ukrainian (phonetic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>typewriter</name>
-            <_description>Ukraine - Typewriter</_description>
+            <_description>Ukrainian (typewriter)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>winkeys</name>
-            <_description>Ukraine - Winkeys</_description>
+            <_description>Ukrainian (WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Ukraine - Legacy</_description>
+            <_description>Ukrainian (legacy)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu</name>
-            <_description>Ukraine - Standard RSTU</_description>
+            <_description>Ukrainian (standard RSTU)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>rstu_ru</name>
-            <_description>Ukraine - Standard RSTU on Russian layout</_description>
+            <_description>Ukrainian (standard RSTU on Russian layout)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>homophonic</name>
-            <_description>Ukraine - Homophonic</_description>
+            <_description>Ukrainian (homophonic)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Ukraine - Crimean Tatar (Turkish Q)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4550,7 +4629,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Ukraine - Crimean Tatar (Turkish F)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4559,7 +4638,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Ukraine - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Ukrainian (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4571,7 +4650,7 @@
       <configItem>
         <name>gb</name>
         <_shortDescription>GBr</_shortDescription>
-        <_description>United Kingdom</_description>
+        <_description>English (UK)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4580,43 +4659,43 @@
         <variant>
           <configItem>
             <name>extd</name>
-            <_description>United Kingdom - Extended - Winkeys</_description>
+            <_description>English (UK, extended, WinKeys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>intl</name>
-            <_description>United Kingdom - International (with dead keys)</_description>
+            <_description>English (UK, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>United Kingdom - Dvorak</_description>
+            <_description>English (UK, Dvorak)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>dvorakukp</name>
-            <_description>United Kingdom - Dvorak (UK Punctuation)</_description>
+            <_description>English (UK, Dvorak UK punctuation)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac</name>
-            <_description>United Kingdom - Macintosh</_description>
+            <_description>English (UK, Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>mac_intl</name>
-            <_description>United Kingdom - Macintosh (International)</_description>
+            <_description>English (UK, Mac international)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>United Kingdom - Colemak</_description>
+            <_description>English (UK, Colemak)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4624,8 +4703,8 @@
     <layout>
       <configItem>
         <name>uz</name>
-        <_shortDescription>Uzb</_shortDescription>
-        <_description>Uzbekistan</_description>
+        <_shortDescription>uz</_shortDescription>
+        <_description>Uzbek</_description>
         <languageList>
           <iso639Id>uzb</iso639Id>
         </languageList>
@@ -4634,13 +4713,13 @@
         <variant>
           <configItem>
             <name>latin</name>
-            <_description>Uzbekistan - Latin</_description>
+            <_description>Uzbek (Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>crh</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish Q)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4649,7 +4728,7 @@
         <variant>
           <configItem>
             <name>crh_f</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish F)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish F)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4658,7 +4737,7 @@
         <variant>
           <configItem>
             <name>crh_alt</name>
-            <_description>Uzbekistan - Crimean Tatar (Turkish Alt-Q)</_description>
+            <_description>Uzbek (Crimean Tatar Turkish Alt-Q)</_description>
             <languageList>
               <iso639Id>crh</iso639Id>
             </languageList>
@@ -4669,8 +4748,8 @@
     <layout>
       <configItem>
         <name>vn</name>
-        <_shortDescription>Vnm</_shortDescription>
-        <_description>Vietnam</_description>
+        <_shortDescription>vi</_shortDescription>
+        <_description>Vietnamese</_description>
         <languageList>
           <iso639Id>vie</iso639Id>
         </languageList>
@@ -4680,8 +4759,8 @@
     <layout>
       <configItem>
         <name>kr</name>
-        <_shortDescription>Kor</_shortDescription>
-        <_description>Korea, Republic of</_description>
+        <_shortDescription>ko</_shortDescription>
+        <_description>Korean</_description>
         <languageList>
           <iso639Id>kor</iso639Id>
         </languageList>
@@ -4690,7 +4769,7 @@
         <variant>
           <configItem>
             <name>kr104</name>
-            <_description>Korea, Republic of - 101/104 key Compatible</_description>
+            <_description>Korean (101/104 key compatible)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4698,8 +4777,8 @@
     <layout>
       <configItem>
         <name>nec_vndr/jp</name>
-        <_shortDescription>Jpn</_shortDescription>
-        <_description>Japan (PC-98xx Series)</_description>
+        <_shortDescription>ja</_shortDescription>
+        <_description>Japanese (PC-98xx Series)</_description>
         <countryList>
           <iso3166Id>JP</iso3166Id>
         </countryList>
@@ -4712,8 +4791,8 @@
     <layout>
       <configItem>
         <name>ie</name>
-        <_shortDescription>Irl</_shortDescription>
-        <_description>Ireland</_description>
+        <_shortDescription>ie</_shortDescription>
+        <_description>Irish</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4722,7 +4801,7 @@
         <variant>
           <configItem>
             <name>CloGaelach</name>
-            <_description>Ireland - CloGaelach</_description>
+            <_description>Irish (CloGaelach)</_description>
             <languageList>
               <iso639Id>gla</iso639Id>
             </languageList>
@@ -4731,19 +4810,19 @@
         <variant>
           <configItem>
             <name>UnicodeExpert</name>
-            <_description>Ireland - UnicodeExpert</_description>
+            <_description>Irish (UnicodeExpert)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam</name>
-            <_description>Ireland - Ogham</_description>
+            <_description>Irish (Ogham)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>ogam_is434</name>
-            <_description>Ireland - Ogham IS434</_description>
+            <_description>Irish (Ogham IS434)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4751,8 +4830,8 @@
     <layout>
       <configItem>
         <name>pk</name>
-        <_shortDescription>Pak</_shortDescription>
-        <_description>Pakistan</_description>
+        <_shortDescription>ur</_shortDescription>
+        <_description>Urdu (Pakistan)</_description>
         <languageList>
           <iso639Id>urd</iso639Id>
         </languageList>
@@ -4761,7 +4840,7 @@
         <variant>
           <configItem>
             <name>urd-crulp</name>
-            <_description>Pakistan - CRULP</_description>
+            <_description>Urdu (Pakistan, CRULP)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -4770,7 +4849,7 @@
         <variant>
           <configItem>
             <name>urd-nla</name>
-            <_description>Pakistan - NLA</_description>
+            <_description>Urdu (Pakistan, NLA)</_description>
             <languageList>
               <iso639Id>urd</iso639Id>
             </languageList>
@@ -4779,7 +4858,8 @@
         <variant>
           <configItem>
             <name>ara</name>
-            <_description>Pakistan - Arabic</_description>
+            <_shortDescription>ar</_shortDescription>
+            <_description>Arabic (Pakistan)</_description>
             <languageList>
               <iso639Id>ara</iso639Id>
             </languageList>
@@ -4788,7 +4868,8 @@
         <variant>
           <configItem>
             <name>snd</name>
-            <_description>Pakistan - Sindhi</_description>
+            <_shortDescription>sd</_shortDescription>
+            <_description>Sindhi</_description>
             <languageList>
               <iso639Id>sd</iso639Id>
             </languageList>
@@ -4799,8 +4880,8 @@
     <layout>
       <configItem>
         <name>mv</name>
-        <_shortDescription>Mdv</_shortDescription>
-        <_description>Maldives</_description>
+        <_shortDescription>dv</_shortDescription>
+        <_description>Dhivehi</_description>
         <languageList>
           <iso639Id>div</iso639Id>
         </languageList>
@@ -4810,8 +4891,8 @@
     <layout>
       <configItem>
         <name>za</name>
-        <_shortDescription>Zaf</_shortDescription>
-        <_description>South Africa</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (South Africa)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4820,7 +4901,7 @@
     <layout>
       <configItem>
         <name>epo</name>
-        <_shortDescription>Epo</_shortDescription>
+        <_shortDescription>eo</_shortDescription>
         <_description>Esperanto</_description>
         <languageList>
           <iso639Id>epo</iso639Id>
@@ -4830,7 +4911,7 @@
         <variant>
           <configItem>
             <name>legacy</name>
-            <_description>Esperanto - displaced semicolon and quote (obsolete)</_description>
+            <_description>Esperanto (displaced semicolon and quote, obsolete)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4838,8 +4919,8 @@
     <layout>
       <configItem>
         <name>np</name>
-        <_shortDescription>Npl</_shortDescription>
-        <_description>Nepal</_description>
+        <_shortDescription>ne</_shortDescription>
+        <_description>Nepali</_description>
         <languageList>
           <iso639Id>nep</iso639Id>
         </languageList>
@@ -4848,8 +4929,8 @@
     <layout>
       <configItem>
         <name>ng</name>
-        <_shortDescription>Nga</_shortDescription>
-        <_description>Nigeria</_description>
+        <_shortDescription>en</_shortDescription>
+        <_description>English (Nigeria)</_description>
         <languageList>
           <iso639Id>eng</iso639Id>
         </languageList>
@@ -4858,7 +4939,8 @@
         <variant>
           <configItem>
             <name>igbo</name>
-            <_description>Nigeria - Igbo</_description>
+            <_shortDescription>ig</_shortDescription>
+            <_description>Igbo</_description>
             <languageList>
               <iso639Id>ibo</iso639Id>
             </languageList>
@@ -4867,7 +4949,8 @@
         <variant>
           <configItem>
             <name>yoruba</name>
-            <_description>Nigeria - Yoruba</_description>
+            <_shortDescription>yo</_shortDescription>
+            <_description>Yoruba</_description>
             <languageList>
               <iso639Id>yor</iso639Id>
             </languageList>
@@ -4876,7 +4959,8 @@
         <variant>
           <configItem>
             <name>hausa</name>
-            <_description>Nigeria - Hausa</_description>
+            <_shortDescription>ha</_shortDescription>
+            <_description>Hausa</_description>
             <languageList>
               <iso639Id>hau</iso639Id>
             </languageList>
@@ -4887,8 +4971,8 @@
     <layout>
       <configItem>
         <name>et</name>
-        <_shortDescription>Eth</_shortDescription>
-        <_description>Ethiopia</_description>
+        <_shortDescription>am</_shortDescription>
+        <_description>Amharic</_description>
         <languageList>
           <iso639Id>amh</iso639Id>
         </languageList>
@@ -4898,8 +4982,8 @@
     <layout>
       <configItem>
         <name>sn</name>
-        <_shortDescription>Sen</_shortDescription>
-        <_description>Senegal</_description>
+        <_shortDescription>wo</_shortDescription>
+        <_description>Wolof</_description>
         <languageList>
           <iso639Id>wol</iso639Id>
         </languageList>
@@ -4909,20 +4993,20 @@
     <layout>
       <configItem>
         <name>brai</name>
-        <_shortDescription>Brl</_shortDescription>
+        <_shortDescription>brl</_shortDescription>
         <_description>Braille</_description>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>left_hand</name>
-            <_description>Braille - Left hand</_description>
+            <_description>Braille (left hand)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>right_hand</name>
-            <_description>Braille - Right hand</_description>
+            <_description>Braille (right hand)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4930,8 +5014,8 @@
     <layout>
       <configItem>
         <name>tm</name>
-        <_shortDescription>Tkm</_shortDescription>
-        <_description>Turkmenistan</_description>
+        <_shortDescription>tk</_shortDescription>
+        <_description>Turkmen</_description>
         <languageList>
           <iso639Id>tuk</iso639Id>
         </languageList>
@@ -4940,7 +5024,7 @@
         <variant>
           <configItem>
             <name>alt</name>
-            <_description>Turkmenistan - Alt-Q</_description>
+            <_description>Turkmen (Alt-Q)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4948,8 +5032,8 @@
     <layout>
       <configItem>
         <name>ml</name>
-        <_shortDescription>Mli</_shortDescription>
-        <_description>Mali</_description>
+        <_shortDescription>bm</_shortDescription>
+        <_description>Bambara</_description>
         <languageList>
           <iso639Id>bam</iso639Id>
         </languageList>
@@ -4958,19 +5042,22 @@
         <variant>
           <configItem>
             <name>fr-oss</name>
-            <_description>Mali - Français (France Alternative)</_description>
+            <_shortDescription>fr</_shortDescription>
+            <_description>French (Mali, alternative)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-mac</name>
-            <_description>Mali - English (USA Macintosh)</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, USA Mac)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>us-intl</name>
-            <_description>Mali - English (USA International)</_description>
+            <_shortDescription>en</_shortDescription>
+            <_description>English (Mali, USA international)</_description>
           </configItem>
         </variant>
       </variantList>
@@ -4978,8 +5065,8 @@
     <layout>
       <configItem>
         <name>tz</name>
-        <_shortDescription>Tza</_shortDescription>
-        <_description>Tanzania</_description>
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Tanzania)</_description>
         <languageList>
           <iso639Id>swa</iso639Id>
         </languageList>
@@ -4988,8 +5075,8 @@
     <layout>
       <configItem>
         <name>ke</name>
-        <_shortDescription>Ken</_shortDescription>
-        <_description>Kenya</_description>
+        <_shortDescription>sw</_shortDescription>
+        <_description>Swahili (Kenya)</_description>
         <languageList>
           <iso639Id>swa</iso639Id>
         </languageList>
@@ -4998,7 +5085,8 @@
         <variant>
           <configItem>
             <name>kik</name>
-            <_description>Kenya - Kikuyu</_description>
+            <_shortDescription>ki</_shortDescription>
+            <_description>Kikuyu</_description>
             <languageList>
               <iso639Id>kik</iso639Id>
             </languageList>
@@ -5009,8 +5097,8 @@
     <layout>
       <configItem>
         <name>bw</name>
-        <_shortDescription>Bwa</_shortDescription>
-        <_description>Botswana</_description>
+        <_shortDescription>tn</_shortDescription>
+        <_description>Tswana</_description>
         <languageList>
           <iso639Id>tsn</iso639Id>
         </languageList>
@@ -5019,8 +5107,8 @@
     <layout>
       <configItem>
         <name>ph</name>
-        <_shortDescription>Phi</_shortDescription>
-        <_description>Philippines</_description>
+        <_shortDescription>ph</_shortDescription>
+        <_description>Filipino</_description>
         <languageList><iso639Id>eng</iso639Id>
                      <iso639Id>bik</iso639Id>
                       <iso639Id>ceb</iso639Id>
@@ -5037,7 +5125,7 @@
         <variant>
           <configItem>
             <name>qwerty-bay</name>
-            <_description>Philippines - QWERTY (Baybayin)</_description>
+            <_description>Filipino (QWERTY Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5053,13 +5141,13 @@
         <variant>
           <configItem>
             <name>capewell-dvorak</name>
-            <_description>Philippines - Capewell-Dvorak (Latin)</_description>
+            <_description>Filipino (Capewell-Dvorak Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-dvorak-bay</name>
-            <_description>Philippines - Capewell-Dvorak (Baybayin)</_description>
+            <_description>Filipino (Capewell-Dvorak Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5075,13 +5163,13 @@
         <variant>
           <configItem>
             <name>capewell-qwerf2k6</name>
-            <_description>Philippines - Capewell-QWERF 2006 (Latin)</_description>
+            <_description>Filipino (Capewell-QWERF 2006 Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>capewell-qwerf2k6-bay</name>
-            <_description>Philippines - Capewell-QWERF 2006 (Baybayin)</_description>
+            <_description>Filipino (Capewell-QWERF 2006 Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5097,13 +5185,13 @@
         <variant>
           <configItem>
             <name>colemak</name>
-            <_description>Philippines - Colemak (Latin)</_description>
+            <_description>Filipino (Colemak Latin)</_description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>colemak-bay</name>
-            <_description>Philippines - Colemak (Baybayin)</_description>
+            <_description>Filipino (Colemak Baybayin)</_description>
             <languageList><iso639Id>bik</iso639Id>
                           <iso639Id>ceb</iso639Id>
                           <iso639Id>fil</iso639Id>
@@ -5119,7 +5207,7 @@
         <variant>
           <configItem>
             <name>dvorak</name>
-            <_description>Philippines - Dvorak (Latin)</_description>
+            <_description>Filipino (Dvorak Latin)</_description>
           </configItem>
         </variant>
         <variant>
diff --git a/xorg-server/xkeyboard-config/symbols/mm b/xorg-server/xkeyboard-config/symbols/mm
index 43218ead5..074dfc893 100644
--- a/xorg-server/xkeyboard-config/symbols/mm
+++ b/xorg-server/xkeyboard-config/symbols/mm
@@ -1,63 +1,58 @@
-// based on a keyboard map from an 'xkb/symbols/mm' file

-

-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-      name[Group1]= "Myanmar";

-

-// Mainly numbers.

-      key <AE01> { [      0x1001041, exclam 	]	};

-      key <AE02> { [      0x1001042 		]	};

-      key <AE03> { [      0x1001043 	 	]	};

-      key <AE04> { [      0x1001044  	 	]	};

-      key <AE05> { [      0x1001045 		]	};

-      key <AE06> { [      0x1001046 	 	]	};

-      key <AE07> { [      0x1001047 		]	};

-      key <AE08> { [      0x1001048  	 	]	};

-      key <AE09> { [      0x1001049, parenleft 	]	};

-      key <AE10> { [      0x1001040, parenright ]	};

-      key <AE11> { [      minus, 0x1001038 	]	};

-      key <AE12> { [      0x1001052, 0x1001056 	]	};

-

-// Mainly long vowels

-      key <AD01> { [      0x100102A,  0x100102A ]	};

-      key <AD02> { [      0x1001032,  0x1001032 ]	};

-      key <AD03> { [      0x100102C,  0x1001021 ]	};

-      key <AD04> { [      0x100102E,  0x1001024 ]	};

-      key <AD05> { [      0x1001030,  0x1001026 ]	};

-

-// Mainly voiced consonants

-      key <AD06> { [      0x1001017,  0x1001018 ]	};

-      key <AD07> { [      0x100101F,  0x1001004 ]	};

-      key <AD08> { [      0x1001002,  0x1001003 ]	};

-      key <AD09> { [      0x1001012,  0x1001013 ]	};

-      key <AD10> { [      0x1001007,  0x1001008 ]	};

-      key <AD11> { [      0x100100d,  0x100100e	]	};

-      key <AD12> { [      0x100100a,  0x1001009	]	};

-

-// Mainly short vowels

-      key <AC01> { [      0x1001029,  0x1001029 ]	};

-      key <AC02> { [      0x1001027,  0x1001027 ]	};

-      key <AC03> { [      0x1001039,  0x1001021 ]	};

-      key <AC04> { [      0x100102D,  0x1001023 ]	};

-      key <AC05> { [      0x100102F,  0x1001025 ]	};

-

-// Mainly unvoiced consonants

-      key <AC06> { [      0x1001015,  0x1001016 ]	};

-      key <AC07> { [      0x100101B,  0x100101B ]	};

-      key <AC08> { [      0x1001000,  0x1001001 ]	};

-      key <AC09> { [      0x1001010,  0x1001011 ]	};

-      key <AC10> { [      0x1001005,  0x1001006 ]	};

-      key <AC11> { [      0x100100b,  0x100100c ]	};

-      key <BKSL> { [      0x100104E,  0x100104F ]	};

-

-      key <AB01> { [      0x100104C,  0x100104D ]       };

-      key <AB02> { [      0x1001037,  0x1001036 ]       };

-      key <AB03> { [      0x1001019,  0x100100f ]       };

-      key <AB04> { [      0x1001014,  0x1001014 ]       };

-      key <AB05> { [      0x1001017,  0x1001017 ]       };

-      key <AB06> { [      0x100101C,  0x100101C ]       };

-      key <AB07> { [      0x100101E,  0x1001050 ]       };

-      key <AB08> { [      comma,      0x1001051 ]       };

-      key <AB09> { [      period,     0x100104A ]       };

-      key <AB10> { [      slash,      0x100101A ]       };

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+    name[Group1]= "Myanmar";
+
+    // Alphanumeric section
+    key <TLDE> { [      U1050,      U100E,        grave,  asciitilde ] };
+    key <AE01> { [      U1041,      U100D,            1,      exclam ] };
+    key <AE02> { [      U1042,      U1052,            2,          at ] };
+    key <AE03> { [      U1043,      U100B,            3,  numbersign ] };
+    key <AE04> { [      U1044,      U1053,            4,      dollar ] };
+    key <AE05> { [      U1045,      U1054,            5,     percent ] };
+    key <AE06> { [      U1046,      U1055,            6, asciicircum ] };
+    key <AE07> { [      U1047,      U101B,            7,   ampersand ] };
+    key <AE08> { [      U1048,   asterisk,            8,    asterisk ] };
+    key <AE09> { [      U1049,  parenleft,            9,   parenleft ] };
+    key <AE10> { [      U1040, parenright,            0,  parenright ] };
+    key <AE11> { [      minus, underscore,        minus,  underscore ] };
+    key <AE12> { [      equal,       plus,        equal,        plus ] };
+
+    key <AD01> { [      U1006,      U1008,            q,           Q ] };
+    key <AD02> { [      U1010,      U101D,            w,           W ] };
+    key <AD03> { [      U1014,      U1023,            e,           E ] };
+    key <AD04> { [      U1019,      U104E,            r,           R ] };
+    key <AD05> { [      U1021,      U1024,            t,           T ] };
+    key <AD06> { [      U1015,      U104C,            y,           Y ] };
+    key <AD07> { [      U1000,      U1025,            u,           U ] };
+    key <AD08> { [      U1004,      U104D,            i,           I ] };
+    key <AD09> { [      U101E,      U103F,            o,           O ] };
+    key <AD10> { [      U1005,      U100F,            p,           P ] };
+    key <AD11> { [      U101F,      U1027,  bracketleft,   braceleft ] };
+    key <AD12> { [      U1029,      U102A, bracketright,  braceright ] };
+
+    key <AC01> { [      U1031,      U1017,            a,           A ] };
+    key <AC02> { [      U103B,      U103E,            s,           S ] };
+    key <AC03> { [      U102D,      U102E,            d,           D ] };
+    key <AC04> { [      U103A,      U1039,            f,           F ] };
+    key <AC05> { [      U102B,      U103D,            g,           G ] };
+    key <AC06> { [      U1037,      U1036,            h,           H ] };
+    key <AC07> { [      U103C,      U1032,            j,           J ] };
+    key <AC08> { [      U102F,      U1012,            k,           K ] };
+    key <AC09> { [      U1030,      U1013,            l,           L ] };
+    key <AC10> { [      U1038,      U1002,    semicolon,       colon ] };
+    key <AC11> { [ apostrophe,    quotedbl                           ] };
+
+    key <AB01> { [      U1016,       U1007,           z,           Z ] };
+    key <AB02> { [      U1011,       U100C,           x,           X ] };
+    key <AB03> { [      U1001,       U1003,           c,           C ] };
+    key <AB04> { [      U101C,       U1020,           v,           V ] };
+    key <AB05> { [      U1018,       U101A,           b,           B ] };
+    key <AB06> { [      U100A,       U1009,           n,           N ] };
+    key <AB07> { [      U102C,       U1026,           m,           M ] };
+    key <AB08> { [      comma,        U104A,      comma,        less ] };
+    key <AB09> { [     period,        U104B,     period,     greater ] };
+    key <AB10> { [      slash,    question                           ] };
+
+    key <BKSL> { [      U104F,       U1051,   backslash,         bar ] };
+    // End alphanumeric section
+};