X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fvermiculate.c;h=936479161bcee3032fedbc83e36f102e2177a17c;hb=39809ded547bdbb08207d3e514950425215b4410;hp=c50785afda811afd6510ef267b9a2977ded15a6a;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver diff --git a/hacks/vermiculate.c b/hacks/vermiculate.c index c50785af..93647916 100644 --- a/hacks/vermiculate.c +++ b/hacks/vermiculate.c @@ -438,10 +438,6 @@ maininit (struct state *st) st->instring = sampleStrings[n].str; st->speed = sampleStrings[n].speed; } - if (st->speed == 0) - { - st->speed = 200; - } st->boxh = 10; st->boxw = 10; st->gridden = 0; @@ -773,12 +769,8 @@ vermiculate_init (Display *d, Window w) st->instring = 0; st->max_ticks = get_integer_resource (st->dpy, "ticks", "Integer"); - { - int temp = get_integer_resource (st->dpy, "speed", "Speed"); - if (temp != 0) - st->speed = temp; - } - + st->speed = get_integer_resource (st->dpy, "speed", "Speed"); + if (st->speed <= 0) st->speed = 1; st->mycolors[0].pixel = BlackPixel (st->dpy, DefaultScreen (st->dpy)); XSetWindowBackground (st->dpy, st->window, @@ -816,6 +808,12 @@ vermiculate_reshape (Display *dpy, Window window, void *closure, static Bool vermiculate_event (Display *dpy, Window window, void *closure, XEvent *event) { + struct state *st = (struct state *) closure; + if (screenhack_event_helper (dpy, window, event)) + { + st->reset_p = 1; + return True; + } return False; } @@ -882,8 +880,9 @@ consume_instring(struct state *st) block in which it's invoked, since it declares variables: */ #define forallinbank(LDP) linedata *LDP; int bankc; \ for (bankc = 1; \ - (LDP = &st->thread[st->bank[bankc - 1] - 1], \ - bankc <= st->bnkt); bankc++) + ((bankc <= st->bnkt) ? ( \ + (LDP = &st->thread[st->bank[bankc - 1] - 1], 1) \ + ) : 0) ; bankc++) { forallinbank (L) L->slice = degs / (st->ch - '0'); } @@ -1200,12 +1199,13 @@ vermiculate_free (Display *dpy, Window window, void *closure) static const char *vermiculate_defaults[] = { + ".lowrez: true", ".background: Black", "*ticks: 20000", "*fpsSolid: true", - "*speed: 0", + "*speed: 1", "*instring: ", -#ifdef USE_IPHONE +#ifdef HAVE_MOBILE "*ignoreRotation: True", #endif 0