X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fdiscrete.c;h=bfb4459a233324d31a0b45d8cb2c332d3498c7e0;hb=39809ded547bdbb08207d3e514950425215b4410;hp=bf251f579d3f8f1d18e02819554107e2f7b4bf57;hpb=a94197e76a5dea5cb60542840809d6c20d0abbf3;p=xscreensaver diff --git a/hacks/discrete.c b/hacks/discrete.c index bf251f57..bfb4459a 100644 --- a/hacks/discrete.c +++ b/hacks/discrete.c @@ -1,13 +1,12 @@ /* -*- Mode: C; tab-width: 4 -*- */ /* discrete --- chaotic mappings */ -#if !defined( lint ) && !defined( SABER ) +#if 0 static const char sccsid[] = "@(#)discrete.c 5.00 2000/11/01 xlockmore"; - #endif /*- - * Copyright (c) 1996 by Tim Auckland + * Copyright (c) 1996 by Tim Auckland * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose and without fee is hereby granted, @@ -33,31 +32,32 @@ static const char sccsid[] = "@(#)discrete.c 5.00 2000/11/01 xlockmore"; */ #ifdef STANDALONE -#define MODE_discrete -#define PROGCLASS "Discrete" -#define HACK_INIT init_discrete -#define HACK_DRAW draw_discrete -#define discrete_opts xlockmore_opts -#define DEFAULTS "*delay: 1000 \n" \ - "*count: 4096 \n" \ - "*cycles: 2500 \n" \ - "*ncolors: 100 \n" -#define SMOOTH_COLORS -#include "xlockmore.h" /* in xscreensaver distribution */ -#include "erase.h" +# define MODE_discrete +#define DEFAULTS "*delay: 20000 \n" \ + "*count: 4096 \n" \ + "*cycles: 2500 \n" \ + "*ncolors: 100 \n" \ + "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ + "*lowrez: True \n" \ + +# define SMOOTH_COLORS +# define release_discrete 0 +# define discrete_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_discrete -ModeSpecOpt discrete_opts = +ENTRYPOINT ModeSpecOpt discrete_opts = {0, (XrmOptionDescRec *) NULL, 0, (argtype *) NULL, (OptionStruct *) NULL}; #ifdef USE_MODULES ModStruct discrete_description = -{"discrete", "init_discrete", "draw_discrete", "release_discrete", - "refresh_discrete", "init_discrete", (char *) NULL, &discrete_opts, +{"discrete", "init_discrete", "draw_discrete", (char *) NULL, + "refresh_discrete", "init_discrete", "free_discrete", &discrete_opts, 1000, 4096, 2500, 1, 64, 1.0, "", "Shows various discrete maps", 0, NULL}; @@ -100,22 +100,20 @@ typedef struct { enum ftypes op; int count; XPoint *pointBuffer; /* pointer for XDrawPoints */ + + int sqrt_sign, std_sign; + } discretestruct; static discretestruct *discretes = (discretestruct *) NULL; -void -init_discrete(ModeInfo * mi) +ENTRYPOINT void +init_discrete (ModeInfo * mi) { double range; discretestruct *hp; - if (discretes == NULL) { - if ((discretes = - (discretestruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (discretestruct))) == NULL) - return; - } + MI_INIT (mi, discretes); hp = &discretes[MI_SCREEN(mi)]; hp->maxx = MI_WIDTH(mi); @@ -249,11 +247,13 @@ init_discrete(ModeInfo * mi) XSetForeground(MI_DISPLAY(mi), MI_GC(mi), MI_WHITE_PIXEL(mi)); hp->count = 0; + hp->sqrt_sign = 1; + hp->std_sign = 1; } -void -draw_discrete(ModeInfo * mi) +static void +draw_discrete_1 (ModeInfo * mi) { Display *dsp = MI_DISPLAY(mi); Window win = MI_WINDOW(mi); @@ -339,11 +339,9 @@ draw_discrete(ModeInfo * mi) ? sqrt(fabs(hp->b * (hp->i - hp->c))) : -sqrt(fabs(hp->b * (hp->i - hp->c)))); } else { - static int s = 1; - - hp->i = s * hp->inc * hp->maxx / cycles / 2; + hp->i = (hp->sqrt_sign ? 1 : -1) * hp->inc * hp->maxx / cycles / 2; hp->j = hp->a + hp->i; - s = -s; + hp->sqrt_sign = !hp->sqrt_sign; } break; case STANDARD: @@ -353,11 +351,9 @@ draw_discrete(ModeInfo * mi) hp->i = oldi + hp->j; hp->i = fmod(hp->i + 2 * M_PI, 2 * M_PI); } else { - static int s = 1; - - hp->j = M_PI + fmod(s * hp->inc * 2 * M_PI / (cycles - 0.5), M_PI); + hp->j = M_PI + fmod((hp->std_sign ? 1 : -1) * hp->inc * 2 * M_PI / (cycles - 0.5), M_PI); hp->i = M_PI; - s = -s; + hp->std_sign = !hp->std_sign; } break; case BIRDIE: @@ -391,37 +387,54 @@ draw_discrete(ModeInfo * mi) xp++; } XDrawPoints(dsp, win, gc, hp->pointBuffer, count, CoordModeOrigin); - if (++hp->count > cycles) { -#ifdef STANDALONE - erase_full_window(MI_DISPLAY(mi), MI_WINDOW(mi)); -#endif /* STANDALONE */ - init_discrete(mi); - } } -void -release_discrete(ModeInfo * mi) +ENTRYPOINT void +draw_discrete (ModeInfo * mi) { - if (discretes != NULL) { - int screen; + discretestruct *hp = &discretes[MI_SCREEN(mi)]; + int cycles = MI_CYCLES(mi); + int i; + + for (i = 0; i < 10; i++) { + draw_discrete_1 (mi); + hp->count++; + } + + if (hp->count > cycles) { + init_discrete(mi); + } +} - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - discretestruct *hp = &discretes[screen]; - if (hp->pointBuffer != NULL) { - (void) free((void *) hp->pointBuffer); - /* hp->pointBuffer = NULL; */ - } - } - (void) free((void *) discretes); - discretes = (discretestruct *) NULL; +ENTRYPOINT void +reshape_discrete(ModeInfo * mi, int width, int height) +{ + discretestruct *hp = &discretes[MI_SCREEN(mi)]; + hp->maxx = width; + hp->maxy = height; + XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi)); +} + +ENTRYPOINT void +free_discrete(ModeInfo * mi) +{ + discretestruct *hp = &discretes[MI_SCREEN(mi)]; + + if (hp->pointBuffer != NULL) { + (void) free((void *) hp->pointBuffer); + /* hp->pointBuffer = NULL; */ } } -void +#ifndef STANDALONE +ENTRYPOINT void refresh_discrete(ModeInfo * mi) { MI_CLEARWINDOW(mi); } +#endif + +XSCREENSAVER_MODULE ("Discrete", discrete) #endif /* MODE_discrete */