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, 168 insertions, 0 deletions

diff --git a/xorg-server/hw/xgl/egl/xeglinput.c b/xorg-server/hw/xgl/egl/xeglinput.c
new file mode 100644
index 000000000..8c50b7846
--- /dev/null
+++ b/xorg-server/hw/xgl/egl/xeglinput.c
@@ -0,0 +1,168 @@
+#include "xgl.h"
+#include "xegl.h"
+
+KdOsFuncs *kdOsFuncs;
+Bool kdEmulateMiddleButton;
+Bool kdRawPointerCoordinates;
+Bool kdDontZap;
+Bool kdDisableZaphod;
+int kdScreenPrivateIndex;
+
+static char *
+KdParseFindNext (char *cur, char *delim, char *save, char *last)
+{
+    while (*cur && !strchr (delim, *cur))
+    {
+        *save++ = *cur++;
+    }
+    *save = 0;
+    *last = *cur;
+    if (*cur)
+        cur++;
+    return cur;
+}
+
+/*
+ * Mouse argument syntax:
+ *
+ *  device,protocol,options...
+ *
+ *  Options are any of:
+ *      1-5         n button mouse
+ *      2button     emulate middle button
+ *      {NMO}       Reorder buttons
+ */
+char *
+KdSaveString (char *str)
+{
+    char    *n = (char *) xalloc (strlen (str) + 1);
+
+    if (!n)
+        return 0;
+    strcpy (n, str);
+    return n;
+}
+
+/*
+ * Parse mouse information.  Syntax:
+ *
+ *  <device>,<nbutton>,<protocol>{,<option>}...
+ *
+ * options: {nmo}   pointer mapping (e.g. {321})
+ *          2button emulate middle button
+ *          3button dont emulate middle button
+ */
+void
+KdParseMouse (char *arg)
+{
+    char        save[1024];
+    char        delim;
+    KdMouseInfo *mi;
+    int         i;
+
+    mi = KdMouseInfoAdd ();
+    if (!mi)
+        return;
+    mi->name = 0;
+    mi->prot = 0;
+    mi->emulateMiddleButton = kdEmulateMiddleButton;
+    mi->transformCoordinates = !kdRawPointerCoordinates;
+    mi->nbutton = 3;
+    for (i = 0; i < KD_MAX_BUTTON; i++)
+        mi->map[i] = i + 1;
+
+    if (!arg)
+        return;
+    if (strlen (arg) >= sizeof (save))
+        return;
+    arg = KdParseFindNext (arg, ",", save, &delim);
+    if (!save[0])
+        return;
+    mi->name = KdSaveString (save);
+    if (delim != ',')
+        return;
+
+    arg = KdParseFindNext (arg, ",", save, &delim);
+    if (!save[0])
+        return;
+
+    if ('1' <= save[0] && save[0] <= '0' + KD_MAX_BUTTON && save[1] == '\0')
+    {
+        mi->nbutton = save[0] - '0';
+        if (mi->nbutton > KD_MAX_BUTTON)
+        {
+            UseMsg ();
+            return;
+        }
+    }
+
+    if (!delim != ',')
+        return;
+
+    arg = KdParseFindNext (arg, ",", save, &delim);
+
+    if (save[0])
+        mi->prot = KdSaveString (save);
+
+    while (delim == ',')
+    {
+        arg = KdParseFindNext (arg, ",", save, &delim);
+        if (save[0] == '{')
+        {
+            char        *s = save + 1;
+            i = 0;
+            while (*s && *s != '}')
+            {
+                if ('1' <= *s && *s <= '0' + mi->nbutton)
+                    mi->map[i] = *s - '0';
+                else
+                    UseMsg ();
+                s++;
+            }
+        }
+        else if (!strcmp (save, "2button"))
+            mi->emulateMiddleButton = TRUE;
+        else if (!strcmp (save, "3button"))
+            mi->emulateMiddleButton = FALSE;
+        else if (!strcmp (save, "rawcoord"))
+            mi->transformCoordinates = FALSE;
+        else if (!strcmp (save, "transform"))
+            mi->transformCoordinates = TRUE;
+        else
+            UseMsg ();
+    }
+}
+
+KdMouseInfo *kdMouseInfo;
+
+KdMouseInfo *
+KdMouseInfoAdd (void)
+{
+    KdMouseInfo *mi, **prev;
+
+    mi = (KdMouseInfo *) xalloc (sizeof (KdMouseInfo));
+    if (!mi)
+        return 0;
+    bzero (mi, sizeof (KdMouseInfo));
+    for (prev = &kdMouseInfo; *prev; prev = &(*prev)->next);
+    *prev = mi;
+    return mi;
+}
+
+void
+KdMouseInfoDispose (KdMouseInfo *mi)
+{
+    KdMouseInfo **prev;
+
+    for (prev = &kdMouseInfo; *prev; prev = &(*prev)->next)
+        if (*prev == mi)
+        {
+            *prev = mi->next;
+            if (mi->name)
+                xfree (mi->name);
+            if (mi->prot)
+                xfree (mi->prot);
+            xfree (mi);
+            break;
+        }
+}