diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | FL/glut.H | 3 | ||||
| -rw-r--r-- | src/glut_compatability.cxx | 4 | ||||
| -rw-r--r-- | src/glut_font.cxx | 5 |
4 files changed, 13 insertions, 0 deletions
@@ -1,5 +1,6 @@ CHANGES IN FLTK 1.1.8 + - Added some GLUT4 functions (STR #1370) - Added "context_changed()" function for OpenGL windows which allows efficent texture loading (STR #1372) - Added missing "const" to GLUT call (STR #1371) @@ -125,6 +125,8 @@ FL_EXPORT void glutDestroyWindow(int win); inline void glutPostRedisplay() {glut_window->redraw();} +FL_EXPORT void glutPostWindowRedisplay(int win); + FL_EXPORT void glutSwapBuffers(); inline int glutGetWindow() {return glut_window->number;} @@ -421,6 +423,7 @@ extern FL_EXPORT struct Glut_Bitmap_Font {uchar font; int size;} FL_EXPORT void glutBitmapCharacter(void *font, int character); FL_EXPORT int glutBitmapWidth(void *font, int character); +FL_EXPORT int glutBitmapLength(void *font, const unsigned char *string); //////////////////////////////////////////////////////////////// // GLUT drawing functions. These are NOT emulated but you can diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index 71aeb73ba..b2acfdec4 100644 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -257,6 +257,10 @@ void glutDestroyWindow(int win) { delete windows[win]; } +void glutPostWindowRedisplay(int win) { + windows[win]->redraw(); +} + void glutSetWindow(int win) { windows[win]->make_current(); } diff --git a/src/glut_font.cxx b/src/glut_font.cxx index eca309934..071767cdd 100644 --- a/src/glut_font.cxx +++ b/src/glut_font.cxx @@ -53,6 +53,11 @@ int glutBitmapWidth(void* font, int character) { return int(gl_width(character)+.5); } +int glutBitmapLength(void *font, const unsigned char *string) { + gl_font(((Glut_Bitmap_Font *)font)->font,((Glut_Bitmap_Font *)font)->size); + return int(gl_width((const char*)string)+.5); +} + #endif // |