X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcubestorm.c;h=09a0ff2d594b792bdc508dc7eee4d1525b85afea;hb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;hp=e6801b9a47bf1589fa57494fa1b3523de3135c60;hpb=9c9d475ff889ed8be02e8ce8c17da28b93278fca;p=xscreensaver

diff --git a/hacks/glx/cubestorm.c b/hacks/glx/cubestorm.c
index e6801b9a..09a0ff2d 100644
--- a/hacks/glx/cubestorm.c
+++ b/hacks/glx/cubestorm.c
@@ -9,36 +9,15 @@
  * implied warranty.
  */
 
-#include <X11/Intrinsic.h>
-
-extern XtAppContext app;
-
-#define PROGCLASS	"CubeStorm"
-#define HACK_INIT	init_cube
-#define HACK_DRAW	draw_cube
-#define HACK_RESHAPE	reshape_cube
-#define HACK_HANDLE_EVENT cube_handle_event
-#define EVENT_MASK      PointerMotionMask
-#define sws_opts	xlockmore_opts
-
-#define DEF_SPIN        "True"
-#define DEF_WANDER      "True"
-#define DEF_SPEED       "1.0"
-#define DEF_THICKNESS   "0.06"
-#define DEF_COUNT       "4"
-
 #define DEFAULTS	"*delay:	30000       \n" \
-			"*count:        30          \n" \
+			"*count:      " DEF_COUNT   "\n" \
 			"*showFPS:      False       \n" \
 	               	"*fpsSolid:     True        \n" \
 			"*wireframe:    False       \n" \
-			"*speed:      " DEF_SPEED " \n" \
-			"*spin:       " DEF_SPIN   "\n" \
-			"*wander:     " DEF_WANDER "\n" \
-			"*thickness:  " DEF_THICKNESS "\n" \
-			"*count:      " DEF_COUNT   "\n" \
 
 
+# define refresh_cube 0
+# define release_cube 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
 
@@ -50,7 +29,11 @@ extern XtAppContext app;
 
 #ifdef USE_GL /* whole file */
 
-#include <GL/glu.h>
+#define DEF_SPIN        "True"
+#define DEF_WANDER      "True"
+#define DEF_SPEED       "1.0"
+#define DEF_THICKNESS   "0.06"
+#define DEF_COUNT       "4"
 
 typedef struct {
   rotator *rot;
@@ -95,7 +78,7 @@ static argtype vars[] = {
   {&thickness, "thickness", "Thickness",  DEF_THICKNESS,  t_Float},
 };
 
-ModeSpecOpt sws_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt cube_opts = {countof(opts), opts, countof(vars), vars, NULL};
 
 
 static void
@@ -169,7 +152,7 @@ new_cube_colors (ModeInfo *mi)
 
 /* Window management, etc
  */
-void
+ENTRYPOINT void
 reshape_cube (ModeInfo *mi, int width, int height)
 {
   GLfloat h = (GLfloat) height / (GLfloat) width;
@@ -190,13 +173,13 @@ reshape_cube (ModeInfo *mi, int width, int height)
 }
 
 
-Bool
+ENTRYPOINT Bool
 cube_handle_event (ModeInfo *mi, XEvent *event)
 {
   cube_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,
@@ -205,11 +188,19 @@ cube_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))
+    {
+      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
+                              !!event->xbutton.state);
+      return True;
+    }
   else if (event->xany.type == MotionNotify &&
            bp->button_down_p)
     {
@@ -238,7 +229,7 @@ cube_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
-void 
+ENTRYPOINT void 
 init_cube (ModeInfo *mi)
 {
   cube_configuration *bp;
@@ -321,7 +312,7 @@ init_cube (ModeInfo *mi)
 }
 
 
-void
+ENTRYPOINT void
 draw_cube (ModeInfo *mi)
 {
   cube_configuration *bp = &bps[MI_SCREEN(mi)];
@@ -334,6 +325,8 @@ draw_cube (ModeInfo *mi)
   if (!bp->glx_context)
     return;
 
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+
   glShadeModel(GL_SMOOTH);
 
   glEnable(GL_DEPTH_TEST);
@@ -371,9 +364,9 @@ draw_cube (ModeInfo *mi)
 
   for (i = 0; i < MI_COUNT(mi); i++)
     {
-      static GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0};
-      static GLfloat bspec[4]  = {1.0, 1.0, 1.0, 1.0};
-      static GLfloat bshiny    = 128.0;
+      GLfloat bcolor[4] = {0.0, 0.0, 0.0, 1.0};
+      GLfloat bspec[4]  = {1.0, 1.0, 1.0, 1.0};
+      GLfloat bshiny    = 128.0;
 
       glPushMatrix();
 
@@ -420,4 +413,6 @@ draw_cube (ModeInfo *mi)
   glXSwapBuffers(dpy, window);
 }
 
+XSCREENSAVER_MODULE_2 ("CubeStorm", cubestorm, cube)
+
 #endif /* USE_GL */