Skip to content

N
nx-libs
Commit ed40c3db authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

{dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes dependency…

{dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes dependency on X11's misc fonts package obsolete. This backports a mixture of these X.org commits (only focusing on SetDefaultFontPath() function): commit 03e8bfa1d122f7dea905d48c93cfd54afd991dfd Author: Alan Coopersmith <alan.coopersmith@oracle.com> Date: Sat Nov 27 20:09:04 2010 -0800 Convert existing Xprintf style calls to asprintf style Signed-off-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: 's avatarJeremy Huddleston <jeremyhu@apple.com> Reviewed-by: 's avatarMikhail Gusarov <dottedmag@dottedmag.net> commit 12e46e83733b47d2704e1509960192365102af46 Author: Tiago Vignatti <tiago.vignatti@nokia.com> Date: Fri Mar 25 22:07:31 2011 +0200 dix: fix memory leak in SetDefaultFontPath Signed-off-by: 's avatarTiago Vignatti <tiago.vignatti@nokia.com> Reviewed-by: 's avatarNicolas Peninguy <nico@lostgeeks.org> Reviewed-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> commit 6592db6bb526f0c43b4c7b55859c629709e039b4 Author: Mikhail Gusarov <dottedmag@dottedmag.net> Date: Fri Jun 4 16:58:58 2010 +0700 Get rid of xstrdup when argument is definitely non-NULL Replace xstrdup with strdup when either constant string is being duplicated or argument is guarded by conditionals and obviously can't be NULL Signed-off-by: 's avatarMikhail Gusarov <dottedmag@dottedmag.net> Reviewed-by: 's avatarAlan Coopersmith <alan.coopersmith@oracle.com> commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52 Author: Rémi Cardona <remi@gentoo.org> Date: Mon Sep 14 17:09:59 2009 +0200 dix: append "built-ins" to the font path in SetDefaultFontPath 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on a "fixed" font go away but only Xorg could use the built-ins fonts by default. With this commit, all DDXs get "built-ins" appended to their FontPath, not just Xorg. Tested with Xorg, Xvfb and Xnest. Signed-off-by: 's avatarRémi Cardona <remi@gentoo.org> Signed-off-by: 's avatarJon TURNEY <jon.turney@dronecode.org.uk> Tested-by: 's avatarJon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> commit 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> Date: Wed Jan 7 19:37:03 2009 -0200 Default to use standard bitmap fonts, with builtins as fallback The builtin-fonts configure option was removed, as it at best should have been a runtime option. Instead, now it always register all "font path element" backends, and adds built-ins fonts at the end of the default font path. This should be a more reasonable solution, to "correct" the most common Xorg FAQ (could not open default font 'fixed'), and also don't break by default applications that use only the standard/historical X Font rendering. Backported-to-NX-by: 's avatarMike Gabriel <mike.gabriel@das-netzwerkteam.de> Fixes ArcticaProject/nx-libs#84. Fixes ArcticaProject/nx-libs#285.
parent 82a7f72c
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 11 deletions
nx-X11/programs/Xserver/dix/dixfonts.c
View file @ ed40c3db
......@@ -1925,7 +1925,11 @@ InitFonts ()
{
patternCache = MakeFontPatternCache();
#if defined(BUILTIN_FONTS) || defined(NXAGENT_SERVER)
BuiltinRegisterFpeFunctions();
#else
register_fpe_functions();
#endif
}
int
......
nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c
View file @ ed40c3db
......@@ -926,6 +926,9 @@ bail:
int
SetDefaultFontPath(char *path)
{
char *temp_path,
*start,
*end;
unsigned char *cp,
*pp,
*nump,
......@@ -936,20 +939,41 @@ SetDefaultFontPath(char *path)
size = 0,
bad;
/* get enough for string, plus values -- use up commas */
#ifdef NX_TRANS_SOCKET
len = strlen(_NXGetFontPath(path)) + 1;
#else
len = strlen(path) + 1;
#endif
path = (char *) _NXGetFontPath(path);
#endif /* NX_TRANS_SOCKET */
start = path;
/* ensure temp_path contains "built-ins" */
while (1) {
start = strstr(start, "built-ins");
if (start == NULL)
break;
end = start + strlen("built-ins");
if ((start == path || start[-1] == ',') && (!*end || *end == ','))
break;
start = end;
}
if (!start) {
if (asprintf(&temp_path, "%s%sbuilt-ins", path, *path ? "," : "")
== -1)
temp_path = NULL;
}
else {
temp_path = strdup(path);
}
if (!temp_path)
return BadAlloc;
/* get enough for string, plus values -- use up commas */
len = strlen(temp_path) + 1;
nump = cp = newpath = (unsigned char *) ALLOCATE_LOCAL(len);
if (!newpath)
if (!newpath) {
free(temp_path);
return BadAlloc;
#ifdef NX_TRANS_SOCKET
pp = (unsigned char *) _NXGetFontPath(path);
#else
pp = (unsigned char *) path;
#endif
}
pp = (unsigned char *) temp_path;
cp++;
while (*pp) {
if (*pp == ',') {
......@@ -968,6 +992,7 @@ SetDefaultFontPath(char *path)
err = SetFontPathElements(num, newpath, &bad, TRUE);
DEALLOCATE_LOCAL(newpath);
free(temp_path);
return err;
}
......
nx-X11/programs/Xserver/include/dixfont.h
View file @ ed40c3db
......@@ -150,4 +150,9 @@ extern void InitGlyphCaching(void);
extern void SetGlyphCachingMode(int /*newmode*/);
/*
* libXfont/src/builtins/builtin.h
*/
extern _X_EXPORT void BuiltinRegisterFpeFunctions(void);
#endif /* DIXFONT_H */
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