Commit ca531cce authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Splash.c: use more Xlib types

parent 2cddd5c5
...@@ -59,8 +59,6 @@ extern int nxagentClients; ...@@ -59,8 +59,6 @@ extern int nxagentClients;
extern ScreenPtr nxagentDefaultScreen; extern ScreenPtr nxagentDefaultScreen;
extern Pixmap nxagentPixmapLogo;
extern Window nxagentIconWindow; extern Window nxagentIconWindow;
extern Window nxagentFullscreenWindow; extern Window nxagentFullscreenWindow;
......
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
#define nxagentLogoDarkGray 0x222222 #define nxagentLogoDarkGray 0x222222
#define nxagentLogoLightGray 0xbbbbbb #define nxagentLogoLightGray 0xbbbbbb
Pixmap nxagentPixmapLogo; XlibPixmap nxagentPixmapLogo;
Window nxagentSplashWindow = None; XlibWindow nxagentSplashWindow = None;
Bool nxagentWMPassed = False; Bool nxagentWMPassed = False;
static void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height); static void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, int height);
void nxagentShowSplashWindow(Window parentWindow) void nxagentShowSplashWindow(XlibWindow parentWindow)
{ {
XWindowAttributes getAttributes; XWindowAttributes getAttributes;
XWindowChanges values; XWindowChanges values;
...@@ -138,7 +138,7 @@ void nxagentShowSplashWindow(Window parentWindow) ...@@ -138,7 +138,7 @@ void nxagentShowSplashWindow(Window parentWindow)
BlackPixel (nxagentDisplay, 0)); BlackPixel (nxagentDisplay, 0));
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: Created new splash window with id [%ld].\n", __func__, fprintf(stderr, "%s: Created new splash window with id [0x%lx].\n", __func__,
nxagentSplashWindow); nxagentSplashWindow);
#endif #endif
...@@ -165,7 +165,7 @@ Bool nxagentHaveSplashWindow(void) ...@@ -165,7 +165,7 @@ Bool nxagentHaveSplashWindow(void)
return (nxagentSplashWindow != None); return (nxagentSplashWindow != None);
} }
void nxagentPaintLogo(Window win, XlibGC gc, int scale, int width, int height) void nxagentPaintLogo(XlibWindow win, XlibGC gc, int scale, int width, int height)
{ {
int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay)); int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
...@@ -435,7 +435,7 @@ void nxagentRemoveSplashWindow(void) ...@@ -435,7 +435,7 @@ void nxagentRemoveSplashWindow(void)
nxagentRefreshWindows(screenInfo.screens[0]->root); nxagentRefreshWindows(screenInfo.screens[0]->root);
#ifdef TEST #ifdef TEST
fprintf(stderr, "%s: setting the ownership of %s (%d) on window 0x%lx\n", __func__, fprintf(stderr, "%s: setting the ownership of %s (%d) on window [0x%lx]\n", __func__,
"NX_CUT_BUFFER_SERVER", (int)serverTransToAgentProperty, nxagentWindow(screenInfo.screens[0]->root)); "NX_CUT_BUFFER_SERVER", (int)serverTransToAgentProperty, nxagentWindow(screenInfo.screens[0]->root));
#endif #endif
...@@ -446,6 +446,6 @@ void nxagentRemoveSplashWindow(void) ...@@ -446,6 +446,6 @@ void nxagentRemoveSplashWindow(void)
if (nxagentPixmapLogo) if (nxagentPixmapLogo)
{ {
XFreePixmap(nxagentDisplay, nxagentPixmapLogo); XFreePixmap(nxagentDisplay, nxagentPixmapLogo);
nxagentPixmapLogo = (Pixmap) 0; nxagentPixmapLogo = (XlibPixmap) 0;
} }
} }
...@@ -37,10 +37,9 @@ extern int XdmcpTimeOutRtx; ...@@ -37,10 +37,9 @@ extern int XdmcpTimeOutRtx;
extern int XdmcpStartTime; extern int XdmcpStartTime;
extern int nxagentXdmcpUp; extern int nxagentXdmcpUp;
extern Window nxagentSplashWindow; #ifdef XlibWindow
extern void nxagentShowSplashWindow(XlibWindow);
extern void nxagentShowSplashWindow(Window); #endif
extern void nxagentRemoveSplashWindow(); extern void nxagentRemoveSplashWindow(void);
extern Bool nxagentHaveSplashWindow(void); extern Bool nxagentHaveSplashWindow(void);
#endif /* __Splash_H__ */ #endif /* __Splash_H__ */
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