X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-getimage.c;h=d7c150875b445ddcffebbda24e111a1a4fb76f89;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hp=68637a7be4e2fb8662d035a293247ea48ef11993;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f;p=xscreensaver diff --git a/driver/xscreensaver-getimage.c b/driver/xscreensaver-getimage.c index 68637a7b..d7c15087 100644 --- a/driver/xscreensaver-getimage.c +++ b/driver/xscreensaver-getimage.c @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2001-2006 by Jamie Zawinski +/* xscreensaver, Copyright (c) 2001-2008 by Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -66,8 +66,11 @@ #ifdef __APPLE__ - /* On MacOSX / XDarwin, the usual X11 mechanism of getting a screen shot - doesn't work, and we need to use an external program. */ + /* On MacOS under X11, the usual X11 mechanism of getting a screen shot + doesn't work, and we need to use an external program. This is only + used when running under X11 on MacOS. If it's a Cocoa build, this + path is not taken, and OSX/osxgrabscreen.m is used instead. + */ # define USE_EXTERNAL_SCREEN_GRABBER #endif @@ -405,6 +408,20 @@ read_file_gdk (Screen *screen, Window window, Drawable drawable, int srcx, srcy, destx, desty, w2, h2; Bool bg_p = False; +# ifdef HAVE_GDK_PIXBUF_APPLY_EMBEDDED_ORIENTATION + { + int ow = w, oh = h; + GdkPixbuf *opb = pb; + pb = gdk_pixbuf_apply_embedded_orientation (opb); + gdk_pixbuf_unref (opb); + w = gdk_pixbuf_get_width (pb); + h = gdk_pixbuf_get_height (pb); + if (verbose_p && (w != ow || h != oh)) + fprintf (stderr, "%s: rotated %dx%d to %dx%d\n", + progname, ow, oh, w, h); + } +# endif + compute_image_scaling (w, h, win_width, win_height, verbose_p, &srcx, &srcy, &destx, &desty, &w2, &h2); if (w != w2 || h != h2) @@ -480,6 +497,8 @@ read_file_gdk (Screen *screen, Window window, Drawable drawable, /* Allocates a colormap that makes a PseudoColor or DirectColor visual behave like a TrueColor visual of the same depth. + + #### Duplicated in utils/grabscreen.c */ static void allocate_cubic_colormap (Screen *screen, Visual *visual, Colormap cmap, @@ -546,6 +565,8 @@ allocate_cubic_colormap (Screen *screen, Visual *visual, Colormap cmap, /* Find the pixel index that is closest to the given color (using linear distance in RGB space -- which is far from the best way.) + + #### Duplicated in utils/grabscreen.c */ static unsigned long find_closest_pixel (XColor *colors, int ncolors, @@ -586,6 +607,8 @@ find_closest_pixel (XColor *colors, int ncolors, displayable with the given X colormap. The farther from a perfect color cube the contents of the colormap are, the lossier the transformation will be. No dithering is done. + + #### Duplicated in utils/grabscreen.c */ static void remap_image (Screen *screen, Colormap cmap, XImage *image, Bool verbose_p) @@ -1105,7 +1128,7 @@ display_file (Screen *screen, Window window, Drawable drawable, /* Invokes a sub-process and returns its output (presumably, a file to load.) Free the string when done. 'grab_type' controls which program - to run. + to run. Returned pathname may be relative to 'directory', or absolute. */ static char * get_filename_1 (Screen *screen, const char *directory, grab_type type, @@ -1115,7 +1138,7 @@ get_filename_1 (Screen *screen, const char *directory, grab_type type, pid_t forked; int fds [2]; int in, out; - char buf[1024]; + char buf[10240]; char *av[20]; int ac = 0; @@ -1200,6 +1223,7 @@ get_filename_1 (Screen *screen, const char *directory, grab_type type, int wait_status = 0; FILE *f = fdopen (in, "r"); int L; + char *ret = 0; close (out); /* don't need this one */ *buf = 0; @@ -1216,14 +1240,28 @@ get_filename_1 (Screen *screen, const char *directory, grab_type type, if (!*buf) return 0; + + ret = strdup (buf); + + if (*ret != '/') + { + /* Program returned path relative to directory. Prepend dir + to buf so that we can properly stat it. */ + strcpy (buf, directory); + if (directory[strlen(directory)-1] != '/') + strcat (buf, "/"); + strcat (buf, ret); + } + if (stat(buf, &st)) { fprintf (stderr, "%s: file does not exist: \"%s\"\n", progname, buf); + free (ret); return 0; } else - return strdup (buf); + return ret; } } @@ -1473,6 +1511,7 @@ get_image (Screen *screen, grab_type which = GRAB_BARS; struct stat st; const char *file_prop = 0; + char *absfile = 0; XRectangle geom = { 0, 0, 0, 0 }; if (! drawable_window_p (dpy, window)) @@ -1558,7 +1597,8 @@ get_image (Screen *screen, We cannot grab desktop images that way if: - the window is a non-top-level window. - Using the MacOS X way, desktops are just like loaded image files. + Under X11 on MacOS, desktops are just like loaded image files. + Under Cocoa on MacOS, this code is not used at all. */ # ifndef USE_EXTERNAL_SCREEN_GRABBER if (desk_p) @@ -1636,7 +1676,18 @@ get_image (Screen *screen, break; case GRAB_FILE: - if (! display_file (screen, window, drawable, file, verbose_p, &geom)) + if (*file && *file != '/') /* pathname is relative to dir. */ + { + if (absfile) free (absfile); + absfile = malloc (strlen(dir) + strlen(file) + 10); + strcpy (absfile, dir); + if (dir[strlen(dir)-1] != '/') + strcat (absfile, "/"); + strcat (absfile, file); + } + if (! display_file (screen, window, drawable, + (absfile ? absfile : file), + verbose_p, &geom)) goto COLORBARS; file_prop = file; break; @@ -1672,6 +1723,7 @@ get_image (Screen *screen, XDeleteProperty (dpy, window, a); } + if (absfile) free (absfile); XSync (dpy, False); }