X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fmoebius.c;h=5fe2d9b8a8c4f43438ee51932eff61010bd6ff5a;hb=39809ded547bdbb08207d3e514950425215b4410;hp=feb1a488233c2be68ecf5b40925db43589119329;hpb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;p=xscreensaver

diff --git a/hacks/glx/moebius.c b/hacks/glx/moebius.c
index feb1a488..5fe2d9b8 100644
--- a/hacks/glx/moebius.c
+++ b/hacks/glx/moebius.c
@@ -79,16 +79,18 @@ static const char sccsid[] = "@(#)moebius.c	5.01 2001/03/01 xlockmore";
 
 #ifdef STANDALONE
 # define MODE_moebius
-# define refresh_moebius 0
+# define free_moebius 0
+# define release_moebius 0
 # define DEFAULTS			"*delay:		20000   \n"			\
-							"*showFPS:      False   \n"
+							"*showFPS:      False   \n"			\
+							"*suppressRotationAnimation: True\n" \
 
 # include "xlockmore.h"		/* from the xscreensaver distribution */
 #else /* !STANDALONE */
 # include "xlock.h"		/* from the xlockmore distribution */
 #endif /* !STANDALONE */
 
-#ifdef HAVE_COCOA
+#ifdef HAVE_JWXYZ
 # include "jwxyz.h"
 #else
 # include <X11/Xlib.h>
@@ -147,7 +149,7 @@ ENTRYPOINT ModeSpecOpt moebius_opts =
 
 #ifdef USE_MODULES
 ModStruct   moebius_description =
-{"moebius", "init_moebius", "draw_moebius", "release_moebius",
+{"moebius", "init_moebius", "draw_moebius", (char *) NULL,
  "draw_moebius", "change_moebius", (char *) NULL, &moebius_opts,
  1000, 1, 1, 1, 4, 1.0, "",
  "Shows Moebius Strip II, an Escher-like GL scene with ants", 0, NULL};
@@ -562,8 +564,14 @@ ENTRYPOINT void
 reshape_moebius (ModeInfo * mi, int width, int height)
 {
 	moebiusstruct *mp = &moebius[MI_SCREEN(mi)];
+    int y = 0;
 
-	glViewport(0, 0, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
+    if (width > height * 5) {   /* tiny window: show middle */
+      height = width;
+      y = -height/2;
+    }
+
+	glViewport(0, y, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
 	glMatrixMode(GL_PROJECTION);
 	glLoadIdentity();
 	glFrustum(-1.0, 1.0, -1.0, 1.0, 5.0, 15.0);
@@ -652,17 +660,6 @@ pinit(ModeInfo *mi)
 }
 
 
-
-ENTRYPOINT void
-release_moebius (ModeInfo * mi)
-{
-	if (moebius != NULL) {
-		(void) free((void *) moebius);
-		moebius = (moebiusstruct *) NULL;
-	}
-	FreeAllGL(mi);
-}
-
 ENTRYPOINT Bool
 moebius_handle_event (ModeInfo *mi, XEvent *event)
 {
@@ -682,11 +679,7 @@ init_moebius (ModeInfo * mi)
 {
 	moebiusstruct *mp;
 
-	if (moebius == NULL) {
-		if ((moebius = (moebiusstruct *) calloc(MI_NUM_SCREENS(mi),
-					    sizeof (moebiusstruct))) == NULL)
-			return;
-	}
+	MI_INIT (mi, moebius);
 	mp = &moebius[MI_SCREEN(mi)];
 	mp->step = NRAND(90);
 	mp->ant_position = NRAND(90);
@@ -730,6 +723,7 @@ draw_moebius (ModeInfo * mi)
 
 	glPushMatrix();
 
+
 	glTranslatef(0.0, 0.0, -10.0);
 
     gltrackball_rotate (mp->trackball);
@@ -740,6 +734,18 @@ draw_moebius (ModeInfo * mi)
 		glScalef(Scale4Iconic * mp->WindH / mp->WindW, Scale4Iconic, Scale4Iconic);
 	}
 
+# ifdef HAVE_MOBILE	/* Keep it the same relative size when rotated. */
+    {
+      GLfloat h = MI_HEIGHT(mi) / (GLfloat) MI_WIDTH(mi);
+      int o = (int) current_device_rotation();
+      if (o != 0 && o != 180 && o != -180) {
+        glScalef (1/h, h, 1);  /* #### not quite right */
+        h = 1.7;
+        glScalef (h, h, h);
+      }
+    }
+# endif
+
     {
       double x, y, z;
       get_rotation (mp->rot, &x, &y, &z, !mp->button_down_p);
@@ -750,7 +756,7 @@ draw_moebius (ModeInfo * mi)
 
 	/* moebius */
 	if (!draw_moebius_strip(mi)) {
-		release_moebius(mi);
+		MI_ABORT(mi);
 		return;
 	}