projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
driver
/
splash.c
diff --git
a/driver/splash.c
b/driver/splash.c
index 4a5ff73375d03b6c53c3bdf4d0163bafe699987d..59816a32eea2dcbc3016bd1764fa36af9f3dd461 100644
(file)
--- a/
driver/splash.c
+++ b/
driver/splash.c
@@
-1,4
+1,4
@@
-/* xscreensaver, Copyright (c) 1991-200
2
Jamie Zawinski <jwz@netscape.com>
+/* xscreensaver, Copyright (c) 1991-200
5
Jamie Zawinski <jwz@netscape.com>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-404,7
+404,8
@@
make_splash_dialog (saver_info *si)
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
attrmask, &attrs);
XSetWindowBackground (si->dpy, si->splash_dialog, sp->background);
- sp->logo_pixmap = xscreensaver_logo (si->dpy, si->splash_dialog, cmap,
+ sp->logo_pixmap = xscreensaver_logo (ssi->screen, ssi->current_visual,
+ si->splash_dialog, cmap,
sp->background,
&sp->logo_pixels, &sp->logo_npixels,
0, True);
sp->background,
&sp->logo_pixels, &sp->logo_npixels,
0, True);
@@
-853,8
+854,9
@@
do_help (saver_info *si)
}
help_command = (char *) malloc (strlen (p->load_url_command) +
}
help_command = (char *) malloc (strlen (p->load_url_command) +
- (strlen (p->help_url) * 2) + 10);
- sprintf (help_command, p->load_url_command, p->help_url, p->help_url);
+ (strlen (p->help_url) * 4) + 10);
+ sprintf (help_command, p->load_url_command,
+ p->help_url, p->help_url, p->help_url, p->help_url);
fork_and_exec (si, help_command, "URL-loading");
free (help_command);
}
fork_and_exec (si, help_command, "URL-loading");
free (help_command);
}