xserver xkeyboard-config mesa git update 28 Mar 2011

4 files changed, 390 insertions, 563 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)
+{
+}