http://www.jwz.org/xscreensaver/xscreensaver-5.13.tar.gz

[xscreensaver] / hacks / glx / xlock-gl-utils.c

diff --git a/hacks/glx/xlock-gl-utils.c b/hacks/glx/xlock-gl-utils.c
index d72b4ebdd4aa4ad0d4884893441d05c3e4aecec0..e3aeff0b5462c43476f767bc10e7a582c3ba35fb 100644 (file)
--- a/hacks/glx/xlock-gl-utils.c
+++ b/hacks/glx/xlock-gl-utils.c
@@ -118,6 +118,21 @@ init_GL(ModeInfo * mi)
       glDrawBuffer (GL_FRONT);
   }
 
+  /* Sometimes glDrawBuffer() throws "invalid op". Dunno why. Ignore. */
+  clear_gl_error ();
+
+  /* Process the -background argument. */
+  {
+    char *s = get_string_resource(mi->dpy, "background", "Background");
+    XColor c = { 0, };
+    if (! XParseColor (dpy, mi->xgwa.colormap, s, &c))
+      fprintf (stderr, "%s: can't parse color %s; using black.\n", 
+               progname, s);
+    glClearColor (c.red   / 65535.0,
+                  c.green / 65535.0,
+                  c.blue  / 65535.0,
+                  1.0);
+  }
 
   /* GLXContext is already a pointer type.
      Why this function returns a pointer to a pointer, I have no idea...