X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fglknots.c;h=36ff1983daca7773483822ebe53ff5fda1293bd6;hb=d5186197bc394e10a4402f7f6d23fbb14103bc50;hp=f12e4348dae948c7d0dabfbb49825eb8e7633f0f;hpb=488f2fa8fbdbc77e91a70da2962d73af49e6cace;p=xscreensaver

diff --git a/hacks/glx/glknots.c b/hacks/glx/glknots.c
index f12e4348..36ff1983 100644
--- a/hacks/glx/glknots.c
+++ b/hacks/glx/glknots.c
@@ -1,4 +1,4 @@
-/* glknots, Copyright (c) 2003-2007 Jamie Zawinski <jwz@jwz.org>
+/* glknots, Copyright (c) 2003-2014 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
@@ -227,35 +227,13 @@ knot_handle_event (ModeInfo *mi, XEvent *event)
 {
   knot_configuration *bp = &bps[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
+  if (gltrackball_event_handler (event, bp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &bp->button_down_p))
+    return True;
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      bp->button_down_p = True;
-      gltrackball_start (bp->trackball,
-                         event->xbutton.x, event->xbutton.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
-      return True;
-    }
-  else if (event->xany.type == ButtonRelease &&
-           event->xbutton.button == Button1)
-    {
-      bp->button_down_p = False;
-      return True;
-    }
-  else if (event->xany.type == ButtonPress &&
-           (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5))
-    {
-      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 5,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           bp->button_down_p)
-    {
-      gltrackball_track (bp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
+      bp->last_time = 1;
       return True;
     }
 
@@ -277,8 +255,6 @@ init_knot (ModeInfo *mi)
       fprintf(stderr, "%s: out of memory\n", progname);
       exit(1);
     }
-
-    bp = &bps[MI_SCREEN(mi)];
   }
 
   bp = &bps[MI_SCREEN(mi)];
@@ -339,7 +315,7 @@ init_knot (ModeInfo *mi)
                             spin_accel,
                             do_wander ? wander_speed : 0,
                             (spinx && spiny && spinz));
-    bp->trackball = gltrackball_init ();
+    bp->trackball = gltrackball_init (True);
   }
 
   bp->knot_list = glGenLists (1);
@@ -376,7 +352,7 @@ draw_knot (ModeInfo *mi)
               now - bp->last_time >= duration)
             {
               bp->mode = 1;    /* go out */
-              bp->mode_tick = 10 * speed;
+              bp->mode_tick = 10 / speed;
               bp->last_time = now;
             }
         }
@@ -386,7 +362,7 @@ draw_knot (ModeInfo *mi)
       if (--bp->mode_tick <= 0)
         {
           new_knot (mi);
-          bp->mode_tick = 10 * speed;
+          bp->mode_tick = 10 / speed;
           bp->mode = 2;  /* go in */
         }
     }
@@ -440,8 +416,8 @@ draw_knot (ModeInfo *mi)
   if (bp->mode != 0)
     {
       GLfloat s = (bp->mode == 1
-                   ? bp->mode_tick / (10 * speed)
-                   : ((10 * speed) - bp->mode_tick + 1) / (10 * speed));
+                   ? bp->mode_tick / (10 / speed)
+                   : ((10 / speed) - bp->mode_tick + 1) / (10 / speed));
       glScalef (s, s, s);
     }