summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/tkUnixRFont.c19
2 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index be4177d..dc7a124 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-08 Joe English <jenglish@users.sourceforge.net>
+
+ * unix/tkUnixRFont.c: TIP #205 "Use pkgconfig Database to
+ Register Xft Support".
+
2004-10-05 Jeff Hobbs <jeffh@ActiveState.com>
* doc/wm.n (iconphoto): added support for Tk photo
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index cf45c7c..fdf9ebd 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixRFont.c,v 1.6 2003/11/17 23:48:47 dkf Exp $
+ * RCS: @(#) $Id: tkUnixRFont.c,v 1.7 2004/10/08 16:16:54 jenglish Exp $
*/
#include "tkUnixInt.h"
@@ -37,10 +37,27 @@ typedef struct _UnixFtFont {
XftColor color;
} UnixFtFont;
+
+/*
+ * Package initialization:
+ * Nothing to do here except register the fact that we're using Xft
+ * in the TIP 59 configuration database.
+ */
+
+#ifndef TCL_CFGVAL_ENCODING
+#define TCL_CFGVAL_ENCODING "ascii"
+#endif
+
+static Tcl_Config cfg[] = {
+ { "fontsystem", "xft" },
+ { 0,0 }
+};
+
void
TkpFontPkgInit(mainPtr)
TkMainInfo *mainPtr; /* The application being created. */
{
+ Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING);
}
static XftFont *