X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fantinspect.c;h=ad3bef56ef15b7172e1ce6b5787bbd923b9e0045;hb=39809ded547bdbb08207d3e514950425215b4410;hp=a1ffadd569e3ec760deb17f0b855af657039b65b;hpb=aa75c7476aeaa84cf3abc192b376a8b03c325213;p=xscreensaver

diff --git a/hacks/glx/antinspect.c b/hacks/glx/antinspect.c
index a1ffadd5..ad3bef56 100644
--- a/hacks/glx/antinspect.c
+++ b/hacks/glx/antinspect.c
@@ -19,7 +19,8 @@
 #define DEFAULTS	    "*delay:   20000   \n" \
 			    "*showFPS: False   \n"
 
-# define refresh_antinspect 0
+# define free_antinspect 0
+# define release_antinspect 0
 #include "xlockmore.h"
 #else
 #include "xlock.h"
@@ -65,7 +66,7 @@ ENTRYPOINT ModeSpecOpt antinspect_opts = {sizeof opts / sizeof opts[0],
 
 #ifdef USE_MODULES
 ModStruct   antinspect_description =
-  {"antinspect", "init_antinspect", "draw_antinspect", "release_antinspect",
+  {"antinspect", "init_antinspect", "draw_antinspect", (char *) NULL,
    "draw_antinspect", "change_antinspect", (char *) NULL, &antinspect_opts,
    1000, 1, 1, 1, 4, 1.0, "",
    "draws some ants", 0, NULL};
@@ -548,10 +549,17 @@ static Bool draw_antinspect_strip(ModeInfo * mi)
 ENTRYPOINT void reshape_antinspect(ModeInfo * mi, int width, int height) 
 {
   double h = (GLfloat) height / (GLfloat) width;  
+  int y = 0;
   antinspectstruct *mp = &antinspect[MI_SCREEN(mi)];
   mp->linewidth = (width / 512) + 1;
 
-  glViewport(0, 0, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
+  if (width > height * 5) {   /* tiny window: show middle */
+    height = width * 9/16;
+    y = -height/2;
+    h = height / (GLfloat) width;
+  }
+
+  glViewport(0, y, mp->WindW = (GLint) width, mp->WindH = (GLint) height);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
 
@@ -588,15 +596,6 @@ static void pinit(void)
   glMaterialfv(GL_FRONT_AND_BACK, GL_SPECULAR, front_specular);
 }
 
-ENTRYPOINT void release_antinspect(ModeInfo * mi) 
-{
-  if(antinspect) {
-	free((void *) antinspect);
-	antinspect = (antinspectstruct *) NULL;
-  }
-  FreeAllGL(mi);
-}
-
 ENTRYPOINT Bool antinspect_handle_event (ModeInfo *mi, XEvent *event) 
 {
   antinspectstruct *mp = &antinspect[MI_SCREEN(mi)];
@@ -613,11 +612,7 @@ ENTRYPOINT void init_antinspect(ModeInfo * mi)
 {
   antinspectstruct *mp;
   
-  if(antinspect == NULL) {
-    if((antinspect = (antinspectstruct *) calloc(MI_NUM_SCREENS(mi),
-						 sizeof (antinspectstruct))) == NULL)
-      return;
-  }
+  MI_INIT(mi, antinspect);
   mp = &antinspect[MI_SCREEN(mi)];
   mp->step = NRAND(90);
   mp->ant_position = NRAND(90);
@@ -678,7 +673,7 @@ ENTRYPOINT void draw_antinspect(ModeInfo * mi)
   glRotatef(180.0, 0.0, 1.0, 0.0);
   
   if (!draw_antinspect_strip(mi)) {
-	release_antinspect(mi);
+	MI_ABORT(mi);
 	return;
   }