X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fglx%2Ffps-gl.c;h=6020b257ea59e3ca3cec8c2e02264a27fdc6da75;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hp=070ae6fb64f31b9226d857ae7c3036f9d0fd1b3e;hpb=f8cf5ac7b2f53510f80a0eaf286a25298be17bfe;p=xscreensaver

diff --git a/hacks/glx/fps-gl.c b/hacks/glx/fps-gl.c
index 070ae6fb..6020b257 100644
--- a/hacks/glx/fps-gl.c
+++ b/hacks/glx/fps-gl.c
@@ -1,4 +1,4 @@
-/* fps, Copyright (c) 2001-2012 Jamie Zawinski <jwz@jwz.org>
+/* fps, Copyright (c) 2001-2015 Jamie Zawinski <jwz@jwz.org>
  * Draw a frames-per-second display (Xlib and OpenGL).
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -16,7 +16,9 @@
 
 #ifdef HAVE_COCOA
 # include "jwxyz.h"
-#else /* !HAVE_COCOA -- real Xlib */
+#elif defined(HAVE_ANDROID)
+# include <GLES/gl.h>
+#else /* real Xlib */
 # include <GL/glx.h>
 # include <GL/glu.h>
 #endif /* !HAVE_COCOA */
@@ -27,40 +29,32 @@
 
 #include "xlockmoreI.h"
 #include "fpsI.h"
-#include "glxfonts.h"
+#include "texfont.h"
 
 /* These are in xlock-gl.c */
 extern void clear_gl_error (void);
 extern void check_gl_error (const char *type);
 
+typedef struct {
+  texture_font_data *texfont;
+  int line_height;
+  Bool top_p;
+} gl_fps_data;
+
 
 static void
 xlockmore_gl_fps_init (fps_state *st)
 {
-#ifdef HAVE_GLBITMAP
-
-  XFontStruct *f = st->font;
-  int first = f->min_char_or_byte2;
-  int last  = f->max_char_or_byte2;
-
-  clear_gl_error ();
-  st->font_dlist = glGenLists ((GLuint) last+1);
-  check_gl_error ("glGenLists");
-
-  xscreensaver_glXUseXFont (st->dpy, f->fid,
-                            first, last-first+1, st->font_dlist + first);
-  check_gl_error ("xscreensaver_glXUseXFont");
-
-#else  /* !HAVE_GLBITMAP */
-
-  clear_gl_error();  /* screw it */
-  st->gl_fps_data = load_texture_font (st->dpy, "fpsFont");
-
-#endif /* !HAVE_GLBITMAP */
+  gl_fps_data *data = (gl_fps_data *) calloc (1, sizeof(*data));
+  int ascent, descent;
+  data->top_p = get_boolean_resource (st->dpy, "fpsTop", "FPSTop");
+  data->texfont = load_texture_font (st->dpy, "fpsFont");
+  texture_string_metrics (data->texfont, "M", 0, &ascent, &descent);
+  data->line_height = ascent + descent;
+  st->gl_fps_data = data;
 }
 
 
-
 /* Callback in xscreensaver_function_table, via xlockmore.c.
  */
 void
@@ -86,10 +80,10 @@ xlockmore_gl_draw_fps (ModeInfo *mi)
   fps_state *st = mi->fpst;
   if (st)   /* might be too early */
     {
+      gl_fps_data *data = (gl_fps_data *) st->gl_fps_data;
       XWindowAttributes xgwa;
       int lines = 1;
       const char *s;
-      int lh = st->font->ascent + st->font->descent;
       int y = st->y;
 
       XGetWindowAttributes (st->dpy, st->window, &xgwa);
@@ -97,17 +91,13 @@ xlockmore_gl_draw_fps (ModeInfo *mi)
         if (*s == '\n') lines++;
 
       if (y < 0)
-        y = xgwa.height + y - lines*lh;
-      y += lines*lh + st->font->descent;
+        y = xgwa.height + y - (lines * data->line_height);
+      y += lines * data->line_height;
 
       glColor3f (1, 1, 1);
-      print_gl_string (st->dpy, 
-# ifdef HAVE_GLBITMAP
-                       st->font, st->font_dlist, 
-# else  /* !HAVE_GLBITMAP */
-                       st->gl_fps_data,
-# endif /* !HAVE_GLBITMAP */
-                       xgwa.width, xgwa.height,
-                       st->x, y, st->string, st->clear_p);
+      print_texture_label (st->dpy, data->texfont,
+                           xgwa.width, xgwa.height,
+                           (data->top_p ? 1 : 2),
+                           st->string);
     }
 }