X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffreeglut_font.c;h=4bdfa88e165a0913bcdf92da8b3f66a1c567f8ec;hb=aa4643b483379e0f1e40b8abc6584363cf395216;hp=596a491dbc38a0f87ec5d2dac4c48bced384d052;hpb=238b81d2b9eab3675c30066c2f57f2c4ef1c2035;p=freeglut diff --git a/src/freeglut_font.c b/src/freeglut_font.c index 596a491..4bdfa88 100644 --- a/src/freeglut_font.c +++ b/src/freeglut_font.c @@ -29,8 +29,6 @@ #include "config.h" #endif -#define G_LOG_DOMAIN "freeglut-font" - #include "../include/GL/freeglut.h" #include "freeglut_internal.h" @@ -64,23 +62,23 @@ extern SFG_StrokeFont fgStrokeMonoRoman; */ static SFG_Font* fghFontByID( void* font ) { - /* - * Try matching the font ID and the font data structure - */ - 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 ); - - /* - * This probably is the library user's fault - */ - fgError( "font 0x%08x not found", font ); - - return 0; + 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 ***/ } /* @@ -89,18 +87,13 @@ static SFG_Font* fghFontByID( void* font ) */ static SFG_StrokeFont* fghStrokeByID( void* font ) { - /* - * Try matching the font ID and the font data structure - */ - if( font == GLUT_STROKE_ROMAN ) return( &fgStrokeRoman ); - if( font == GLUT_STROKE_MONO_ROMAN ) return( &fgStrokeMonoRoman ); - - /* - * This probably is the library user's fault - */ - fgError( "stroke font 0x%08x not found", font ); - - return 0; + 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 ***/ } @@ -111,114 +104,71 @@ static SFG_StrokeFont* fghStrokeByID( void* font ) */ void FGAPIENTRY glutBitmapCharacter( void* fontID, int character ) { - const GLubyte* face; - - /* - * First of all we'll need a font to use - */ - SFG_Font* font = fghFontByID( fontID ); - - /* - * Make sure the character we want to output is valid - */ - freeglut_return_if_fail( character >= 1 && character < 256 ); - - /* - * Then find the character we want to draw - */ - face = font->Characters[ character - 1 ]; - - /* - * Save the old pixel store settings - */ - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); - - /* - * Set up the pixel unpacking ways - */ - glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); - glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); - glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - - /* - * We'll use a glBitmap call to draw the font. - */ - glBitmap( - face[ 0 ], font->Height, /* The bitmap's width and height */ - font->xorig, font->yorig, /* The origin -- what on earth? */ - (float)(face[ 0 ]), 0.0, /* The raster advance -- inc. x */ - (face + 1) /* The packed bitmap data... */ - ); - - /* - * Restore the old pixel store settings - */ - glPopClientAttrib(); + const GLubyte* face; + SFG_Font* font = fghFontByID( fontID ); + + freeglut_return_if_fail( ( character >= 1 )&&( character < 256 ) ); + + /* + * Find the character we want to draw (???) + */ + face = font->Characters[ character - 1 ]; + + glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); + glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); + glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); + glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); + glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); + glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); + glBitmap( + face[ 0 ], font->Height, /* The bitmap's width and height */ + font->xorig, font->yorig, /* The origin in the font glyph */ + ( float )( face[ 0 ] ), 0.0, /* The raster advance -- inc. x,y */ + ( face + 1 ) /* The packed bitmap data... */ + ); + glPopClientAttrib( ); } void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string ) { - int c; - int numchar = strlen ( string ) ; - - /* - * First of all we'll need a font to use - */ - SFG_Font* font = fghFontByID( fontID ); - - float raster_position[4] ; - glGetFloatv ( GL_CURRENT_RASTER_POSITION, raster_position ) ; - - /* - * Save the old pixel store settings - */ - glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT ); - - /* - * Set up the pixel unpacking ways - */ - glPixelStorei( GL_UNPACK_SWAP_BYTES, GL_FALSE ); - glPixelStorei( GL_UNPACK_LSB_FIRST, GL_FALSE ); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); - glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); - glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); - glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - - /* - * Step through the string, drawing each character. - * A carriage return will simply translate the next character's insertion point back to the - * start of the line and down one line. - */ - for( c = 0; c < numchar; c++ ) - { - if ( string[c] == '\n' ) - { - raster_position[1] -= (float)font->Height ; - glRasterPos4fv ( raster_position ) ; - } - else /* Not a carriage return, draw the bitmap character */ - { - const GLubyte* face = font->Characters[ string[ c ] - 1 ] ; - - /* - * We'll use a glBitmap call to draw the font. - */ - glBitmap( - face[ 0 ], font->Height, /* The bitmap's width and height */ - font->xorig, font->yorig, /* The origin -- what on earth? */ - (float)(face[ 0 ]), 0.0, /* The raster advance -- inc. x */ - (face + 1) /* The packed bitmap data... */ - ) ; - } - } + int c; + int numchar = strlen( (char *) string ); + SFG_Font* font = fghFontByID( fontID ); + float raster_position[ 4 ]; + + 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 ); + glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); + glPixelStorei( GL_UNPACK_SKIP_ROWS, 0 ); + glPixelStorei( GL_UNPACK_SKIP_PIXELS, 0 ); + glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); - /* - * Restore the old pixel store settings - */ - glPopClientAttrib(); + /* + * Step through the string, drawing each character. + * A newline will simply translate the next character's insertion + * point back to the start of the line and down one line. + */ + for( c = 0; c < numchar; c++ ) + if( string[c] == '\n' ) + { + raster_position[ 1 ] -= ( float )font->Height; + glRasterPos4fv( raster_position ); + } + else /* Not an EOL, draw the bitmap character */ + { + const GLubyte* face = font->Characters[ string[ c ] - 1 ]; + + glBitmap( + face[ 0 ], font->Height, /* Bitmap's width and height */ + font->xorig, font->yorig, /* The origin in the font glyph */ + ( float )( face[ 0 ] ), 0.0, /* The raster advance; inc. x,y */ + ( face + 1 ) /* The packed bitmap data... */ + ); + } + glPopClientAttrib( ); } /* @@ -226,20 +176,10 @@ void FGAPIENTRY glutBitmapString( void* fontID, const unsigned char *string ) */ int FGAPIENTRY glutBitmapWidth( void* fontID, int character ) { - /* - * First of all, grab the font we need - */ - SFG_Font* font = fghFontByID( fontID ); - - /* - * Make sure the character we want to output is valid - */ - freeglut_return_val_if_fail( character > 0 && character < 256, 0 ); - - /* - * Scan the font looking for the specified character - */ - return( *(font->Characters[ character - 1 ]) ); + SFG_Font* font = fghFontByID( fontID ); + + freeglut_return_val_if_fail( character > 0 && character < 256, 0 ); + return *( font->Characters[ character - 1 ] ); } /* @@ -247,34 +187,25 @@ int FGAPIENTRY glutBitmapWidth( void* fontID, int character ) */ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string ) { - int c, length = 0, this_line_length = 0; - - /* - * First of all, grab the font we need - */ - SFG_Font* font = fghFontByID( fontID ); - - /* - * Step through the characters in the string, adding up the width of each one - */ - int numchar = strlen ( string ) ; - for( c = 0; c < numchar; c++ ) - { - if ( string[ c ] == '\n' ) /* Carriage return, reset the length of this line */ + int c, length = 0, this_line_length = 0; + SFG_Font* font = fghFontByID( fontID ); + int numchar = strlen( (char *) string ); + + for( c = 0; c < numchar; c++ ) { - if ( length < this_line_length ) length = this_line_length ; - this_line_length = 0 ; + if( string[ c ] != '\n' )/* Not an EOL, increment length of line */ + this_line_length += *( font->Characters[ string[ c ] - 1 ]); + else /* EOL; reset the length of this line */ + { + if( length < this_line_length ) + length = this_line_length; + this_line_length = 0; + } } - else /* Not a carriage return, increment the length of this line */ - this_line_length += *(font->Characters[ string[ c ] - 1 ]) ; - } - - if ( length < this_line_length ) length = this_line_length ; + if ( length < this_line_length ) + length = this_line_length; - /* - * Return the result now - */ - return( length ); + return length; } /* @@ -282,15 +213,8 @@ int FGAPIENTRY glutBitmapLength( void* fontID, const unsigned char* string ) */ int FGAPIENTRY glutBitmapHeight( void* fontID ) { - /* - * See which font are we queried about - */ - SFG_Font* font = fghFontByID( fontID ); - - /* - * Return the character set's height - */ - return( font->Height ); + SFG_Font* font = fghFontByID( fontID ); + return font->Height; } /* @@ -298,85 +222,70 @@ int FGAPIENTRY glutBitmapHeight( void* fontID ) */ void FGAPIENTRY glutStrokeCharacter( void* fontID, int character ) { - const SFG_StrokeChar *schar; - const SFG_StrokeStrip *strip; - int i, j; - - /* - * First of all we'll need a font to use - */ - SFG_StrokeFont* font = fghStrokeByID( fontID ); - - /* - * Make sure the character we want to output is valid - */ - freeglut_return_if_fail( character >= 0 && character < font->Quantity ); - - schar = font->Characters[character]; + const SFG_StrokeChar *schar; + const SFG_StrokeStrip *strip; + int i, j; + SFG_StrokeFont* font = fghStrokeByID( fontID ); - freeglut_return_if_fail( schar ); + freeglut_return_if_fail( character >= 0 ); + freeglut_return_if_fail( character < font->Quantity ); - strip = schar->Strips; + schar = font->Characters[ character ]; + freeglut_return_if_fail( schar ); + strip = schar->Strips; - for (i = 0; i < schar->Number; i++, strip++) - { - glBegin(GL_LINE_STRIP); - for(j = 0; j < strip->Number; j++) + for( i = 0; i < schar->Number; i++, strip++ ) { - glVertex2f(strip->Vertices[j].X, strip->Vertices[j].Y); + glBegin( GL_LINE_STRIP ); + for( j = 0; j < strip->Number; j++ ) + glVertex2f( strip->Vertices[ j ].X, strip->Vertices[ j ].Y ); + glEnd( ); } - glEnd(); - } - glTranslatef(schar->Right, 0.0, 0.0); + glTranslatef( schar->Right, 0.0, 0.0 ); } void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) { - int c, i, j; - int numchar = strlen ( string ) ; - float length = 0.0 ; - - /* - * First of all we'll need a font to use - */ - SFG_StrokeFont* font = fghStrokeByID( fontID ); - - /* - * Step through the string, drawing each character. - * A carriage return will simply translate the next character's insertion point back to the - * start of the line and down one line. - */ - for( c = 0; c < numchar; c++ ) - { - if ( string[ c ] < font->Quantity ) - { - if ( string[c] == '\n' ) - { - glTranslatef ( -length, -(float)(font->Height), 0.0 ) ; - length = 0.0 ; - } - else /* Not a carriage return, draw the bitmap character */ - { - const SFG_StrokeChar *schar = font->Characters[string[c]]; - if ( schar != NULL ) - { - const SFG_StrokeStrip *strip = schar->Strips; - - for (i = 0; i < schar->Number; i++, strip++) - { - glBegin(GL_LINE_STRIP); - for(j = 0; j < strip->Number; j++) - glVertex2f(strip->Vertices[j].X, strip->Vertices[j].Y); - - glEnd(); - } + int c, i, j; + int numchar = strlen( (char *) string ); + float length = 0.0; + SFG_StrokeFont* font = fghStrokeByID( fontID ); - length += schar->Right ; - glTranslatef(schar->Right, 0.0, 0.0); + /* + * Step through the string, drawing each character. + * A newline will simply translate the next character's insertion + * point back to the start of the line and down one line. + */ + for( c = 0; c < numchar; c++ ) + if( string[ c ] < font->Quantity ) + { + if( string[ c ] == '\n' ) + { + glTranslatef ( -length, -( float )( font->Height ), 0.0 ); + length = 0.0; + } + else /* Not an EOL, draw the bitmap character */ + { + const SFG_StrokeChar *schar = font->Characters[ string[ c ] ]; + if( schar ) + { + const SFG_StrokeStrip *strip = schar->Strips; + + for( i = 0; i < schar->Number; i++, strip++ ) + { + glBegin( GL_LINE_STRIP ); + for( j = 0; j < strip->Number; j++ ) + glVertex2f( strip->Vertices[ j ].X, + strip->Vertices[ j ].Y); + + glEnd( ); + } + + length += schar->Right; + glTranslatef( schar->Right, 0.0, 0.0 ); + } + } } - } - } - } } /* @@ -384,22 +293,17 @@ void FGAPIENTRY glutStrokeString( void* fontID, const unsigned char *string ) */ int FGAPIENTRY glutStrokeWidth( void* fontID, int character ) { - const SFG_StrokeChar *schar; - /* - * First of all we'll need a font to use - */ - SFG_StrokeFont* font = fghStrokeByID( fontID ); - - /* - * Make sure the character we want to output is valid - */ - freeglut_return_val_if_fail( character >= 0 && character < font->Quantity, 0 ); - - schar = font->Characters[character]; - - freeglut_return_val_if_fail( schar, 0 ); + const SFG_StrokeChar *schar; + SFG_StrokeFont* font = fghStrokeByID( fontID ); - return ((int)(schar->Right + 0.5)); + freeglut_return_val_if_fail( ( character >= 0 ) && + ( character < font->Quantity ), + 0 + ); + schar = font->Characters[ character ]; + freeglut_return_val_if_fail( schar, 0 ); + + return ( int )( schar->Right + 0.5 ); } /* @@ -407,43 +311,31 @@ int FGAPIENTRY glutStrokeWidth( void* fontID, int character ) */ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) { - int c; - float length = 0.0; - float this_line_length = 0.0 ; - - /* - * First of all we'll need a font to use - */ - SFG_StrokeFont* font = fghStrokeByID( fontID ); - - /* - * Step through the characters in the string, adding up the width of each one - */ - int numchar = strlen ( string ) ; - for( c = 0; c < numchar; c++ ) - { - if ( string[ c ] < font->Quantity ) - { - if ( string[ c ] == '\n' ) /* Carriage return, reset the length of this line */ - { - if ( length < this_line_length ) length = this_line_length ; - this_line_length = 0.0 ; - } - else /* Not a carriage return, increment the length of this line */ - { - const SFG_StrokeChar *schar = font->Characters[string[c]]; - if ( schar != NULL ) - this_line_length += schar->Right ; - } - } - } - - if ( length < this_line_length ) length = this_line_length ; + int c; + float length = 0.0; + float this_line_length = 0.0; + SFG_StrokeFont* font = fghStrokeByID( fontID ); + int numchar = strlen( (char *) string ); - /* - * Return the result now - */ - return( (int)(length+0.5) ); + for( c = 0; c < numchar; c++ ) + if( string[ c ] < font->Quantity ) + { + if( string[ c ] == '\n' ) /* EOL; reset the length of this line */ + { + if( length < this_line_length ) + length = this_line_length; + this_line_length = 0.0; + } + else /* Not an EOL, increment the length of this line */ + { + const SFG_StrokeChar *schar = font->Characters[ string[ c ] ]; + if( schar ) + this_line_length += schar->Right; + } + } + if( length < this_line_length ) + length = this_line_length; + return( int )( length + 0.5 ); } /* @@ -451,15 +343,8 @@ int FGAPIENTRY glutStrokeLength( void* fontID, const unsigned char* string ) */ GLfloat FGAPIENTRY glutStrokeHeight( void* fontID ) { - /* - * See which font are we queried about - */ SFG_StrokeFont* font = fghStrokeByID( fontID ); - - /* - * Return the character set's height - */ - return( font->Height ); + return font->Height; } /*** END OF FILE ***/