X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fzoom.c;h=e2c4203250c8dcbaa7807c4de8d09287ba4088c1;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=4b35797d300094a78693d0f23e4016e4d5b46773;hpb=de460e831dc8578acfa8b72251ab9346c99c1f96;p=xscreensaver

diff --git a/hacks/zoom.c b/hacks/zoom.c
index 4b35797d..e2c42032 100644
--- a/hacks/zoom.c
+++ b/hacks/zoom.c
@@ -72,7 +72,7 @@ zoom_init (Display *dpy, Window window)
   XGCValues gcv;
   XWindowAttributes xgwa;
   Colormap cmap;
-  unsigned long fg, bg;
+  unsigned long bg;
   long gcflags;
   int nblocksx, nblocksy;
 
@@ -83,7 +83,6 @@ zoom_init (Display *dpy, Window window)
   st->sizex = xgwa.width;
   st->sizey = xgwa.height;
   cmap = xgwa.colormap;
-  fg = get_pixel_resource(st->dpy, cmap, "foreground", "Foreground");
   bg = get_pixel_resource(st->dpy, cmap, "background", "Background");
 
   st->delay = get_integer_resource(st->dpy, "delay", "Integer");
@@ -219,6 +218,12 @@ zoom_reshape (Display *dpy, Window window, void *closure,
 static Bool
 zoom_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
+  struct state *st = (struct state *) closure;
+  if (screenhack_event_helper (dpy, window, event))
+    {
+      st->start_time = 0;
+      return True;
+    }
   return False;
 }
 
@@ -237,10 +242,11 @@ static const char *zoom_defaults[] = {
   "*dontClearRoot: True",
   ".foreground: white",
   ".background: #111111",
+  "*fpsSolid:	true",
 #ifdef __sgi /* really, HAVE_READ_DISPLAY_EXTENSION */
   "*visualID: Best",
 #endif
-  "*lenses:      false",
+  "*lenses:      true",
   "*delay:       10000",
   "*duration:    120",
   "*pixwidth:    10",
@@ -249,11 +255,16 @@ static const char *zoom_defaults[] = {
   "*pixspacey:   2",
   "*lensoffsetx: 5",
   "*lensoffsety: 5",
+#ifdef USE_IPHONE
+  "*ignoreRotation: True",
+  "*rotateImages:   True",
+#endif
   0
 };
 
 static XrmOptionDescRec zoom_options[] = {
   { "-lenses", ".lenses", XrmoptionNoArg, "true" },
+  { "-no-lenses", ".lenses", XrmoptionNoArg, "false" },
   { "-delay", ".delay", XrmoptionSepArg, 0 },
   { "-duration",  ".duration", XrmoptionSepArg, 0 },
   { "-pixwidth", ".pixwidth", XrmoptionSepArg, 0 },