X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fspotlight.c;h=a47e55c746fc1c410f1dfc24488fd7ff343a39ec;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=d8b76b24070b4d3d2f3c7010a59da32688d6b1d2;hpb=5f1f12f2a37da634000f96d18d59cc73a8814ef7;p=xscreensaver

diff --git a/hacks/spotlight.c b/hacks/spotlight.c
index d8b76b24..a47e55c7 100644
--- a/hacks/spotlight.c
+++ b/hacks/spotlight.c
@@ -38,7 +38,7 @@ struct state {
   int delay;
   int duration;
   time_t start_time;
-
+  int first_time;
   GC window_gc;
 #ifdef DEBUG
   GC white_gc;
@@ -91,7 +91,7 @@ spotlight_init (Display *dpy, Window window)
   XWindowAttributes xgwa;
   long gcflags;
   Colormap cmap;
-  unsigned long fg, bg;
+  unsigned long bg;
   GC clip_gc;
   Pixmap clip_pm;
 
@@ -104,7 +104,6 @@ spotlight_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");
 
   /* read parameters, keep em sane */
@@ -139,6 +138,8 @@ spotlight_init (Display *dpy, Window window)
   st->pm = XCreatePixmap(st->dpy, st->window, st->sizex, st->sizey, xgwa.depth);
   XClearWindow(st->dpy, st->window);
 
+  st->first_time = 1;
+
   /* create buffer to reduce flicker */
 #ifdef HAVE_COCOA	/* Don't second-guess Quartz's double-buffering */
   st->buffer = 0;
@@ -150,10 +151,6 @@ spotlight_init (Display *dpy, Window window)
   if (st->buffer)
     XFillRectangle(st->dpy, st->buffer, st->buffer_gc, 0, 0, st->sizex, st->sizey);
 
-  /* blank out screen */
-  XFillRectangle(st->dpy, st->window, st->window_gc, 0, 0, st->sizex, st->sizey);
-  XSetWindowBackground (st->dpy, st->window, bg);
-
   /* create clip mask (so it's a circle, not a square) */
   clip_pm = XCreatePixmap(st->dpy, st->window, st->radius*4, st->radius*4, 1);
   st->img_loader = load_image_async_simple (0, xgwa.screen, st->window, st->pm,
@@ -185,6 +182,10 @@ spotlight_init (Display *dpy, Window window)
   gcv.foreground = fg;
   st->white_gc = XCreateGC(st->dpy, st->window, gcflags, &gcv);
 #endif
+
+  /* blank out screen */
+  XFillRectangle(st->dpy, st->window, st->window_gc, 0, 0, st->sizex, st->sizey);
+
   return st;
 }
 
@@ -253,6 +254,12 @@ onestep (struct state *st, Bool first_p)
       XSetClipOrigin(st->dpy, st->buffer_gc, st->x,st->y);
       XCopyArea(st->dpy, st->pm, st->buffer, st->buffer_gc, st->x, st->y, st->s, st->s, st->x, st->y);
 
+      if (st->first_time) {
+        /* blank out screen */
+        XFillRectangle(st->dpy, st->window, st->window_gc, 0, 0, st->sizex, st->sizey);
+        st->first_time = 0;
+      }
+
       /* copy buffer to screen (window) */
       XCopyArea(st->dpy, st->buffer, st->window, st->window_gc, st->x , st->y, st->s, st->s, st->x, st->y);
     }
@@ -283,6 +290,12 @@ spotlight_reshape (Display *dpy, Window window, void *closure,
 static Bool
 spotlight_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;
 }
 
@@ -313,6 +326,10 @@ static const char *spotlight_defaults [] = {
   "*delay:			10000",
   "*duration:			120",
   "*radius:			125",
+#ifdef USE_IPHONE
+  "*ignoreRotation:             True",
+  "*rotateImages:               True",
+#endif
   0
 };