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

diff --git a/xorg-server/hw/dmx/input/dmxsigio.c b/xorg-server/hw/dmx/input/dmxsigio.c
new file mode 100644
index 000000000..03c3070d7
--- /dev/null
+++ b/xorg-server/hw/dmx/input/dmxsigio.c
@@ -0,0 +1,233 @@
+/*
+ * 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
+ *
+ * Provides an interface for handling SIGIO signals for input devices. */
+
+#ifdef HAVE_DMX_CONFIG_H
+#include <dmx-config.h>
+#endif
+
+#include "inputstr.h"
+#include "dmxinputinit.h"
+#include "dmxsigio.h"
+#include "dmxevents.h"
+#include <signal.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+static int  dmxFdCount      = 0;
+static Bool dmxInputEnabled = TRUE;
+
+/* Define equivalents for non-POSIX systems (e.g., SGI IRIX, Solaris) */
+#ifndef O_ASYNC
+# ifdef FASYNC
+# define O_ASYNC FASYNC
+# else
+# define O_ASYNC 0
+# endif
+#endif
+#ifndef O_NONBLOCK
+#define O_NONBLOCK FNONBLK
+#endif
+
+static void dmxSigioHandler(int sig)
+{
+    int          i, j;
+    DMXInputInfo *dmxInput;
+
+    for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++) {
+        if (dmxInput->sigioState == DMX_ACTIVESIGIO) {
+            for (j = 0; j < dmxInput->numDevs; j++) {
+                DMXLocalInputInfoPtr dmxLocal = dmxInput->devs[j];
+                if (dmxLocal->collect_events) {
+                    dmxLocal->collect_events(&dmxLocal->pDevice->public,
+                                             dmxMotion,
+                                             dmxEnqueue,
+                                             dmxCheckSpecialKeys,
+                                             DMX_NO_BLOCK);
+                }
+            }
+        }
+    }
+}
+
+/** Block SIGIO handling. */
+void dmxSigioBlock(void)
+{
+    sigset_t s;
+
+    sigemptyset(&s);
+    sigaddset(&s, SIGIO);
+    sigprocmask(SIG_BLOCK, &s, 0);
+}
+
+/** Unblock SIGIO handling. */
+void dmxSigioUnblock(void)
+{
+    sigset_t s;
+
+    sigemptyset(&s);
+    sigaddset(&s, SIGIO);
+    sigprocmask(SIG_UNBLOCK, &s, 0);
+}
+
+static void dmxSigioHook(void)
+{
+    struct sigaction a;
+    sigset_t         s;
+
+    memset(&a, 0, sizeof(a));
+    a.sa_handler = dmxSigioHandler;
+    sigemptyset(&a.sa_mask);
+    sigaddset(&a.sa_mask, SIGIO);
+    sigaddset(&a.sa_mask, SIGALRM);
+    sigaddset(&a.sa_mask, SIGVTALRM);
+    sigaction(SIGIO, &a, 0);
+    
+    sigemptyset(&s);
+    sigprocmask(SIG_SETMASK, &s, 0);
+}
+
+static void dmxSigioUnhook(void)
+{
+    struct sigaction a;
+
+    memset (&a, 0, sizeof(a));
+    a.sa_handler = SIG_IGN;
+    sigemptyset(&a.sa_mask);
+    sigaction(SIGIO, &a, 0);
+}
+
+static void dmxSigioAdd(DMXInputInfo *dmxInput)
+{
+    int flags;
+    int i;
+
+    switch (dmxInput->sigioState) {
+    case DMX_NOSIGIO:     return;
+    case DMX_USESIGIO:    dmxInput->sigioState = DMX_ACTIVESIGIO; break;
+    case DMX_ACTIVESIGIO: return;
+    }
+
+    for (i = 0; i < dmxInput->sigioFdCount; i++) {
+        if (!dmxInput->sigioAdded[i]) {
+            int fd = dmxInput->sigioFd[i];
+        
+            fcntl(fd, F_SETOWN, getpid());
+            flags = fcntl(fd, F_GETFL);
+            flags |= O_ASYNC|O_NONBLOCK;
+            fcntl(fd, F_SETFL, flags);
+    
+            AddEnabledDevice(fd);
+            dmxInput->sigioAdded[i] = TRUE;
+
+            if (++dmxFdCount == 1) dmxSigioHook();
+        }
+    }
+}
+
+static void dmxSigioRemove(DMXInputInfo *dmxInput)
+{
+    int flags;
+    int i;
+    
+    switch (dmxInput->sigioState) {
+    case DMX_NOSIGIO:     return;
+    case DMX_USESIGIO:    return;
+    case DMX_ACTIVESIGIO: dmxInput->sigioState = DMX_USESIGIO; break;
+    }
+
+    for (i = 0; i < dmxInput->sigioFdCount; i++) {
+        if (dmxInput->sigioAdded[i]) {
+            int fd = dmxInput->sigioFd[i];
+        
+            dmxInput->sigioAdded[i] = FALSE;
+            RemoveEnabledDevice(fd);
+        
+            flags = fcntl(fd, F_GETFL);
+            flags &= ~(O_ASYNC|O_NONBLOCK);
+            fcntl(fd, F_SETFL, flags);
+
+            if (!--dmxFdCount) dmxSigioUnhook();
+        }
+    }
+}
+
+/** Enable SIGIO handling.  This instantiates the handler with the OS. */
+void dmxSigioEnableInput(void)
+{
+    int              i;
+    DMXInputInfo     *dmxInput;
+
+    dmxInputEnabled = TRUE;
+    for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
+        dmxSigioAdd(dmxInput);
+}
+
+/** Disable SIGIO handling.  This removes the hanlder from the OS. */
+void dmxSigioDisableInput(void)
+{
+    int              i;
+    DMXInputInfo     *dmxInput;
+
+    dmxInputEnabled = FALSE;
+    for (i = 0, dmxInput = &dmxInputs[0]; i < dmxNumInputs; i++, dmxInput++)
+        dmxSigioRemove(dmxInput);
+}
+
+/** Make a note that the input device described in \a dmxInput will be
+ * using the file descriptor \a fd for SIGIO signals.  Calls
+ * AddEnabledDevice ifi SIGIO handling has been enabled with
+ * #dmxSigioEnableInput(). */
+void dmxSigioRegister(DMXInputInfo *dmxInput, int fd)
+{
+    dmxInput->sigioState = DMX_USESIGIO;
+    if (dmxInput->sigioFdCount >= DMX_MAX_SIGIO_FDS)
+        dmxLog(dmxFatal, "Too many SIGIO file descriptors (%d >= %d)\n",
+               dmxInput->sigioFdCount, DMX_MAX_SIGIO_FDS);
+    
+    dmxInput->sigioFd[dmxInput->sigioFdCount++] = fd;
+    if (dmxInputEnabled) dmxSigioAdd(dmxInput);
+}
+
+/** Remove the notes that \a dmxInput is using any file descriptors for
+ * SIGIO signals.  Calls RemoveEnabledDevice. */
+void dmxSigioUnregister(DMXInputInfo *dmxInput)
+{
+    if (dmxInput->sigioState == DMX_NOSIGIO) return;
+    dmxSigioRemove(dmxInput);
+    dmxInput->sigioState   = DMX_NOSIGIO;
+    dmxInput->sigioFdCount = 0;
+}