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

[xscreensaver] / hacks / glx / fliptext.c

diff --git a/hacks/glx/fliptext.c b/hacks/glx/fliptext.c
index 25dd84c7624f1f7627fedecb0fa48d0ff44df346..b47bbb83edfd0c204c11c162145142f2a89db7df 100644 (file)
--- a/hacks/glx/fliptext.c
+++ b/hacks/glx/fliptext.c
@@ -1,5 +1,5 @@
 /*
- * fliptext, Copyright (c) 2005-2007 Jamie Zawinski <jwz@jwz.org>
+ * fliptext, Copyright (c) 2005-2011 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
@@ -72,7 +72,7 @@
 #define DEF_LINES      "8"
 #define DEF_FONT_SIZE  "20"
 #define DEF_COLUMNS    "80"
-#define DEF_ALIGN      "random"
+#define DEF_ALIGNMENT  "random"
 #define DEF_SPEED       "1.0"
 #define TAB_WIDTH        8
 
@@ -164,7 +164,7 @@ static argtype vars[] = {
   {&max_lines,      "lines",     "Integer",    DEF_LINES,     t_Int},
   {&font_size,      "fontSize",  "Float",      DEF_FONT_SIZE, t_Float},
   {&target_columns, "columns",   "Integer",    DEF_COLUMNS,   t_Int},
-  {&alignment_str,  "alignment", "Alignment",  DEF_ALIGN,     t_String},
+  {&alignment_str,  "alignment", "Alignment",  DEF_ALIGNMENT, t_String},
   {&speed,         "speed",     "Speed",      DEF_SPEED,     t_Float},
 };
 
@@ -914,6 +914,7 @@ init_fliptext (ModeInfo *mi)
 
   if ((sc->glx_context = init_GL(mi)) != NULL) {
     reshape_fliptext (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
+    clear_gl_error(); /* WTF? sometimes "invalid op" from glViewport! */
   }
 
   program = get_string_resource (mi->dpy, "program", "Program");