libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011

1 files changed, 170 insertions, 174 deletions

diff --git a/xorg-server/Xi/opendev.c b/xorg-server/Xi/opendev.c
index 273cb2404..ba0d30436 100644
--- a/xorg-server/Xi/opendev.c
+++ b/xorg-server/Xi/opendev.c
@@ -1,174 +1,170 @@
-/************************************************************

-

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

-

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

-

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

- *

- * Request to open an extension input 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 "XIstubs.h"

-#include "windowstr.h"	/* window structure  */

-#include "exglobals.h"

-#include "exevents.h"

-

-#include "opendev.h"

-

-extern CARD8 event_base[];

-

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

- *

- * This procedure swaps the request if the server and client have different

- * byte orderings.

- *

- */

-

-int

-SProcXOpenDevice(ClientPtr client)

-{

-    char n;

-

-    REQUEST(xOpenDeviceReq);

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

-    return (ProcXOpenDevice(client));

-}

-

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

- *

- * This procedure causes the server to open an input device.

- *

- */

-

-int

-ProcXOpenDevice(ClientPtr client)

-{

-    xInputClassInfo evbase[numInputClasses];

-    int j = 0;

-    int status = Success;

-    xOpenDeviceReply rep;

-    DeviceIntPtr dev;

-

-    REQUEST(xOpenDeviceReq);

-    REQUEST_SIZE_MATCH(xOpenDeviceReq);

-

-    status = dixLookupDevice(&dev, stuff->deviceid, client, DixUseAccess);

-

-    if (status == BadDevice) {  /* not open */

-	for (dev = inputInfo.off_devices; dev; dev = dev->next)

-	    if (dev->id == stuff->deviceid)

-		break;

-	if (dev == NULL)

-	    return BadDevice;

-    } else if (status != Success)

-	return status;

-

-    if (IsMaster(dev))

-            return BadDevice;

-

-    if (status != Success)

-	return status;

-

-    memset(&rep, 0, sizeof(xOpenDeviceReply));

-    rep.repType = X_Reply;

-    rep.RepType = X_OpenDevice;

-    rep.sequenceNumber = client->sequence;

-    if (dev->key != NULL) {

-	evbase[j].class = KeyClass;

-	evbase[j++].event_type_base = event_base[KeyClass];

-    }

-    if (dev->button != NULL) {

-	evbase[j].class = ButtonClass;

-	evbase[j++].event_type_base = event_base[ButtonClass];

-    }

-    if (dev->valuator != NULL) {

-	evbase[j].class = ValuatorClass;

-	evbase[j++].event_type_base = event_base[ValuatorClass];

-    }

-    if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL ||

-	dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) {

-	evbase[j].class = FeedbackClass;

-	evbase[j++].event_type_base = event_base[FeedbackClass];

-    }

-    if (dev->focus != NULL) {

-	evbase[j].class = FocusClass;

-	evbase[j++].event_type_base = event_base[FocusClass];

-    }

-    if (dev->proximity != NULL) {

-	evbase[j].class = ProximityClass;

-	evbase[j++].event_type_base = event_base[ProximityClass];

-    }

-    evbase[j].class = OtherClass;

-    evbase[j++].event_type_base = event_base[OtherClass];

-    rep.length = bytes_to_int32(j * sizeof(xInputClassInfo));

-    rep.num_classes = j;

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

-    WriteToClient(client, j * sizeof(xInputClassInfo), (char *)evbase);

-    return Success;

-}

-

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

- *

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

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

- *

- */

-

-void

-SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)

-{

-    char n;

-

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

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

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

-}

+/************************************************************
+
+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.
+
+********************************************************/
+
+/***********************************************************************
+ *
+ * Request to open an extension input 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 "XIstubs.h"
+#include "windowstr.h"	/* window structure  */
+#include "exglobals.h"
+#include "exevents.h"
+
+#include "opendev.h"
+
+extern CARD8 event_base[];
+
+/***********************************************************************
+ *
+ * This procedure swaps the request if the server and client have different
+ * byte orderings.
+ *
+ */
+
+int
+SProcXOpenDevice(ClientPtr client)
+{
+    REQUEST(xOpenDeviceReq);
+    swaps(&stuff->length);
+    return (ProcXOpenDevice(client));
+}
+
+/***********************************************************************
+ *
+ * This procedure causes the server to open an input device.
+ *
+ */
+
+int
+ProcXOpenDevice(ClientPtr client)
+{
+    xInputClassInfo evbase[numInputClasses];
+    int j = 0;
+    int status = Success;
+    xOpenDeviceReply rep;
+    DeviceIntPtr dev;
+
+    REQUEST(xOpenDeviceReq);
+    REQUEST_SIZE_MATCH(xOpenDeviceReq);
+
+    status = dixLookupDevice(&dev, stuff->deviceid, client, DixUseAccess);
+
+    if (status == BadDevice) {  /* not open */
+	for (dev = inputInfo.off_devices; dev; dev = dev->next)
+	    if (dev->id == stuff->deviceid)
+		break;
+	if (dev == NULL)
+	    return BadDevice;
+    } else if (status != Success)
+	return status;
+
+    if (IsMaster(dev))
+            return BadDevice;
+
+    if (status != Success)
+	return status;
+
+    memset(&rep, 0, sizeof(xOpenDeviceReply));
+    rep.repType = X_Reply;
+    rep.RepType = X_OpenDevice;
+    rep.sequenceNumber = client->sequence;
+    if (dev->key != NULL) {
+	evbase[j].class = KeyClass;
+	evbase[j++].event_type_base = event_base[KeyClass];
+    }
+    if (dev->button != NULL) {
+	evbase[j].class = ButtonClass;
+	evbase[j++].event_type_base = event_base[ButtonClass];
+    }
+    if (dev->valuator != NULL) {
+	evbase[j].class = ValuatorClass;
+	evbase[j++].event_type_base = event_base[ValuatorClass];
+    }
+    if (dev->kbdfeed != NULL || dev->ptrfeed != NULL || dev->leds != NULL ||
+	dev->intfeed != NULL || dev->bell != NULL || dev->stringfeed != NULL) {
+	evbase[j].class = FeedbackClass;
+	evbase[j++].event_type_base = event_base[FeedbackClass];
+    }
+    if (dev->focus != NULL) {
+	evbase[j].class = FocusClass;
+	evbase[j++].event_type_base = event_base[FocusClass];
+    }
+    if (dev->proximity != NULL) {
+	evbase[j].class = ProximityClass;
+	evbase[j++].event_type_base = event_base[ProximityClass];
+    }
+    evbase[j].class = OtherClass;
+    evbase[j++].event_type_base = event_base[OtherClass];
+    rep.length = bytes_to_int32(j * sizeof(xInputClassInfo));
+    rep.num_classes = j;
+    WriteReplyToClient(client, sizeof(xOpenDeviceReply), &rep);
+    WriteToClient(client, j * sizeof(xInputClassInfo), (char *)evbase);
+    return Success;
+}
+
+/***********************************************************************
+ *
+ * This procedure writes the reply for the XOpenDevice function,
+ * if the client and server have a different byte ordering.
+ *
+ */
+
+void
+SRepXOpenDevice(ClientPtr client, int size, xOpenDeviceReply * rep)
+{
+    swaps(&rep->sequenceNumber);
+    swapl(&rep->length);
+    WriteToClient(client, size, (char *)rep);
+}