X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Fskytentacles.c;h=1061482074d5d96c21fb25863c04e0de4899ec2a;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hp=ce61cf0160b82d988178a4550314112a29ad956b;hpb=4361b69d3178d7fc98d0388f9a223af6c2651aba;p=xscreensaver

diff --git a/hacks/glx/skytentacles.c b/hacks/glx/skytentacles.c
index ce61cf01..10614820 100644
--- a/hacks/glx/skytentacles.c
+++ b/hacks/glx/skytentacles.c
@@ -1,4 +1,4 @@
-/* Sky Tentacles, Copyright (c) 2008-2014 Jamie Zawinski <jwz@jwz.org>
+/* Sky Tentacles, Copyright (c) 2008-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
@@ -14,7 +14,7 @@
 			"*showFPS:      False       \n" \
 			"*wireframe:    False       \n" \
 
-# define refresh_tentacles 0
+# define free_tentacles 0
 # define release_tentacles 0
 #undef countof
 #define countof(x) (sizeof((x))/sizeof((*x)))
@@ -26,16 +26,8 @@
 #include "gltrackball.h"
 #include <ctype.h>
 
-#include "xpm-ximage.h"
-#include "../images/scales.xpm"
-
-static char *grey_texture[] = {
-  "16 1 3 1",
-  "X c #808080",
-  "x c #C0C0C0",
-  ". c #FFFFFF",
-  "XXXxxxxx........"
-};
+#include "ximage-loader.h"
+#include "images/gen/scales_png.h"
 
 #ifdef USE_GL /* whole file */
 
@@ -171,8 +163,15 @@ reshape_tentacles (ModeInfo *mi, int width, int height)
 {
   tentacles_configuration *tc = &tcs[MI_SCREEN(mi)];
   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();
@@ -851,7 +850,7 @@ init_tentacles (ModeInfo *mi)
   int wire = MI_IS_WIREFRAME(mi);
   int i;
 
-  MI_INIT (mi, tcs, NULL);
+  MI_INIT (mi, tcs);
 
   tc = &tcs[MI_SCREEN(mi)];
 
@@ -912,9 +911,27 @@ init_tentacles (ModeInfo *mi)
     glBindTexture ((cel_p ? GL_TEXTURE_1D : GL_TEXTURE_2D), tc->texid);
 # endif
 
-    tc->texture = xpm_to_ximage (MI_DISPLAY(mi), MI_VISUAL(mi), 
-                                 MI_COLORMAP(mi), 
-                                 (cel_p ? grey_texture : scales));
+    if (cel_p)
+      {
+        /* "16 1 3 1",
+           "X c #808080",
+           "x c #C0C0C0",
+           ". c #FFFFFF",
+           "XXXxxxxx........"
+         */
+        int w = 16;
+        tc->texture = XCreateImage (MI_DISPLAY(mi), MI_VISUAL(mi),
+                                    32, ZPixmap, 0, 0, w, 1, 32, 0);
+        tc->texture->data = (char *) calloc(1, tc->texture->bytes_per_line);
+        /* ABGR */
+        for (i = 0; i < 3; i++) XPutPixel (tc->texture, i, 0, 0xFF808080);
+        for (;      i < 8; i++) XPutPixel (tc->texture, i, 0, 0xFFC0C0C0);
+        for (;      i < w; i++) XPutPixel (tc->texture, i, 0, 0xFFFFFFFF);
+      }
+    else
+      tc->texture = image_data_to_ximage (MI_DISPLAY(mi), MI_VISUAL(mi), 
+                                          scales_png, sizeof(scales_png));
+
     if (!tc->texture) texture_p = cel_p = False;
   }
 
@@ -923,10 +940,7 @@ init_tentacles (ModeInfo *mi)
     clear_gl_error();
     glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
                   tc->texture->width, tc->texture->height, 0,
-                  GL_RGBA,
-                  /* GL_UNSIGNED_BYTE, */
-                  GL_UNSIGNED_INT_8_8_8_8_REV,
-                  tc->texture->data);
+                  GL_RGBA, GL_UNSIGNED_BYTE, tc->texture->data);
     check_gl_error("texture");
 
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -942,10 +956,7 @@ init_tentacles (ModeInfo *mi)
     clear_gl_error();
     glTexImage1D (GL_TEXTURE_1D, 0, GL_RGBA,
                   tc->texture->width, 0,
-                  GL_RGBA,
-                  /* GL_UNSIGNED_BYTE, */
-                  GL_UNSIGNED_INT_8_8_8_8_REV,
-                  tc->texture->data);
+                  GL_RGBA, GL_UNSIGNED_BYTE, tc->texture->data);
     check_gl_error("texture");
 
     glTexParameterf(GL_TEXTURE_1D, GL_TEXTURE_WRAP_S, GL_REPEAT);