hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically be found in dix/window.c.

2 files changed, 53 insertions, 5 deletions

diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile
index cc5712126..a383ee064 100644
--- a/nx-X11/programs/Xserver/dix/Imakefile
+++ b/nx-X11/programs/Xserver/dix/Imakefile
@@ -16,9 +16,11 @@ FFS_OBJ = ffs.o
 #if (!(defined(NXAgentServer) && NXAgentServer))
 NXAGENT_SKIP_SRCS =                  \
                     extension.c      \
+                    window.c         \
                     $(NULL)
 NXAGENT_SKIP_OBJS =                  \
                     extension.o      \
+                    window.o         \
                     $(NULL)
 #endif
 
@@ -42,7 +44,6 @@ SRCS =                          \
        swaprep.c                \
        swapreq.c                \
        tables.c                 \
-       window.c                 \
        initatoms.c              \
        dixfonts.c               \
        privates.c               \
@@ -70,7 +71,6 @@ OBJS =                          \
        swaprep.o                \
        swapreq.o                \
        tables.o                 \
-       window.o                 \
        initatoms.o              \
        dixfonts.o               \
        privates.o               \
diff --git a/nx-X11/programs/Xserver/dix/window.c b/nx-X11/programs/Xserver/dix/window.c
index 5a4818f88..7ec61b153 100644
--- a/nx-X11/programs/Xserver/dix/window.c
+++ b/nx-X11/programs/Xserver/dix/window.c
@@ -160,7 +160,7 @@ static Bool TileScreenSaver(int i, int kind);
 int numSaveUndersViewable = 0;
 int deltaSaveUndersViewable = 0;
 
-#ifdef DEBUG
+#if defined(DEBUG) || (defined(NXAGENT_SERVER) && defined(WINDOW_TREE_DEBUG))
 /******
  * PrintWindowTree
  *    For debugging only
@@ -286,6 +286,7 @@ SetWindowToDefaults(register WindowPtr pWin)
 #endif
 }
 
+#ifndef NXAGENT_SERVER
 static void
 MakeRootTile(WindowPtr pWin)
 {
@@ -331,6 +332,7 @@ MakeRootTile(WindowPtr pWin)
    FreeScratchGC(pGC);
 
 }
+#endif /* NXAGENT_SERVER */
 
 WindowPtr
 AllocateWindow(ScreenPtr pScreen)
@@ -477,6 +479,7 @@ CreateRootWindow(ScreenPtr pScreen)
     return TRUE;
 }
 
+#ifndef NXAGENT_SERVER
 void
 InitRootWindow(WindowPtr pWin)
 {
@@ -498,6 +501,7 @@ InitRootWindow(WindowPtr pWin)
 
     MapWindow(pWin, serverClient);
 }
+#endif /* NXAGENT_SERVER */
 
 /* Set the region to the intersection of the rectangle and the
  * window's winSize.  The window is typically the parent of the
@@ -872,13 +876,15 @@ CrushTree(WindowPtr pWin)
 	}
     }
 }
-	
+
+
 /*****
  *  DeleteWindow
  *	 Deletes child of window then window itself
  *	 If wid is None, don't send any events
  *****/
 
+#ifndef NXAGENT_SERVER
 int
 DeleteWindow(void * value, XID wid)
  {
@@ -914,6 +920,7 @@ DeleteWindow(void * value, XID wid)
     xfree(pWin);
     return Success;
 }
+#endif /* NXAGENT_SERVER */
 
 void
 DestroySubwindows(register WindowPtr pWin, ClientPtr client)
@@ -1231,6 +1238,25 @@ ChangeWindowAttributes(register WindowPtr pWin, Mask vmask, XID *vlist, ClientPt
 #endif /* DO_SAVE_UNDERS */
 	    break;
 	  case CWEventMask:
+
+	    /*
+	     * TODO: Some applications like java bean shell
+	     * don' t work if they cannot monitor the root
+	     * window for Structure Redirect events. However
+	     * this doesn't seem to be the best solution, since
+	     * also an X server with a window manager running,
+	     * doesn't allow to monitor for those events, but
+	     * the java bean shell works flawlessy on this
+	     * server.
+	     *
+	     * #ifdef NXAGENT_SERVER
+	     * if (nxagentCheckIllegalRootMonitoring(pWin, (Mask)*pVlist))
+	     * {
+	     *   return BadAccess;
+	     * }
+	     * #endif
+	     */
+
 	    result = EventSelectForWindow(pWin, client, (Mask )*pVlist);
 	    if (result)
 	    {
@@ -1752,6 +1778,7 @@ GravityTranslate (register int x, register int y, int oldx, int oldy,
 }
 
 /* XXX need to retile border on each window with ParentRelative origin */
+#ifndef NXAGENT_SERVER
 void
 ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
 {
@@ -1816,6 +1843,7 @@ ResizeChildrenWinSize(register WindowPtr pWin, int dx, int dy, int dw, int dh)
 	}
     }
 }
+#endif /* NXAGENT_SERVER */
 
 #define GET_INT16(m, f) \
 	if (m & mask) \
@@ -2164,6 +2192,7 @@ ReflectStackChange(
  * ConfigureWindow
  *****/
 
+#ifndef NXAGENT_SERVER
 int
 ConfigureWindow(register WindowPtr pWin, register Mask mask, XID *vlist, ClientPtr client)
 {
@@ -2417,6 +2446,7 @@ ActuallyDoSomething:
 #undef RESIZE_WIN
 #undef REBORDER_WIN
 }
+#endif /* NXAGENT_SERVER */
 
 
 /******
@@ -2436,6 +2466,17 @@ CirculateWindow(WindowPtr pParent, int direction, ClientPtr client)
     xEvent event;
     BoxRec box;
 
+    /*
+     * #ifdef NXAGENT_SERVER
+     * if (nxagentOption(Rootless) && nxagentWMIsRunning &&
+     *         nxagentWindowTopLevel(pWin) && pWin -> overrideRedirect == 0)
+     * {
+     *   nxagentCirculateRootlessWindows(direction);
+     *   return Success;
+     * }
+     * #endif
+     */
+
     pHead = RealChildHead(pParent);
     pFirst = pHead ? pHead->nextSib : pParent->firstChild;
     if (direction == RaiseLowest)
@@ -2501,6 +2542,7 @@ CompareWIDs(
  *  ReparentWindow
  *****/
 
+#ifndef NXAGENT_SERVER
 int
 ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
                int x, int y, ClientPtr client)
@@ -2593,6 +2635,7 @@ ReparentWindow(register WindowPtr pWin, register WindowPtr pParent,
     RecalculateDeliverableEvents(pWin);
     return(Success);
 }
+#endif /* NXAGENT_SERVER */
 
 static void
 RealizeTree(WindowPtr pWin)
@@ -2635,6 +2678,7 @@ RealizeTree(WindowPtr pWin)
  *    MapNotify event is generated.
  *****/
 
+#ifndef NXAGENT_SERVER
 int
 MapWindow(register WindowPtr pWin, ClientPtr client)
 {
@@ -2737,7 +2781,7 @@ MapWindow(register WindowPtr pWin, ClientPtr client)
 
     return(Success);
 }
-
+#endif /* NXAGENT_SERVER */
 
 /*****
  * MapSubwindows
@@ -2926,6 +2970,7 @@ UnrealizeTree(
  *    generated.  Cannot unmap a root window.
  *****/
 
+#ifndef NXAGENT_SERVER
 int
 UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
 {
@@ -2979,6 +3024,7 @@ UnmapWindow(register WindowPtr pWin, Bool fromConfigure)
 	WindowsRestructured ();
     return(Success);
 }
+#endif /* NXAGENT_SERVER */
 
 /*****
  * UnmapSubwindows
@@ -3251,6 +3297,7 @@ static void DrawLogo(
 );
 #endif
 
+#ifndef NXAGENT_SERVER
 void
 SaveScreens(int on, int mode)
 {
@@ -3363,6 +3410,7 @@ SaveScreens(int on, int mode)
     if (mode == ScreenSaverReset)
        SetScreenSaverTimer();
 }
+#endif /* NXAGENT_SERVER */
 
 static Bool
 TileScreenSaver(int i, int kind)