From c8288bd7b45136cc8b11aeed5056f15999ad5973 Mon Sep 17 00:00:00 2001
From: Matthias Melcher <fltk@matthiasm.com>
Date: Thu, 17 Aug 2006 09:56:59 +0000
Subject: Added some GLUT4 functions (STR #1370)

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5323 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 CHANGES                    | 1 +
 FL/glut.H                  | 3 +++
 src/glut_compatability.cxx | 4 ++++
 src/glut_font.cxx          | 5 +++++
 4 files changed, 13 insertions(+)

diff --git a/CHANGES b/CHANGES
index 1a192405c..47226ea4e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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)
diff --git a/FL/glut.H b/FL/glut.H
index 8fa9a2f5b..80f3c10c9 100644
--- a/FL/glut.H
+++ b/FL/glut.H
@@ -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
 
 //
-- 
cgit v1.2.3