diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2020-01-28 08:21:53 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-05-07 12:55:04 +0200 |
| commit | ca531cce24f232cf702fe673b86a2b0934c1c6ef (patch) | |
| tree | 840885740c5b949e1f63fd2e08468be47b65c841 /nx-X11/programs/Xserver | |
| parent | 2cddd5c5e31f1d46b7a8370ef1c6af4dc33c5bfb (diff) | |
| download | nx-libs-ca531cce24f232cf702fe673b86a2b0934c1c6ef.tar.gz nx-libs-ca531cce24f232cf702fe673b86a2b0934c1c6ef.tar.bz2 nx-libs-ca531cce24f232cf702fe673b86a2b0934c1c6ef.zip | |
Splash.c: use more Xlib types
Diffstat (limited to 'nx-X11/programs/Xserver')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Screen.h | 2 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Splash.c | 16 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Splash.h | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.h b/nx-X11/programs/Xserver/hw/nxagent/Screen.h index 104da1cea..f74fd66b6 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Screen.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.h @@ -59,8 +59,6 @@ extern int nxagentClients; extern ScreenPtr nxagentDefaultScreen; -extern Pixmap nxagentPixmapLogo; - extern Window nxagentIconWindow; extern Window nxagentFullscreenWindow; diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c index 26b897c91..48ddda520 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c @@ -57,13 +57,13 @@ #define nxagentLogoDarkGray 0x222222 #define nxagentLogoLightGray 0xbbbbbb -Pixmap nxagentPixmapLogo; -Window nxagentSplashWindow = None; +XlibPixmap nxagentPixmapLogo; +XlibWindow nxagentSplashWindow = None; 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; XWindowChanges values; @@ -138,7 +138,7 @@ void nxagentShowSplashWindow(Window parentWindow) BlackPixel (nxagentDisplay, 0)); #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); #endif @@ -165,7 +165,7 @@ Bool nxagentHaveSplashWindow(void) 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)); @@ -435,7 +435,7 @@ void nxagentRemoveSplashWindow(void) nxagentRefreshWindows(screenInfo.screens[0]->root); #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)); #endif @@ -446,6 +446,6 @@ void nxagentRemoveSplashWindow(void) if (nxagentPixmapLogo) { XFreePixmap(nxagentDisplay, nxagentPixmapLogo); - nxagentPixmapLogo = (Pixmap) 0; + nxagentPixmapLogo = (XlibPixmap) 0; } } diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h index bf3ccf5f9..46655e039 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h @@ -37,10 +37,9 @@ extern int XdmcpTimeOutRtx; extern int XdmcpStartTime; extern int nxagentXdmcpUp; -extern Window nxagentSplashWindow; - -extern void nxagentShowSplashWindow(Window); -extern void nxagentRemoveSplashWindow(); - +#ifdef XlibWindow +extern void nxagentShowSplashWindow(XlibWindow); +#endif +extern void nxagentRemoveSplashWindow(void); extern Bool nxagentHaveSplashWindow(void); #endif /* __Splash_H__ */ |