diff options
author | Michael Jennings <mej@kainx.org> | 2009-01-06 07:51:15 +0000 |
---|---|---|
committer | Michael Jennings <mej@kainx.org> | 2009-01-06 07:51:15 +0000 |
commit | 0261bd001bf0aef052525a4ba126bb6fabc77868 (patch) | |
tree | 3b31427cde7135d19fc85bdb6f2330773431b37e /src | |
parent | 9a7cd3adace634401cbb54c3341d0d1a1acf0319 (diff) | |
download | eterm-0261bd001bf0aef052525a4ba126bb6fabc77868.tar.gz |
Mon Jan 5 23:50:28 2009 Michael Jennings (mej)
Remove fontset fallbacks. I think this might help speed up the load
time slowness some people are seeing. Let's find out.
----------------------------------------------------------------------
SVN revision: 38477
Diffstat (limited to 'src')
-rw-r--r-- | src/command.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/command.c b/src/command.c index 647fe3c..0e5f456 100644 --- a/src/command.c +++ b/src/command.c @@ -1853,33 +1853,34 @@ create_fontset(const char *font1, const char *font2) XFontSet fontset = 0; char *fontname, **ml, *ds; int mc; - const char fs_base[] = ",-misc-fixed-*-r-*-*-*-120-*-*-*-*-*-*,*"; + /*const char fs_base[] = ",-misc-fixed-*-r-*-*-*-120-*-*-*-*-*-*,*";*/ ASSERT_RVAL(font1 != NULL, (XFontSet) 0); if (font2) { - fontname = MALLOC(strlen(font1) + strlen(font2) + sizeof(fs_base) + 2); + fontname = MALLOC(strlen(font1) + strlen(font2) /*+ sizeof(fs_base)*/ + 2); if (fontname) { strcpy(fontname, font1); strcat(fontname, ","); strcat(fontname, font2); - strcat(fontname, fs_base); + /*strcat(fontname, fs_base);*/ } } else { - fontname = MALLOC(strlen(font1) + sizeof(fs_base) + 1); + fontname = MALLOC(strlen(font1) /*+ sizeof(fs_base)*/ + 1); if (fontname) { strcpy(fontname, font1); - strcat(fontname, fs_base); + /*strcat(fontname, fs_base);*/ } } if (fontname) { setlocale(LC_ALL, ""); - fontset = XCreateFontSet(Xdisplay, fontname, &ml, &mc, &ds); - D_FONT(("Created fontset from %s, %d missing charsets, default string \"%s\".\n", fontname, mc, NONULL(ds))); + fontset = XCreateFontSet(Xdisplay, fontname, &ml, &mc, NULL); + D_FONT(("Created fontset from %s, %d missing charsets (\"%s\").\n", fontname, mc, + ((mc > 0) ? (ml[0]) : ("N/A")))); FREE(fontname); if (mc) { XFreeStringList(ml); - fontset = 0; + /*fontset = 0;*/ } } return fontset; |