X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdistort.c;h=477ee63b77844dbdaae1a07bf68f628558a7627d;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=8173c43b96bcdc61a1ff92217abc3b2cc52e5003;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/hacks/distort.c b/hacks/distort.c
index 8173c43b..477ee63b 100644
--- a/hacks/distort.c
+++ b/hacks/distort.c
@@ -1,5 +1,5 @@
 /* -*- mode: C; tab-width: 4 -*-
- * xscreensaver, Copyright (c) 1992-2013 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1992-2014 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
@@ -35,6 +35,7 @@
  */
 
 #include <math.h>
+#include <time.h>
 #include "screenhack.h"
 /*#include <X11/Xmd.h>*/
 
@@ -105,17 +106,15 @@ static void generic_draw(struct state *st, XImage *, XImage *, int, int, int *);
 
 static void distort_finish_loading (struct state *);
 
-static void *
-distort_init (Display *dpy, Window window)
+static void
+distort_reset (struct state *st)
 {
-  struct state *st = (struct state *) calloc (1, sizeof(*st));
-	XGCValues gcv;
-	long gcflags;
-	int i;
     char *s;
+    int i;
 
-    st->dpy = dpy;
-    st->window = window;
+    st->start_time = 0;
+
+	XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
 
 	st->delay = get_integer_resource(st->dpy, "delay", "Integer");
     st->duration = get_integer_resource (st->dpy, "duration", "Seconds");
@@ -123,19 +122,15 @@ distort_init (Display *dpy, Window window)
 	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 */
-	
 	st->blackhole = get_boolean_resource(st->dpy, "blackhole", "Boolean");
 	st->vortex = get_boolean_resource(st->dpy, "vortex", "Boolean");
 	st->magnify = get_boolean_resource(st->dpy, "magnify", "Boolean");
 	st->reflect = get_boolean_resource(st->dpy, "reflect", "Boolean");
 	st->slow = get_boolean_resource(st->dpy, "slow", "Boolean");
 	
+    if (st->delay < 0) st->delay = 0;
+    if (st->duration < 1) st->duration = 1;
+
     st->effect = NULL;
     s = get_string_resource(st->dpy, "effect", "String");
 	if (s && !strcasecmp(s,"swamp"))
@@ -147,29 +142,27 @@ distort_init (Display *dpy, Window window)
     else if (s && *s)
       fprintf(stderr,"%s: bogus effect: %s\n", progname, s);
 
-	XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
-
 	if (st->effect == NULL && st->radius == 0 && st->speed == 0 && st->number == 0
 		&& !st->blackhole && !st->vortex && !st->magnify && !st->reflect) {
 /* if no cmdline options are given, randomly choose one of:
- * -radius 50 -number 4 -speed 1 -bounce
- * -radius 50 -number 4 -speed 1 -blackhole
- * -radius 50 -number 4 -speed 1 -vortex
- * -radius 50 -number 4 -speed 1 -vortex -magnify
- * -radius 50 -number 4 -speed 1 -vortex -magnify -blackhole
- * -radius 100 -number 1 -speed 2 -bounce
- * -radius 100 -number 1 -speed 2 -blackhole
- * -radius 100 -number 1 -speed 2 -vortex
- * -radius 100 -number 1 -speed 2 -vortex -magnify
- * -radius 100 -number 1 -speed 2 -vortex -magnify -blackhole
+ * -radius 125 -number 4 -speed 1 -bounce
+ * -radius 125 -number 4 -speed 1 -blackhole
+ * -radius 125 -number 4 -speed 1 -vortex
+ * -radius 125 -number 4 -speed 1 -vortex -magnify
+ * -radius 125 -number 4 -speed 1 -vortex -magnify -blackhole
+ * -radius 250 -number 1 -speed 2 -bounce
+ * -radius 250 -number 1 -speed 2 -blackhole
+ * -radius 250 -number 1 -speed 2 -vortex
+ * -radius 250 -number 1 -speed 2 -vortex -magnify
+ * -radius 250 -number 1 -speed 2 -vortex -magnify -blackhole
  * -radius 80 -number 1 -speed 2 -reflect
- * -radius 50 -number 3 -speed 2 -reflect
+ * -radius 125 -number 3 -speed 2 -reflect
  * jwz: not these
- *   -radius 50 -number 4 -speed 2 -swamp
- *   -radius 50 -number 4 -speed 2 -swamp -blackhole
- *   -radius 50 -number 4 -speed 2 -swamp -vortex
- *   -radius 50 -number 4 -speed 2 -swamp -vortex -magnify
- *   -radius 50 -number 4 -speed 2 -swamp -vortex -magnify -blackhole
+ *   -radius 125 -number 4 -speed 2 -swamp
+ *   -radius 125 -number 4 -speed 2 -swamp -blackhole
+ *   -radius 125 -number 4 -speed 2 -swamp -vortex
+ *   -radius 125 -number 4 -speed 2 -swamp -vortex -magnify
+ *   -radius 125 -number 4 -speed 2 -swamp -vortex -magnify -blackhole
  */
 		
 		i = (random() % 12 /* 17 */);
@@ -178,74 +171,70 @@ distort_init (Display *dpy, Window window)
 
 		switch (i) {
 			case 0:
-				st->radius=50;st->number=4;st->speed=1;
+				st->radius=125;st->number=4;st->speed=1;
 				st->effect=&move_lense;break;
 			case 1:
-				st->radius=50;st->number=4;st->speed=1;st->blackhole=1;
+				st->radius=125;st->number=4;st->speed=1;st->blackhole=1;
 				st->effect=&move_lense;break;
 			case 2:
-				st->radius=50;st->number=4;st->speed=1;st->vortex=1;
+				st->radius=125;st->number=4;st->speed=1;st->vortex=1;
 				st->effect=&move_lense;break;
 			case 3:
-				st->radius=50;st->number=4;st->speed=1;st->vortex=1;st->magnify=1;
+				st->radius=125;st->number=4;st->speed=1;st->vortex=1;st->magnify=1;
 				st->effect=&move_lense;break;
 			case 4:
-				st->radius=50;st->number=4;st->speed=1;st->vortex=1;st->magnify=1;st->blackhole=1;
+				st->radius=125;st->number=4;st->speed=1;st->vortex=1;st->magnify=1;st->blackhole=1;
 				st->effect=&move_lense;break;
 			case 5:
-				st->radius=100;st->number=1;st->speed=2;
+				st->radius=250;st->number=1;st->speed=2;
 				st->effect=&move_lense;break;
 			case 6:
-				st->radius=100;st->number=1;st->speed=2;st->blackhole=1;
+				st->radius=250;st->number=1;st->speed=2;st->blackhole=1;
 				st->effect=&move_lense;break;
 			case 7:
-				st->radius=100;st->number=1;st->speed=2;st->vortex=1;
+				st->radius=250;st->number=1;st->speed=2;st->vortex=1;
 				st->effect=&move_lense;break;
 			case 8:
-				st->radius=100;st->number=1;st->speed=2;st->vortex=1;st->magnify=1;
+				st->radius=250;st->number=1;st->speed=2;st->vortex=1;st->magnify=1;
 				st->effect=&move_lense;break;
 			case 9:
-				st->radius=100;st->number=1;st->speed=2;st->vortex=1;st->magnify=1;st->blackhole=1;
+				st->radius=250;st->number=1;st->speed=2;st->vortex=1;st->magnify=1;st->blackhole=1;
 				st->effect=&move_lense;break;
 
 			case 10:
 				st->radius=80;st->number=1;st->speed=2;st->reflect=1;
 				st->draw = &reflect_draw;st->effect = &move_lense;break;
 			case 11:
-				st->radius=50;st->number=4;st->speed=2;st->reflect=1;
+				st->radius=125;st->number=4;st->speed=2;st->reflect=1;
 				st->draw = &reflect_draw;st->effect = &move_lense;break;
 
 #if 0 /* jwz: not these */
 			case 12:
-				st->radius=50;st->number=4;st->speed=2;
+				st->radius=125;st->number=4;st->speed=2;
 				effect=&swamp_thing;break;
 			case 13:
-				st->radius=50;st->number=4;st->speed=2;st->blackhole=1;
+				st->radius=125;st->number=4;st->speed=2;st->blackhole=1;
 				effect=&swamp_thing;break;
 			case 14:
-				st->radius=50;st->number=4;st->speed=2;st->vortex=1;
+				st->radius=125;st->number=4;st->speed=2;st->vortex=1;
 				effect=&swamp_thing;break;
 			case 15:
-				st->radius=50;st->number=4;st->speed=2;st->vortex=1;st->magnify=1;
+				st->radius=125;st->number=4;st->speed=2;st->vortex=1;st->magnify=1;
 				effect=&swamp_thing;break;
 			case 16:
-				st->radius=50;st->number=4;st->speed=2;st->vortex=1;st->magnify=1;st->blackhole=1;
+				st->radius=125;st->number=4;st->speed=2;st->vortex=1;st->magnify=1;st->blackhole=1;
 				effect=&swamp_thing;break;
 #endif
 
             default:
                 abort(); break;
 		}
-
-        /* but if the window is small, reduce default radius */
-        if (st->xgwa.width < st->radius * 8)
-          st->radius = st->xgwa.width/8;
 	}
 
     /* never allow the radius to be too close to the min window dimension
      */
-    if (st->radius >= st->xgwa.width  * 0.45) st->radius = st->xgwa.width  * 0.45;
-    if (st->radius >= st->xgwa.height * 0.45) st->radius = st->xgwa.height * 0.45;
+    if (st->radius > st->xgwa.width  * 0.3) st->radius = st->xgwa.width  * 0.3;
+    if (st->radius > st->xgwa.height * 0.3) st->radius = st->xgwa.height * 0.3;
 
 
     /* -swamp mode consumes vast amounts of memory, proportional to radius --
@@ -272,6 +261,23 @@ distort_init (Display *dpy, Window window)
 	}
 	if (st->draw == NULL)
 		st->draw = &plain_draw;
+}
+
+static void *
+distort_init (Display *dpy, Window window)
+{
+  struct state *st = (struct state *) calloc (1, sizeof(*st));
+	XGCValues gcv;
+	long gcflags;
+
+    st->dpy = dpy;
+    st->window = window;
+
+#ifdef HAVE_XSHM_EXTENSION
+	st->use_shm = get_boolean_resource(st->dpy, "useSHM", "Boolean");
+#endif /* HAVE_XSHM_EXTENSION */
+	
+    distort_reset (st);
 
 	st->black_pixel = BlackPixelOfScreen( st->xgwa.screen );
 
@@ -284,7 +290,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);
+    st->start_time = time ((time_t *) 0);
     return st;
 }
 
@@ -293,7 +299,7 @@ distort_finish_loading (struct state *st)
 {
     int i;
 
-    st->start_time = time ((time_t) 0);
+    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,
@@ -664,6 +670,7 @@ static void reflect_draw(struct state *st, int k)
 static void new_rnd_coo(struct state *st, int k)
 {
 	int i;
+    int loop = 0;
 
 	st->xy_coo[k].x = (random() % (st->xgwa.width-2*st->radius));
 	st->xy_coo[k].y = (random() % (st->xgwa.height-2*st->radius));
@@ -677,6 +684,7 @@ static void new_rnd_coo(struct state *st, int k)
 				i=-1; /* ugly */
 			} 
 		}
+        if (loop++ > 1000) return;  /* let's not get stuck */
 	}
 }
 
@@ -764,7 +772,7 @@ distort_draw (Display *dpy, Window window, void *closure)
     }
 
   if (!st->img_loader &&
-      st->start_time + st->duration < time ((time_t) 0)) {
+      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;
@@ -793,6 +801,12 @@ distort_reshape (Display *dpy, Window window, void *closure,
 static Bool
 distort_event (Display *dpy, Window window, void *closure, XEvent *event)
 {
+  struct state *st = (struct state *) closure;
+  if (screenhack_event_helper (dpy, window, event))
+    {
+      distort_reset(st);
+      return True;
+    }
   return False;
 }
 
@@ -834,8 +848,9 @@ static const char *distort_defaults [] = {
 #ifdef HAVE_XSHM_EXTENSION
 	"*useSHM:			False",		/* xshm turns out not to help. */
 #endif /* HAVE_XSHM_EXTENSION */
-#ifdef USE_IPHONE
+#ifdef HAVE_MOBILE
   "*ignoreRotation:     True",
+  "*rotateImages:       True",
 #endif
 	0
 };