Commit 6e9fc5de authored by Keith Packard's avatar Keith Packard

Automatically initialize the fontconfig library

parent aae6f7d4
/*
* $XFree86: $
* $XFree86: xc/lib/fontconfig/src/fccfg.c,v 1.2 2002/02/15 06:01:27 keithp Exp $
*
* Copyright 2000 Keith Packard, member of The XFree86 Project, Inc.
*
......@@ -27,7 +27,7 @@
#include <stdio.h>
#include "fcint.h"
static FcConfig *fcConfig;
FcConfig *_fcConfig;
FcConfig *
FcConfigCreate (void)
......@@ -186,16 +186,19 @@ FcConfigSetCurrent (FcConfig *config)
if (!FcConfigBuildFonts (config))
return FcFalse;
if (fcConfig)
FcConfigDestroy (fcConfig);
fcConfig = config;
if (_fcConfig)
FcConfigDestroy (_fcConfig);
_fcConfig = config;
return FcTrue;
}
FcConfig *
FcConfigGetCurrent (void)
{
return fcConfig;
if (!_fcConfig)
if (!FcInit ())
return 0;
return _fcConfig;
}
FcBool
......
/*
* $XFree86: $
* $XFree86: xc/lib/fontconfig/src/fcinit.c,v 1.2 2002/02/15 06:01:28 keithp Exp $
*
* Copyright 2001 Keith Packard, member of The XFree86 Project, Inc.
*
......@@ -67,7 +67,7 @@ FcInitConfig (void)
{
FcConfig *config;
if (FcConfigGetCurrent ())
if (_fcConfig)
return FcTrue;
config = FcConfigCreate ();
......
/*
* $XFree86: xc/lib/fontconfig/src/fcint.h,v 1.2 2002/02/15 06:01:28 keithp Exp $
* $XFree86: xc/lib/fontconfig/src/fcint.h,v 1.3 2002/02/18 22:29:28 keithp Exp $
*
* Copyright 2000 Keith Packard, member of The XFree86 Project, Inc.
*
......@@ -241,6 +241,8 @@ struct _FcConfig {
FcFontSet *fonts[FcSetApplication + 1];
};
extern FcConfig *_fcConfig;
/* fcblanks.c */
/* fccache.c */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment