X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fglknots.c;h=c02e16cac44a12eba5fe1018768e4848fd87d47c;hp=978b70f097e609fe0108d8a9d7c670f686edf1f3;hb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439

diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index 978b70f0..c02e16ca 100644
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -1,4 +1,4 @@
-/* glknots, Copyright (c) 2003-2006 Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003-2008 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
@@ -158,12 +158,10 @@ make_knot (ModeInfo *mi)
               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;
@@ -246,7 +244,9 @@ knot_handle_event (ModeInfo *mi, XEvent *event)
     }
   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);