X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fhopalong.c;h=d3cc7df0cbdc5461f9e20ec0ddd263d21295c2c0;hb=39809ded547bdbb08207d3e514950425215b4410;hp=502c73dbeb2f04fa853f4bc4108be05ff62e0641;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38;p=xscreensaver diff --git a/hacks/hopalong.c b/hacks/hopalong.c index 502c73db..d3cc7df0 100644 --- a/hacks/hopalong.c +++ b/hacks/hopalong.c @@ -52,20 +52,20 @@ static const char sccsid[] = "@(#)hop.c 5.00 2000/11/01 xlockmore"; #ifdef STANDALONE #define MODE_hop -#define PROGCLASS "Hop" -#define HACK_INIT init_hop -#define HACK_DRAW draw_hop -#define hop_opts xlockmore_opts -#define DEFAULTS "*delay: 10000 \n" \ - "*count: 1000 \n" \ - "*cycles: 2500 \n" \ - "*ncolors: 200 \n" -#define SMOOTH_COLORS -#include "xlockmore.h" /* in xscreensaver distribution */ -#include "erase.h" +#define DEFAULTS "*delay: 10000 \n" \ + "*count: 1000 \n" \ + "*cycles: 2500 \n" \ + "*ncolors: 200 \n" \ + "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ + +# define SMOOTH_COLORS +# define reshape_hop 0 +# define release_hop 0 +# define hop_handle_event 0 +# include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ -#include "xlock.h" /* in xlockmore distribution */ - +# include "xlock.h" /* in xlockmore distribution */ #endif /* STANDALONE */ #ifdef MODE_hop @@ -96,28 +96,28 @@ static Bool sine; static XrmOptionDescRec opts[] = { - {(char *) "-martin", (char *) ".hop.martin", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+martin", (char *) ".hop.martin", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-popcorn", (char *) ".hop.popcorn", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+popcorn", (char *) ".hop.popcorn", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk1", (char *) ".hop.ejk1", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk1", (char *) ".hop.ejk1", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk2", (char *) ".hop.ejk2", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk2", (char *) ".hop.ejk2", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk3", (char *) ".hop.ejk3", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk3", (char *) ".hop.ejk3", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk4", (char *) ".hop.ejk4", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk4", (char *) ".hop.ejk4", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk5", (char *) ".hop.ejk5", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk5", (char *) ".hop.ejk5", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-ejk6", (char *) ".hop.ejk6", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+ejk6", (char *) ".hop.ejk6", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-rr", (char *) ".hop.rr", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+rr", (char *) ".hop.rr", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-jong", (char *) ".hop.jong", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+jong", (char *) ".hop.jong", XrmoptionNoArg, (caddr_t) "off"}, - {(char *) "-sine", (char *) ".hop.sine", XrmoptionNoArg, (caddr_t) "on"}, - {(char *) "+sine", (char *) ".hop.sine", XrmoptionNoArg, (caddr_t) "off"} + {"-martin", ".hop.martin", XrmoptionNoArg, "on"}, + {"+martin", ".hop.martin", XrmoptionNoArg, "off"}, + {"-popcorn", ".hop.popcorn", XrmoptionNoArg, "on"}, + {"+popcorn", ".hop.popcorn", XrmoptionNoArg, "off"}, + {"-ejk1", ".hop.ejk1", XrmoptionNoArg, "on"}, + {"+ejk1", ".hop.ejk1", XrmoptionNoArg, "off"}, + {"-ejk2", ".hop.ejk2", XrmoptionNoArg, "on"}, + {"+ejk2", ".hop.ejk2", XrmoptionNoArg, "off"}, + {"-ejk3", ".hop.ejk3", XrmoptionNoArg, "on"}, + {"+ejk3", ".hop.ejk3", XrmoptionNoArg, "off"}, + {"-ejk4", ".hop.ejk4", XrmoptionNoArg, "on"}, + {"+ejk4", ".hop.ejk4", XrmoptionNoArg, "off"}, + {"-ejk5", ".hop.ejk5", XrmoptionNoArg, "on"}, + {"+ejk5", ".hop.ejk5", XrmoptionNoArg, "off"}, + {"-ejk6", ".hop.ejk6", XrmoptionNoArg, "on"}, + {"+ejk6", ".hop.ejk6", XrmoptionNoArg, "off"}, + {"-rr", ".hop.rr", XrmoptionNoArg, "on"}, + {"+rr", ".hop.rr", XrmoptionNoArg, "off"}, + {"-jong", ".hop.jong", XrmoptionNoArg, "on"}, + {"+jong", ".hop.jong", XrmoptionNoArg, "off"}, + {"-sine", ".hop.sine", XrmoptionNoArg, "on"}, + {"+sine", ".hop.sine", XrmoptionNoArg, "off"} }; static argtype vars[] = { @@ -135,26 +135,26 @@ static argtype vars[] = }; static OptionStruct desc[] = { - {(char *) "-/+martin", (char *) "turn on/off sqrt format"}, - {(char *) "-/+popcorn", (char *) "turn on/off Clifford A. Pickover's popcorn format"}, - {(char *) "-/+ejk1", (char *) "turn on/off ejk1 format"}, - {(char *) "-/+ejk2", (char *) "turn on/off ejk2 format"}, - {(char *) "-/+ejk3", (char *) "turn on/off ejk3 format"}, - {(char *) "-/+ejk4", (char *) "turn on/off ejk4 format"}, - {(char *) "-/+ejk5", (char *) "turn on/off ejk5 format"}, - {(char *) "-/+ejk6", (char *) "turn on/off ejk6 format"}, - {(char *) "-/+rr", (char *) "turn on/off rr format"}, - {(char *) "-/+jong", (char *) "turn on/off jong format"}, - {(char *) "-/+sine", (char *) "turn on/off sine format"} + {"-/+martin", "turn on/off sqrt format"}, + {"-/+popcorn", "turn on/off Clifford A. Pickover's popcorn format"}, + {"-/+ejk1", "turn on/off ejk1 format"}, + {"-/+ejk2", "turn on/off ejk2 format"}, + {"-/+ejk3", "turn on/off ejk3 format"}, + {"-/+ejk4", "turn on/off ejk4 format"}, + {"-/+ejk5", "turn on/off ejk5 format"}, + {"-/+ejk6", "turn on/off ejk6 format"}, + {"-/+rr", "turn on/off rr format"}, + {"-/+jong", "turn on/off jong format"}, + {"-/+sine", "turn on/off sine format"} }; -ModeSpecOpt hop_opts = +ENTRYPOINT ModeSpecOpt hop_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES ModStruct hop_description = -{"hop", "init_hop", "draw_hop", "release_hop", - "refresh_hop", "init_hop", (char *) NULL, &hop_opts, +{"hop", "init_hop", "draw_hop", (char *) NULL, + "refresh_hop", "init_hop", "free_hop", &hop_opts, 10000, 1000, 2500, 1, 64, 1.0, "", "Shows real plane iterated fractals", 0, NULL}; @@ -191,7 +191,7 @@ typedef struct { static hopstruct *hops = (hopstruct *) NULL; -void +ENTRYPOINT void init_hop(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); @@ -199,11 +199,7 @@ init_hop(ModeInfo * mi) double range; hopstruct *hp; - if (hops == NULL) { - if ((hops = (hopstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (hopstruct))) == NULL) - return; - } + MI_INIT (mi, hops); hp = &hops[MI_SCREEN(mi)]; hp->centerx = MI_WIDTH(mi) / 2; @@ -393,7 +389,7 @@ init_hop(ModeInfo * mi) } -void +ENTRYPOINT void draw_hop(ModeInfo * mi) { double oldj, oldi; @@ -404,6 +400,8 @@ draw_hop(ModeInfo * mi) if (hops == NULL) return; hp = &hops[MI_SCREEN(mi)]; + + if (hp->pointBuffer == NULL) return; xp = hp->pointBuffer; @@ -531,34 +529,27 @@ draw_hop(ModeInfo * mi) XDrawPoints(MI_DISPLAY(mi), MI_WINDOW(mi), MI_GC(mi), hp->pointBuffer, hp->bufsize, CoordModeOrigin); if (++hp->count > MI_CYCLES(mi)) { -#ifdef STANDALONE - erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi)); -#endif /* STANDALONE */ init_hop(mi); } } -void -release_hop(ModeInfo * mi) +ENTRYPOINT void +free_hop(ModeInfo * mi) { - if (hops != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - hopstruct *hp = &hops[screen]; + hopstruct *hp = &hops[MI_SCREEN(mi)]; - if (hp->pointBuffer != NULL) - (void) free((void *) hp->pointBuffer); - } - (void) free((void *) hops); - hops = (hopstruct *) NULL; - } + if (hp->pointBuffer != NULL) + (void) free((void *) hp->pointBuffer); } -void +#ifndef STANDALONE +ENTRYPOINT void refresh_hop(ModeInfo * mi) { MI_CLEARWINDOW(mi); } +#endif + +XSCREENSAVER_MODULE_2 ("Hopalong", hopalong, hop) #endif /* MODE_hop */