joystick updates from John Fay

[freeglut] / src / freeglut_font.c

diff --git a/src/freeglut_font.c b/src/freeglut_font.c
index 3be0a0d..2dff832 100644 (file)
--- a/src/freeglut_font.c
+++ b/src/freeglut_font.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include "../include/GL/freeglut.h"
+#include <GL/freeglut.h>
 #include "freeglut_internal.h"
 
 /*
@@ -62,18 +62,21 @@ extern SFG_StrokeFont fgStrokeMonoRoman;
  */
 static SFG_Font* fghFontByID( void* font )
 {
-    /*
-     * XXX Use a macro, a table of some kind, or else split these
-     * XXX statements properly.  Jamming "return" on the end of an
-     * XXX "if" is just bad style, IMHO.
-     */
-    if( font == GLUT_BITMAP_8_BY_13        ) return &fgFontFixed8x13;
-    if( font == GLUT_BITMAP_9_BY_15        ) return &fgFontFixed9x15;
-    if( font == GLUT_BITMAP_HELVETICA_10   ) return &fgFontHelvetica10;
-    if( font == GLUT_BITMAP_HELVETICA_12   ) return &fgFontHelvetica12;
-    if( font == GLUT_BITMAP_HELVETICA_18   ) return &fgFontHelvetica18;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_10 ) return &fgFontTimesRoman10;
-    if( font == GLUT_BITMAP_TIMES_ROMAN_24 ) return &fgFontTimesRoman24;
+    if( font == GLUT_BITMAP_8_BY_13        )
+        return &fgFontFixed8x13;
+    if( font == GLUT_BITMAP_9_BY_15        )
+        return &fgFontFixed9x15;
+    if( font == GLUT_BITMAP_HELVETICA_10   )
+        return &fgFontHelvetica10;
+    if( font == GLUT_BITMAP_HELVETICA_12   )
+        return &fgFontHelvetica12;
+    if( font == GLUT_BITMAP_HELVETICA_18   )
+        return &fgFontHelvetica18;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_10 )
+        return &fgFontTimesRoman10;
+    if( font == GLUT_BITMAP_TIMES_ROMAN_24 )
+        return &fgFontTimesRoman24;
+
     fgError( "font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -84,12 +87,11 @@ static SFG_Font* fghFontByID( void* font )
  */
 static SFG_StrokeFont* fghStrokeByID( void* font )
 {
-    /*
-     * XXX Same comment as above about jamming "return" in after an
-     * XXX "if".
-     */
-    if( font == GLUT_STROKE_ROMAN      ) return &fgStrokeRoman;
-    if( font == GLUT_STROKE_MONO_ROMAN ) return &fgStrokeMonoRoman;
+    if( font == GLUT_STROKE_ROMAN      )
+        return &fgStrokeRoman;
+    if( font == GLUT_STROKE_MONO_ROMAN )
+        return &fgStrokeMonoRoman;
+
     fgError( "stroke font 0x%08x not found", font );
     return 0; /*** NOT REACHED ***/
 }
@@ -110,7 +112,7 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
     /*
      * Find the character we want to draw (???)
      */
-    face = font->Characters[ character - 1 ];
+    face = font->Characters[ character ];
 
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
@@ -131,11 +133,10 @@ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character )
 void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
 {
     int c;
-    int numchar = strlen( string );
+    int numchar = strlen( (char *) string );
     SFG_Font* font = fghFontByID( fontID );
-    float raster_position[ 4 ];
+    float x = 0.0f ;
 
-    glGetFloatv ( GL_CURRENT_RASTER_POSITION, raster_position );
     glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT );
     glPixelStorei( GL_UNPACK_SWAP_BYTES,  GL_FALSE );
     glPixelStorei( GL_UNPACK_LSB_FIRST,   GL_FALSE );
@@ -152,12 +153,12 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
     for( c = 0; c < numchar; c++ )
         if( string[c] == '\n' )
         {
-            raster_position[ 1 ] -= ( float )font->Height;
-            glRasterPos4fv( raster_position );
+            glBitmap ( 0, 0, 0, 0, -x, (float) -font->Height, NULL );
+            x = 0.0f;
         }
         else  /* Not an EOL, draw the bitmap character */
         {
-            const GLubyte* face = font->Characters[ string[ c ] - 1 ];
+            const GLubyte* face = font->Characters[ string[ c ] ];
 
             glBitmap(
                 face[ 0 ], font->Height,     /* Bitmap's width and height    */
@@ -165,7 +166,10 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string )
                 ( float )( face[ 0 ] ), 0.0, /* The raster advance; inc. x,y */
                 ( face + 1 )                 /* The packed bitmap data...    */
             );
+
+            x += ( float )( face[ 0 ] );
         }
+
     glPopClientAttrib( );
 }
 
@@ -177,7 +181,7 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character )
     SFG_Font* font = fghFontByID( fontID );
 
     freeglut_return_val_if_fail( character > 0 && character < 256, 0 );
-    return *( font->Characters[ character - 1 ] );
+    return *( font->Characters[ character ] );
 }
 
 /*
@@ -187,12 +191,12 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string )
 {
     int c, length = 0, this_line_length = 0;
     SFG_Font* font = fghFontByID( fontID );
-    int numchar = strlen( string );
+    int numchar = strlen( (char *) string );
 
     for( c = 0; c < numchar; c++ )
     {
         if( string[ c ] != '\n' )/* Not an EOL, increment length of line */
-            this_line_length += *( font->Characters[ string[ c ] - 1 ]);
+            this_line_length += *( font->Characters[ string[ c ] ]);
         else  /* EOL; reset the length of this line */
         {
             if( length < this_line_length )
@@ -245,7 +249,7 @@ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character )
 void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
 {
     int c, i, j;
-    int numchar = strlen( string );
+    int numchar = strlen( (char *) string );
     float length = 0.0;
     SFG_StrokeFont* font = fghStrokeByID( fontID );
 
@@ -278,7 +282,7 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string )
 
                         glEnd( );
                     }
-                    
+
                     length += schar->Right;
                     glTranslatef( schar->Right, 0.0, 0.0 );
                 }
@@ -300,7 +304,7 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character )
     );
     schar = font->Characters[ character ];
     freeglut_return_val_if_fail( schar, 0 );
-    
+
     return ( int )( schar->Right + 0.5 );
 }
 
@@ -313,7 +317,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
     float length = 0.0;
     float this_line_length = 0.0;
     SFG_StrokeFont* font = fghStrokeByID( fontID );
-    int numchar = strlen( string );
+    int numchar = strlen( (char *) string );
 
     for( c = 0; c < numchar; c++ )
         if( string[ c ] < font->Quantity )
@@ -333,7 +337,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
         }
     if( length < this_line_length )
         length = this_line_length;
-    return ( int )( length + 0.5 );
+    return( int )( length + 0.5 );
 }
 
 /*
@@ -342,7 +346,7 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string )
 GLfloat FGAPIENTRY glutStrokeHeight( void* fontID )
 {
     SFG_StrokeFont* font = fghStrokeByID( fontID );
-    return( font->Height );
+    return font->Height;
 }
 
 /*** END OF FILE ***/