projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz
[xscreensaver]
/
driver
/
splash.c
diff --git
a/driver/splash.c
b/driver/splash.c
index 491ebe80c2f1b355e2f83407750225953087c2ef..02844b58c72b94624c1127c9cb619e774003faf3 100644
(file)
--- a/
driver/splash.c
+++ b/
driver/splash.c
@@
-126,6
+126,7
@@
struct splash_dialog_data {
Pixel foreground;
Pixel background;
Pixel foreground;
Pixel background;
+ Pixel border;
Pixel button_foreground;
Pixel button_background;
Pixel shadow_top;
Pixel button_foreground;
Pixel button_background;
Pixel shadow_top;
@@
-241,6
+242,9
@@
make_splash_dialog (saver_info *si)
sp->background = get_pixel_resource (si->dpy, cmap,
"splash.background",
"Dialog.Background");
sp->background = get_pixel_resource (si->dpy, cmap,
"splash.background",
"Dialog.Background");
+ sp->border = get_pixel_resource (si->dpy, cmap,
+ "splash.borderColor",
+ "Dialog.borderColor");
if (sp->foreground == sp->background)
{
if (sp->foreground == sp->background)
{
@@
-420,6
+424,8
@@
make_splash_dialog (saver_info *si)
DefaultVisualOfScreen(ssi->screen),
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
DefaultVisualOfScreen(ssi->screen),
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
+ XSetWindowBorder (si->dpy, si->splash_dialog, sp->border);
+
sp->logo_pixmap = xscreensaver_logo (ssi->screen,
/* same visual as si->splash_dialog */
sp->logo_pixmap = xscreensaver_logo (ssi->screen,
/* same visual as si->splash_dialog */