#define DEFAULTS "*delay: 30000 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
- "*speed: " DEF_SPEED " \n" \
- "*ntoasters: " DEF_NTOASTERS "\n" \
- "*nslices: " DEF_NSLICES "\n" \
- "*texture: " DEF_TEXTURE "\n" \
/* #define DEBUG */
{ "-speed", ".speed", XrmoptionSepArg, 0 },
{ "-ntoasters", ".ntoasters", XrmoptionSepArg, 0 },
{ "-nslices", ".nslices", XrmoptionSepArg, 0 },
- {"-texture", ".texture", XrmoptionNoArg, (caddr_t) "True" },
- {"+texture", ".texture", XrmoptionNoArg, (caddr_t) "False" },
+ {"-texture", ".texture", XrmoptionNoArg, "True" },
+ {"+texture", ".texture", XrmoptionNoArg, "False" },
};
static argtype vars[] = {
toaster_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->user_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->user_trackball, event->xbutton.button, 5,
+ !event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
bp->button_down_p)
{