X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdemon.c;h=eb926ca6b150c7403dca4d30932e367ea28a01aa;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=9e6bffa17cacc3f8c535b899fa78d496a8800a57;hpb=447db08c956099b3b183886729108bf5b364c4b8;p=xscreensaver diff --git a/hacks/demon.c b/hacks/demon.c index 9e6bffa1..eb926ca6 100644 --- a/hacks/demon.c +++ b/hacks/demon.c @@ -46,23 +46,25 @@ static const char sccsid[] = "@(#)demon.c 5.00 2000/11/01 xlockmore"; Triangle 3, 9, or 12 */ +#ifndef HAVE_JWXYZ +# define DO_STIPPLE +#endif + #ifdef STANDALONE -#define MODE_demon -#define PROGCLASS "Demon" -#define HACK_INIT init_demon -#define HACK_DRAW draw_demon -#define demon_opts xlockmore_opts -#define DEFAULTS "*delay: 50000 \n" \ - "*count: 0 \n" \ - "*cycles: 1000 \n" \ - "*size: -7 \n" \ - "*ncolors: 64 \n" \ - -#define UNIFORM_COLORS -#include "xlockmore.h" /* in xscreensaver distribution */ +# define MODE_demon +# define DEFAULTS "*delay: 50000 \n" \ + "*count: 0 \n" \ + "*cycles: 1000 \n" \ + "*size: -30 \n" \ + "*ncolors: 64 \n" \ + "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ + +# define UNIFORM_COLORS +# define release_demon 0 +# include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ -#include "xlock.h" /* in xlockmore distribution */ - +# include "xlock.h" /* in xlockmore distribution */ #endif /* STANDALONE */ #include "automata.h" @@ -89,12 +91,12 @@ static OptionStruct desc[] = {"-neighbors num", "squares 4 or 8, hexagons 6, triangles 3, 9 or 12"} }; -ModeSpecOpt demon_opts = +ENTRYPOINT ModeSpecOpt demon_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES ModStruct demon_description = -{"demon", "init_demon", "draw_demon", "release_demon", +{"demon", "init_demon", "draw_demon", (char *) NULL, "refresh_demon", "init_demon", (char *) NULL, &demon_opts, 50000, 0, 1000, -7, 64, 1.0, "", "Shows Griffeath's cellular automata", 0, NULL}; @@ -103,8 +105,8 @@ ModStruct demon_description = #define DEMONBITS(n,w,h)\ if ((dp->pixmaps[dp->init_bits]=\ - XCreatePixmapFromBitmapData(display,window,(char *)n,w,h,1,0,1))==None){\ - free_demon(display,dp); return;} else {dp->init_bits++;} + XCreatePixmapFromBitmapData(MI_DISPLAY(mi),window,(char *)n,w,h,1,0,1))==None){\ + free_demon(mi); return;} else {dp->init_bits++;} #define REDRAWSTEP 2000 /* How many cells to draw per cycle */ #define MINSTATES 2 @@ -164,8 +166,9 @@ drawcell(ModeInfo * mi, int col, int row, unsigned char state) gc = MI_GC(mi); } else { XGCValues gcv; - +#ifdef DO_STIPPLE gcv.stipple = dp->pixmaps[(state - 1) % (NUMSTIPPLES - 1)]; +#endif /* DO_STIPPLE */ gcv.foreground = MI_WHITE_PIXEL(mi); gcv.background = MI_BLACK_PIXEL(mi); XChangeGC(MI_DISPLAY(mi), dp->stippledGC, @@ -226,25 +229,6 @@ addtolist(ModeInfo * mi, int col, int row, unsigned char state) return True; } -#ifdef DEBUG -static void -print_state(ModeInfo * mi, int state) -{ - demonstruct *dp = &demons[MI_SCREEN(mi)]; - CellList *locallist; - int i = 0; - - locallist = dp->cellList[state]; - (void) printf("state %d\n", state); - while (locallist) { - (void) printf("%d x %d, y %d\n", i, - locallist->pt.x, locallist->pt.y); - locallist = locallist->next; - i++; - } -} - -#endif static void free_state(demonstruct * dp, int state) @@ -294,8 +278,10 @@ free_struct(demonstruct * dp) } static void -free_demon(Display *display, demonstruct *dp) +free_demon(ModeInfo * mi) { + Display *display = MI_DISPLAY(mi); + demonstruct *dp = &demons[MI_SCREEN(mi)]; int shade; if (dp->stippledGC != None) { @@ -328,7 +314,9 @@ draw_state(ModeInfo * mi, int state) } else { XGCValues gcv; +#ifdef DO_STIPPLE gcv.stipple = dp->pixmaps[(state - 1) % (NUMSTIPPLES - 1)]; +#endif /* DO_STIPPLE */ gcv.foreground = MI_WHITE_PIXEL(mi); gcv.background = MI_BLACK_PIXEL(mi); XChangeGC(MI_DISPLAY(mi), dp->stippledGC, @@ -401,7 +389,6 @@ draw_state(ModeInfo * mi, int state) } } free_state(dp, state); - XFlush(MI_DISPLAY(mi)); return True; } @@ -422,31 +409,27 @@ RandomSoup(ModeInfo * mi) } } -void -init_demon(ModeInfo * mi) +ENTRYPOINT void +init_demon (ModeInfo * mi) { - Display *display = MI_DISPLAY(mi); - Window window = MI_WINDOW(mi); int size = MI_SIZE(mi), nk; demonstruct *dp; - if (demons == NULL) { - if ((demons = (demonstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (demonstruct))) == NULL) - return; - } + MI_INIT (mi, demons, free_demon); dp = &demons[MI_SCREEN(mi)]; dp->generation = 0; dp->redrawing = 0; +#ifdef DO_STIPPLE if (MI_NPIXELS(mi) < NUMSTIPPLES) { - if (dp->stippledGC == None) { + Window window = MI_WINDOW(mi); + if (dp->stippledGC == None) { XGCValues gcv; gcv.fill_style = FillOpaqueStippled; - if ((dp->stippledGC = XCreateGC(display, window, + if ((dp->stippledGC = XCreateGC(MI_DISPLAY(mi), window, GCFillStyle, &gcv)) == None) { - free_demon(display, dp); + free_demon(mi); return; } } @@ -458,8 +441,13 @@ init_demon(ModeInfo * mi) } } } +#endif /* DO_STIPPLE */ free_struct(dp); +#ifdef HAVE_JWXYZ + jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi), False); +#endif + for (nk = 0; nk < NEIGHBORKINDS; nk++) { if (neighbors == plots[0][nk]) { dp->neighbors = plots[0][nk]; @@ -479,11 +467,11 @@ init_demon(ModeInfo * mi) dp->states = plots[1][nk]; if ((dp->cellList = (CellList **) calloc(dp->states, sizeof (CellList *))) == NULL) { - free_demon(display, dp); + free_demon(mi); return; } if ((dp->ncells = (int *) calloc(dp->states, sizeof (int))) == NULL) { - free_demon(display, dp); + free_demon(mi); return; } @@ -575,21 +563,21 @@ init_demon(ModeInfo * mi) if ((dp->oldcell = (unsigned char *) malloc(dp->ncols * dp->nrows * sizeof (unsigned char))) == NULL) { - free_demon(display, dp); + free_demon(mi); return; } if ((dp->newcell = (unsigned char *) malloc(dp->ncols * dp->nrows * sizeof (unsigned char))) == NULL) { - free_demon(display, dp); + free_demon(mi); return; } RandomSoup(mi); } -void -draw_demon(ModeInfo * mi) +ENTRYPOINT void +draw_demon (ModeInfo * mi) { int i, j, k, l, mj = 0, ml; demonstruct *dp; @@ -688,7 +676,7 @@ draw_demon(ModeInfo * mi) dp->newcell[i + mj] = dp->oldcell[k + ml]; /* W */ k = (!i) ? dp->ncols - 1 : i - 1; - l = j; + /*l = j;*/ ml = mj; if (dp->oldcell[k + ml] == (int) (dp->oldcell[i + mj] + 1) % dp->states) @@ -858,7 +846,7 @@ draw_demon(ModeInfo * mi) dp->newcell[i + mj] = dp->oldcell[k + ml]; /* EE */ k = (i + 1 == dp->ncols) ? 0 : i + 1; - l = j; + /*l = j;*/ ml = mj; if (dp->oldcell[k + ml] == (int) (dp->oldcell[i + mj] + 1) % dp->states) @@ -890,7 +878,7 @@ draw_demon(ModeInfo * mi) dp->newcell[i + mj] = dp->oldcell[k + ml]; /* WW */ k = (!i) ? dp->ncols - 1 : i - 1; - l = j; + /*l = j;*/ ml = mj; if (dp->oldcell[k + ml] == (int) (dp->oldcell[i + mj] + 1) % dp->states) @@ -908,7 +896,7 @@ draw_demon(ModeInfo * mi) if (dp->oldcell[i + mj] != dp->newcell[i + mj]) { dp->oldcell[i + mj] = dp->newcell[i + mj]; if (!addtolist(mi, i, j, dp->oldcell[i + mj])) { - free_demon(MI_DISPLAY(mi), dp); + free_demon(mi); return; } } @@ -920,7 +908,7 @@ draw_demon(ModeInfo * mi) } else { if (dp->ncells[dp->state]) if (!draw_state(mi, dp->state)) { - free_demon(MI_DISPLAY(mi), dp); + free_demon(mi); return; } dp->state++; @@ -938,21 +926,18 @@ draw_demon(ModeInfo * mi) } } } -void -release_demon(ModeInfo * mi) -{ - if (demons != NULL) { - int screen; - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) - free_demon(MI_DISPLAY(mi), &demons[screen]); - (void) free((void *) demons); - demons = (demonstruct *) NULL; - } + +ENTRYPOINT void +reshape_demon(ModeInfo * mi, int width, int height) +{ + XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi)); + init_demon (mi); } -void -refresh_demon(ModeInfo * mi) + +ENTRYPOINT void +refresh_demon (ModeInfo * mi) { demonstruct *dp; @@ -964,4 +949,19 @@ refresh_demon(ModeInfo * mi) dp->redrawpos = 0; } +ENTRYPOINT Bool +demon_handle_event (ModeInfo *mi, XEvent *event) +{ + if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + { + reshape_demon (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + return True; + } + return False; +} + + + +XSCREENSAVER_MODULE ("Demon", demon) + #endif /* MODE_demon */