From http://www.jwz.org/xscreensaver/xscreensaver-5.33.tar.gz

[xscreensaver] / hacks / glx / geodesicgears.c

diff --git a/hacks/glx/geodesicgears.c b/hacks/glx/geodesicgears.c
index 83127c42178f072511e645d9a4aec2148f01ad02..6002e3477460f7d9ba93d0422c30e308ded316c8 100644 (file)
--- a/hacks/glx/geodesicgears.c
+++ b/hacks/glx/geodesicgears.c
@@ -1,4 +1,4 @@
-/* geodesicgears, Copyright (c) 2014 Jamie Zawinski <jwz@jwz.org>
+/* geodesicgears, Copyright (c) 2014-2015 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
@@ -1700,6 +1700,7 @@ draw_geodesic (ModeInfo *mi)
 
           int w, h, j;
           char buf[100];
+          XCharStruct e;
 
           /* If an even number of teeth, offset by 1/2 tooth width. */
           if (s->direction > 0 /* && !(g->nteeth & 1) */)
@@ -1721,8 +1722,10 @@ draw_geodesic (ModeInfo *mi)
           glPushMatrix();
           glScalef(0.005, 0.005, 0.005);
           sprintf (buf, "%d", i);
-          w = texture_string_width (bp->font, buf, &h);
-          glTranslatef (-w/2, -h*2/3, 0);
+          texture_string_metrics (bp->font, buf, &e, 0, 0);
+          w = e.width;
+          h = e.ascent + e.descent;
+          glTranslatef (-w/2, -h/2, 0);
           print_texture_string (bp->font, buf);
           glPopMatrix();
 
@@ -1738,8 +1741,10 @@ draw_geodesic (ModeInfo *mi)
               glTranslatef (r * cos(th), r * sin(th), -g->z + 0.01);
               glScalef(ss, ss, ss);
               sprintf (buf, "%d", j + 1);
-              w = texture_string_width (bp->font, buf, &h);
-              glTranslatef (-w/2, -h*2/3, 0);
+              texture_string_metrics (bp->font, buf, &e, 0, 0);
+              w = e.width;
+              h = e.ascent + e.descent;
+              glTranslatef (-w/2, -h/2, 0);
               print_texture_string (bp->font, buf);
               glPopMatrix();
             }