X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fwhirlwindwarp.c;h=3525e498b134c5461d4a4d230332387c0b3b276e;hb=aa75c7476aeaa84cf3abc192b376a8b03c325213;hp=d76d5ed250c39746a0bdc9e89a0155cf63232d2c;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/whirlwindwarp.c b/hacks/whirlwindwarp.c
index d76d5ed2..3525e498 100644
--- a/hacks/whirlwindwarp.c
+++ b/hacks/whirlwindwarp.c
@@ -447,7 +447,8 @@ whirlwindwarp_draw (Display *dpy, Window window, void *closure)
         struct timeval now;
         long timediff;
         gettimeofday(&now, NULL);
-        timediff = now.tv_sec*1000000 + now.tv_usec - st->lastframe.tv_sec*1000000 - st->lastframe.tv_usec;
+        /* timediff = now.tv_sec*1000000 + now.tv_usec - st->lastframe.tv_sec*1000000 - st->lastframe.tv_usec; */
+        timediff = (now.tv_sec - st->lastframe.tv_sec) * 1000000 + now.tv_usec - st->lastframe.tv_usec;
         if (timediff < utimeperframe) {
           /* fprintf(stderr,"sleeping for %i\n",utimeperframe-timediff); */
           this_delay = (utimeperframe-timediff);
@@ -463,6 +464,9 @@ static void
 whirlwindwarp_reshape (Display *dpy, Window window, void *closure, 
                  unsigned int w, unsigned int h)
 {
+  struct state *st = (struct state *) closure;
+  st->scrwid = w;
+  st->scrhei = h;
 }
 
 static Bool
@@ -482,9 +486,13 @@ whirlwindwarp_free (Display *dpy, Window window, void *closure)
 static const char *whirlwindwarp_defaults [] = {
   ".background:	black",
   ".foreground:	white",
+  "*fpsSolid:	true",
   "*points:	400",
   "*tails:	8",
   "*meters:	false",
+#ifdef HAVE_MOBILE
+  "*ignoreRotation: True",
+#endif
   0
 };
 
@@ -495,4 +503,4 @@ static XrmOptionDescRec whirlwindwarp_options [] = {
   { 0, 0, 0, 0 }
 };
 
-XSCREENSAVER_MODULE ("Whirlwindwarp", whirlwindwarp)
+XSCREENSAVER_MODULE ("WhirlWindWarp", whirlwindwarp)