xserver git update 15/5/2010

1 files changed, 314 insertions, 314 deletions

diff --git a/xorg-server/Xi/getdctl.c b/xorg-server/Xi/getdctl.c
index 68181fa61..35ddd3f8e 100644
--- a/xorg-server/Xi/getdctl.c
+++ b/xorg-server/Xi/getdctl.c
@@ -1,314 +1,314 @@
-/************************************************************
-
-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 *)xalloc(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);
-    xfree(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 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;

+}