summaryrefslogtreecommitdiff
path: root/XTrap/xtrapdi.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-25 19:29:01 +0000
commitadc7f9a4ebdfe11d4cd6de9388b63dfe36450b39 (patch)
tree23eb7becc5360b2cbe16aa8d45529880067f3989 /XTrap/xtrapdi.c
parent90f1536dd315cd265bfc7ef35058761a65a01734 (diff)
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16
Diffstat (limited to 'XTrap/xtrapdi.c')
-rw-r--r--XTrap/xtrapdi.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/XTrap/xtrapdi.c b/XTrap/xtrapdi.c
index 6aae14be2..d09b2120a 100644
--- a/XTrap/xtrapdi.c
+++ b/XTrap/xtrapdi.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.5 2002/09/18 17:11:47 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/XTrap/xtrapdi.c,v 1.7 2003/10/28 22:52:10 tsi Exp $ */
/*****************************************************************************
Copyright 1987, 1988, 1989, 1990, 1991 by Digital Equipment Corp., Maynard, MA
X11R6 Changes Copyright (c) 1994 by Robert Chesler of Absol-Puter, Hudson, NH.
@@ -152,7 +152,9 @@ static Bool gate_closed = False; /* The global "gatekeeper" */
static Bool key_ignore = False; /* The global "keymaster" */
static Bool ignore_grabs = False;
static CARD8 next_key = XEKeyIsClear; /* Echo, Clear, or Other */
+#ifdef VECTORED_EVENTS
static INT16 current_screen = -1L; /* Current screen for events */
+#endif
static INT16 vectored_requests[256L] = {0L}; /* cnt of vectoring clients */
static INT16 vectored_events[KeyPress+MotionNotify] = {0L};
typedef struct _client_list
@@ -208,8 +210,9 @@ int XETrapDestroyEnv(pointer value, XID id)
next_key = XEKeyIsClear;
}
-
+#ifdef VECTORED_EVENTS
current_screen = -1L; /* Invalidate current screen */
+#endif
#ifdef VERBOSE
ErrorF("%s: Client '%d' Disconnected\n", XTrapExtName,
@@ -376,7 +379,7 @@ void DEC_XTRAPInit()
(XETrapType = CreateNewResourceType(XETrapDestroyEnv)) == 0L)
{
ErrorF("%s: Setup can't create new resource type (%d,%d,%d)\n",
- XTrapExtName, a,XETrapClass,XETrapType);
+ XTrapExtName, (int)a,(int)XETrapClass,(int)XETrapType);
return;
}
/* initialize the GetAvailable info reply here */
@@ -512,7 +515,9 @@ int XETrapCreateEnv(ClientPtr client)
}
}
+#ifdef VECTORED_EVENTS
current_screen = -1L; /* Invalidate current screen */
+#endif
#ifdef VERBOSE
if (status == Success)