From 92bd40b3fc3830028340969f2cc5c6a0720c4450 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 16 Jan 2013 08:28:39 +0100 Subject: libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config libxtrans: d9f3728ff74ceb956f6cf8dc24b38611f9a4868a fontconfig: ec5ca08c807585a9230f83c95f7cca6b7065b142 glproto: 8e3407e02980d088e20041e79bdcdd3737e7827e libX11: f57fd760cba92ad846917f21e94e73e9c846185f libXau: 1a8a1b2c68967b48c07b56142799b1020f017027 libXext: 8eee1236041d46a21faba32e0d27c26985267d89 libXft: c5e760a239afc62a1c75e0509868e35957c8df52 libXinerama: 470b9356af961ff7d3968b164aa73872b49a5dcc libXmu: 474d22468c90f99104873b4c5fd7b0f0d2cbf823 libfontenc: 0c3518df24192f18f15ce91c2868560a5973a3dc mesa: 3c00a52f7e02007f40fa53a06fad517bed0328ff xkeyboard-config: 8a117fbd4a029b952afcfe362931628dccf496e4 --- fontconfig/src/fccfg.c | 7 ++++ fontconfig/src/fccompat.c | 6 +++- fontconfig/src/fcdefault.c | 85 ++++++++++++++++++++++++++++++++++++++++++++-- fontconfig/src/fcint.h | 3 ++ fontconfig/src/fcobjs.h | 2 ++ 5 files changed, 100 insertions(+), 3 deletions(-) (limited to 'fontconfig/src') diff --git a/fontconfig/src/fccfg.c b/fontconfig/src/fccfg.c index 877a4f57e..3e9fdaba4 100644 --- a/fontconfig/src/fccfg.c +++ b/fontconfig/src/fccfg.c @@ -1478,6 +1478,7 @@ FcConfigSubstituteWithPat (FcConfig *config, FcPattern *p_pat, FcMatchKind kind) { + FcValue v; FcSubst *s; FcSubState *st; int i; @@ -1513,6 +1514,12 @@ FcConfigSubstituteWithPat (FcConfig *config, } FcStrListDone (l); } + if (FcPatternObjectGet (p, FC_PRGNAME_OBJECT, 0, &v) == FcResultNoMatch) + { + FcChar8 *prgname = FcGetPrgname (); + if (prgname) + FcPatternObjectAddString (p, FC_PRGNAME_OBJECT, prgname); + } break; case FcMatchFont: s = config->substFont; diff --git a/fontconfig/src/fccompat.c b/fontconfig/src/fccompat.c index 169cab9ed..2aa29ddcc 100644 --- a/fontconfig/src/fccompat.c +++ b/fontconfig/src/fccompat.c @@ -100,7 +100,11 @@ FcMakeTempfile (char *template) return -1; fd = FcOpen(template, O_RDWR | O_EXCL | O_CREAT, 0600); #else -#error no secure functions to create a temporary file + /* warn at the runtime for just debugging purpose why something may + * goes wrong. mingw may not have one, but it shouldn't be reached since + * this function isn't used so far. + */ + fprintf(stderr, "Fontconfig warning: No secure functions to create a temporary file\n"); #endif return fd; diff --git a/fontconfig/src/fcdefault.c b/fontconfig/src/fcdefault.c index 6937994b7..aa47840d1 100644 --- a/fontconfig/src/fcdefault.c +++ b/fontconfig/src/fcdefault.c @@ -104,11 +104,81 @@ retry: return lang; } +static FcChar8 *default_prgname; + +FcChar8 * +FcGetPrgname (void) +{ + FcChar8 *prgname; +retry: + prgname = fc_atomic_ptr_get (&default_prgname); + if (!prgname) + { +#ifdef _WIN32 + char buf[MAX_PATH+1]; + + /* TODO This is ASCII-only; fix it. */ + if (GetModuleFileNameA (GetModuleHandle (NULL), buf, sizeof (buf) / sizeof (buf[0])) > 0) + { + char *p; + unsigned int len; + + p = strrchr (buf, '\\'); + if (p) + p++; + else + p = buf; + + len = strlen (p); + + if (len > 4 && 0 == strcmp (p + len - 4, ".exe")) + { + len -= 4; + buf[len] = '\0'; + } + + prgname = FcStrdup (p); + } +#else + char buf[8192]; + unsigned int len; + + len = readlink ("/proc/self/exe", buf, sizeof (buf) - 1); + if (len > 0) + { + char *p; + + p = strrchr (buf, '/'); + if (p) + p++; + else + p = buf; + + prgname = FcStrdup (p); + } +#endif + + if (!prgname) + prgname = FcStrdup (""); + + if (!fc_atomic_ptr_cmpexch (&default_prgname, NULL, prgname)) { + free (prgname); + goto retry; + } + } + + if (prgname && !prgname[0]) + return NULL; + + return prgname; +} + void FcDefaultFini (void) { FcChar8 *lang; FcStrSet *langs; + FcChar8 *prgname; lang = fc_atomic_ptr_get (&default_lang); if (lang && fc_atomic_ptr_cmpexch (&default_lang, lang, NULL)) { @@ -120,6 +190,11 @@ FcDefaultFini (void) FcRefInit (&langs->ref, 1); FcStrSetDestroy (langs); } + + prgname = fc_atomic_ptr_get (&default_prgname); + if (prgname && fc_atomic_ptr_cmpexch (&default_prgname, prgname, NULL)) { + free (prgname); + } } void @@ -195,7 +270,7 @@ FcDefaultSubstitute (FcPattern *pattern) * exact matched "en" has higher score than ll-cc. */ v2.type = FcTypeString; - v2.u.s = FcStrdup ("en-us"); + v2.u.s = (FcChar8 *) "en-us"; if (FcPatternObjectGet (pattern, FC_FAMILYLANG_OBJECT, 0, &v) == FcResultNoMatch) { FcPatternObjectAdd (pattern, FC_FAMILYLANG_OBJECT, namelang, FcTrue); @@ -211,7 +286,13 @@ FcDefaultSubstitute (FcPattern *pattern) FcPatternObjectAdd (pattern, FC_FULLNAMELANG_OBJECT, namelang, FcTrue); FcPatternObjectAddWithBinding (pattern, FC_FULLNAMELANG_OBJECT, v2, FcValueBindingWeak, FcTrue); } - FcFree (v2.u.s); + + if (FcPatternObjectGet (pattern, FC_PRGNAME_OBJECT, 0, &v) == FcResultNoMatch) + { + FcChar8 *prgname = FcGetPrgname (); + if (prgname) + FcPatternObjectAddString (pattern, FC_PRGNAME_OBJECT, prgname); + } } #define __fcdefault__ #include "fcaliastail.h" diff --git a/fontconfig/src/fcint.h b/fontconfig/src/fcint.h index 512926797..3cf526f3d 100644 --- a/fontconfig/src/fcint.h +++ b/fontconfig/src/fcint.h @@ -770,6 +770,9 @@ FcInitDebug (void); FcPrivate FcChar8 * FcGetDefaultLang (void); +FcPrivate FcChar8 * +FcGetPrgname (void); + FcPrivate void FcDefaultFini (void); diff --git a/fontconfig/src/fcobjs.h b/fontconfig/src/fcobjs.h index 1e9067e21..ad803eb13 100644 --- a/fontconfig/src/fcobjs.h +++ b/fontconfig/src/fcobjs.h @@ -41,4 +41,6 @@ FC_OBJECT (EMBEDDED_BITMAP, FcTypeBool) FC_OBJECT (DECORATIVE, FcTypeBool) FC_OBJECT (LCD_FILTER, FcTypeInteger) FC_OBJECT (NAMELANG, FcTypeString) +FC_OBJECT (FONT_FEATURES, FcTypeString) +FC_OBJECT (PRGNAME, FcTypeString) /* ^-------------- Add new objects here. */ -- cgit v1.2.3