X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Ftwang.c;h=7d52a411156bda8047298f13ba6ea15d3acf6514;hb=d6b0217f2417bd19187f0ebc389d6c5c2233b11c;hp=79bbd8f735b6b10cfef31bdc595e2e96a001c9a0;hpb=07faf451b99879183ed7e909e43a0e065be1ee7f;p=xscreensaver

diff --git a/hacks/twang.c b/hacks/twang.c
index 79bbd8f7..7d52a411 100644
--- a/hacks/twang.c
+++ b/hacks/twang.c
@@ -48,6 +48,7 @@ struct state {
   Window window;
 
   int delay;			/* delay (usec) between iterations */
+  int duration;			/* time (sec) before loading new image */
   int maxColumns;		/* the maximum number of columns of tiles */
   int maxRows;			/* the maximum number of rows of tiles */
   int tileSize;			/* the size (width and height) of a tile */
@@ -61,7 +62,6 @@ struct state {
   Screen *screen;       	   /* the screen to draw on */
   XImage *sourceImage;  	   /* image source of stuff to draw */
   XImage *workImage;    	   /* work area image, used when rendering */
-  XImage *backgroundImage;	 /* image filled with background pixels */
 
   GC backgroundGC;        	 /* GC for the background color */
   GC foregroundGC;        	 /* GC for the foreground color */
@@ -76,7 +76,9 @@ struct state {
   Tile **sortedTiles; /* array of tile pointers, sorted by zoom */
   int tileCount;     /* total number of tiles */
 
+  time_t start_time;
   async_load_state *img_loader;
+  Pixmap pm;
 
   Bool useShm;		/* whether or not to use xshm */
 #ifdef HAVE_XSHM_EXTENSION
@@ -102,28 +104,37 @@ struct state {
  */
 
 /* grab the source image */
-static void grabImage_start (struct state *st, XWindowAttributes *xwa)
+static void
+grabImage_start (struct state *st, XWindowAttributes *xwa)
 {
-    XFillRectangle (st->dpy, st->window, st->backgroundGC, 0, 0, 
-		    st->windowWidth, st->windowHeight);
-    st->backgroundImage = 
-	XGetImage (st->dpy, st->window, 0, 0, st->windowWidth, st->windowHeight,
-		   ~0L, ZPixmap);
-
+    /* On MacOS X11, XGetImage on a Window often gets an inexplicable BadMatch,
+       possibly due to the window manager having occluded something?  It seems
+       nondeterministic. Loading the image into a pixmap instead fixes it. */
+    if (st->pm) XFreePixmap (st->dpy, st->pm);
+    st->pm = XCreatePixmap (st->dpy, st->window,
+                            xwa->width, xwa->height, xwa->depth);
+
+    st->start_time = time ((time_t *) 0);
     st->img_loader = load_image_async_simple (0, xwa->screen, st->window,
-                                              st->window, 0, 0);
+                                              st->pm, 0, 0);
 }
 
-static void grabImage_done (struct state *st)
+static void
+grabImage_done (struct state *st)
 {
-   XWindowAttributes xwa;
-   XGetWindowAttributes (st->dpy, st->window, &xwa);
+    XWindowAttributes xwa;
+    XGetWindowAttributes (st->dpy, st->window, &xwa);
 
-    st->sourceImage = XGetImage (st->dpy, st->window, 0, 0, st->windowWidth, st->windowHeight,
+    st->start_time = time ((time_t *) 0);
+    if (st->sourceImage) XDestroyImage (st->sourceImage);
+    st->sourceImage = XGetImage (st->dpy, st->pm, 0, 0,
+                                 st->windowWidth, st->windowHeight,
 			     ~0L, ZPixmap);
 
-#ifdef HAVE_XSHM_EXTENSION
+    if (st->workImage) XDestroyImage (st->workImage);
     st->workImage = NULL;
+
+#ifdef HAVE_XSHM_EXTENSION
     if (st->useShm) 
     {
 	st->workImage = create_xshm_image (st->dpy, xwa.visual, xwa.depth,
@@ -515,7 +526,8 @@ static void renderFrame (struct state *st)
 {
     int n;
 
-    memcpy (st->workImage->data, st->backgroundImage->data, 
+    /* This assumes black is zero. */
+    memset (st->workImage->data, 0, 
 	    st->workImage->bytes_per_line * st->workImage->height);
 
     sortTiles (st);
@@ -572,6 +584,7 @@ static void setupModel (struct state *st)
     leftX = (st->windowWidth - (st->columns * st->tileSize) + st->tileSize) / 2;
     topY = (st->windowHeight - (st->rows * st->tileSize) + st->tileSize) / 2;
 
+    if (st->tileCount < 1) st->tileCount = 1;
     st->tiles = calloc (st->tileCount, sizeof (Tile));
     st->sortedTiles = calloc (st->tileCount, sizeof (Tile *));
 
@@ -605,6 +618,13 @@ twang_draw (Display *dpy, Window window, void *closure)
       return st->delay;
     }
 
+  if (!st->img_loader &&
+      st->start_time + st->duration < time ((time_t *) 0)) {
+    XWindowAttributes xgwa;
+    XGetWindowAttributes (st->dpy, st->window, &xgwa);
+    grabImage_start (st, &xgwa);
+    return st->delay;
+  }
 
   modelEvents (st);
   updateModel (st);
@@ -622,6 +642,12 @@ twang_reshape (Display *dpy, Window window, void *closure,
 static Bool
 twang_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;
 }
 
@@ -629,6 +655,7 @@ static void
 twang_free (Display *dpy, Window window, void *closure)
 {
   struct state *st = (struct state *) closure;
+  if (st->pm) XFreePixmap (dpy, st->pm);
   free (st);
 }
 
@@ -655,6 +682,9 @@ static void initParams (struct state *st)
 	problems = 1;
     }
 
+    st->duration = get_integer_resource (st->dpy, "duration", "Seconds");
+    if (st->duration < 1) st->duration = 1;
+
     st->eventChance = get_float_resource (st->dpy, "eventChance", "Double");
     if ((st->eventChance < 0.0) || (st->eventChance > 1.0))
     {
@@ -735,6 +765,7 @@ static const char *twang_defaults [] = {
     "*borderColor:      blue",
     "*borderWidth:	3",
     "*delay:		10000",
+    "*duration:		120",
     "*eventChance:      0.01",
     "*friction:		0.05",
     "*maxColumns:       0",
@@ -746,6 +777,10 @@ static const char *twang_defaults [] = {
     "*useSHM: True",
 #else
     "*useSHM: False",
+#endif
+#ifdef HAVE_MOBILE
+  "*ignoreRotation: True",
+  "*rotateImages:   True",
 #endif
     0
 };
@@ -754,6 +789,7 @@ static XrmOptionDescRec twang_options [] = {
   { "-border-color",     ".borderColor",    XrmoptionSepArg, 0 },
   { "-border-width",     ".borderWidth",    XrmoptionSepArg, 0 },
   { "-delay",            ".delay",          XrmoptionSepArg, 0 },
+  { "-duration",	 ".duration",	    XrmoptionSepArg, 0 },
   { "-event-chance",     ".eventChance",    XrmoptionSepArg, 0 },
   { "-friction",         ".friction",       XrmoptionSepArg, 0 },
   { "-max-columns",      ".maxColumns",     XrmoptionSepArg, 0 },