Check-in [a211db3b97]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:add tk upstream changes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a211db3b9725f838c7ea70104fbe54a485e373cd
User & Date: chw 2020-02-10 06:45:23
Context
2020-02-10
09:19
update rl_json to version 0.11.0 check-in: 1a97144602 user: chw tags: trunk
06:45
add tk upstream changes check-in: a211db3b97 user: chw tags: trunk
06:35
update tklib to version 0.7 check-in: 46b5fa1fac user: chw tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to jni/sdl2tk/unix/tkUnixRFont.c.

267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
    XftDefaultSubstitute(Tk_Display(tkwin), Tk_ScreenNumber(tkwin), pattern);

    /*
     * Generate the list of fonts
     */

    set = FcFontSort(0, pattern, FcTrue, NULL, &result);
    if (!set) {
	ckfree(fontPtr);
	return NULL;
    }

    fontPtr->fontset = set;
    fontPtr->pattern = pattern;
    fontPtr->faces = ckalloc(set->nfont * sizeof(UnixFtFace));







|







267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
    XftDefaultSubstitute(Tk_Display(tkwin), Tk_ScreenNumber(tkwin), pattern);

    /*
     * Generate the list of fonts
     */

    set = FcFontSort(0, pattern, FcTrue, NULL, &result);
    if (!set || set->nfont == 0) {
	ckfree(fontPtr);
	return NULL;
    }

    fontPtr->fontset = set;
    fontPtr->pattern = pattern;
    fontPtr->faces = ckalloc(set->nfont * sizeof(UnixFtFace));