X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fgrav.c;h=305b8e81b8bcfe778e76008b5fae68881ce98e5c;hb=39809ded547bdbb08207d3e514950425215b4410;hp=a6ea63126f995f20970e79978ba9c29caa90d5e5;hpb=6f5482d73adb0165c0130bb47d852644ab0c4869;p=xscreensaver diff --git a/hacks/grav.c b/hacks/grav.c index a6ea6312..305b8e81 100644 --- a/hacks/grav.c +++ b/hacks/grav.c @@ -33,8 +33,11 @@ static const char sccsid[] = "@(#)grav.c 5.00 2000/11/01 xlockmore"; "*count: 12 \n" \ "*ncolors: 64 \n" \ "*fpsSolid: true \n" \ + "*ignoreRotation: True \n" \ + "*lowrez: True \n" \ #define BRIGHT_COLORS +# define release_grav 0 # define grav_handle_event 0 # include "xlockmore.h" /* in xscreensaver distribution */ #else /* STANDALONE */ @@ -72,8 +75,8 @@ ENTRYPOINT ModeSpecOpt grav_opts = #ifdef USE_MODULES ModStruct grav_description = -{"grav", "init_grav", "draw_grav", "release_grav", - "refresh_grav", "init_grav", (char *) NULL, &grav_opts, +{"grav", "init_grav", "draw_grav", (char *) NULL, + "refresh_grav", "init_grav", "free_grav", &grav_opts, 10000, -12, 1, 1, 64, 1.0, "", "Shows orbiting planets", 0, NULL}; @@ -138,12 +141,9 @@ static gravstruct *gravs = (gravstruct *) NULL; static void init_planet(ModeInfo * mi, planetstruct * planet) { - Display *display = MI_DISPLAY(mi); - Window window = MI_WINDOW(mi); - GC gc = MI_GC(mi); gravstruct *gp = &gravs[MI_SCREEN(mi)]; -# ifdef HAVE_COCOA +# ifdef HAVE_JWXYZ jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi), False); # endif @@ -169,9 +169,6 @@ init_planet(ModeInfo * mi, planetstruct * planet) VEL(X) = FLOATRAND(-VR, VR); VEL(Y) = FLOATRAND(-VR, VR); VEL(Z) = FLOATRAND(-VR, VR); - - /* Draw planets */ - Planet(planet->xi, planet->yi); } static void @@ -237,16 +234,10 @@ draw_planet(ModeInfo * mi, planetstruct * planet) ENTRYPOINT void init_grav(ModeInfo * mi) { - Display *display = MI_DISPLAY(mi); - GC gc = MI_GC(mi); unsigned char ball; gravstruct *gp; - if (gravs == NULL) { - if ((gravs = (gravstruct *) calloc(MI_NUM_SCREENS(mi), - sizeof (gravstruct))) == NULL) - return; - } + MI_INIT (mi, gravs); gp = &gravs[MI_SCREEN(mi)]; gp->width = MI_WIDTH(mi); @@ -276,11 +267,6 @@ init_grav(ModeInfo * mi) gp->starcolor = MI_WHITE_PIXEL(mi); for (ball = 0; ball < (unsigned char) gp->nplanets; ball++) init_planet(mi, &gp->planets[ball]); - - /* Draw centrepoint */ - XDrawArc(display, MI_WINDOW(mi), gc, - gp->width / 2 - gp->sr / 2, gp->height / 2 - gp->sr / 2, gp->sr, gp->sr, - 0, 23040); } ENTRYPOINT void @@ -298,6 +284,20 @@ draw_grav(ModeInfo * mi) if (gp->planets == NULL) return; + if (!MI_IS_DRAWN(mi)) { + for (ball = 0; ball < (unsigned char) gp->nplanets; ball++) { + planetstruct *planet = &gp->planets[ball]; + + /* Draw planets */ + Planet(planet->xi, planet->yi); + } + + /* Draw centrepoint */ + XDrawArc(display, MI_WINDOW(mi), gc, + gp->width / 2 - gp->sr / 2, gp->height / 2 - gp->sr / 2, gp->sr, gp->sr, + 0, 23040); + } + MI_IS_DRAWN(mi) = True; /* Mask centrepoint */ XSetForeground(display, gc, MI_BLACK_PIXEL(mi)); @@ -336,27 +336,20 @@ reshape_grav(ModeInfo * mi, int width, int height) } ENTRYPOINT void -release_grav(ModeInfo * mi) +free_grav(ModeInfo * mi) { - if (gravs != NULL) { - int screen; - - for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) { - gravstruct *gp = &gravs[screen]; - - if (gp->planets) - (void) free((void *) gp->planets); - } - (void) free((void *) gravs); - gravs = (gravstruct *) NULL; - } + gravstruct *gp = &gravs[MI_SCREEN(mi)]; + if (gp->planets) + (void) free((void *) gp->planets); } +#ifndef STANDALONE ENTRYPOINT void refresh_grav(ModeInfo * mi) { MI_CLEARWINDOW(mi); } +#endif XSCREENSAVER_MODULE ("Grav", grav)