Checked in the following released items:

xkeyboard-config-1.4.tar.gz
ttf-bitstream-vera-1.10.tar.gz
font-alias-1.0.1.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sun-misc-1.0.0.tar.gz
font-sony-misc-1.0.0.tar.gz
font-schumacher-misc-1.0.0.tar.gz
font-mutt-misc-1.0.0.tar.gz
font-misc-misc-1.0.0.tar.gz
font-misc-meltho-1.0.0.tar.gz
font-micro-misc-1.0.0.tar.gz
font-jis-misc-1.0.0.tar.gz
font-isas-misc-1.0.0.tar.gz
font-dec-misc-1.0.0.tar.gz
font-daewoo-misc-1.0.0.tar.gz
font-cursor-misc-1.0.0.tar.gz
font-arabic-misc-1.0.0.tar.gz
font-winitzki-cyrillic-1.0.0.tar.gz
font-misc-cyrillic-1.0.0.tar.gz
font-cronyx-cyrillic-1.0.0.tar.gz
font-screen-cyrillic-1.0.1.tar.gz
font-xfree86-type1-1.0.1.tar.gz
font-adobe-utopia-type1-1.0.1.tar.gz
font-ibm-type1-1.0.0.tar.gz
font-bitstream-type1-1.0.0.tar.gz
font-bitstream-speedo-1.0.0.tar.gz
font-bh-ttf-1.0.0.tar.gz
font-bh-type1-1.0.0.tar.gz
font-bitstream-100dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz
font-bh-100dpi-1.0.0.tar.gz
font-adobe-utopia-100dpi-1.0.1.tar.gz
font-adobe-100dpi-1.0.0.tar.gz
font-util-1.0.1.tar.gz
font-bitstream-75dpi-1.0.0.tar.gz
font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz
font-adobe-utopia-75dpi-1.0.1.tar.gz
font-bh-75dpi-1.0.0.tar.gz
bdftopcf-1.0.1.tar.gz
font-adobe-75dpi-1.0.0.tar.gz
mkfontscale-1.0.6.tar.gz
openssl-0.9.8k.tar.gz
bigreqsproto-1.0.2.tar.gz
xtrans-1.2.2.tar.gz
resourceproto-1.0.2.tar.gz
inputproto-1.4.4.tar.gz
compositeproto-0.4.tar.gz
damageproto-1.1.0.tar.gz
zlib-1.2.3.tar.gz
xkbcomp-1.0.5.tar.gz
freetype-2.3.9.tar.gz
pthreads-w32-2-8-0-release.tar.gz
pixman-0.12.0.tar.gz
kbproto-1.0.3.tar.gz
evieext-1.0.2.tar.gz
fixesproto-4.0.tar.gz
recordproto-1.13.2.tar.gz
randrproto-1.2.2.tar.gz
scrnsaverproto-1.1.0.tar.gz
renderproto-0.9.3.tar.gz
xcmiscproto-1.1.2.tar.gz
fontsproto-2.0.2.tar.gz
xextproto-7.0.3.tar.gz
xproto-7.0.14.tar.gz
libXdmcp-1.0.2.tar.gz
libxkbfile-1.0.5.tar.gz
libfontenc-1.0.4.tar.gz
libXfont-1.3.4.tar.gz
libX11-1.1.5.tar.gz
libXau-1.0.4.tar.gz
libxcb-1.1.tar.gz
xorg-server-1.5.3.tar.gz

1 files changed, 143 insertions, 0 deletions

diff --git a/xorg-server/hw/dmx/input/dmxmotion.c b/xorg-server/hw/dmx/input/dmxmotion.c
new file mode 100644
index 000000000..cc55eedff
--- /dev/null
+++ b/xorg-server/hw/dmx/input/dmxmotion.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2002-2003 Red Hat Inc., Durham, North Carolina.
+ *
+ * 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 on 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL RED HAT AND/OR THEIR 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:
+ *   Rickard E. (Rik) Faith <faith@redhat.com>
+ *
+ */
+
+/** \file
+ * This file provides functions similar to miPointerGetMotionEvents and
+ * miPointerPutMotionEvents, with the exception that devices with more
+ * than two axes are fully supported.  These routines may be used only
+ * for motion buffers for extension devices, and are \a not compatible
+ * replacements for the mi routines.  */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "inputstr.h"
+#include "dmxinputinit.h"
+#include "dmxcommon.h"
+#include "dmxmotion.h"
+
+#define OFFSET(offset,element) ((offset) * (numAxes + 1) + (element))
+
+/** Return size of motion buffer. \see DMX_MOTION_SIZE */
+int dmxPointerGetMotionBufferSize(void)
+{
+    return DMX_MOTION_SIZE;
+}
+
+/** This routine performs the same function as \a miPointerGetMotionEvents:
+ * the events in the motion history that are between the start and stop
+ * times (in mS) are placed in the coords vector, and the count of the
+ * number of items so placed is returned.  This routine is called from
+ * dix/devices.c so that coords can hold valuator->numMotionEvents
+ * events.  This routine is called from \a Xi/gtmotion.c with coords large
+ * enough to hold the same number of events in a variable-length
+ * extended \a xTimecoord structure.  This provides sufficient data for the
+ * \a XGetDeviceMotionEvents library call, and would be identical to
+ * \a miPointerGetMotionEvents for devices with only 2 axes (i.e., core
+ * pointers) if \a xTimecoord used 32bit integers.
+ *
+ * Because DMX uses the mi* routines for all core devices, this routine
+ * only has to support extension devices using the polymorphic coords.
+ * Because compatibility with miPointerGetMotionEvents is not possible,
+ * it is not provided. */
+int dmxPointerGetMotionEvents(DeviceIntPtr pDevice,
+                              xTimecoord *coords,
+                              unsigned long start,
+                              unsigned long stop,
+                              ScreenPtr pScreen)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int           numAxes = pDevice->valuator->numAxes;
+    unsigned long *c      = (unsigned long *)coords;
+    int           count   = 0;
+    int           i, j;
+
+    if (!dmxLocal->history) return 0;
+    for (i = dmxLocal->head; i != dmxLocal->tail;) {
+        if (dmxLocal->history[OFFSET(i,0)] >= stop) break;
+        if (dmxLocal->history[OFFSET(i,0)] >= start) {
+            for (j = 0; j < numAxes + 1; j++)
+                c[OFFSET(count,j)] = dmxLocal->history[OFFSET(i,j)];
+            ++count;
+        }
+        if (++i >= DMX_MOTION_SIZE) i = 0;
+    }
+    return count;
+}
+
+/** This routine adds an event to the motion history.  A similar
+ * function is performed by miPointerMove for the mi versions of these
+ * routines. */
+void dmxPointerPutMotionEvent(DeviceIntPtr pDevice,
+                              int firstAxis, int axesCount, int *v,
+                              unsigned long time)
+{
+    GETDMXLOCALFROMPDEVICE;
+    int           numAxes = pDevice->valuator->numAxes;
+    int           i;
+
+    if (!dmxLocal->history) {
+        dmxLocal->history   = xalloc(sizeof(*dmxLocal->history)
+                                     * (numAxes + 1)
+                                     * DMX_MOTION_SIZE);
+        dmxLocal->head      = 0;
+        dmxLocal->tail      = 0;
+        dmxLocal->valuators = xalloc(sizeof(*dmxLocal->valuators) * numAxes);
+        memset(dmxLocal->valuators, 0, sizeof(*dmxLocal->valuators) * numAxes);
+    } else {
+        if (++dmxLocal->tail >= DMX_MOTION_SIZE) dmxLocal->tail = 0;
+        if (dmxLocal->head == dmxLocal->tail)
+            if (++dmxLocal->head >= DMX_MOTION_SIZE) dmxLocal->head = 0;
+    }
+
+    dmxLocal->history[OFFSET(dmxLocal->tail,0)] = time;
+
+                                /* Initialize the data from the known
+                                 * values (if Absolute) or to zero (if
+                                 * Relative) */
+    if (pDevice->valuator->mode == Absolute) {
+        for (i = 0; i < numAxes; i++) 
+            dmxLocal->history[OFFSET(dmxLocal->tail,i+1)]
+                = dmxLocal->valuators[i];
+    } else {
+        for (i = 0; i < numAxes; i++) 
+            dmxLocal->history[OFFSET(dmxLocal->tail,i+1)] = 0;
+    }
+    
+    for (i = firstAxis; i < axesCount; i++) {
+        dmxLocal->history[OFFSET(dmxLocal->tail,i+i)]
+            = (unsigned long)v[i-firstAxis];
+        dmxLocal->valuators[i] = v[i-firstAxis];
+    }
+}