projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://www.tienza.es/crux/src/www.jwz.org/xscreensaver/xscreensaver-5.05.tar.gz
[xscreensaver]
/
hacks
/
glx
/
glknots.c
diff --git
a/hacks/glx/glknots.c
b/hacks/glx/glknots.c
index 978b70f097e609fe0108d8a9d7c670f686edf1f3..c02e16cac44a12eba5fe1018768e4848fd87d47c 100644
(file)
--- a/
hacks/glx/glknots.c
+++ b/
hacks/glx/glknots.c
@@
-1,4
+1,4
@@
-/* glknots, Copyright (c) 2003-200
6
Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003-200
8
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
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@
-158,12
+158,10
@@
make_knot (ModeInfo *mi)
di = (di * di * 3);
}
di = (di * di * 3);
}
- tube (ox, oy, oz,
- x, y, z,
- di, dist/3,
- faces, True, wire, wire);
-
- mi->polygon_count += faces;
+ mi->polygon_count += tube (ox, oy, oz,
+ x, y, z,
+ di, dist/3,
+ faces, True, wire, wire);
}
ox = x;
}
ox = x;
@@
-246,7
+244,9
@@
knot_handle_event (ModeInfo *mi, XEvent *event)
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
}
else if (event->xany.type == ButtonPress &&
(event->xbutton.button == Button4 ||
- event->xbutton.button == Button5))
+ event->xbutton.button == Button5 ||
+ event->xbutton.button == Button6 ||
+ event->xbutton.button == Button7))
{
gltrackball_mousewheel (bp->trackball, event->xbutton.button, 5,
!!event->xbutton.state);
{
gltrackball_mousewheel (bp->trackball, event->xbutton.button, 5,
!!event->xbutton.state);