Fix Xft2 usage (still need to do a final fix that loads the proper X

font...)

Fix Fl_Window/Fl_Double_Window in FLUID.

Fix background tile coloring for plastic scheme.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

5 files changed, 36 insertions, 16 deletions

diff --git a/CHANGES b/CHANGES
index 1c95acd55..39740a385 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 CHANGES IN FLTK 1.1.4
 
+	- FLUID didn't keep the double/single buffer type for
+	  windows.
+	- FLTK didn't work with Xft2.
 	- OSX window resizing didn't work (STR #64)
 	- Fixed MacOS X shared library generation (STR #51)
 	- Several widgets defined their own size() method but
diff --git a/configure.in b/configure.in
index 23c6a9c3d..e774628f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.100 2003/06/15 05:37:32 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -541,10 +541,17 @@ case $uname in
         AC_ARG_ENABLE(xft, [  --enable-xft            turn on Xft support [default=no]])
 
 	if test x$enable_xft = xyes; then
-	    AC_CHECK_HEADER(X11/Xft/Xft.h,
-		AC_CHECK_LIB(Xft, XftDrawCreate,
-	            AC_DEFINE(USE_XFT)
-		    LIBS="-lXft $LIBS"))
+            AC_PATH_PROG(FTCONFIG,freetype-config)
+
+	    if test "x$FTCONFIG" != "x:"; then
+	        CPPFLAGS="`$FTCONFIG --cflags` $CPPFLAGS"
+	        CXXFLAGS="`$FTCONFIG --cflags` $CXXFLAGS"
+
+		AC_CHECK_HEADER(X11/Xft/Xft.h,
+		    AC_CHECK_LIB(Xft, XftDrawCreate,
+	        	AC_DEFINE(USE_XFT)
+			LIBS="-lXft $LIBS"))
+	    fi
 	fi
 
 	dnl Check for the Xdbe extension unless disabled...
@@ -845,5 +852,5 @@ dnl Make sure the fltk-config script is executable...
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.100 2003/06/15 05:37:32 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.101 2003/07/12 04:20:48 easysw Exp $".
 dnl
diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx
index 083e7ad66..4ad5cf25e 100644
--- a/fluid/Fl_Widget_Type.cxx
+++ b/fluid/Fl_Widget_Type.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.25 2003/05/27 20:20:17 easysw Exp $"
+// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.26 2003/07/12 04:20:48 easysw Exp $"
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
@@ -1679,7 +1679,7 @@ void Fl_Widget_Type::write_properties() {
   }
   write_string("xywh {%d %d %d %d}", o->x(), o->y(), o->w(), o->h());
   Fl_Widget* tplate = ((Fl_Widget_Type*)factory)->o;
-  if (o->type() != tplate->type()) {
+  if (o->type() != tplate->type() || is_window()) {
     write_string("type");
     write_word(item_name(subtypes(), o->type()));
   }
@@ -1978,5 +1978,5 @@ int Fl_Widget_Type::read_fdesign(const char* propname, const char* value) {
 }
 
 //
-// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.25 2003/05/27 20:20:17 easysw Exp $".
+// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.26 2003/07/12 04:20:48 easysw Exp $".
 //
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index 43d998aee..69fea0086 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.20 2003/05/21 16:12:14 easysw Exp $"
+// "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $"
 //
 // System color support for the Fast Light Tool Kit (FLTK).
 //
@@ -258,17 +258,20 @@ int Fl::reload_scheme() {
 
     get_color(FL_GRAY, r, g, b);
 
+//    printf("FL_GRAY = 0x%02x 0x%02x 0x%02x\n", r, g, b);
+
     for (i = 0; i < 3; i ++) {
-      nr = levels[i] * r / 0xd8;
+      nr = levels[i] * r / 0xe8;
       if (nr > 255) nr = 255;
 
-      ng = levels[i] * g / 0xd8;
+      ng = levels[i] * g / 0xe8;
       if (ng > 255) ng = 255;
 
-      nb = levels[i] * b / 0xd8;
+      nb = levels[i] * b / 0xe8;
       if (nb > 255) nb = 255;
 
       sprintf(tile_cmap[i], "%c c #%02x%02x%02x", "Oo."[i], nr, ng, nb);
+//      puts(tile_cmap[i]);
     }
 
     tile.uncache();
@@ -320,5 +323,5 @@ int Fl::reload_scheme() {
 
 
 //
-// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.20 2003/05/21 16:12:14 easysw Exp $".
+// End of "$Id: Fl_get_system_colors.cxx,v 1.6.2.7.2.21 2003/07/12 04:20:48 easysw Exp $".
 //
diff --git a/src/fl_font_xft.cxx b/src/fl_font_xft.cxx
index 07b65a84e..aeeae3c11 100644
--- a/src/fl_font_xft.cxx
+++ b/src/fl_font_xft.cxx
@@ -1,5 +1,5 @@
 //
-// "$Id: fl_font_xft.cxx,v 1.4.2.11 2003/05/04 21:58:59 easysw Exp $"
+// "$Id: fl_font_xft.cxx,v 1.4.2.12 2003/07/12 04:20:48 easysw Exp $"
 //
 // Xft font code for the Fast Light Tool Kit (FLTK).
 //
@@ -169,11 +169,18 @@ double fl_width(uchar c) {
 #if HAVE_GL
 // This call is used by opengl to get a bitmapped font.
 XFontStruct* fl_xxfont() {
+#  if XFT_MAJOR > 1
+  // kludge!
+  static XFontStruct* fixed = 0;
+  if (!fixed) fixed = XLoadQueryFont(fl_display, "fixed");
+  return fixed;
+#  else
   if (current_font->core) return current_font->u.core.font;
   static XftFont* xftfont;
   if (xftfont) XftFontClose (fl_display, xftfont);
   xftfont = fontopen(fl_fonts[fl_font_].name, true);
   return xftfont->u.core.font;
+#  endif // XFT_MAJOR > 1
 }
 #endif // HAVE_GL
 
@@ -240,5 +247,5 @@ void fl_draw(const char *str, int n, int x, int y) {
 }
 
 //
-// End of "$Id: fl_font_xft.cxx,v 1.4.2.11 2003/05/04 21:58:59 easysw Exp $"
+// End of "$Id: fl_font_xft.cxx,v 1.4.2.12 2003/07/12 04:20:48 easysw Exp $"
 //