projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://ftp.ksu.edu.tw/FTP/FreeBSD/distfiles/xscreensaver-4.20.tar.gz
[xscreensaver]
/
hacks
/
glx
/
gears.c
diff --git
a/hacks/glx/gears.c
b/hacks/glx/gears.c
index e89ba4e44255464b1de9ad742fa0072902309bd7..15d99dba5a345052e895a42c3d62586d40bba40f 100644
(file)
--- a/
hacks/glx/gears.c
+++ b/
hacks/glx/gears.c
@@
-34,13
+34,6
@@
static const char sccsid[] = "@(#)gears.c 4.07 97/11/24 xlockmore";
* been fixed in MesaGL 2.2 and later releases.
*/
* been fixed in MesaGL 2.2 and later releases.
*/
-/*-
- * 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 "Gears"
# define HACK_INIT init_gears
#ifdef STANDALONE
# define PROGCLASS "Gears"
# define HACK_INIT init_gears
@@
-73,8
+66,8
@@
static const char sccsid[] = "@(#)gears.c 4.07 97/11/24 xlockmore";
static int planetary;
static XrmOptionDescRec opts[] = {
static int planetary;
static XrmOptionDescRec opts[] = {
- {"-planetary", ".gears.planetary", XrmoptionNoArg,
(caddr_t)
"true" },
- {"+planetary", ".gears.planetary", XrmoptionNoArg,
(caddr_t)
"false" },
+ {"-planetary", ".gears.planetary", XrmoptionNoArg, "true" },
+ {"+planetary", ".gears.planetary", XrmoptionNoArg, "false" },
};
static argtype vars[] = {
};
static argtype vars[] = {
@@
-926,7
+919,7
@@
gears_handle_event (ModeInfo *mi, XEvent *event)
gearsstruct *gp = &gears[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
gearsstruct *gp = &gears[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
gp->button_down_p = True;
gltrackball_start (gp->trackball,
{
gp->button_down_p = True;
gltrackball_start (gp->trackball,
@@
-935,11
+928,19
@@
gears_handle_event (ModeInfo *mi, XEvent *event)
return True;
}
else if (event->xany.type == ButtonRelease &&
return True;
}
else if (event->xany.type == ButtonRelease &&
- event->xbutton.button
&
Button1)
+ event->xbutton.button
==
Button1)
{
gp->button_down_p = False;
return True;
}
{
gp->button_down_p = False;
return True;
}
+ else if (event->xany.type == ButtonPress &&
+ (event->xbutton.button == Button4 ||
+ event->xbutton.button == Button5))
+ {
+ gltrackball_mousewheel (gp->trackball, event->xbutton.button, 10,
+ !!event->xbutton.state);
+ return True;
+ }
else if (event->xany.type == MotionNotify &&
gp->button_down_p)
{
else if (event->xany.type == MotionNotify &&
gp->button_down_p)
{