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
/
glplanet.c
diff --git
a/hacks/glx/glplanet.c
b/hacks/glx/glplanet.c
index e81199956d56fe22f00d4b17329297fd1ea059e0..91b4ad0ccc7087dc1a6d567f46b41270813204c7 100644
(file)
--- a/
hacks/glx/glplanet.c
+++ b/
hacks/glx/glplanet.c
@@
-183,25
+183,6
@@
typedef struct {
static planetstruct *planets = NULL;
static planetstruct *planets = NULL;
-static inline void
-normalize(GLfloat v[3])
-{
- GLfloat d = (GLfloat) sqrt((double) (v[0] * v[0] +
- v[1] * v[1] +
- v[2] * v[2]));
- if (d != 0)
- {
- v[0] /= d;
- v[1] /= d;
- v[2] /= d;
- }
- else
- {
- v[0] = v[1] = v[2] = 0;
- }
-}
-
-
/* Set up and enable texturing on our object */
static void
setup_xpm_texture (ModeInfo *mi, char **xpm_data)
/* Set up and enable texturing on our object */
static void
setup_xpm_texture (ModeInfo *mi, char **xpm_data)
@@
-467,7
+448,7
@@
planet_handle_event (ModeInfo *mi, XEvent *event)
planetstruct *gp = &planets[MI_SCREEN(mi)];
if (event->xany.type == ButtonPress &&
planetstruct *gp = &planets[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,
@@
-476,11
+457,19
@@
planet_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)
{