-/* cubestorm, Copyright (c) 2003 Jamie Zawinski <jwz@jwz.org>
+/* cubestorm, Copyright (c) 2003, 2004 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
* 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)))
#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;
{&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
/* Window management, etc
*/
-void
+ENTRYPOINT void
reshape_cube (ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
}
-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,
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)
{
}
-void
+ENTRYPOINT void
init_cube (ModeInfo *mi)
{
cube_configuration *bp;
}
-void
+ENTRYPOINT void
draw_cube (ModeInfo *mi)
{
cube_configuration *bp = &bps[MI_SCREEN(mi)];
if (!bp->glx_context)
return;
+ glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(bp->glx_context));
+
glShadeModel(GL_SMOOTH);
glEnable(GL_DEPTH_TEST);
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();
glXSwapBuffers(dpy, window);
}
+XSCREENSAVER_MODULE_2 ("CubeStorm", cubestorm, cube)
+
#endif /* USE_GL */