svn merge -r588:HEAD ^/branches/released .

1 files changed, 187 insertions, 187 deletions

diff --git a/xorg-server/Xi/getprop.c b/xorg-server/Xi/getprop.c
index 1f28a8a40..8f2d792be 100644
--- a/xorg-server/Xi/getprop.c
+++ b/xorg-server/Xi/getprop.c
@@ -1,187 +1,187 @@
-/************************************************************
-
-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.
-
-********************************************************/
-
-/***********************************************************************
- *
- * Function to return the dont-propagate-list for an extension device.
- *
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include "inputstr.h"	/* DeviceIntPtr      */
-#include "windowstr.h"	/* window structs    */
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XIproto.h>
-#include "exglobals.h"
-#include "swaprep.h"
-
-#include "getprop.h"
-
-extern XExtEventInfo EventInfo[];
-extern int ExtEventIndex;
-
-/***********************************************************************
- *
- * Handle a request from a client with a different byte order.
- *
- */
-
-int
-SProcXGetDeviceDontPropagateList(ClientPtr client)
-{
-    char n;
-
-    REQUEST(xGetDeviceDontPropagateListReq);
-    swaps(&stuff->length, n);
-    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
-    swapl(&stuff->window, n);
-    return (ProcXGetDeviceDontPropagateList(client));
-}
-
-/***********************************************************************
- *
- * This procedure lists the input devices available to the server.
- *
- */
-
-int
-ProcXGetDeviceDontPropagateList(ClientPtr client)
-{
-    CARD16 count = 0;
-    int i, rc;
-    XEventClass *buf = NULL, *tbuf;
-    WindowPtr pWin;
-    xGetDeviceDontPropagateListReply rep;
-    OtherInputMasks *others;
-
-    REQUEST(xGetDeviceDontPropagateListReq);
-    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);
-
-    rep.repType = X_Reply;
-    rep.RepType = X_GetDeviceDontPropagateList;
-    rep.sequenceNumber = client->sequence;
-    rep.length = 0;
-    rep.count = 0;
-
-    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
-    if (rc != Success)
-	return rc;
-
-    if ((others = wOtherInputMasks(pWin)) != 0) {
-	for (i = 0; i < EMASKSIZE; i++)
-	    tbuf = ClassFromMask(NULL, others->dontPropagateMask[i], i,
-				 &count, COUNT);
-	if (count) {
-	    rep.count = count;
-	    buf = (XEventClass *) xalloc(rep.count * sizeof(XEventClass));
-	    rep.length = bytes_to_int32(rep.count * sizeof(XEventClass));
-
-	    tbuf = buf;
-	    for (i = 0; i < EMASKSIZE; i++)
-		tbuf = ClassFromMask(tbuf, others->dontPropagateMask[i], i,
-				     NULL, CREATE);
-	}
-    }
-
-    WriteReplyToClient(client, sizeof(xGetDeviceDontPropagateListReply), &rep);
-
-    if (count) {
-	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;
-	WriteSwappedDataToClient(client, count * sizeof(XEventClass), buf);
-	xfree(buf);
-    }
-    return Success;
-}
-
-/***********************************************************************
- *
- * This procedure gets a list of event classes from a mask word.
- * A single mask may translate to more than one event class.
- *
- */
-
-XEventClass
-    * ClassFromMask(XEventClass * buf, Mask mask, int maskndx, CARD16 * count,
-		    int mode)
-{
-    int i, j;
-    int id = maskndx;
-    Mask tmask = 0x80000000;
-
-    for (i = 0; i < 32; i++, tmask >>= 1)
-	if (tmask & mask) {
-	    for (j = 0; j < ExtEventIndex; j++)
-		if (EventInfo[j].mask == tmask) {
-		    if (mode == COUNT)
-			(*count)++;
-		    else
-			*buf++ = (id << 8) | EventInfo[j].type;
-		}
-	}
-    return (buf);
-}
-
-/***********************************************************************
- *
- * This procedure writes the reply for the XGetDeviceDontPropagateList function,
- * if the client and server have a different byte ordering.
- *
- */
-
-void
-SRepXGetDeviceDontPropagateList(ClientPtr client, int size,
-				xGetDeviceDontPropagateListReply * rep)
-{
-    char n;
-
-    swaps(&rep->sequenceNumber, n);
-    swapl(&rep->length, n);
-    swaps(&rep->count, 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.

+

+********************************************************/

+

+/***********************************************************************

+ *

+ * Function to return the dont-propagate-list for an extension device.

+ *

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

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

+#include "windowstr.h"	/* window structs    */

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

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

+#include "exglobals.h"

+#include "swaprep.h"

+

+#include "getprop.h"

+

+extern XExtEventInfo EventInfo[];

+extern int ExtEventIndex;

+

+/***********************************************************************

+ *

+ * Handle a request from a client with a different byte order.

+ *

+ */

+

+int

+SProcXGetDeviceDontPropagateList(ClientPtr client)

+{

+    char n;

+

+    REQUEST(xGetDeviceDontPropagateListReq);

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

+    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);

+    swapl(&stuff->window, n);

+    return (ProcXGetDeviceDontPropagateList(client));

+}

+

+/***********************************************************************

+ *

+ * This procedure lists the input devices available to the server.

+ *

+ */

+

+int

+ProcXGetDeviceDontPropagateList(ClientPtr client)

+{

+    CARD16 count = 0;

+    int i, rc;

+    XEventClass *buf = NULL, *tbuf;

+    WindowPtr pWin;

+    xGetDeviceDontPropagateListReply rep;

+    OtherInputMasks *others;

+

+    REQUEST(xGetDeviceDontPropagateListReq);

+    REQUEST_SIZE_MATCH(xGetDeviceDontPropagateListReq);

+

+    rep.repType = X_Reply;

+    rep.RepType = X_GetDeviceDontPropagateList;

+    rep.sequenceNumber = client->sequence;

+    rep.length = 0;

+    rep.count = 0;

+

+    rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);

+    if (rc != Success)

+	return rc;

+

+    if ((others = wOtherInputMasks(pWin)) != 0) {

+	for (i = 0; i < EMASKSIZE; i++)

+	    tbuf = ClassFromMask(NULL, others->dontPropagateMask[i], i,

+				 &count, COUNT);

+	if (count) {

+	    rep.count = count;

+	    buf = (XEventClass *) malloc(rep.count * sizeof(XEventClass));

+	    rep.length = bytes_to_int32(rep.count * sizeof(XEventClass));

+

+	    tbuf = buf;

+	    for (i = 0; i < EMASKSIZE; i++)

+		tbuf = ClassFromMask(tbuf, others->dontPropagateMask[i], i,

+				     NULL, CREATE);

+	}

+    }

+

+    WriteReplyToClient(client, sizeof(xGetDeviceDontPropagateListReply), &rep);

+

+    if (count) {

+	client->pSwapReplyFunc = (ReplySwapPtr) Swap32Write;

+	WriteSwappedDataToClient(client, count * sizeof(XEventClass), buf);

+	free(buf);

+    }

+    return Success;

+}

+

+/***********************************************************************

+ *

+ * This procedure gets a list of event classes from a mask word.

+ * A single mask may translate to more than one event class.

+ *

+ */

+

+XEventClass

+    * ClassFromMask(XEventClass * buf, Mask mask, int maskndx, CARD16 * count,

+		    int mode)

+{

+    int i, j;

+    int id = maskndx;

+    Mask tmask = 0x80000000;

+

+    for (i = 0; i < 32; i++, tmask >>= 1)

+	if (tmask & mask) {

+	    for (j = 0; j < ExtEventIndex; j++)

+		if (EventInfo[j].mask == tmask) {

+		    if (mode == COUNT)

+			(*count)++;

+		    else

+			*buf++ = (id << 8) | EventInfo[j].type;

+		}

+	}

+    return (buf);

+}

+

+/***********************************************************************

+ *

+ * This procedure writes the reply for the XGetDeviceDontPropagateList function,

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

+ *

+ */

+

+void

+SRepXGetDeviceDontPropagateList(ClientPtr client, int size,

+				xGetDeviceDontPropagateListReply * rep)

+{

+    char n;

+

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

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

+    swaps(&rep->count, n);

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

+}