Progressing on bringing Radiant 1.6.x to a workable state on Windows.

This commit:
1. Reverts to using GtkR-deps-1.6-3.zip (instead of GtkR-deps-1.6-4.zip).
Some font-related DLLs are therefore no longer used with this patch.
2. Because of the above #1, now using the really old OpenGL font rendering
code on Windows systems.  This is controlled via "#ifdef _WIN32" blocks.
Linux still uses the new and improved OpenGL font rendering.
Note that this old font rendering that Windows now uses (err, has used in the
past too) makes use of gdk_gl_font_use_pango_font(), which is really old
and crufty.

So, with this commit Radiant is fully working (modulo bugs) on Linux and
Windows, and OpenGL fonts work too.

I WOULD NOT SUGGEST MERGING THIS CHANGE INTO TRUNK.  THE CORRECT APPROACH
IS TO INSTEAD FIX THE DLL LIBRARY DEPENDENCIES IN TRUNK.  I AM ONLY COMMITTING
THIS SO THAT I CAN CONTINUE FIXING BUGS IN RADIANT IN THE MEANTIME.

There are still a zillion bugs on Windows.  For example, I can't even save
a .map file at this point.  That is my next task, to fix saving of .map files.

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/branches/Rambetter-temp-fixes@350 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/config.py b/config.py
index e91e9f1f2e62843509e2799dcd6f9722d6ad7d50..e0f20a01e52271274abd64a2aa3d6b8284f29836 100644 (file)
--- a/config.py
+++ b/config.py
@@ -273,7 +273,7 @@ class Config:
                        self.FetchGamePaks( self.install_directory )
                # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
                if ( self.platform == 'Windows' ):
-                       depsfile = 'GtkR-deps-1.6-4.zip'
+                       depsfile = 'GtkR-deps-1.6-3.zip'
                        if ( not os.path.exists( depsfile ) ):
                                cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile ]
                                print( repr( cmd ) )
@@ -310,9 +310,9 @@ class Config:
                                        'gtk2/lib/libgdkglext-win32-1.0-0.dll',
                                        'gtk2/lib/iconv.dll',
                                         'gtk2/zlib1.dll',
-                                        'freetype-dev_2.4.2-1_win32/bin/freetype6.dll',
-                                        'fontconfig-dev_2.8.0-2_win32/bin/libfontconfig-1.dll',
-                                        'expat_2.0.1-1_win32/bin/libexpat-1.dll',
+#                                       'freetype-dev_2.4.2-1_win32/bin/freetype6.dll',
+#                                       'fontconfig-dev_2.8.0-2_win32/bin/libfontconfig-1.dll',
+#                                       'expat_2.0.1-1_win32/bin/libexpat-1.dll',
                                         ]:
                                         cmd = [ 'cp', '-v', os.path.join( srcdir, f ), 'install' ]
                                         print( repr( cmd ) )
@@ -320,9 +320,9 @@ class Config:
                                for d in [
                                        'gtk2/etc',
                                        'gtk2/share',
-                                        'fontconfig-dev_2.8.0-2_win32/etc',
-                                        'fontconfig-dev_2.8.0-2_win32/share',
-                                        'freetype-dev_2.4.2-1_win32/share',
+#                                       'fontconfig-dev_2.8.0-2_win32/etc',
+#                                       'fontconfig-dev_2.8.0-2_win32/share',
+#                                       'freetype-dev_2.4.2-1_win32/share',
                                        ]:
                                         cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, d ), 'install' ]
                                        print( repr( cmd ) )

diff --git a/radiant/glwidget.cpp b/radiant/glwidget.cpp
index 7a408f9e51cebec59999e9945eddf09d46fcfd95..57699b379ee1b9ff137ec8ff4c0b76acf755e606 100644 (file)
--- a/radiant/glwidget.cpp
+++ b/radiant/glwidget.cpp
@@ -33,7 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "stdafx.h"
 
 #include <gtk/gtkgl.h>
+
+#ifndef _WIN32
 #include <pango/pangoft2.h>
+#endif
+
 #include "glwidget.h"
 #include "qgl.h"
 
@@ -208,6 +212,15 @@ gboolean WINAPI gtk_glwidget_make_current (GtkWidget *widget)
 }
 
 
+#ifdef _WIN32
+
+GLuint font_list_base;
+static gchar font_string[] = "courier 8";
+static gint font_height;
+static int font_created = 0;
+
+#else
+
 // Think about rewriting this font stuff to use OpenGL display lists and glBitmap().
 // Bit maps together with display lists may offer a performance increase, but
 // they would not allow antialiased fonts.
@@ -219,31 +232,88 @@ static int y_offset_bitmap_render_pango_units = -1;
 static PangoContext *ft2_context = NULL;
 static int _debug_font_created = 0;
 
+#endif
+
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_ascent()
 {
+#ifdef _WIN32
+
+  return 6; // Approximation.
+
+#else
+
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_ascent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_ascent;
+
+#endif
 }
 
 // Units are pixels.  Returns a positive value [most likely].
 int gtk_glwidget_font_descent()
 {
+#ifdef _WIN32
+
+  return 0; // Approximation.
+
+#else
+
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_font_descent() called but font does not exist; "
           "you should have called gtk_glwidget_create_font() first");
   }
 
   return font_descent;
+
+#endif
+}
+
+#ifdef _WIN32
+
+void gtk_glwidget_create_font_win_internal()
+{
+  if (font_created) return;
+  font_created = 1;
+
+  PangoFontDescription *font_desc;
+  PangoFont *font;
+  PangoFontMetrics *font_metrics;
+
+  font_list_base = qglGenLists (256);
+
+  font_desc = pango_font_description_from_string (font_string);
+
+  font = gdk_gl_font_use_pango_font (font_desc, 0, 256, font_list_base);
+
+  if(font != NULL)
+  {
+    font_metrics = pango_font_get_metrics (font, NULL);
+
+    font_height = pango_font_metrics_get_ascent (font_metrics) +
+                  pango_font_metrics_get_descent (font_metrics);
+    font_height = PANGO_PIXELS (font_height);
+
+    pango_font_metrics_unref (font_metrics);
+  }
+
+  pango_font_description_free (font_desc);
 }
 
+#endif
+
 void gtk_glwidget_create_font()
 {
+#ifdef _WIN32
+
+  // Do nothing.
+
+#else
+
   PangoFontDescription *font_desc;
   PangoLayout *layout;
   PangoRectangle log_rect;
@@ -294,10 +364,18 @@ void gtk_glwidget_create_font()
   font_ascent = PANGO_PIXELS_CEIL(font_ascent_pango_units);
   font_descent = PANGO_PIXELS_CEIL(font_descent_pango_units);
   y_offset_bitmap_render_pango_units = (font_ascent * PANGO_SCALE) - font_ascent_pango_units;
+
+#endif
 }
 
 void gtk_glwidget_destroy_font()
 {
+#ifdef _WIN32
+
+  // Do nothing.
+
+#else
+
   if (!_debug_font_created) {
     Error("Programming error: gtk_glwidget_destroy_font() called when font "
           "does not exist");
@@ -308,6 +386,8 @@ void gtk_glwidget_destroy_font()
   y_offset_bitmap_render_pango_units = -1;
   g_object_unref(G_OBJECT(ft2_context));
   _debug_font_created = 0;
+
+#endif
 }
 
 
@@ -323,6 +403,14 @@ void gtk_glwidget_destroy_font()
 // Google for "glDrawPixels clipping".
 void gtk_glwidget_print_string(const char *s)
 {
+#ifdef _WIN32
+
+  gtk_glwidget_create_font_win_internal();
+  qglListBase(font_list_base);
+  qglCallLists(strlen(s), GL_UNSIGNED_BYTE, (unsigned char *)s);
+
+#else
+
   // The idea for this code initially came from the font-pangoft2.c example that comes with GtkGLExt.
 
   PangoLayout *layout;
@@ -396,12 +484,24 @@ void gtk_glwidget_print_string(const char *s)
   }
 
   g_object_unref(G_OBJECT(layout));
+
+#endif
 }
 
 void gtk_glwidget_print_char(char s)
 {
+#ifdef _WIN32
+
+  gtk_glwidget_create_font_win_internal();
+  qglListBase(font_list_base);
+  qglCallLists(1, GL_UNSIGNED_BYTE, (unsigned char *) &s);
+
+#else
+
   char str[2];
   str[0] = s;
   str[1] = '\0';
   gtk_glwidget_print_string(str);
+
+#endif
 }