#ifdef STANDALONE
#define MODE_grav
-#define PROGCLASS "Grav"
-#define HACK_INIT init_grav
-#define HACK_DRAW draw_grav
-#define grav_opts xlockmore_opts
-#define DEFAULTS "*delay: 10000 \n" \
- "*count: 12 \n" \
- "*ncolors: 64 \n"
+#define DEFAULTS "*delay: 10000 \n" \
+ "*count: 12 \n" \
+ "*ncolors: 64 \n" \
+ "*fpsSolid: true \n" \
+ "*ignoreRotation: True \n" \
+
#define BRIGHT_COLORS
-#include "xlockmore.h" /* in xscreensaver distribution */
+# define release_grav 0
+# define grav_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_grav
-#define DEF_DECAY "False" /* Damping for decaying orbits */
-#define DEF_TRAIL "False" /* For trails (works good in mono only) */
+#define DEF_DECAY "True" /* Damping for decaying orbits */
+#define DEF_TRAIL "True" /* For trails (works good in mono only) */
static Bool decay;
static Bool trail;
static XrmOptionDescRec opts[] =
{
- {(char *) "-decay", (char *) ".grav.decay", XrmoptionNoArg, (caddr_t) "on"},
- {(char *) "+decay", (char *) ".grav.decay", XrmoptionNoArg, (caddr_t) "off"},
- {(char *) "-trail", (char *) ".grav.trail", XrmoptionNoArg, (caddr_t) "on"},
- {(char *) "+trail", (char *) ".grav.trail", XrmoptionNoArg, (caddr_t) "off"}
+ {"-decay", ".grav.decay", XrmoptionNoArg, "on"},
+ {"+decay", ".grav.decay", XrmoptionNoArg, "off"},
+ {"-trail", ".grav.trail", XrmoptionNoArg, "on"},
+ {"+trail", ".grav.trail", XrmoptionNoArg, "off"}
};
static argtype vars[] =
{
};
static OptionStruct desc[] =
{
- {(char *) "-/+decay", (char *) "turn on/off decaying orbits"},
- {(char *) "-/+trail", (char *) "turn on/off trail dots"}
+ {"-/+decay", "turn on/off decaying orbits"},
+ {"-/+trail", "turn on/off trail dots"}
};
-ModeSpecOpt grav_opts =
+ENTRYPOINT ModeSpecOpt grav_opts =
{sizeof opts / sizeof opts[0], opts, sizeof vars / sizeof vars[0], vars, desc};
#ifdef USE_MODULES
ModStruct grav_description =
-{"grav", "init_grav", "draw_grav", "release_grav",
+{"grav", "init_grav", "draw_grav", (char *) NULL,
"refresh_grav", "init_grav", (char *) NULL, &grav_opts,
10000, -12, 1, 1, 64, 1.0, "",
"Shows orbiting planets", 0, NULL};
GC gc = MI_GC(mi);
gravstruct *gp = &gravs[MI_SCREEN(mi)];
+# ifdef HAVE_JWXYZ
+ jwxyz_XSetAntiAliasing (MI_DISPLAY(mi), MI_GC(mi), False);
+# endif
+
if (MI_NPIXELS(mi) > 2)
planet->colors = MI_PIXEL(mi, NRAND(MI_NPIXELS(mi)));
else
Planet(gp->x, gp->y);
}
-void
+static void free_grav(ModeInfo * mi);
+
+ENTRYPOINT void
init_grav(ModeInfo * mi)
{
Display *display = MI_DISPLAY(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, free_grav);
gp = &gravs[MI_SCREEN(mi)];
gp->width = MI_WIDTH(mi);
0, 23040);
}
-void
+ENTRYPOINT void
draw_grav(ModeInfo * mi)
{
Display *display = MI_DISPLAY(mi);
draw_planet(mi, &gp->planets[ball]);
}
-void
-release_grav(ModeInfo * mi)
+ENTRYPOINT void
+reshape_grav(ModeInfo * mi, int width, int height)
{
- if (gravs != NULL) {
- int screen;
-
- for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++) {
- gravstruct *gp = &gravs[screen];
+ gravstruct *gp = &gravs[MI_SCREEN(mi)];
+ gp->width = width;
+ gp->height = height;
+ XClearWindow (MI_DISPLAY (mi), MI_WINDOW(mi));
+}
- if (gp->planets)
- (void) free((void *) gp->planets);
- }
- (void) free((void *) gravs);
- gravs = (gravstruct *) NULL;
- }
+static void
+free_grav(ModeInfo * mi)
+{
+ gravstruct *gp = &gravs[MI_SCREEN(mi)];
+ if (gp->planets)
+ (void) free((void *) gp->planets);
}
-void
+ENTRYPOINT void
refresh_grav(ModeInfo * mi)
{
MI_CLEARWINDOW(mi);
}
+XSCREENSAVER_MODULE ("Grav", grav)
+
#endif /* MODE_grav */