From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / glx / glblur.c

diff --git a/hacks/glx/glblur.c b/hacks/glx/glblur.c
index d65fdacf20c796cc5f6292b9331fc5ed1c21d2bd..cee020ca2d5ff576cd71d6569e07b5d103a7a17a 100644 (file)
--- a/hacks/glx/glblur.c
+++ b/hacks/glx/glblur.c
@@ -1,5 +1,5 @@
 /* glblur --- radial blur using GL textures
- * Copyright (c) 2002-2011 Jamie Zawinski <jwz@jwz.org>
+ * Copyright (c) 2002-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
@@ -24,9 +24,10 @@
 
 #define DEFAULTS       "*delay:    10000 \n" \
                        "*showFPS:  False \n" \
-                       "*fpsSolid: True  \n"
+                       "*fpsSolid: True  \n" \
+                       "*suppressRotationAnimation: True\n" \
 
-# define refresh_glblur 0
+# define free_glblur 0
 # define release_glblur 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -124,6 +125,14 @@ reshape_glblur (ModeInfo *mi, int width, int height)
              0.0, 0.0, 0.0,
              0.0, 1.0, 0.0);
 
+# ifdef HAVE_MOBILE    /* Keep it the same relative size when rotated. */
+  {
+    int o = (int) current_device_rotation();
+    if (o != 0 && o != 180 && o != -180)
+      glScalef (1/h, 1/h, 1/h);
+  }
+# endif
+
   glClear(GL_COLOR_BUFFER_BIT);
 }
 
@@ -241,10 +250,7 @@ init_texture (ModeInfo *mi)
   glBindTexture (GL_TEXTURE_2D, bp->texture);
   glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
                 bp->tex_w, bp->tex_h, 0,
-               GL_RGBA,
-                /* GL_UNSIGNED_BYTE, */
-                GL_UNSIGNED_INT_8_8_8_8_REV,
-                bp->tex_data);
+               GL_RGBA, GL_UNSIGNED_BYTE, bp->tex_data);
   check_gl_error ("texture generation");
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -343,39 +349,10 @@ glblur_handle_event (ModeInfo *mi, XEvent *event)
 {
   glblur_configuration *bp = &bps[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      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 ||
-            event->xbutton.button == Button6 ||
-            event->xbutton.button == Button7))
-    {
-      gltrackball_mousewheel (bp->trackball, event->xbutton.button, 10,
-                              !!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));
-      return True;
-    }
+  if (gltrackball_event_handler (event, bp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &bp->button_down_p))
+    return True;
 
   return False;
 }
@@ -387,14 +364,7 @@ init_glblur (ModeInfo *mi)
   glblur_configuration *bp;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!bps) {
-    bps = (glblur_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (glblur_configuration));
-    if (!bps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];
 
@@ -461,7 +431,7 @@ init_glblur (ModeInfo *mi)
                             1.0,
                             do_wander ? wander_speed : 0,
                             False);
-    bp->trackball = gltrackball_init ();
+    bp->trackball = gltrackball_init (True);
   }
 
   if (blursize < 0) blursize = 0;