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.23.tar.gz
[xscreensaver]
/
driver
/
xscreensaver-getimage.c
diff --git
a/driver/xscreensaver-getimage.c
b/driver/xscreensaver-getimage.c
index 174bfd97f9de8636060b59452a94ced2c8ee41e3..24c0246e262d2c1a1214f5e5d666121c5f2f8fd8 100644
(file)
--- a/
driver/xscreensaver-getimage.c
+++ b/
driver/xscreensaver-getimage.c
@@
-136,6
+136,7
@@
ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error)
return 0;
}
return 0;
}
+#ifndef USE_EXTERNAL_SCREEN_GRABBER
static int
ignore_badmatch_ehandler (Display *dpy, XErrorEvent *error)
{
static int
ignore_badmatch_ehandler (Display *dpy, XErrorEvent *error)
{
@@
-144,6
+145,7
@@
ignore_badmatch_ehandler (Display *dpy, XErrorEvent *error)
else
return x_ehandler (dpy, error);
}
else
return x_ehandler (dpy, error);
}
+#endif /* ! USE_EXTERNAL_SCREEN_GRABBER */
/* Returns True if the given Drawable is a Window; False if it's a Pixmap.
/* Returns True if the given Drawable is a Window; False if it's a Pixmap.
@@
-295,6
+297,7
@@
compute_image_scaling (int src_w, int src_h,
If out of memory, returns False, and the XImage will have been
destroyed and freed.
*/
If out of memory, returns False, and the XImage will have been
destroyed and freed.
*/
+#ifndef USE_EXTERNAL_SCREEN_GRABBER
static Bool
scale_ximage (Screen *screen, Visual *visual,
XImage *ximage, int new_width, int new_height)
static Bool
scale_ximage (Screen *screen, Visual *visual,
XImage *ximage, int new_width, int new_height)
@@
-342,6
+345,7
@@
scale_ximage (Screen *screen, Visual *visual,
return True;
}
return True;
}
+#endif /* ! USE_EXTERNAL_SCREEN_GRABBER */
#ifdef HAVE_GDK_PIXBUF
#ifdef HAVE_GDK_PIXBUF
@@
-1197,7
+1201,8
@@
get_filename_1 (Screen *screen, const char *directory, grab_type type,
close (out); /* don't need this one */
*buf = 0;
close (out); /* don't need this one */
*buf = 0;
- fgets (buf, sizeof(buf)-1, f);
+ if (! fgets (buf, sizeof(buf)-1, f))
+ *buf = 0;
fclose (f);
/* Wait for the child to die. */
fclose (f);
/* Wait for the child to die. */