X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpulsar.c;fp=hacks%2Fglx%2Fpulsar.c;h=869933b6e24a4c89e11935b5d062eaf87187a4fa;hp=c229090d2279ef7b5210f84521a69786d927f61e;hb=39809ded547bdbb08207d3e514950425215b4410;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c index c229090d..869933b6 100644 --- a/hacks/glx/pulsar.c +++ b/hacks/glx/pulsar.c @@ -44,9 +44,8 @@ #define DEFAULTS "*delay: 10000 \n" \ "*showFPS: False \n" \ -# define refresh_pulsar 0 # define release_pulsar 0 -# define pulsar_handle_event 0 +# define pulsar_handle_event xlockmore_no_events # include "xlockmore.h" /* from the xpulsar distribution */ #else /* !STANDALONE */ # include "xlock.h" /* from the xlockmore distribution */ @@ -162,7 +161,7 @@ ENTRYPOINT ModeSpecOpt pulsar_opts = {countof(opts), opts, countof(vars), vars, #ifdef USE_MODULES ModStruct pulsar_description = {"pulsar", "init_pulsar", "draw_pulsar", NULL, - "draw_pulsar", "init_pulsar", NULL, &pulsar_opts, + "draw_pulsar", "init_pulsar", "free_pulsar", &pulsar_opts, 1000, 1, 2, 1, 4, 1.0, "", "OpenGL pulsar", 0, NULL}; #endif @@ -482,8 +481,6 @@ reshape_pulsar(ModeInfo *mi, int width, int height) resetProjection(); } -static void free_pulsar(ModeInfo * mi); - ENTRYPOINT void init_pulsar(ModeInfo * mi) { @@ -491,7 +488,7 @@ init_pulsar(ModeInfo * mi) pulsarstruct *gp; - MI_INIT (mi, Pulsar, free_pulsar); + MI_INIT (mi, Pulsar); gp = &Pulsar[screen]; gp->window = MI_WINDOW(mi); @@ -508,7 +505,7 @@ init_pulsar(ModeInfo * mi) /* all sorts of nice cleanup code should go here! */ -static void free_pulsar(ModeInfo * mi) +ENTRYPOINT void free_pulsar(ModeInfo * mi) { pulsarstruct *gp = &Pulsar[MI_SCREEN(mi)]; free(gp->quads);