From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz

[xscreensaver] / utils / grabclient.c

diff --git a/utils/grabclient.c b/utils/grabclient.c
index 6eec38430d320b26e5b6ea7618d4beed788de9b5..fc002012d05d3c111c0cac17e6de14c9c244f201 100644 (file)
--- a/utils/grabclient.c
+++ b/utils/grabclient.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 1992-2016 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1992-2017 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -44,7 +44,7 @@
 
        load_image_async CB
            load_random_image_cocoa
-               osx_grab_desktop_image (osxgrabscreen.m, MacOS version)
+               osx_grab_desktop_image (grabclient-osx.m, MacOS version)
                    copy_framebuffer_to_ximage
                    XPutImage
                draw_colorbars
@@ -62,7 +62,7 @@
 
        load_image_async CB
            load_random_image_cocoa
-               osx_grab_desktop_image (osxgrabscreen.m, iOS version)
+               osx_grab_desktop_image (grabclient-osx.m, iOS version)
                    CGWindowListCreateImage
                    jwxyz_draw_NSImage_or_CGImage
                draw_colorbars
@@ -702,7 +702,7 @@ xscreensaver_getimage_file_cb (XtPointer closure, int *source, XtInputId *id)
 # else   /* HAVE_COCOA && USE_IPHONE -- iOS */
 
 /* Callback for ios_load_random_image(), called after we have loaded an
-   image from the iOS device's Photo Library.  See iosgrabimage.m.
+   image from the iOS device's Photo Library.  See grabclient-ios.m.
  */
 static void
 ios_load_random_image_cb (void *uiimage, const char *filename, 
@@ -783,7 +783,12 @@ osx_load_image_file_async (Screen *screen, Window xwindow, Drawable drawable,
                             (XtPointer) (XtInputReadMask | XtInputExceptMask),
                             xscreensaver_getimage_file_cb, (XtPointer) clo2);
 # else /* USE_IPHONE */
-  ios_load_random_image (ios_load_random_image_cb, clo2);
+  {
+    XWindowAttributes xgwa;
+    XGetWindowAttributes (DisplayOfScreen (screen), xwindow, &xgwa);
+    ios_load_random_image (ios_load_random_image_cb, clo2,
+                           xgwa.width, xgwa.height);
+  }
 # endif /* USE_IPHONE */
 }