X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fcrystal.c;h=5ceb91f6f2a2f29d2b1a862c8fe2703fe3d14f9e;hp=7041e5c4cccee352aca085963a35f2349d73d42a;hb=07faf451b99879183ed7e909e43a0e065be1ee7f;hpb=f54438ea00f152166e68073e98000fd3a00f65cd diff --git a/hacks/crystal.c b/hacks/crystal.c index 7041e5c4..5ceb91f6 100644 --- a/hacks/crystal.c +++ b/hacks/crystal.c @@ -1,9 +1,8 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* crystal --- polygons moving according to plane group rules */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)crystal.c 4.12 98/09/10 xlockmore"; - #endif /*- @@ -70,17 +69,13 @@ static const char sccsid[] = "@(#)crystal.c 4.12 98/09/10 xlockmore"; */ #ifdef STANDALONE -# define PROGCLASS "Crystal" -# define HACK_INIT init_crystal -# define HACK_DRAW draw_crystal -# define crystal_opts xlockmore_opts # define DEFAULTS "*delay: 60000 \n" \ "*count: -500 \n" \ "*cycles: 200 \n" \ "*size: -15 \n" \ - "*ncolors: 100 \n" \ - "*fullrandom: True \n" \ - "*verbose: False \n" + "*ncolors: 100 \n" +# define reshape_crystal 0 +# define crystal_handle_event 0 # include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ # include "xlock.h" /* in xlockmore distribution */ @@ -97,11 +92,10 @@ static const char sccsid[] = "@(#)crystal.c 4.12 98/09/10 xlockmore"; #define DEF_MAXSIZE "False" #define DEF_CYCLE "True" -#define min(a,b) ((a) <= (b) ? (a) : (b)) +#undef NRAND +#define NRAND(n) ( (n) ? (int) (LRAND() % (n)) : 0) -#ifdef STANDALONE -void release_crystal(ModeInfo * mi); -#endif +#define min(a,b) ((a) <= (b) ? (a) : (b)) static int nx, ny; @@ -109,29 +103,29 @@ static Bool unit_cell, grid_cell, centre, maxsize, cycle_p; static XrmOptionDescRec opts[] = { - {"-nx", "crystal.nx", XrmoptionSepArg, (caddr_t) NULL}, - {"-ny", "crystal.ny", XrmoptionSepArg, (caddr_t) NULL}, - {"-centre", ".crystal.centre", XrmoptionNoArg, (caddr_t) "on"}, - {"+centre", ".crystal.centre", XrmoptionNoArg, (caddr_t) "off"}, - {"-maxsize", ".crystal.maxsize", XrmoptionNoArg, (caddr_t) "on"}, - {"+maxsize", ".crystal.maxsize", XrmoptionNoArg, (caddr_t) "off"}, - {"-cell", ".crystal.cell", XrmoptionNoArg, (caddr_t) "on"}, - {"+cell", ".crystal.cell", XrmoptionNoArg, (caddr_t) "off"}, - {"-grid", ".crystal.grid", XrmoptionNoArg, (caddr_t) "on"}, - {"+grid", ".crystal.grid", XrmoptionNoArg, (caddr_t) "off"}, - {"-shift", ".crystal.shift", XrmoptionNoArg, (caddr_t) "on"}, - {"+shift", ".crystal.shift", XrmoptionNoArg, (caddr_t) "off"} + {"-nx", "crystal.nx", XrmoptionSepArg, 0}, + {"-ny", "crystal.ny", XrmoptionSepArg, 0}, + {"-centre", ".crystal.centre", XrmoptionNoArg, "on"}, + {"+centre", ".crystal.centre", XrmoptionNoArg, "off"}, + {"-maxsize", ".crystal.maxsize", XrmoptionNoArg, "on"}, + {"+maxsize", ".crystal.maxsize", XrmoptionNoArg, "off"}, + {"-cell", ".crystal.cell", XrmoptionNoArg, "on"}, + {"+cell", ".crystal.cell", XrmoptionNoArg, "off"}, + {"-grid", ".crystal.grid", XrmoptionNoArg, "on"}, + {"+grid", ".crystal.grid", XrmoptionNoArg, "off"}, + {"-shift", ".crystal.shift", XrmoptionNoArg, "on"}, + {"+shift", ".crystal.shift", XrmoptionNoArg, "off"} }; static argtype vars[] = { - {(caddr_t *) & nx, "nx", "nx", DEF_NX, t_Int}, - {(caddr_t *) & ny, "ny", "ny", DEF_NY, t_Int}, - {(caddr_t *) & centre, "centre", "Centre", DEF_CENTRE, t_Bool}, - {(caddr_t *) & maxsize, "maxsize", "Maxsize", DEF_MAXSIZE, t_Bool}, - {(caddr_t *) & unit_cell, "cell", "Cell", DEF_CELL, t_Bool}, - {(caddr_t *) & grid_cell, "grid", "Grid", DEF_GRID, t_Bool}, - {(caddr_t *) & cycle_p, "shift", "Shift", DEF_CYCLE, t_Bool} + {&nx, "nx", "nx", DEF_NX, t_Int}, + {&ny, "ny", "ny", DEF_NY, t_Int}, + {¢re, "centre", "Centre", DEF_CENTRE, t_Bool}, + {&maxsize, "maxsize", "Maxsize", DEF_MAXSIZE, t_Bool}, + {&unit_cell, "cell", "Cell", DEF_CELL, t_Bool}, + {&grid_cell, "grid", "Grid", DEF_GRID, t_Bool}, + {&cycle_p, "shift", "Shift", DEF_CYCLE, t_Bool} }; static OptionStruct desc[] = { @@ -144,7 +138,7 @@ static OptionStruct desc[] = {"-/+shift", "turn on/off colour cycling"} }; -ModeSpecOpt crystal_opts = +ENTRYPOINT ModeSpecOpt crystal_opts = {sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc}; #ifdef USE_MODULES @@ -561,13 +555,21 @@ crystal_drawatom(ModeInfo * mi, crystalatom * atom0) } } -void +ENTRYPOINT void init_crystal(ModeInfo * mi); +ENTRYPOINT void release_crystal(ModeInfo * mi); + + +ENTRYPOINT void draw_crystal(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); crystalstruct *cryst = &crystals[MI_SCREEN(mi)]; int i; +#ifdef HAVE_COCOA /* 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); @@ -588,6 +590,7 @@ draw_crystal(ModeInfo * mi) crystalatom *atom0; atom0 = &cryst->atom[i]; + if (MI_IS_INSTALL(mi) && MI_NPIXELS(mi) > 2) { XSetForeground(display, cryst->gc, cryst->colors[atom0->colour].pixel); } else { @@ -618,7 +621,7 @@ draw_crystal(ModeInfo * mi) XSetFunction(display, cryst->gc, GXcopy); } -void +ENTRYPOINT void refresh_crystal(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); @@ -785,7 +788,7 @@ refresh_crystal(ModeInfo * mi) XSetFunction(display, cryst->gc, GXcopy); } -void +ENTRYPOINT void release_crystal(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); @@ -807,7 +810,9 @@ release_crystal(ModeInfo * mi) free_colors(display, cryst->cmap, cryst->colors, cryst->ncolors); if (cryst->colors) (void) free((void *) cryst->colors); +#if 0 /* #### wrong! -jwz */ XFreeColormap(display, cryst->cmap); +#endif } if (cryst->gc != NULL) XFreeGC(display, cryst->gc); @@ -819,7 +824,7 @@ release_crystal(ModeInfo * mi) } } -void +ENTRYPOINT void init_crystal(ModeInfo * mi) { Display *display = MI_DISPLAY(mi); @@ -851,9 +856,13 @@ init_crystal(ModeInfo * mi) #endif cryst->blackpixel = MI_BLACK_PIXEL(mi); cryst->whitepixel = MI_WHITE_PIXEL(mi); +#if 0 /* #### wrong! -jwz */ cryst->cmap = XCreateColormap(display, window, MI_VISUAL(mi), AllocNone); XSetWindowColormap(display, window, cryst->cmap); +#else + cryst->cmap = mi->xgwa.colormap; +#endif (void) XParseColor(display, cryst->cmap, "black", &color); (void) XAllocColor(display, cryst->cmap, &color); MI_BLACK_PIXEL(mi) = color.pixel; @@ -974,9 +983,12 @@ init_crystal(ModeInfo * mi) cryst->offset_w = (int) (cryst->b * 0.5); } } else { + int max_repeat = 10; cryst->offset_w = -1; - while (cryst->offset_w < 4 || (int) (cryst->offset_w - cryst->b * - sin((cryst->gamma - 90) * PI_RAD)) < 4) { + while (max_repeat-- && + (cryst->offset_w < 4 || (int) (cryst->offset_w - cryst->b * + sin((cryst->gamma - 90) * PI_RAD)) < 4) + ) { cryst->b = NRAND((int) (cryst->win_height / (cos((cryst->gamma - 90) * PI_RAD))) - cell_min) + cell_min; if (cryst->planegroup > 8) @@ -1200,7 +1212,9 @@ init_crystal(ModeInfo * mi) make_smooth_colormap(MI_DISPLAY(mi), MI_VISUAL(mi), cryst->cmap, cryst->colors, &cryst->ncolors, True, &cryst->cycle_p, True); } +#if 0 /* #### wrong! -jwz */ XInstallColormap(display, cryst->cmap); +#endif if (cryst->ncolors < 2) { cryst->ncolors = 2; cryst->no_colors = True; @@ -1251,6 +1265,7 @@ init_crystal(ModeInfo * mi) crystal_setupatom(atom0, cryst->gamma); crystal_drawatom(mi, atom0); } - XSync(display, False); XSetFunction(display, cryst->gc, GXcopy); } + +XSCREENSAVER_MODULE ("Crystal", crystal)