*
*/
-/*-
- * due to a Bug/feature in VMS X11/Intrinsic.h has to be placed before xlock.
- * otherwise caddr_t is not defined correctly
- */
-
-#include <X11/Intrinsic.h>
-
#ifdef STANDALONE
-# define PROGCLASS "Klein"
-# define HACK_INIT init_klein
-# define HACK_DRAW draw_klein
-# define HACK_RESHAPE reshape_klein
-# define HACK_HANDLE_EVENT klein_handle_event
-# define EVENT_MASK PointerMotionMask
-# define klein_opts xlockmore_opts
-
-
-#define DEF_SPIN "True"
-#define DEF_WANDER "False"
-#define DEF_RANDOM "False"
-#define DEF_SPEED "150"
-
-# define DEFAULTS "*delay: 20000 \n" \
- "*showFPS: False \n" \
- "*wireframe: False \n" \
- "*random: " DEF_RANDOM "\n" \
- "*speed: " DEF_SPEED "\n" \
- "*spin: " DEF_SPIN "\n" \
- "*wander: " DEF_WANDER "\n" \
+# define DEFAULTS "*delay: 20000 \n" \
+ "*showFPS: False \n"
+# define refresh_klein 0
# include "xlockmore.h" /* from the xscreensaver distribution */
#else /* !STANDALONE */
# include "xlock.h" /* from the xlockmore distribution */
#ifdef USE_GL
-#include <GL/glu.h>
+#define DEF_SPIN "True"
+#define DEF_WANDER "False"
+#define DEF_RANDOM "True"
+#define DEF_SPEED "150"
+
#include "rotator.h"
#include "gltrackball.h"
static Bool do_wander;
static XrmOptionDescRec opts[] = {
- {"-speed", ".speed", XrmoptionSepArg, (caddr_t) 0 },
+ {"-speed", ".speed", XrmoptionSepArg, 0 },
{ "-spin", ".spin", XrmoptionNoArg, "True" },
{ "+spin", ".spin", XrmoptionNoArg, "False" },
{ "-wander", ".wander", XrmoptionNoArg, "True" },
};
static argtype vars[] = {
- {(caddr_t *) &rand, "rand", "Random", DEF_RANDOM, t_Bool},
- {(caddr_t *) &do_spin, "spin", "Spin", DEF_SPIN, t_Bool},
- {(caddr_t *) &do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
- {(caddr_t *) &speed, "speed", "Speed", DEF_SPEED, t_Int},
+ {&rand, "rand", "Random", DEF_RANDOM, t_Bool},
+ {&do_spin, "spin", "Spin", DEF_SPIN, t_Bool},
+ {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
+ {&speed, "speed", "Speed", DEF_SPEED, t_Int},
};
-ModeSpecOpt klein_opts = {countof(opts), opts, countof(vars), vars, NULL};
+ENTRYPOINT ModeSpecOpt klein_opts = {countof(opts), opts, countof(vars), vars, NULL};
float du, dv;
float a, b, c;
+ float draw_step;
+
} kleinstruct;
static kleinstruct *klein = NULL;
draw(ModeInfo *mi)
{
kleinstruct *kp = &klein[MI_SCREEN(mi)];
- static float step = 0.0;
double u, v;
float coord[3];
glPopMatrix();
- kp->a = sin(step+=0.01);
- kp->b = cos(step+=0.01);
+ kp->a = sin(kp->draw_step+=0.01);
+ kp->b = cos(kp->draw_step+=0.01);
}
/* new window size or exposure */
-void
+ENTRYPOINT void
reshape_klein(ModeInfo *mi, int width, int height)
{
GLfloat h = (GLfloat) height / (GLfloat) width;
}
-Bool
+ENTRYPOINT Bool
klein_handle_event (ModeInfo *mi, XEvent *event)
{
kleinstruct *kp = &klein[MI_SCREEN(mi)];
- if (event->xany.type == ButtonPress && event->xbutton.button & Button1) {
+ if (event->xany.type == ButtonPress && event->xbutton.button == Button1) {
kp->button_down_p = True;
gltrackball_start (kp->trackball, event->xbutton.x, event->xbutton.y, MI_WIDTH (mi), MI_HEIGHT (mi));
return True;
- } else if (event->xany.type == ButtonRelease && event->xbutton.button & Button1) {
+ } else if (event->xany.type == ButtonRelease && event->xbutton.button == Button1) {
kp->button_down_p = False;
return True;
- } else if (event->xany.type == MotionNotify && kp->button_down_p) {
+ } else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7)) {
+ gltrackball_mousewheel (kp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ } else if (event->xany.type == MotionNotify && kp->button_down_p) {
gltrackball_track (kp->trackball, event->xmotion.x, event->xmotion.y, MI_WIDTH (mi), MI_HEIGHT (mi));
return True;
}
}
-void
+ENTRYPOINT void
init_klein(ModeInfo *mi)
{
int screen = MI_SCREEN(mi);
}
}
-void
+ENTRYPOINT void
draw_klein(ModeInfo * mi)
{
kleinstruct *kp = &klein[MI_SCREEN(mi)];
glXSwapBuffers(display, window);
}
-void
+ENTRYPOINT void
release_klein(ModeInfo * mi)
{
if (klein != NULL) {
}
+XSCREENSAVER_MODULE ("Klein", klein)
+
/*********************************************************/
#endif