aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-28 08:20:14 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-05-07 12:55:04 +0200
commit2cddd5c5e31f1d46b7a8370ef1c6af4dc33c5bfb (patch)
treebc836f51175070867d340c110dcf08bf45d6ca94 /nx-X11
parent7b669d7e0e46cc63afb1448fdb01a3e0334c9728 (diff)
downloadnx-libs-2cddd5c5e31f1d46b7a8370ef1c6af4dc33c5bfb.tar.gz
nx-libs-2cddd5c5e31f1d46b7a8370ef1c6af4dc33c5bfb.tar.bz2
nx-libs-2cddd5c5e31f1d46b7a8370ef1c6af4dc33c5bfb.zip
Splash.c: add nxagentHaveSplashWindow helper
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c2
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c5
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.h1
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Window.c2
4 files changed, 8 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
index ede0ffdcc..1b4b2cc85 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c
@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
clientReady[0] = 0;
- if (nxagentSplashWindow != None || (nxagentOption(Xdmcp) == 1 && nxagentXdmcpUp == 0))
+ if (nxagentHaveSplashWindow() || (nxagentOption(Xdmcp) == 1 && nxagentXdmcpUp == 0))
{
#ifdef TEST
fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n",
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index 06ac62a59..26b897c91 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -160,6 +160,11 @@ void nxagentShowSplashWindow(Window parentWindow)
#endif
}
+Bool nxagentHaveSplashWindow(void)
+{
+ return (nxagentSplashWindow != None);
+}
+
void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height)
{
int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index a43801469..bf3ccf5f9 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -42,4 +42,5 @@ extern Window nxagentSplashWindow;
extern void nxagentShowSplashWindow(Window);
extern void nxagentRemoveSplashWindow();
+extern Bool nxagentHaveSplashWindow(void);
#endif /* __Splash_H__ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index d60be1aa7..a39cc035f 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -1447,7 +1447,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
*
* else if (mask & CWStackMode)
* {
- * if (nxagentSplashWindow)
+ * if (nxagentHaveSplashWindow())
* {
* valuemask = CWStackMode;
*