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

[xscreensaver] / hacks / glx / menger.c

diff --git a/hacks/glx/menger.c b/hacks/glx/menger.c
index 03384a45e4611c91fbaa56601969419131b25c15..c5108a28d93c4725dc618e9127f0875d52a042fc 100644 (file)
--- a/hacks/glx/menger.c
+++ b/hacks/glx/menger.c
@@ -1,4 +1,4 @@
-/* menger, Copyright (c) 2001-2006 Jamie Zawinski <jwz@jwz.org>
+/* menger, Copyright (c) 2001-2014 Jamie Zawinski <jwz@jwz.org>
  *         Copyright (c) 2002 Aurelien Jacobs <aurel@gnuage.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -53,6 +53,7 @@
 #define DEFAULTS       "*delay:         30000          \n" \
                        "*showFPS:       False          \n" \
                        "*wireframe:     False          \n" \
+                       "*suppressRotationAnimation: True\n" \
 
 
 # define refresh_sponge 0
@@ -140,6 +141,14 @@ reshape_sponge (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);
 }
 
@@ -346,35 +355,38 @@ sponge_handle_event (ModeInfo *mi, XEvent *event)
 {
   sponge_configuration *sp = &sps[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
+  if (gltrackball_event_handler (event, sp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &sp->button_down_p))
+    return True;
+  else if (event->xany.type == KeyPress)
     {
-      sp->button_down_p = True;
-      gltrackball_start (sp->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)
-    {
-      sp->button_down_p = False;
-      return True;
+      KeySym keysym;
+      char c = 0;
+      XLookupString (&event->xkey, &c, 1, &keysym, 0);
+      if (c == '+' || c == '=' ||
+          keysym == XK_Up || keysym == XK_Right || keysym == XK_Next)
+        {
+          sp->draw_tick = speed;
+          sp->current_depth += (sp->current_depth > 0 ? 1 : -1);
+          sp->current_depth--;
+          return True;
+        }
+      else if (c == '-' || c == '_' ||
+               keysym == XK_Down || keysym == XK_Left || keysym == XK_Prior)
+        {
+          sp->draw_tick = speed;
+          sp->current_depth -= (sp->current_depth > 0 ? 1 : -1);
+          sp->current_depth--;
+          return True;
+        }
+      else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+        goto DEF;
     }
-  else if (event->xany.type == ButtonPress &&
-           (event->xbutton.button == Button4 ||
-            event->xbutton.button == Button5))
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      gltrackball_mousewheel (sp->trackball, event->xbutton.button, 5,
-                              !!event->xbutton.state);
-      return True;
-    }
-  else if (event->xany.type == MotionNotify &&
-           sp->button_down_p)
-    {
-      gltrackball_track (sp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
+    DEF:
+      sp->draw_tick = speed;
       return True;
     }
 
@@ -389,16 +401,7 @@ init_sponge (ModeInfo *mi)
   sponge_configuration *sp;
   int wire = MI_IS_WIREFRAME(mi);
 
-  if (!sps) {
-    sps = (sponge_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (sponge_configuration));
-    if (!sps) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-
-    sp = &sps[MI_SCREEN(mi)];
-  }
+  MI_INIT (mi, sps, NULL);
 
   sp = &sps[MI_SCREEN(mi)];
 
@@ -437,7 +440,7 @@ init_sponge (ModeInfo *mi)
                             1.0,
                             do_wander ? wander_speed : 0,
                             True);
-    sp->trackball = gltrackball_init ();
+    sp->trackball = gltrackball_init (True);
   }
 
   sp->ncolors = 128;
@@ -526,6 +529,8 @@ draw_sponge (ModeInfo *mi)
                      ? -sp->current_depth : sp->current_depth));
 
       mi->polygon_count = sp->squares_fp;  /* for FPS display */
+      mi->recursion_depth = (sp->current_depth < 0
+                             ? -sp->current_depth : sp->current_depth);
     }
 
   glScalef (2.0, 2.0, 2.0);