/* font-ximage.c --- renders text to an XImage for use with OpenGL.
- * xscreensaver, Copyright (c) 2001, 2003 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 2001-2013 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
#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"
overall.rbearing = MAX(overall.rbearing, o2.rbearing);
lines++;
}
+ free (text);
+ text = 0;
width = overall.lbearing + overall.rbearing + margin + margin + 1;
height = ((f->ascent + f->descent) * lines) + margin + margin;
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)) +