11 files changed, 75 insertions, 24 deletions
diff --git a/xc/programs/Xserver/dix/Imakefile b/xc/programs/Xserver/dix/Imakefile
index 312910c4c..3a7821172 100644
--- a/xc/programs/Xserver/dix/Imakefile
+++ b/xc/programs/Xserver/dix/Imakefile
@@ -3,7 +3,7 @@ XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:16 cpqbld Exp $
 
 
 
-XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.13 2001/03/04 17:40:04 herrb Exp $
+XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.14 2001/08/01 00:44:47 tsi Exp $
 
 #include <Server.tmpl>
 
@@ -26,7 +26,8 @@ OBJS = atom.o colormap.o cursor.o devices.o dispatch.o dixutils.o events.o \
 	main.o property.o resource.o swaprep.o swapreq.o \
 	tables.o window.o initatoms.o dixfonts.o privates.o pixmap.o $(FFS_OBJ)
 
-    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext
+    INCLUDES = -I../include -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) \
+	       -I$(SERVERSRC)/Xext -I$(SERVERSRC)/lbx
     LINTLIBS = ../os/llib-los.ln
 
 /*
diff --git a/xc/programs/Xserver/dix/colormap.c b/xc/programs/Xserver/dix/colormap.c
index 5db20ca69..2394a680a 100644
--- a/xc/programs/Xserver/dix/colormap.c
+++ b/xc/programs/Xserver/dix/colormap.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.5 2001/01/17 22:36:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/colormap.c,v 3.6 2001/08/01 00:44:47 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -54,6 +54,9 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include "resource.h"
 #include "windowstr.h"
+#ifdef LBX
+#include "lbxserve.h"
+#endif
 
 extern XID clientErrorValue;
 
diff --git a/xc/programs/Xserver/dix/devices.c b/xc/programs/Xserver/dix/devices.c
index 457927cdb..af41baaa7 100644
--- a/xc/programs/Xserver/dix/devices.c
+++ b/xc/programs/Xserver/dix/devices.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.17 2001/02/16 13:24:06 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/devices.c,v 3.18 2001/08/01 00:44:47 tsi Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -65,6 +65,9 @@ SOFTWARE.
 #define _SECURITY_SERVER
 #include "security.h"
 #endif
+#ifdef LBX
+#include "lbxserve.h"
+#endif
 
 #include "dispatch.h"
 #include "swaprep.h"
diff --git a/xc/programs/Xserver/dix/dispatch.c b/xc/programs/Xserver/dix/dispatch.c
index 8591136ec..4a86bfed0 100644
--- a/xc/programs/Xserver/dix/dispatch.c
+++ b/xc/programs/Xserver/dix/dispatch.c
@@ -64,7 +64,7 @@ SOFTWARE.
 *                                                               *
 *****************************************************************/
 
-/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.23 2001/01/17 22:36:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.c,v 3.24 2001/08/01 00:44:47 tsi Exp $ */
 
 #ifdef PANORAMIX_DEBUG
 #include <stdio.h>
@@ -104,6 +104,9 @@ int ProcInitialConnection();
 #include "inputstr.h"
 #include "XKBsrv.h"
 #endif
+#ifdef LBX
+#include "lbxserve.h"
+#endif
 
 #define mskcnt ((MAXCLIENTS + 31) / 32)
 #define BITMASK(i) (1U << ((i) & 31))
diff --git a/xc/programs/Xserver/dix/dispatch.h b/xc/programs/Xserver/dix/dispatch.h
index 48b287b2b..b8252c0dc 100644
--- a/xc/programs/Xserver/dix/dispatch.h
+++ b/xc/programs/Xserver/dix/dispatch.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.1 1996/05/06 05:56:15 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dispatch.h,v 3.2 2001/08/01 00:44:48 tsi Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -79,6 +79,18 @@ void SetInputCheck(
 #endif
 );
 
+void ProcessWorkQueue(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
+void ProcessWorkQueueZombies(
+#if NeedFunctionPrototypes
+    void
+#endif
+);
+
 DISPATCH_PROC(InitClientPrivates);
 DISPATCH_PROC(ProcAllocColor);
 DISPATCH_PROC(ProcAllocColorCells);
diff --git a/xc/programs/Xserver/dix/dixfonts.c b/xc/programs/Xserver/dix/dixfonts.c
index 3a3218fef..56a09f775 100644
--- a/xc/programs/Xserver/dix/dixfonts.c
+++ b/xc/programs/Xserver/dix/dixfonts.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.24 2001/01/17 22:36:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixfonts.c,v 3.25 2001/08/01 00:44:48 tsi Exp $ */
 /************************************************************************
 Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
 
@@ -45,6 +45,15 @@ SOFTWARE.
 #include "panoramiX.h"
 #endif
 
+#ifdef LBX
+#include "lbxserve.h"
+#endif
+
+#ifdef XF86BIGFONT
+#define _XF86BIGFONT_SERVER_
+#include "xf86bigfont.h"
+#endif
+
 #define QUERYCHARINFO(pci, pr)  *(pr) = (pci)->metrics
 
 extern pointer fosNaturalParams;
diff --git a/xc/programs/Xserver/dix/dixutils.c b/xc/programs/Xserver/dix/dixutils.c
index 614d930fb..1434517d0 100644
--- a/xc/programs/Xserver/dix/dixutils.c
+++ b/xc/programs/Xserver/dix/dixutils.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.6 2001/01/17 22:36:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/dixutils.c,v 3.7 2001/07/25 15:05:01 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -394,11 +394,7 @@ DeleteWindowFromAnySaveSet(pWin)
  * procedure to call than to check if there's a procedure 
  */
 void
-NoopDDA(
-#if NeedVarargsPrototypes
-    void* f, ...
-#endif
-)
+NoopDDA(void* f, ...)
 {
 }
 
diff --git a/xc/programs/Xserver/dix/events.c b/xc/programs/Xserver/dix/events.c
index 13cdf3ad8..50a6961e3 100644
--- a/xc/programs/Xserver/dix/events.c
+++ b/xc/programs/Xserver/dix/events.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.38 2001/02/16 13:24:07 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/events.c,v 3.40 2001/08/06 20:51:04 dawes Exp $ */
 /************************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -108,8 +108,6 @@ extern Bool XkbFilterEvents();
 
 extern WindowPtr *WindowTable;
 
-extern void (* EventSwapVector[128]) ();
-
 #define EXTENSION_EVENT_BASE  64
 
 #define NoSuchEvent 0x80000000	/* so doesn't match NoEventMask */
@@ -1190,6 +1188,24 @@ playmore:
     PostNewCursor();
 }
 
+#ifdef RANDR
+void
+ScreenRestructured (ScreenPtr pScreen)
+{
+    GrabPtr grab;
+
+    if ((grab = inputInfo.pointer->grab) && grab->confineTo)
+    {
+	if (grab->confineTo->drawable.pScreen != sprite.hotPhys.pScreen)
+	    sprite.hotPhys.x = sprite.hotPhys.y = 0;
+	ConfineCursorToWindow(grab->confineTo, TRUE, TRUE);
+    }
+    else
+	ConfineCursorToWindow(WindowTable[sprite.hotPhys.pScreen->myNum],
+			      TRUE, FALSE);
+}
+#endif
+
 void
 CheckGrabForSyncs(thisDev, thisMode, otherMode)
     register DeviceIntPtr thisDev;
diff --git a/xc/programs/Xserver/dix/extension.c b/xc/programs/Xserver/dix/extension.c
index 0cf93a42b..ed925f8bc 100644
--- a/xc/programs/Xserver/dix/extension.c
+++ b/xc/programs/Xserver/dix/extension.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.9 2001/01/17 22:36:43 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/extension.c,v 3.10 2001/08/01 00:44:48 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -57,6 +57,9 @@ SOFTWARE.
 #define _SECURITY_SERVER
 #include "security.h"
 #endif
+#ifdef LBX
+#include "lbxserve.h"
+#endif
 
 #define EXTENSION_BASE  128
 #define EXTENSION_EVENT_BASE  64
diff --git a/xc/programs/Xserver/dix/main.c b/xc/programs/Xserver/dix/main.c
index f38a86182..5368132e7 100644
--- a/xc/programs/Xserver/dix/main.c
+++ b/xc/programs/Xserver/dix/main.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.35 2001/04/28 20:42:17 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.37 2001/08/06 20:51:05 dawes Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -79,9 +79,6 @@ SOFTWARE.
 #include "dixstruct.h"
 #include "gcstruct.h"
 #include "extension.h"
-#ifndef PANORAMIX
-#include "extnsionst.h"
-#endif
 #include "colormap.h"
 #include "colormapst.h"
 #include "cursorstr.h"
@@ -90,7 +87,10 @@ SOFTWARE.
 #include "servermd.h"
 #include "site.h"
 #include "dixfont.h"
-#ifndef PANORAMIX
+#ifdef PANORAMIX
+#include "panoramiXsrv.h"
+#else
+#include "extnsionst.h"
 #include "dixevents.h"		/* InitEvents() */
 #include "dispatch.h"		/* InitProcVectors() */
 #endif
@@ -98,6 +98,7 @@ SOFTWARE.
 #ifdef DPMSExtension
 #define DPMS_SERVER
 #include "dpms.h"
+#include "dpmsproc.h"
 #endif
 
 void ddxGiveUp();
@@ -147,7 +148,7 @@ static int restart = 0;
 /*ARGSUSED*/
 void
 NotImplemented(
-#if NeedFunctionPrototypes && defined(EVENT_SWAP_PTR)
+#if NeedFunctionPrototypes
 	xEvent * from,
 	xEvent * to
 #endif
diff --git a/xc/programs/Xserver/dix/property.c b/xc/programs/Xserver/dix/property.c
index 8557f231f..8a8204ebe 100644
--- a/xc/programs/Xserver/dix/property.c
+++ b/xc/programs/Xserver/dix/property.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.8 2001/01/17 22:36:44 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/dix/property.c,v 3.9 2001/08/01 00:44:48 tsi Exp $ */
 /***********************************************************
 
 Copyright 1987, 1998  The Open Group
@@ -56,6 +56,10 @@ SOFTWARE.
 #define _SECURITY_SERVER
 #include "security.h"
 #endif
+#ifdef LBX
+#include "lbxserve.h"
+#include "lbxtags.h"
+#endif
 
 #if defined(LBX) || defined(LBX_COMPAT)
 int fWriteToClient(client, len, buf)