X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=hacks%2Fglx%2Fglblur.c;h=08bd6911129a1f04d4d077868fc5b4b92ab489d3;hb=c1b9b55ad8d59dc05ef55e316aebf5863e7dfa56;hp=193da13f3e85fffe4d5a80c178661546e956ddab;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index 193da13f..08bd6911 100644
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -1,5 +1,5 @@
 /* glblur --- radial blur using GL textures
- * Copyright (c) 2002-2004 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002-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
@@ -46,7 +46,7 @@
 
 #define DEF_SPIN        "XYZ"
 #define DEF_WANDER      "True"
-#define DEF_BLURSIZE    "15"
+#define DEF_BLUR_SIZE   "15"
 
 typedef struct metaball metaball;
 
@@ -99,7 +99,7 @@ static XrmOptionDescRec opts[] = {
 static argtype vars[] = {
   {&do_spin,   "spin",   "Spin",   DEF_SPIN,   t_String},
   {&do_wander, "wander", "Wander", DEF_WANDER, t_Bool},
-  {&blursize,  "blurSize","BlurSize", DEF_BLURSIZE,  t_Int},
+  {&blursize,  "blurSize","BlurSize", DEF_BLUR_SIZE,  t_Int},
 };
 
 ENTRYPOINT ModeSpecOpt glblur_opts = {countof(opts), opts, countof(vars), vars, NULL};
@@ -361,7 +361,9 @@ glblur_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, 10,
                               !!event->xbutton.state);