-/* 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
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) */)
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();
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();
}