-/* cubenetic, Copyright (c) 2002, 2003 Jamie Zawinski <jwz@jwz.org>
+/* cubenetic, Copyright (c) 2002-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
#define DEF_WAVE_SPEED "80"
#define DEF_WAVE_RADIUS "512"
-#define DEFAULTS "*delay: 30000 \n" \
+#define DEFAULTS "*delay: 20000 \n" \
"*count: 5 \n" \
"*showFPS: False \n" \
"*wireframe: False \n" \
{ "+spin", ".spin", XrmoptionNoArg, "" },
{ "-wander", ".wander", XrmoptionNoArg, "True" },
{ "+wander", ".wander", XrmoptionNoArg, "False" },
- {"-texture", ".texture", XrmoptionNoArg, (caddr_t) "true" },
- {"+texture", ".texture", XrmoptionNoArg, (caddr_t) "false" },
+ {"-texture", ".texture", XrmoptionNoArg, "true" },
+ {"+texture", ".texture", XrmoptionNoArg, "false" },
{"-waves", ".waves", XrmoptionSepArg, 0 },
{"-wave-speed", ".waveSpeed", XrmoptionSepArg, 0 },
{"-wave-radius", ".waveRadius", XrmoptionSepArg, 0 },
cube_configuration *cc = &ccs[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button & Button1)
+ event->xbutton.button == Button1)
{
cc->button_down_p = True;
gltrackball_start (cc->trackball,
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button & Button1)
+ event->xbutton.button == Button1)
{
cc->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (cc->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
cc->button_down_p)
{