diff options
| author | jenglish <jenglish@flightlab.com> | 2004-10-08 16:16:53 (GMT) |
|---|---|---|
| committer | jenglish <jenglish@flightlab.com> | 2004-10-08 16:16:53 (GMT) |
| commit | d49a835d76c5adf377a44c5dda9ed4770d795f46 (patch) | |
| tree | 07cc905c01e42f42a28586423d93321b51e026a9 | |
| parent | f5b2ce79f79842d2eb160dde6f592ab6906f81be (diff) | |
| download | tk-d49a835d76c5adf377a44c5dda9ed4770d795f46.zip tk-d49a835d76c5adf377a44c5dda9ed4770d795f46.tar.gz tk-d49a835d76c5adf377a44c5dda9ed4770d795f46.tar.bz2 | |
TIP #205 "Use pkgconfig Database to Register Xft Support".
(xref: patch #971980)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 19 |
2 files changed, 23 insertions, 1 deletions
@@ -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 * |