X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=hacks%2Fglx%2Ffont-ximage.c;h=25ceb422112b234d6f848120b594efec2654b173;hb=c141c2b05e374757b6499d12bb8a6d4d943b1529;hp=c8ddc4824088c3cd4f50b8dfcff489a6b45f1cdd;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/hacks/glx/font-ximage.c b/hacks/glx/font-ximage.c
index c8ddc482..25ceb422 100644
--- a/hacks/glx/font-ximage.c
+++ b/hacks/glx/font-ximage.c
@@ -20,13 +20,16 @@
 
 #ifdef HAVE_COCOA
 # include "jwxyz.h"
-# include <OpenGL/gl.h>
 #else  /* !HAVE_COCOA */
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
 # include <GL/gl.h>	/* only for GLfloat */
 #endif /* !HAVE_COCOA */
 
+#ifdef HAVE_JWZGLES
+# include "jwzgles.h"
+#endif /* HAVE_JWZGLES */
+
 extern char *progname;
 
 #include "font-ximage.h"
@@ -158,15 +161,11 @@ text_to_ximage (Screen *screen, Visual *visual,
     while ((line = strtok(token, "\r\n")))
       {
         XCharStruct o2;
-        int ascent, descent, direction, xoff2;
+        int ascent, descent, direction;
         token = 0;
 
         XTextExtents(f, line, strlen(line),
                      &direction, &ascent, &descent, &o2);
-        xoff2 = (xoff +
-                 ((overall.lbearing + overall.rbearing) -
-                  (o2.lbearing + o2.rbearing)) / 2);
-
         XDrawString(dpy, bitmap, gc,
                     overall.lbearing + margin + xoff,
                     ((f->ascent * (lines + 1)) +