http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz

[xscreensaver] / hacks / glx / flurry.c

diff --git a/hacks/glx/flurry.c b/hacks/glx/flurry.c
index 51a241bc364ed872daaf98c1d09c74d152f7becc..08305b0a1ded2351a83a5f5755479a87ca570964 100644 (file)
--- a/hacks/glx/flurry.c
+++ b/hacks/glx/flurry.c
@@ -41,19 +41,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 static const char sccsid[] = "@(#)flurry.c     4.07 97/11/24 xlockmore";
 #endif
 
-#define DEF_PRESET     "classic"
+#define DEF_PRESET     "random"
 #define DEF_BRIGHTNESS "8"
 
-#include <X11/Intrinsic.h>
-
-# define PROGCLASS             "Flurry"
-# define HACK_INIT             init_flurry
-# define HACK_DRAW             draw_flurry
-# define HACK_RESHAPE          reshape_flurry
-# define flurry_opts           xlockmore_opts
-# define DEFAULTS              "*showFPS:      False   \n" \
-                               "*preset:       " DEF_PRESET "   \n"
+# define DEFAULTS              "*delay:      10000 \n" \
+                                               "*showFPS:    False \n"
 
+# define refresh_flurry 0
+# define flurry_handle_event 0
 # include "xlockmore.h"                /* from the xscreensaver distribution */
 
 #ifdef USE_GL
@@ -70,7 +65,7 @@ static argtype vars[] = {
 
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
-ModeSpecOpt flurry_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt flurry_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 #ifdef USE_MODULES
 ModStruct   flurry_description = {
@@ -91,14 +86,13 @@ ModStruct   flurry_description = {
 
 #endif
 
-#include <sys/time.h>
-
 #include "flurry.h"
 
 global_info_t *flurry_info = NULL;
 
 static double gTimeCounter = 0.0;
 
+static
 double currentTime(void) {
   struct timeval tv;
 # ifdef GETTIMEOFDAY_TWO_ARGS
@@ -130,6 +124,8 @@ static int IsAltiVecAvailable(void)
 #endif
 #endif
 
+
+static
 void delete_flurry_info(flurry_info_t *flurry)
 {
     int i;
@@ -140,9 +136,10 @@ void delete_flurry_info(flurry_info_t *flurry)
     {
        free(flurry->spark[i]);
     }
-    free(flurry);
+    /* free(flurry); */
 }
 
+static
 flurry_info_t *new_flurry_info(global_info_t *global, int streams, ColorModes colour, float thickness, float speed, double bf)
 {
     int i,k;
@@ -187,6 +184,7 @@ flurry_info_t *new_flurry_info(global_info_t *global, int streams, ColorModes co
     return flurry;
 }
 
+static
 void GLSetupRC(global_info_t *global)
 {
     /* setup the defaults for OpenGL */
@@ -205,7 +203,6 @@ void GLSetupRC(global_info_t *global)
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
 
-    glClearColor(0.0,0.0,0.0,1.0);
     glClear(GL_COLOR_BUFFER_BIT);
 
     glEnableClientState(GL_COLOR_ARRAY);       
@@ -226,6 +223,7 @@ void GLSetupRC(global_info_t *global)
 #endif /* 0 */
 }
 
+static
 void GLRenderScene(global_info_t *global, flurry_info_t *flurry, double b)
 {
     int i;
@@ -310,6 +308,7 @@ void GLRenderScene(global_info_t *global, flurry_info_t *flurry, double b)
     glDisable(GL_TEXTURE_2D);
 }
 
+static
 void GLResize(global_info_t *global, float w, float h)
 {
     global->sys_glWidth = w;
@@ -317,7 +316,7 @@ void GLResize(global_info_t *global, float w, float h)
 }
 
 /* new window size or exposure */
-void reshape_flurry(ModeInfo *mi, int width, int height)
+ENTRYPOINT void reshape_flurry(ModeInfo *mi, int width, int height)
 {
     global_info_t *global = flurry_info + MI_SCREEN(mi);
 
@@ -328,16 +327,12 @@ void reshape_flurry(ModeInfo *mi, int width, int height)
     glLoadIdentity();
     gluOrtho2D(0, width, 0, height);
     glMatrixMode(GL_MODELVIEW);
-
-    glClearColor(0.0, 0.0, 0.0, 1.0);
     glClear(GL_COLOR_BUFFER_BIT);
-
     glFlush();
-
     GLResize(global, (float)width, (float)height);
 }
 
-void
+ENTRYPOINT void
 init_flurry(ModeInfo * mi)
 {
     int screen = MI_SCREEN(mi);
@@ -403,7 +398,7 @@ init_flurry(ModeInfo * mi)
     case PRESET_FIRE: {
        flurry_info_t *flurry;
 
-       flurry = new_flurry_info(global, 12, slowCyclicColorMode, 10000.0, 0.0, 1.0);
+       flurry = new_flurry_info(global, 12, slowCyclicColorMode, 10000.0, 0.2, 1.0);
        flurry->next = global->flurry;
        global->flurry = flurry;        
         break;
@@ -475,7 +470,7 @@ init_flurry(ModeInfo * mi)
     }
 }
 
-void
+ENTRYPOINT void
 draw_flurry(ModeInfo * mi)
 {
     static int first = 1;
@@ -543,7 +538,7 @@ draw_flurry(ModeInfo * mi)
     glXSwapBuffers(display, window);
 }
 
-void
+ENTRYPOINT void
 release_flurry(ModeInfo * mi)
 {
     if (flurry_info != NULL) {
@@ -567,4 +562,6 @@ release_flurry(ModeInfo * mi)
     FreeAllGL(mi);
 }
 
+XSCREENSAVER_MODULE ("Flurry", flurry)
+
 #endif