X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fkaleidescope.c;h=8c3f80b978ae9b903f51a55ed07a90268d2835ec;hb=50be9bb40dc60130c99ffa568e6677779904ff70;hp=8c727317e19a63b369e97ae8e74ea6330fd6045e;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver diff --git a/hacks/kaleidescope.c b/hacks/kaleidescope.c index 8c727317..8c3f80b9 100644 --- a/hacks/kaleidescope.c +++ b/hacks/kaleidescope.c @@ -84,6 +84,7 @@ struct state { static const char *kaleidescope_defaults [] = { ".background: black", ".foreground: white", + "*fpsSolid: true", "*color_mode: nice", "*symmetry: 11", "*ntrails: 100", @@ -125,14 +126,11 @@ static XrmOptionDescRec kaleidescope_options [] = { static void krandom_color(GLOBAL *g, XColor *color) { - int r; - r = random() % 3; - if((g->color_mode == 0) || (g->color_mode == 1)) { - color->blue = ((r = random()) % g->bluerange) + g->bluemin; - color->green = ((r = random()) % g->greenrange) + g->greenmin; - color->red = ((r = random()) % g->redrange) + g->redmin; + color->blue = (random() % g->bluerange) + g->bluemin; + color->green = (random() % g->greenrange) + g->greenmin; + color->red = (random() % g->redrange) + g->redmin; if(!XAllocColor(g->dpy, g->cmap, color)) { color->pixel = g->default_fg_pixel; @@ -228,10 +226,10 @@ init_ksegment (GLOBAL *g, OBJECT *obj) { /* Give the segment some random values */ - ((Ksegment *)obj->cur)->x1 = random() % g->xoff; - ((Ksegment *)obj->cur)->y1 = random() % g->yoff; - ((Ksegment *)obj->cur)->x2 = random() % g->xoff; - ((Ksegment *)obj->cur)->y2 = random() % g->yoff; + ((Ksegment *)obj->cur)->x1 = (g->xoff ? random() % g->xoff : 0); + ((Ksegment *)obj->cur)->y1 = (g->yoff ? random() % g->yoff : 0); + ((Ksegment *)obj->cur)->x2 = (g->xoff ? random() % g->xoff : 0); + ((Ksegment *)obj->cur)->y2 = (g->yoff ? random() % g->yoff : 0); }