Module Name: xsrc
Committed By: mlelstv
Date: Wed Oct 1 09:56:39 UTC 2014
Modified Files:
xsrc/external/mit/twm/dist/src: util.c
Log Message:
do not try to extend the font-pattern with a wild-card. This will almost
always select the wrong fontset and use wrong metrics.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/external/mit/twm/dist/src/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/twm/dist/src/util.c
diff -u xsrc/external/mit/twm/dist/src/util.c:1.1.1.4 xsrc/external/mit/twm/dist/src/util.c:1.2
--- xsrc/external/mit/twm/dist/src/util.c:1.1.1.4 Mon Mar 17 08:48:43 2014
+++ xsrc/external/mit/twm/dist/src/util.c Wed Oct 1 09:56:39 2014
@@ -589,17 +589,13 @@ GetFont(MyFont *font)
int ascent;
int descent;
int fnum;
- char *basename2;
if (use_fontset) {
if (font->fontset != NULL){
XFreeFontSet(dpy, font->fontset);
}
- basename2 = malloc(strlen(font->name) + 3);
- if (basename2) sprintf(basename2, "%s,*", font->name);
- else basename2 = font->name;
- if( (font->fontset = XCreateFontSet(dpy, basename2,
+ if( (font->fontset = XCreateFontSet(dpy, font->name,
&missing_charset_list_return,
&missing_charset_count_return,
&def_string_return)) == NULL) {
@@ -607,7 +603,6 @@ GetFont(MyFont *font)
ProgramName, font->name);
exit(1);
}
- if (basename2 != font->name) free(basename2);
for(i=0; i<missing_charset_count_return; i++){
printf("%s: warning: font for charset %s is lacking.\n",
ProgramName, missing_charset_list_return[i]);
