X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglblur.c;h=7d358d127fdb09c908fb4200a4bc047c0eaba7b0;hp=47edc52a07c109894236cf0bfe7a2033f34276ee;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=e4fa2ac140f7bc56571373a7b7eb585fa4500e38

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index 47edc52a..7d358d12 100644
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -1,5 +1,5 @@
 /* glblur --- radial blur using GL textures
- * Copyright (c) 2002 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002-2008 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -22,31 +22,12 @@
  *    http://nehe.gamedev.net/tutorials/lesson.asp?l=36
  */
 
-#include <X11/Intrinsic.h>
-
-extern XtAppContext app;
-
-#define PROGCLASS	"GLBlur"
-#define HACK_INIT	init_glblur
-#define HACK_DRAW	draw_glblur
-#define HACK_RESHAPE	reshape_glblur
-#define HACK_HANDLE_EVENT glblur_handle_event
-#define EVENT_MASK      PointerMotionMask
-#define sws_opts	xlockmore_opts
-
-#define DEF_SPIN        "XYZ"
-#define DEF_WANDER      "True"
-#define DEF_BLURSIZE    "15"
-
-#define DEFAULTS	"*delay:	10000       \n" \
-			"*showFPS:      False       \n" \
-	               	"*fpsSolid:     True	    \n" \
-			"*wireframe:    False       \n" \
-			"*spin:       " DEF_SPIN   "\n" \
-			"*wander:     " DEF_WANDER "\n" \
-			"*blurSize:   " DEF_BLURSIZE "\n" \
-
+#define DEFAULTS	"*delay:    10000 \n" \
+			"*showFPS:  False \n" \
+	               	"*fpsSolid: True  \n"
 
+# define refresh_glblur 0
+# define release_glblur 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -63,8 +44,9 @@ extern XtAppContext app;
 
 #ifdef USE_GL /* whole file */
 
-#include <GL/glu.h>
-
+#define DEF_SPIN        "XYZ"
+#define DEF_WANDER      "True"
+#define DEF_BLURSIZE    "15"
 
 typedef struct metaball metaball;
 
@@ -120,12 +102,12 @@ static argtype vars[] = {
   {&blursize,  "blurSize","BlurSize", DEF_BLURSIZE,  t_Int},
 };
 
-ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt glblur_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 
 /* Window management, etc
  */
-void
+ENTRYPOINT void
 reshape_glblur (ModeInfo *mi, int width, int height)
 {
   GLfloat h = (GLfloat) height / (GLfloat) width;
@@ -357,13 +339,13 @@ overlay_blur_texture (ModeInfo *mi)
 /* Startup initialization
  */
 
-Bool
+ENTRYPOINT Bool
 glblur_handle_event (ModeInfo *mi, XEvent *event)
 {
   glblur_configuration *bp = &bps[MI_SCREEN(mi)];
 
   if (event->xany.type == ButtonPress &&
-      event->xbutton.button & Button1)
+      event->xbutton.button == Button1)
     {
       bp->button_down_p = True;
       gltrackball_start (bp->trackball,
@@ -372,11 +354,21 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
       return True;
     }
   else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button & Button1)
+           event->xbutton.button == Button1)
     {
       bp->button_down_p = False;
       return True;
     }
+  else if (event->xany.type == ButtonPress &&
+           (event->xbutton.button == Button4 ||
+            event->xbutton.button == Button5 ||
+            event->xbutton.button == Button6 ||
+            event->xbutton.button == Button7))
+    {
+      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
+                              !!event->xbutton.state);
+      return True;
+    }
   else if (event->xany.type == MotionNotify &&
            bp->button_down_p)
     {
@@ -390,7 +382,7 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
-void 
+ENTRYPOINT void 
 init_glblur (ModeInfo *mi)
 {
   glblur_configuration *bp;
@@ -452,6 +444,7 @@ init_glblur (ModeInfo *mi)
         if      (*s == 'x' || *s == 'X') spinx = True;
         else if (*s == 'y' || *s == 'Y') spiny = True;
         else if (*s == 'z' || *s == 'Z') spinz = True;
+        else if (*s == '0') ;
         else
           {
             fprintf (stderr,
@@ -499,18 +492,18 @@ init_glblur (ModeInfo *mi)
 
 /* Render one frame
  */
-void
+ENTRYPOINT void
 draw_glblur (ModeInfo *mi)
 {
   glblur_configuration *bp = &bps[MI_SCREEN(mi)];
   Display *dpy = MI_DISPLAY(mi);
   Window window = MI_WINDOW(mi);
 
-  static GLfloat color0[4] = {0.0, 0.0, 0.0, 1.0};
-  static GLfloat color1[4] = {0.0, 0.0, 0.0, 1.0};
-  static GLfloat color2[4] = {0.0, 0.0, 0.0, 1.0};
-  static GLfloat color3[4] = {0.0, 0.0, 0.0, 1.0};
-  static GLfloat spec[4]   = {1.0, 1.0, 1.0, 1.0};
+  GLfloat color0[4] = {0.0, 0.0, 0.0, 1.0};
+  GLfloat color1[4] = {0.0, 0.0, 0.0, 1.0};
+  GLfloat color2[4] = {0.0, 0.0, 0.0, 1.0};
+  GLfloat color3[4] = {0.0, 0.0, 0.0, 1.0};
+  GLfloat spec[4]   = {1.0, 1.0, 1.0, 1.0};
 
   double rx, ry, rz;
   double px, py, pz;
@@ -519,6 +512,8 @@ draw_glblur (ModeInfo *mi)
   if (!bp->glx_context)
     return;
 
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+
   /* Decide what we're drawing
    */
   if (0 == (random() % 30))
@@ -575,6 +570,7 @@ draw_glblur (ModeInfo *mi)
     glMaterialfv (GL_FRONT_AND_BACK, GL_SPECULAR, spec);
 
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color0);
+
     glCallList (bp->obj_dlist0);
 
     glMaterialfv (GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color1);
@@ -637,5 +633,6 @@ draw_glblur (ModeInfo *mi)
   glXSwapBuffers(dpy, window);
 }
 
+XSCREENSAVER_MODULE ("GLBlur", glblur)
 
 #endif /* USE_GL */