*
*/
-/*-
- * 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
SEASHELL,
SWALLOWTAIL,
BOHEM,
- SURFACE_LAST,
+ SURFACE_LAST
};
/* primitives to draw with
MY_POINTS = 0,
MY_LINES,
MY_LINE_LOOP,
- MY_PRIM_LAST,
+ MY_PRIM_LAST
};
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},
};
{
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)) {
+ 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;
}