aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-15 22:10:45 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-08-27 08:27:00 +0200
commit41bfed975b3145f1ac345893d118deb98ca00cc0 (patch)
tree1de3061db8b49965453b2edd19de041616ef39c0
parente12983a677c84794f5ff34e5b14c3feb78878a9c (diff)
downloadnx-libs-41bfed975b3145f1ac345893d118deb98ca00cc0.tar.gz
nx-libs-41bfed975b3145f1ac345893d118deb98ca00cc0.tar.bz2
nx-libs-41bfed975b3145f1ac345893d118deb98ca00cc0.zip
Splash.c: remove global variables for colors
Make them defines. Also determine the screen depth dynamically.
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Display.c16
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.c16
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Splash.h6
3 files changed, 8 insertions, 30 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c
index 1c18ad1a3..c25afc597 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Display.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c
@@ -1387,15 +1387,6 @@ FIXME: Use of nxagentParentWindow is strongly deprecated.
nxagentChangeOption(BorderWidth, 1);
}
- nxagentLogoDepth = DefaultDepth(nxagentDisplay,
- DefaultScreen(nxagentDisplay)
- );
-
- nxagentLogoBlack = 0x000000;
- nxagentLogoRed = 0xff0000;
- nxagentLogoWhite = 0xffffff;
- nxagentLogoGray = 0x222222;
-
#ifdef WATCH
fprintf(stderr, "nxagentOpenDisplay: Watchpoint 5.1.\n");
@@ -2827,13 +2818,6 @@ Bool nxagentReconnectDisplay(void *p0)
nxagentConfineWindow);
#endif
- nxagentLogoDepth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
-
- nxagentLogoBlack = 0x000000;
- nxagentLogoRed = 0xff0000;
- nxagentLogoWhite = 0xffffff;
- nxagentLogoGray = 0x222222;
-
useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);
/*
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.c b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
index 74322648a..91f599cc6 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.c
@@ -58,11 +58,10 @@
* Colors used to paint the splash screen.
*/
-int nxagentLogoDepth;
-int nxagentLogoWhite;
-int nxagentLogoRed;
-int nxagentLogoBlack;
-int nxagentLogoGray;
+#define nxagentLogoWhite 0xffffff
+#define nxagentLogoRed 0xff0000
+#define nxagentLogoBlack 0x000000
+#define nxagentLogoGray 0x222222
static void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height);
@@ -176,6 +175,8 @@ void nxagentShowSplashWindow(Window parentWindow)
void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
{
+ int depth = DefaultDepth(nxagentDisplay, DefaultScreen(nxagentDisplay));
+
#ifdef DEBUG
fprintf(stderr, "%s: Got called.\n", __func__);
#endif
@@ -183,9 +184,8 @@ void nxagentPaintLogo(Window win, GC gc, int scale, int width, int height)
#ifdef NXAGENT_LOGO_DEBUG
fprintf(stderr, "%s: begin\n", __func__);
fprintf(stderr, "%s: gen params are: w=%d h=%d d=%d r=%x w=%x b=%x\n", __func__,
- width, height,
- nxagentLogoDepth, nxagentLogoRed,
- nxagentLogoWhite, nxagentLogoBlack);
+ width, height, depth,
+ nxagentLogoRed, nxagentLogoWhite, nxagentLogoBlack);
#endif
int w = width/scale;
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Splash.h b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
index 52adbc340..5f7547e57 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Splash.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Splash.h
@@ -37,12 +37,6 @@ extern int XdmcpTimeOutRtx;
extern int XdmcpStartTime;
extern int nxagentXdmcpUp;
-extern int nxagentLogoDepth;
-extern int nxagentLogoWhite;
-extern int nxagentLogoRed;
-extern int nxagentLogoBlack;
-extern int nxagentLogoGray;
-
extern Window nxagentSplashWindow;
extern int nxagentWMPassed;