X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=3fe559a75b08ea1a71ac356a7cfc2934377183ec;hb=73a6a2749dd40b935863f2e226ab805b88cd0351;hp=46e22194212990adc4fd52f228ea98b93453ed00;hpb=646676b8dbf8ab504ac8a275fe9a63a403a3190b;p=freeglut diff --git a/src/freeglut_font.c b/src/freeglut_font.c index 46e2219..3fe559a 100644 --- a/src/freeglut_font.c +++ b/src/freeglut_font.c @@ -59,15 +59,30 @@ extern SFG_StrokeFont fgStrokeMonoRoman; * This is for GLUT binary compatibility, as suggested by Steve Baker */ #if TARGET_HOST_UNIX_X11 - void* glutStrokeRoman; - void* glutStrokeMonoRoman; - void* glutBitmap9By15; - void* glutBitmap8By13; - void* glutBitmapTimesRoman10; - void* glutBitmapTimesRoman24; - void* glutBitmapHelvetica10; - void* glutBitmapHelvetica12; - void* glutBitmapHelvetica18; + struct _GLUTstrokeFont { + const char *name; + int num_chars; + void *ch; + float top; + float bottom; + }; + + struct _GLUTbitmapFont { + const char *name; + const int num_chars; + const int first; + const void *ch; + }; + + struct _GLUTstrokeFont glutStrokeRoman; + struct _GLUTstrokeFont glutStrokeMonoRoman; + struct _GLUTbitmapFont glutBitmap9By15; + struct _GLUTbitmapFont glutBitmap8By13; + struct _GLUTbitmapFont glutBitmapTimesRoman10; + struct _GLUTbitmapFont glutBitmapTimesRoman24; + struct _GLUTbitmapFont glutBitmapHelvetica10; + struct _GLUTbitmapFont glutBitmapHelvetica12; + struct _GLUTbitmapFont glutBitmapHelvetica18; #endif