Commit 2cddd5c5 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Splash.c: add nxagentHaveSplashWindow helper

parent 7b669d7e
...@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio ...@@ -330,7 +330,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio
clientReady[0] = 0; clientReady[0] = 0;
if (nxagentSplashWindow != None || (nxagentOption(Xdmcp) == 1 && nxagentXdmcpUp == 0)) if (nxagentHaveSplashWindow() || (nxagentOption(Xdmcp) == 1 && nxagentXdmcpUp == 0))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n", fprintf(stderr, "******Dispatch: Requesting a timeout of [%d] Ms.\n",
......
...@@ -160,6 +160,11 @@ void nxagentShowSplashWindow(Window parentWindow) ...@@ -160,6 +160,11 @@ void nxagentShowSplashWindow(Window parentWindow)
#endif #endif
} }
Bool nxagentHaveSplashWindow(void)
{
return (nxagentSplashWindow != None);
}
void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height) void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height)
{ {
int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay)); int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
......
...@@ -42,4 +42,5 @@ extern Window nxagentSplashWindow; ...@@ -42,4 +42,5 @@ extern Window nxagentSplashWindow;
extern void nxagentShowSplashWindow(Window); extern void nxagentShowSplashWindow(Window);
extern void nxagentRemoveSplashWindow(); extern void nxagentRemoveSplashWindow();
extern Bool nxagentHaveSplashWindow(void);
#endif /* __Splash_H__ */ #endif /* __Splash_H__ */
...@@ -1447,7 +1447,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask) ...@@ -1447,7 +1447,7 @@ void nxagentConfigureWindow(WindowPtr pWin, unsigned int mask)
* *
* else if (mask & CWStackMode) * else if (mask & CWStackMode)
* { * {
* if (nxagentSplashWindow) * if (nxagentHaveSplashWindow())
* { * {
* valuemask = CWStackMode; * valuemask = CWStackMode;
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment