X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fcrystal.c;h=2a12a7e2cd84421d0f8f1e7669bf9620464004f1;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=491577a2511944f2827768419f04c1dc35319d55;hpb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;p=xscreensaver diff --git a/hacks/crystal.c b/hacks/crystal.c index 491577a2..2a12a7e2 100644 --- a/hacks/crystal.c +++ b/hacks/crystal.c @@ -74,10 +74,10 @@ static const char sccsid[] = "@(#)crystal.c 4.12 98/09/10 xlockmore"; "*cycles: 200 \n" \ "*size: -15 \n" \ "*ncolors: 100 \n" \ - "*fpsSolid: true \n" \ + "*fpsSolid: True \n" \ + "*ignoreRotation: True \n" \ -# define reshape_crystal 0 -# define crystal_handle_event 0 +# define release_crystal 0 # include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ # include "xlock.h" /* in xlockmore distribution */ @@ -145,7 +145,7 @@ ENTRYPOINT ModeSpecOpt crystal_opts = #ifdef USE_MODULES ModStruct crystal_description = -{"crystal", "init_crystal", "draw_crystal", "release_crystal", +{"crystal", "init_crystal", "draw_crystal", NULL, "refresh_crystal", "init_crystal", NULL, &crystal_opts, 60000, -40, 200, -15, 64, 1.0, "", "Shows polygons in 2D plane groups", 0, NULL}; @@ -558,7 +558,6 @@ crystal_drawatom(ModeInfo * mi, crystalatom * atom0) } ENTRYPOINT void init_crystal(ModeInfo * mi); -ENTRYPOINT void release_crystal(ModeInfo * mi); ENTRYPOINT void @@ -568,12 +567,11 @@ draw_crystal(ModeInfo * mi) crystalstruct *cryst = &crystals[MI_SCREEN(mi)]; int i; -#ifdef HAVE_COCOA /* Don't second-guess Quartz's double-buffering */ +#ifdef HAVE_JWXYZ /* Don't second-guess Quartz's double-buffering */ XClearWindow(MI_DISPLAY(mi), MI_WINDOW(mi)); #endif if (cryst->no_colors) { - release_crystal(mi); init_crystal(mi); return; } @@ -583,7 +581,8 @@ draw_crystal(ModeInfo * mi) /* Rotate colours */ if (cryst->cycle_p) { - rotate_colors(display, cryst->cmap, cryst->colors, cryst->ncolors, + rotate_colors(mi->xgwa.screen, cryst->cmap, + cryst->colors, cryst->ncolors, cryst->direction); if (!(LRAND() % 1000)) cryst->direction = -cryst->direction; @@ -790,40 +789,32 @@ refresh_crystal(ModeInfo * mi) XSetFunction(display, cryst->gc, GXcopy); } -ENTRYPOINT void -release_crystal(ModeInfo * mi) +static void +free_crystal(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); + crystalstruct *cryst = &crystals[MI_SCREEN(mi)]; - if (crystals != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - crystalstruct *cryst = &crystals[screen]; - - if (MI_IS_INSTALL(mi) && MI_NPIXELS(mi) > 2) { - MI_WHITE_PIXEL(mi) = cryst->whitepixel; - MI_BLACK_PIXEL(mi) = cryst->blackpixel; + if (MI_IS_INSTALL(mi) && MI_NPIXELS(mi) > 2) { + MI_WHITE_PIXEL(mi) = cryst->whitepixel; + MI_BLACK_PIXEL(mi) = cryst->blackpixel; #ifndef STANDALONE - MI_FG_PIXEL(mi) = cryst->fg; - MI_BG_PIXEL(mi) = cryst->bg; + MI_FG_PIXEL(mi) = cryst->fg; + MI_BG_PIXEL(mi) = cryst->bg; #endif - if (cryst->colors && cryst->ncolors && !cryst->no_colors) - free_colors(display, cryst->cmap, cryst->colors, cryst->ncolors); - if (cryst->colors) - (void) free((void *) cryst->colors); + if (cryst->colors && cryst->ncolors && !cryst->no_colors) + free_colors(mi->xgwa.screen, cryst->cmap, cryst->colors, + cryst->ncolors); + if (cryst->colors) + (void) free((void *) cryst->colors); #if 0 /* #### wrong! -jwz */ - XFreeColormap(display, cryst->cmap); + XFreeColormap(display, cryst->cmap); #endif - } - if (cryst->gc != NULL) - XFreeGC(display, cryst->gc); - if (cryst->atom != NULL) - (void) free((void *) cryst->atom); - } - (void) free((void *) crystals); - crystals = NULL; } + if (cryst->gc != NULL) + XFreeGC(display, cryst->gc); + if (cryst->atom != NULL) + (void) free((void *) cryst->atom); } ENTRYPOINT void @@ -838,11 +829,7 @@ init_crystal(ModeInfo * mi) #define MIN_CELL 200 /* initialize */ - if (crystals == NULL) { - if ((crystals = (crystalstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (crystalstruct))) == NULL) - return; - } + MI_INIT (mi, crystals, free_crystal); cryst = &crystals[MI_SCREEN(mi)]; if (!cryst->gc) { @@ -1176,7 +1163,8 @@ init_crystal(ModeInfo * mi) if (MI_IS_INSTALL(mi) && MI_NPIXELS(mi) > 2) { /* Set up colour map */ if (cryst->colors && cryst->ncolors && !cryst->no_colors) - free_colors(display, cryst->cmap, cryst->colors, cryst->ncolors); + free_colors(mi->xgwa.screen, cryst->cmap, + cryst->colors, cryst->ncolors); if (cryst->colors) (void) free((void *) cryst->colors); cryst->colors = 0; @@ -1205,14 +1193,20 @@ init_crystal(ModeInfo * mi) } if (!cryst->mono_p) { if (!(LRAND() % 10)) - make_random_colormap(MI_DISPLAY(mi), MI_VISUAL(mi), cryst->cmap, cryst->colors, &cryst->ncolors, - True, True, &cryst->cycle_p, True); + make_random_colormap(mi->xgwa.screen, MI_VISUAL(mi), + cryst->cmap, cryst->colors, + &cryst->ncolors, + True, True, &cryst->cycle_p, True); else if (!(LRAND() % 2)) - make_uniform_colormap(MI_DISPLAY(mi), MI_VISUAL(mi), cryst->cmap, cryst->colors, &cryst->ncolors, - True, &cryst->cycle_p, True); + make_uniform_colormap(mi->xgwa.screen, MI_VISUAL(mi), + cryst->cmap, cryst->colors, + &cryst->ncolors, True, + &cryst->cycle_p, True); else - make_smooth_colormap(MI_DISPLAY(mi), MI_VISUAL(mi), cryst->cmap, cryst->colors, &cryst->ncolors, - True, &cryst->cycle_p, True); + make_smooth_colormap(mi->xgwa.screen, MI_VISUAL(mi), + cryst->cmap, cryst->colors, + &cryst->ncolors, + True, &cryst->cycle_p, True); } #if 0 /* #### wrong! -jwz */ XInstallColormap(display, cryst->cmap); @@ -1270,4 +1264,21 @@ init_crystal(ModeInfo * mi) XSetFunction(display, cryst->gc, GXcopy); } +ENTRYPOINT void +reshape_crystal(ModeInfo * mi, int width, int height) +{ + init_crystal(mi); +} + +ENTRYPOINT Bool +crystal_handle_event (ModeInfo *mi, XEvent *event) +{ + if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event)) + { + reshape_crystal (mi, MI_WIDTH(mi), MI_HEIGHT(mi)); + return True; + } + return False; +} + XSCREENSAVER_MODULE ("Crystal", crystal)