8 files changed, 39 insertions, 20 deletions
diff --git a/src/Fl_Gl_Device_Plugin.cxx b/src/Fl_Gl_Device_Plugin.cxx
index a21aef2b0..9845c9f4f 100644
--- a/src/Fl_Gl_Device_Plugin.cxx
+++ b/src/Fl_Gl_Device_Plugin.cxx
@@ -36,7 +36,8 @@
 
 #include <FL/Fl_Device.H>
 #include <FL/gl.h>
-#include "src/cfg_gfx/opengl.H"
+
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h"
 
 Fl_OpenGL_Display_Device *Fl_OpenGL_Display_Device::display_device() {
   static Fl_OpenGL_Display_Device *display = new Fl_OpenGL_Display_Device(new Fl_OpenGL_Graphics_Driver());
@@ -53,12 +54,12 @@ const char *Fl_OpenGL_Display_Device::class_id = "Fl_OpenGL_Display_Device";
 #endif
 // ------ end of separate file! ------------------------------------------------
 
-#include "cfg_gfx/opengl_arci.cxx"
-#include "cfg_gfx/opengl_color.cxx"
-#include "cfg_gfx/opengl_font.cxx"
-#include "cfg_gfx/opengl_line_style.cxx"
-#include "cfg_gfx/opengl_rect.cxx"
-#include "cfg_gfx/opengl_vertex.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx"
+#include "drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx"
 
 
 #if defined(__APPLE__)
diff --git a/src/cfg_gfx/opengl.H b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h
index 48944fcb8..48944fcb8 100644
--- a/src/cfg_gfx/opengl.H
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver.h
diff --git a/src/cfg_gfx/opengl_arci.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
index 15ec4cf36..15ec4cf36 100644
--- a/src/cfg_gfx/opengl_arci.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.cxx
diff --git a/src/cfg_gfx/opengl_color.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
index 9413be75e..0923b02fb 100644
--- a/src/cfg_gfx/opengl_color.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.cxx
@@ -21,7 +21,7 @@
   \brief Color handling
 */
 
-#include "opengl.H"
+#include "Fl_OpenGL_Graphics_Driver.h"
 #include <FL/gl.h>
 
 // Implementation of fl_color(i), fl_color(r,g,b).
diff --git a/src/cfg_gfx/opengl_font.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
index 18c0c2b77..24a5fe51b 100644
--- a/src/cfg_gfx/opengl_font.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.cxx
@@ -29,6 +29,11 @@
 
 #include <FL/gl.h>
 
+// FIXME: check out FreeGlut:
+// FIXME: implement font-to-RGBA in the main graphics driver
+
+#if 1
+
 /*
   |01234567|
  -+--------+
@@ -59,14 +64,6 @@ static const char *font_data[128] = {
 };
 
 
-#if 0
-
-void Fl_OpenGL_Graphics_Driver::draw(const char* str, int n, int x, int y) {
-  gl_draw(str, n, x, y);
-}
-
-#else
-
 double Fl_OpenGL_Graphics_Driver::width(const char *str, int n) {
   return size_*n*0.5;
 }
@@ -95,7 +92,7 @@ void Fl_OpenGL_Graphics_Driver::draw(const char *str, int n, int x, int y)
     const char *fd = font_data[(int)c];
     if (fd) {
       char rendering = 0;
-      float px=0.0f, py=0.0f;
+      float px, py;
       for (;;) {
         char cmd = *fd++;
         if (cmd==0) {
@@ -125,6 +122,27 @@ void Fl_OpenGL_Graphics_Driver::draw(const char *str, int n, int x, int y)
   }
 }
 
+#elif 0
+
+/*
+extern FL_EXPORT Fl_Glut_StrokeFont glutStrokeRoman;
+extern FL_EXPORT Fl_Glut_StrokeFont glutStrokeMonoRoman;
+#  define GLUT_STROKE_ROMAN             (&glutStrokeRoman)
+#  define GLUT_STROKE_MONO_ROMAN        (&glutStrokeMonoRoman)
+
+FL_EXPORT void glutStrokeCharacter(void *font, int character);
+FL_EXPORT GLfloat glutStrokeHeight(void *font);
+FL_EXPORT int glutStrokeLength(void *font, const unsigned char *string);
+FL_EXPORT void glutStrokeString(void *font, const unsigned char *string);
+FL_EXPORT int glutStrokeWidth(void *font, int character);
+*/
+
+#else
+
+void Fl_OpenGL_Graphics_Driver::draw(const char* str, int n, int x, int y) {
+  gl_draw(str, n, x, y);
+}
+
 #endif
 
 
diff --git a/src/cfg_gfx/opengl_line_style.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
index 4bcb2f7fa..c9606f95d 100644
--- a/src/cfg_gfx/opengl_line_style.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.cxx
@@ -24,7 +24,7 @@
   \brief Line style drawing utility hiding different platforms.
 */
 
-#include "opengl.H"
+#include "Fl_OpenGL_Graphics_Driver.h"
 #include <FL/gl.h>
 
 extern int fl_line_width_;
diff --git a/src/cfg_gfx/opengl_rect.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
index b1617fcd3..1ea30a4d7 100644
--- a/src/cfg_gfx/opengl_rect.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
@@ -26,7 +26,7 @@
  */
 
 #include <FL/gl.h>
-#include "opengl.H"
+#include "Fl_OpenGL_Graphics_Driver.h"
 
 // --- line and polygon drawing with integer coordinates
 
diff --git a/src/cfg_gfx/opengl_vertex.cxx b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
index 46bc77fa8..1dd091f0d 100644
--- a/src/cfg_gfx/opengl_vertex.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
@@ -25,7 +25,7 @@
           simple 2D transformations, implemented for OpenGL.
 */
 
-#include "opengl.H"
+#include "Fl_OpenGL_Graphics_Driver.h"
 
 #include <FL/fl_draw.H>
 #include <FL/gl.h>