aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-15 22:06:14 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:12:24 +0200
commit8fcaafab426686f1e67d4535b391534d210f482c (patch)
tree5065c7213fa27031ffbe56ce1f825e044e12ffc2 /nx-X11/programs/Xserver/hw
parentbe508a447be199b24a3bb856adb64a6fbd016e9e (diff)
downloadnx-libs-8fcaafab426686f1e67d4535b391534d210f482c.tar.gz
nx-libs-8fcaafab426686f1e67d4535b391534d210f482c.tar.bz2
nx-libs-8fcaafab426686f1e67d4535b391534d210f482c.zip
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.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c15
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXwindow.c86
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c51
3 files changed, 4 insertions, 148 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c
index 3e62d9097..fda84cf9b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Events.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c
@@ -124,7 +124,6 @@
extern Bool nxagentOnce;
extern WindowPtr nxagentRootTileWindow;
-extern int nxagentSplashCount;
extern int nxagentLastClipboardClient;
@@ -2453,20 +2452,6 @@ FIXME: This can be maybe optimized by consuming the
}
}
- if (nxagentRootTileWindow != NULL)
- {
- if (nxagentWindowPriv(nxagentRootTileWindow) -> window == nxagentWindowPriv(pWin) -> window &&
- nxagentSplashCount == 1 && X -> xexpose.count == 0)
- {
- #ifdef DEBUG
- fprintf(stderr, "nxagentHandleExposeEvent: Clearing root tile window id [%u].\n",
- nxagentWindowPriv(nxagentRootTileWindow) -> window);
- #endif
-
- XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
- }
- }
-
RegionUninit(&sum);
}
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index 3cd8d0ce9..3dcb552e5 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -114,10 +114,6 @@ Equipment Corporation.
#include "Drawable.h"
#include "Colormap.h"
-/* prototypes (only MakeRootTile() required here) */
-
-static void MakeRootTile(WindowPtr pWin);
-
#include "../../dix/window.c"
extern Bool nxagentWMIsRunning;
@@ -132,72 +128,8 @@ extern Bool nxagentScreenTrap;
#undef TEST
#undef DEBUG
-WindowPtr nxagentRootTileWindow;
-
extern void nxagentSetVersionProperty(WindowPtr pWin);
-void nxagentClearSplash(WindowPtr pW)
-{
- if (!pW)
- return;
-
- ScreenPtr pScreen = pW->drawable.pScreen;
-
- if (pW->backgroundState == BackgroundPixmap)
- {
- (*pScreen->DestroyPixmap)(pW->background.pixmap);
- }
-
- pW->backgroundState = BackgroundPixel;
- pW->background.pixel = nxagentLogoBlack;
-
- (*pScreen->ChangeWindowAttributes)(pW, CWBackPixmap|CWBackPixel);
-}
-
-static void
-MakeRootTile(WindowPtr pWin)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- GCPtr pGC;
- unsigned char back[128];
- int len = BitmapBytePad(sizeof(long));
- register unsigned char *from, *to;
- register int i, j;
-
- pWin->background.pixmap = (*pScreen->CreatePixmap)(pScreen, 4, 4,
- pScreen->rootDepth, 0);
-
- pWin->backgroundState = BackgroundPixmap;
- pGC = GetScratchGC(pScreen->rootDepth, pScreen);
- if (!pWin->background.pixmap || !pGC)
- FatalError("could not create root tile");
-
- {
- CARD32 attributes[2];
-
- attributes[0] = pScreen->whitePixel;
- attributes[1] = pScreen->blackPixel;
-
- (void)ChangeGC(pGC, GCForeground | GCBackground, attributes);
- }
-
- ValidateGC((DrawablePtr)pWin->background.pixmap, pGC);
-
- from = (screenInfo.bitmapBitOrder == LSBFirst) ? _back_lsb : _back_msb;
- to = back;
-
- for (i = 4; i > 0; i--, from++)
- for (j = len; j > 0; j--)
- *to++ = *from;
-
- (*pGC->ops->PutImage)((DrawablePtr)pWin->background.pixmap, pGC, 1,
- 0, 0, len, 4, 0, XYBitmap, (char *)back);
-
- FreeScratchGC(pGC);
-
- nxagentRootTileWindow = pWin;
-}
-
void
InitRootWindow(WindowPtr pWin)
{
@@ -252,21 +184,11 @@ InitRootWindow(WindowPtr pWin)
pWin->optional->cursor = rootCursor;
rootCursor->refcnt++;
-#ifndef NXAGENT_SPLASH
- if (!blackRoot && !whiteRoot) {
- MakeRootTile(pWin);
- backFlag |= CWBackPixmap;
- }
+ if (blackRoot)
+ pWin->background.pixel = pScreen->blackPixel;
else
-#else
- {
- if (blackRoot)
- pWin->background.pixel = pScreen->blackPixel;
- else
- pWin->background.pixel = pScreen->whitePixel;
- backFlag |= CWBackPixel;
- }
-#endif
+ pWin->background.pixel = pScreen->whitePixel;
+ backFlag |= CWBackPixel;
pWin->backingStore = defaultBackingStore;
pWin->forcedBS = (defaultBackingStore != NotUseful);
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
@@ -156,12 +150,6 @@ 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)