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

diff --git a/hacks/glx/surfaces.c b/hacks/glx/surfaces.c
index 9ea84cdd..4c797403 100644
--- a/hacks/glx/surfaces.c
+++ b/hacks/glx/surfaces.c
@@ -46,7 +46,8 @@
                                     "*showFPS:      False   \n" \
 				   "*suppressRotationAnimation: True\n" \
 
-# define refresh_surface 0
+# define free_surface 0
+# define release_surface 0
 # include "xlockmore.h"     /* from the xscreensaver distribution */
 #else  /* !STANDALONE */
 # include "xlock.h"         /* from the xlockmore distribution */
@@ -418,9 +419,19 @@ static void draw(ModeInfo *mi)
 /* new window size or exposure */
 ENTRYPOINT void reshape_surface(ModeInfo *mi, int width, int height)
 {
+  surfacestruct *sp = &surface[MI_SCREEN(mi)];
   GLfloat h = (GLfloat) height / (GLfloat) width;
+  int y = 0;
+
+  if (width > height * 5) {   /* tiny window: show middle */
+    height = width * 9/16;
+    y = -height/2;
+    h = height / (GLfloat) width;
+  }
 
-  glViewport(0, 0, (GLint) width, (GLint) height);
+  glXMakeCurrent(MI_DISPLAY(mi), MI_WINDOW(mi), *(sp->glx_context));
+
+  glViewport(0, y, (GLint) width, (GLint) height);
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   gluPerspective (30.0, 1/h, 1.0, 100.0);
@@ -459,12 +470,7 @@ ENTRYPOINT void init_surface(ModeInfo *mi)
   int    screen = MI_SCREEN(mi);
   surfacestruct *sp;
 
-  if (surface == NULL)
-  {
-    if ((surface = (surfacestruct *) calloc(MI_NUM_SCREENS(mi),
-                                            sizeof(surfacestruct))) == NULL)
-      return;
-  }
+  MI_INIT (mi, surface);
   sp = &surface[screen];
 
   sp->window = MI_WINDOW(mi);
@@ -637,29 +643,6 @@ ENTRYPOINT void draw_surface(ModeInfo * mi)
 }
 
 
-ENTRYPOINT void release_surface(ModeInfo * mi)
-{
-  if (surface != NULL)
-  {
-    int  screen;
-
-    for (screen = 0; screen < MI_NUM_SCREENS(mi); screen++)
-    {
-      surfacestruct *sp = &surface[screen];
-
-      if (sp->glx_context)
-      {
-        /* Display lists MUST be freed while their glXContext is current. */
-        glXMakeCurrent(MI_DISPLAY(mi), sp->window, *(sp->glx_context));
-      }
-    }
-    (void) free((void *)surface);
-    surface = NULL;
-  }
-  FreeAllGL(mi);
-}
-
-
 XSCREENSAVER_MODULE_2("Surfaces", surfaces, surface)
 
 #endif