X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdemon.c;h=eb926ca6b150c7403dca4d30932e367ea28a01aa;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=d48ce7274e06383a5ca3b1f95d2c5b5d6ccb5b0f;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/demon.c b/hacks/demon.c index d48ce727..eb926ca6 100644 --- a/hacks/demon.c +++ b/hacks/demon.c @@ -46,7 +46,7 @@ static const char sccsid[] = "@(#)demon.c 5.00 2000/11/01 xlockmore"; Triangle 3, 9, or 12 */ -#ifndef HAVE_COCOA +#ifndef HAVE_JWXYZ # define DO_STIPPLE #endif @@ -55,13 +55,13 @@ static const char sccsid[] = "@(#)demon.c 5.00 2000/11/01 xlockmore"; # define DEFAULTS "*delay: 50000 \n" \ "*count: 0 \n" \ "*cycles: 1000 \n" \ - "*size: -7 \n" \ + "*size: -30 \n" \ "*ncolors: 64 \n" \ "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ -# define reshape_demon 0 -# define demon_handle_event 0 # define UNIFORM_COLORS +# define release_demon 0 # include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ # include "xlock.h" /* in xlockmore distribution */ @@ -96,7 +96,7 @@ ENTRYPOINT ModeSpecOpt demon_opts = #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}; @@ -105,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 @@ -166,7 +166,6 @@ 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 */ @@ -230,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) @@ -298,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) { @@ -430,15 +412,10 @@ RandomSoup(ModeInfo * mi) ENTRYPOINT void init_demon (ModeInfo * mi) { - Display *display = MI_DISPLAY(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; @@ -450,9 +427,9 @@ init_demon (ModeInfo * mi) 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; } } @@ -467,6 +444,10 @@ 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]; @@ -486,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; } @@ -582,13 +563,13 @@ 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; } @@ -695,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) @@ -865,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) @@ -897,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) @@ -915,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; } } @@ -927,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++; @@ -948,18 +929,13 @@ draw_demon (ModeInfo * mi) ENTRYPOINT void -release_demon (ModeInfo * mi) +reshape_demon(ModeInfo * mi, int width, int height) { - 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; - } + XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi)); + init_demon (mi); } + ENTRYPOINT void refresh_demon (ModeInfo * mi) { @@ -973,6 +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 */