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.07.tar.gz
[xscreensaver]
/
hacks
/
flag.c
diff --git
a/hacks/flag.c
b/hacks/flag.c
index c74e921de4698e9ac3d9b07055bde42b24e016cd..fee5198770452b864534b46435577cfcf3cff828 100644
(file)
--- a/
hacks/flag.c
+++ b/
hacks/flag.c
@@
-45,7
+45,9
@@
static const char sccsid[] = "@(#)flag.c 4.02 97/04/01 xlockmore";
"*ncolors: 200 \n" \
"*bitmap: \n" \
"*font: " DEF_FONT "\n" \
"*ncolors: 200 \n" \
"*bitmap: \n" \
"*font: " DEF_FONT "\n" \
- "*text: \n"
+ "*text: \n" \
+ "*fpsSolid: true \n" \
+
# define BRIGHT_COLORS
# define UNIFORM_COLORS
# define reshape_flag 0
# define BRIGHT_COLORS
# define UNIFORM_COLORS
# define reshape_flag 0
@@
-351,7
+353,9
@@
make_flag_bits(ModeInfo *mi)
fp->image = XGetImage(dpy, bitmap, 0, 0, width, height, 1L, XYPixmap);
XFreePixmap(dpy, bitmap);
}
fp->image = XGetImage(dpy, bitmap, 0, 0, width, height, 1L, XYPixmap);
XFreePixmap(dpy, bitmap);
}
- else
+
+
+ if (! fp->image)
{
char *bits = (char *) malloc (sizeof(bob_bits));
memcpy (bits, bob_bits, sizeof(bob_bits));
{
char *bits = (char *) malloc (sizeof(bob_bits));
memcpy (bits, bob_bits, sizeof(bob_bits));
@@
-407,6
+411,7
@@
init_flag(ModeInfo * mi)
fp = &flags[MI_SCREEN(mi)];
make_flag_bits(mi);
fp = &flags[MI_SCREEN(mi)];
make_flag_bits(mi);
+ if (!fp->image) abort();
fp->width = MI_WIN_WIDTH(mi);
fp->height = MI_WIN_HEIGHT(mi);
fp->width = MI_WIN_WIDTH(mi);
fp->height = MI_WIN_HEIGHT(mi);
@@
-476,6
+481,7
@@
draw_flag(ModeInfo * mi)
Window window = MI_WINDOW(mi);
flagstruct *fp = &flags[MI_SCREEN(mi)];
Window window = MI_WINDOW(mi);
flagstruct *fp = &flags[MI_SCREEN(mi)];
+ if (!fp->image) abort();
if (fp->cache == window) { /* not double-buffering */
XClearWindow (display, window);
} else if (fp->width <= MAXW(fp) || fp->height <= MAXH(fp)) {
if (fp->cache == window) { /* not double-buffering */
XClearWindow (display, window);
} else if (fp->width <= MAXW(fp) || fp->height <= MAXH(fp)) {