X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fsierpinski3d.c;h=3b80fc2b498d499a453498d55928832d19933584;hb=4361b69d3178d7fc98d0388f9a223af6c2651aba;hp=0e417d53106f12b2ea4c2fb73e656a4886b1ddcb;hpb=7b34ef992563d7bcbb64cc5597dc45fa24470b05;p=xscreensaver

diff --git a/hacks/glx/sierpinski3d.c b/hacks/glx/sierpinski3d.c
index 0e417d53..3b80fc2b 100644
--- a/hacks/glx/sierpinski3d.c
+++ b/hacks/glx/sierpinski3d.c
@@ -30,8 +30,10 @@ static const char sccsid[] = "@(#)sierpinski3D.c	00.01 99/11/04 xlockmore";
 # define DEFAULTS					"*delay:		20000   \n"			\
 									"*showFPS:      False   \n"			\
 									"*wireframe:	False	\n"			\
+									"*suppressRotationAnimation: True\n" \
 
 # define refresh_gasket 0
+# define release_gasket 0
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else  /* !STANDALONE */
 # include "xlock.h"			/* from the xlockmore distribution */
@@ -76,7 +78,7 @@ ENTRYPOINT ModeSpecOpt gasket_opts = {countof(opts), opts, countof(vars), vars,
 
 #ifdef USE_MODULES
 ModStruct   gasket_description =
-{"gasket", "init_gasket", "draw_gasket", "release_gasket",
+{"gasket", "init_gasket", "draw_gasket", NULL,
  "draw_gasket", "init_gasket", NULL, &gasket_opts,
  1000, 1, 2, 1, 4, 1.0, "",
  "Shows GL's Sierpinski gasket", 0, NULL};
@@ -372,6 +374,9 @@ draw(ModeInfo *mi)
       glNewList (gp->gasket2, GL_COMPILE); compile_gasket (mi, 2); glEndList();
       glNewList (gp->gasket3, GL_COMPILE); compile_gasket (mi, 3); glEndList();
 
+      mi->recursion_depth = (gp->current_depth > 0
+                             ? gp->current_depth
+                             : -gp->current_depth);
     }
 }
 
@@ -393,6 +398,14 @@ reshape_gasket(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);
 }
 
@@ -415,37 +428,38 @@ gasket_handle_event (ModeInfo *mi, XEvent *event)
 {
   gasketstruct *gp = &gasket[MI_SCREEN(mi)];
 
-  if (event->xany.type == ButtonPress &&
-      event->xbutton.button == Button1)
-    {
-      gp->button_down_p = True;
-      gltrackball_start (gp->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)
+  if (gltrackball_event_handler (event, gp->trackball,
+                                 MI_WIDTH (mi), MI_HEIGHT (mi),
+                                 &gp->button_down_p))
+    return True;
+  else if (event->xany.type == KeyPress)
     {
-      gp->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 (gp->trackball, event->xbutton.button, 10,
-                              !!event->xbutton.state);
-      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)
+        {
+          gp->tick = speed;
+          gp->current_depth += (gp->current_depth > 0 ? 1 : -1);
+          gp->current_depth--;
+          return True;
+        }
+      else if (c == '-' || c == '_' ||
+               keysym == XK_Down || keysym == XK_Left || keysym == XK_Prior)
+        {
+          gp->tick = speed;
+          gp->current_depth -= (gp->current_depth > 0 ? 1 : -1);
+          gp->current_depth--;
+          return True;
+        }
+      else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
+        goto DEF;
     }
-  else if (event->xany.type == MotionNotify &&
-           gp->button_down_p)
+  else if (screenhack_event_helper (MI_DISPLAY(mi), MI_WINDOW(mi), event))
     {
-      gltrackball_track (gp->trackball,
-                         event->xmotion.x, event->xmotion.y,
-                         MI_WIDTH (mi), MI_HEIGHT (mi));
+    DEF:
+      gp->tick = speed;
       return True;
     }
 
@@ -453,18 +467,16 @@ gasket_handle_event (ModeInfo *mi, XEvent *event)
 }
 
 
+static void free_gasket(ModeInfo * mi);
+
+
 ENTRYPOINT void
 init_gasket(ModeInfo *mi)
 {
   int           screen = MI_SCREEN(mi);
   gasketstruct *gp;
 
-  if (gasket == NULL)
-  {
-    if ((gasket = (gasketstruct *) calloc(MI_NUM_SCREENS(mi),
-					      sizeof (gasketstruct))) == NULL)
-	return;
-  }
+  MI_INIT (mi, gasket, free_gasket);
   gp = &gasket[screen];
 
   gp->window = MI_WINDOW(mi);
@@ -478,7 +490,7 @@ init_gasket(ModeInfo *mi)
                             1.0,
                             do_wander ? wander_speed : 0,
                             True);
-    gp->trackball = gltrackball_init ();
+    gp->trackball = gltrackball_init (True);
   }
 
   gp->ncolors = 255;
@@ -543,31 +555,20 @@ draw_gasket(ModeInfo * mi)
 }
 
 ENTRYPOINT void
-release_gasket(ModeInfo * mi)
+free_gasket(ModeInfo * mi)
 {
-  if (gasket != NULL)
-  {
-    int         screen;
-
-    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-    {
-      gasketstruct *gp = &gasket[screen];
+  gasketstruct *gp = &gasket[MI_SCREEN(mi)];
 
-      if (gp->glx_context)
-      {
+  if (gp->glx_context)
+  {
 	/* Display lists MUST be freed while their glXContext is current. */
-        glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
+    glXMakeCurrent(MI_DISPLAY(mi), gp->window, *(gp->glx_context));
 
-        if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1);
-        if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1);
-        if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1);
-        if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1);
-      }
-    }
-    (void) free((void *) gasket);
-    gasket = NULL;
+    if (glIsList(gp->gasket0)) glDeleteLists(gp->gasket0, 1);
+    if (glIsList(gp->gasket1)) glDeleteLists(gp->gasket1, 1);
+    if (glIsList(gp->gasket2)) glDeleteLists(gp->gasket2, 1);
+    if (glIsList(gp->gasket3)) glDeleteLists(gp->gasket3, 1);
   }
-  FreeAllGL(mi);
 }
 
 XSCREENSAVER_MODULE_2 ("Sierpinski3D", sierpinski3d, gasket)