aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-11 01:47:16 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:00 +0200
commit9cd602b271cc846d654f7f5d9a455368e9ca2612 (patch)
treee7310bf5d89c414b4ef1126ccc52dd93a9c15c56 /nx-X11/programs/Xserver/hw
parent8eeaa40b1b0bb76e8bc74534576e8dca98063c3e (diff)
downloadnx-libs-9cd602b271cc846d654f7f5d9a455368e9ca2612.tar.gz
nx-libs-9cd602b271cc846d654f7f5d9a455368e9ca2612.tar.bz2
nx-libs-9cd602b271cc846d654f7f5d9a455368e9ca2612.zip
Splash.c: do not wait in nxagent mode
The splash window is only shown in x2go mode. In nxagent mode the splash window was also shown, but empty (and thus invisible). And the code waited for the splash window to disappear. Fix this by skipping _all_ the splash stuff in nxagent mode.
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXwindow.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c15
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c17
3 files changed, 20 insertions, 17 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
index f67295c43..3cd8d0ce9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXwindow.c
@@ -138,11 +138,14 @@ 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);
+ (*pScreen->DestroyPixmap)(pW->background.pixmap);
}
pW->backgroundState = BackgroundPixel;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index bc86fed36..e2e88674b 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -85,6 +85,12 @@ int nxagentShowSplashWindow(Window parentWindow)
XSetWindowAttributes attributes;
GC gc;
+ /*
+ * Show splash window only when running as X2Go Agent
+ */
+ if(!nxagentX2go)
+ return False;
+
#ifdef TEST
fprintf(stderr, "nxagentShowSplashWindow: Got called.\n");
#endif
@@ -175,15 +181,6 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
XPoint rect[4];
int w, h, c, w2, h2;
- /*
- * Show only X2GO Logo when running as X2Go Agent
- */
- if(! nxagentX2go)
- {
- nxagentPixmapLogo = 0L;
- return;
- }
-
#ifdef DEBUG
fprintf(stderr, "nxagentPaintLogo: Got called.\n");
#endif
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index fc59973bd..86ae1d607 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -670,15 +670,18 @@ Bool nxagentDestroyWindow(WindowPtr pWin)
nxagentSplashCount);
#endif
- if (nxagentSplashCount == 1)
+ if (nxagentRootTileWindow)
{
- XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
- }
+ if (nxagentSplashCount == 1)
+ {
+ XClearWindow(nxagentDisplay, nxagentWindowPriv(nxagentRootTileWindow) -> window);
+ }
- if (pWin == nxagentRootTileWindow)
- {
- nxagentWindowPriv(nxagentRootTileWindow)->window = None;
- nxagentRootTileWindow = None;
+ if (pWin == nxagentRootTileWindow)
+ {
+ nxagentWindowPriv(nxagentRootTileWindow)->window = None;
+ nxagentRootTileWindow = None;
+ }
}
pWindowPriv->window = None;