X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fcompanion.c;h=3c004a506152b8717cf30c5d9858ea2136051e5a;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=10dd959b0cc3fa7451548a2895be70b7196180e9;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba;p=xscreensaver

diff --git a/hacks/glx/companion.c b/hacks/glx/companion.c
index 10dd959b..3c004a50 100644
--- a/hacks/glx/companion.c
+++ b/hacks/glx/companion.c
@@ -1,4 +1,4 @@
-/* companioncube, Copyright (c) 2011-2014 Jamie Zawinski <jwz@jwz.org>
+/* companioncube, Copyright (c) 2011-2018 Jamie Zawinski <jwz@jwz.org>
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
  * documentation for any purpose is hereby granted without fee, provided that
@@ -26,7 +26,7 @@
 /* #define DEBUG */
 
 
-# define refresh_cube 0
+# define free_cube 0
 # define release_cube 0
 #define DEF_SPEED  "1.0"
 #define DEF_SPIN   "False"
@@ -43,7 +43,7 @@
 #include "xlockmore.h"
 #include "rotator.h"
 #include "gltrackball.h"
-#include "xpm-ximage.h"
+#include "ximage-loader.h"
 #include <ctype.h>
 
 #ifdef USE_GL /* whole file */
@@ -348,8 +348,15 @@ ENTRYPOINT void
 reshape_cube (ModeInfo *mi, int width, int height)
 {
   GLfloat h = (GLfloat) height / (GLfloat) width;
+  int y = 0;
 
-  glViewport (0, 0, (GLint) width, (GLint) height);
+  if (width > height * 5) {   /* tiny window: show middle */
+    height = width * 9/16;
+    y = -height/2;
+    h = height / (GLfloat) width;
+  }
+
+  glViewport (0, y, (GLint) width, (GLint) height);
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
@@ -394,7 +401,7 @@ init_cube (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  MI_INIT (mi, bps, NULL);
+  MI_INIT (mi, bps);
 
   bp = &bps[MI_SCREEN(mi)];