Module Name: xsrc
Committed By: jmcneill
Date: Tue Nov 10 23:56:43 UTC 2015
Modified Files:
xsrc/external/mit/ctwm/dist: util.c
Log Message:
if CTWM_WELCOME_FILE is defined, try that before falling back to welcome.xwd
and .xpm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/ctwm/dist/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/ctwm/dist/util.c
diff -u xsrc/external/mit/ctwm/dist/util.c:1.3 xsrc/external/mit/ctwm/dist/util.c:1.4
--- xsrc/external/mit/ctwm/dist/util.c:1.3 Sat Sep 5 14:29:39 2015
+++ xsrc/external/mit/ctwm/dist/util.c Tue Nov 10 23:56:43 2015
@@ -908,6 +908,10 @@ void MaskScreen (char *file)
reportfilenotfound = 0;
AlternateCmap = Scr->WelcomeCmap;
if (! file) {
+#ifdef CTWM_WELCOME_FILE
+ Scr->WelcomeImage = GetImage (CTWM_WELCOME_FILE, WelcomeCp);
+ if (Scr->WelcomeImage == None)
+#endif
Scr->WelcomeImage = GetImage ("xwd:welcome.xwd", WelcomeCp);
#ifdef XPM
if (Scr->WelcomeImage == None)
