X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fdistort.c;h=1653f24d9807220bb8a4fc360bdd6da27cd49208;hp=7755f0283fda8c722c23ef29b1c2e28a06a4dd0c;hb=de460e831dc8578acfa8b72251ab9346c99c1f96;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b

diff --git a/hacks/distort.c b/hacks/distort.c
index 7755f028..1653f24d 100644
--- a/hacks/distort.c
+++ b/hacks/distort.c
@@ -61,6 +61,9 @@ struct state {
   struct coo xy_coo[10];
 
   int delay, radius, speed, number, blackhole, vortex, magnify, reflect, slow;
+  int duration;
+  time_t start_time;
+
   XWindowAttributes xgwa;
   GC gc;
   unsigned long black_pixel;
@@ -115,10 +118,14 @@ distort_init (Display *dpy, Window window)
     st->window = window;
 
 	st->delay = get_integer_resource(st->dpy, "delay", "Integer");
+    st->duration = get_integer_resource (st->dpy, "duration", "Seconds");
 	st->radius = get_integer_resource(st->dpy, "radius", "Integer");
 	st->speed = get_integer_resource(st->dpy, "speed", "Integer");
 	st->number = get_integer_resource(st->dpy, "number", "Integer");
 
+    if (st->delay < 0) st->delay = 0;
+    if (st->duration < 1) st->duration = 1;
+
 #ifdef HAVE_XSHM_EXTENSION
 	st->use_shm = get_boolean_resource(st->dpy, "useSHM", "Boolean");
 #endif /* HAVE_XSHM_EXTENSION */
@@ -277,6 +284,7 @@ distort_init (Display *dpy, Window window)
 
     st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
                                               st->window, 0, 0);
+    st->start_time = time ((time_t) 0);
     return st;
 }
 
@@ -285,6 +293,8 @@ distort_finish_loading (struct state *st)
 {
     int i;
 
+    st->start_time = time ((time_t) 0);
+
 	st->buffer_map = 0;
 	st->orig_map = XGetImage(st->dpy, st->window, 0, 0, st->xgwa.width, st->xgwa.height,
 						 ~0L, ZPixmap);
@@ -747,11 +757,19 @@ distort_draw (Display *dpy, Window window, void *closure)
   if (st->img_loader)   /* still loading */
     {
       st->img_loader = load_image_async_simple (st->img_loader, 0, 0, 0, 0, 0);
-      if (! st->img_loader)  /* just finished */
+      if (! st->img_loader) {  /* just finished */
         distort_finish_loading (st);
+      }
       return st->delay;
     }
 
+  if (!st->img_loader &&
+      st->start_time + st->duration < time ((time_t) 0)) {
+    st->img_loader = load_image_async_simple (0, st->xgwa.screen, st->window,
+                                              st->window, 0, 0);
+    return st->delay;
+  }
+
   for (k = 0; k < st->number; k++) {
     st->effect(st,k);
     st->draw(st,k);
@@ -795,6 +813,7 @@ static const char *distort_defaults [] = {
 #endif
 
 	"*delay:			20000",
+    "*duration:			120",
 	"*radius:			0",
 	"*speed:			0",
 	"*number:			0",
@@ -812,6 +831,7 @@ static const char *distort_defaults [] = {
 
 static XrmOptionDescRec distort_options [] = {
   { "-delay",     ".delay",       XrmoptionSepArg, 0 },
+  { "-duration",  ".duration",	  XrmoptionSepArg, 0 },
   { "-radius",    ".radius",      XrmoptionSepArg, 0 },
   { "-speed",     ".speed",       XrmoptionSepArg, 0 },
   { "-number",    ".number",      XrmoptionSepArg, 0 },