From 8fcaafab426686f1e67d4535b391534d210f482c Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Thu, 15 Aug 2019 22:06:14 +0200
Subject: nxagent: drop nxagentRootTileWindow

We either use a solid black or a white background and no backround
pixmap. So nxagentRootTileWindow is always empty and we can drop all
stuff around it.

remove nxagentSplashCount, too, since it is no longer checked anywhere.
---
 nx-X11/programs/Xserver/hw/nxagent/Window.c | 51 -----------------------------
 1 file changed, 51 deletions(-)

(limited to 'nx-X11/programs/Xserver/hw/nxagent/Window.c')

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index c666f9ad4..6b186ab27 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -118,12 +118,6 @@ extern WindowPtr nxagentRootTileWindow;
 
 extern Bool nxagentReportPrivateWindowIds;
 
-/*
- * Also referenced in Events.c.
- */
-
-int nxagentSplashCount = 0;
-
 #define RECTLIMIT 25
 #define BSPIXMAPLIMIT 128
 
@@ -155,12 +149,6 @@ Bool nxagentIsIconic(WindowPtr);
 int GetWindowProperty(WindowPtr, Atom, long, long, Bool, Atom, Atom*, int*,
                                  unsigned long*, unsigned long*, unsigned char**);
 
-/*
- * From NXwindow.c.
- */
-
-void nxagentClearSplash(WindowPtr pWin);
-
 /*
  * Other local functions.
  */
@@ -268,16 +256,6 @@ Bool nxagentCreateWindow(WindowPtr pWin)
     return True;
   }
 
-  nxagentSplashCount++;
-
-  if (nxagentSplashCount == 2)
-  {
-      nxagentClearSplash(nxagentRootTileWindow);
-  }
-  #ifdef NXAGENT_LOGO_DEBUG
-  fprintf(stderr, "nxagentCreateWindow: nxagentSplashCount [%d]\n", nxagentSplashCount);
-  #endif
-
   if (pWin->drawable.class == InputOnly)
   {
     mask = CWEventMask;
@@ -487,14 +465,6 @@ Bool nxagentCreateWindow(WindowPtr pWin)
   nxagentWindowPriv(pWin)->siblingAbove = None;
   nxagentWindowPriv(pWin)->pPicture = NULL;
 
-  if (nxagentRootTileWindow)
-  {
-    if (nxagentWindowPriv(pWin)->window != nxagentWindowPriv(nxagentRootTileWindow)->window)
-    {
-      XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow)->window);
-    }
-  }
-
   if (pWin->nextSib)
   {
     nxagentWindowPriv(pWin->nextSib)->siblingAbove = nxagentWindow(pWin);
@@ -662,27 +632,6 @@ Bool nxagentDestroyWindow(WindowPtr pWin)
     nxagentRootlessDelTopLevelWindow(pWin);
   }
 
-  nxagentSplashCount--;
-
-  #ifdef DEBUG
-  fprintf(stderr, "nxagentDestroyWindow: The splash counter is now [%d].\n",
-              nxagentSplashCount);
-  #endif
-
-  if (nxagentRootTileWindow)
-  {
-    if (nxagentSplashCount == 1)
-    {
-      XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
-    }
-
-    if (pWin == nxagentRootTileWindow)
-    {
-      nxagentWindowPriv(nxagentRootTileWindow)->window = None;
-      nxagentRootTileWindow = None;
-    }
-  }
-
   pWindowPriv->window = None;
 
   if (pWin -> optional)
-- 
cgit v1.2.3