PuTTy: Diff

Differences From Artifact [70389bc90b]:

File unix/gtkwin.c — part of check-in [91efaca9f4] at 2011-09-16 14:18:54 on branch trunk — Support font fallback even when an X11 server-side font is selected, by introducing a wrapper around an individual unifont which falls back to Pango (which already has built-in fallback) in the case where the selected font doesn't support the glyph in question. The wrapper itself is a (vestigial) subclass of unifont, to minimise disturbance at the call sites. (user: simon size: 109162)

To Artifact [fccdbdc1fd]:

File unix/gtkwin.c — part of check-in [78529746fb] at 2011-10-01 12:38:59 on branch trunk — Change the semantics of 'FontSpec' so that it's a dynamically allocated type. The main reason for this is to stop it from taking up a fixed large amount of space in every 'struct value' subunion in conf.c, although that makes little difference so far because Filename is still doing the same thing (and is therefore next on my list). However, the removal of its arbitrary length limit is not to be sneezed at. (user: simon size: 109058)

︙
147 148 149 150 151 152 153 ~~154~~ 155 ~~156~~ 157 ~~158~~ 159 ~~160 161~~ 162 163 164 165 166 167 168	147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166	- + - - + - - +	if (conf_get_int(inst->conf, CONF_close_on_exit) == FORCE_ON) cleanup_exit(1); } /* * Default settings that are specific to pterm. / ~~FontSpec platform_default_fontspec(const char name)~~ FontSpec platform_default_fontspec(const char name) { ~~FontSpec ret;~~ if (!strcmp(name, "Font")) ~~~~strcpy(~~ret.n~~ame,~~ "server:fixed");~~ return fontspec_new("server:fixed"); else ret.name = '\0'; return ~~ret~~; return fontspec_new(""); } Filename platform_default_filename(const char name) { Filename ret; if (!strcmp(name, "LogFileName")) strcpy(ret.path, "putty.log");
︙
2537 2538 2539 2540 2541 2542 2543 ~~2544~~ 2545 2546 ~~2547 2548 2549~~ 2550 2551 ~~2552~~ 2553 2554 ~~2555 2556 2557~~ 2558 2559 ~~2560~~ 2561 2562 ~~2563 2564 2565~~ 2566 2567 ~~2568~~ 2569 2570 ~~2571 2572 2573~~ 2574 2575 2576 2577 2578 2579 2580	2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578	- + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + +	--argc, ++argv; /* skip next argument / continue; } else if (ret == 1) { continue; } if (!strcmp(p, "-fn") \|\| !strcmp(p, "-font")) { ~~FontSpec fs;~~ FontSpec fs; EXPECTS_ARG; SECOND_PASS_ONLY; ~~~~strncpy(fs.name, val, sizeof(fs.name));~~ fs~~.name[sizeof(fs.name)-1]~~ = ~~'\0'~~; conf_set_fontspec(conf, CONF_font, &fs);~~ fs = fontspec_new(val); conf_set_fontspec(conf, CONF_font, fs); fontspec_free(fs); } else if (!strcmp(p, "-fb")) { ~~FontSpec fs;~~ FontSpec fs; EXPECTS_ARG; SECOND_PASS_ONLY; ~~~~strncpy(fs.name, val, sizeof(fs.name));~~ fs~~.name[sizeof(fs.name)-1]~~ = ~~'\0'~~; conf_set_fontspec(conf, CONF_~~bold~~font, &fs);~~ fs = fontspec_new(val); conf_set_fontspec(conf, CONF_font, fs); fontspec_free(fs); } else if (!strcmp(p, "-fw")) { ~~FontSpec fs;~~ FontSpec fs; EXPECTS_ARG; SECOND_PASS_ONLY; ~~~~strncpy(fs.name, val, sizeof(fs.name));~~ fs~~.name[sizeof(fs.name)-1]~~ = ~~'\0'~~; conf_set_fontspec(conf, CONF_~~wide~~font, &fs);~~ fs = fontspec_new(val); conf_set_fontspec(conf, CONF_font, fs); fontspec_free(fs); } else if (!strcmp(p, "-fwb")) { ~~FontSpec fs;~~ FontSpec *fs; EXPECTS_ARG; SECOND_PASS_ONLY; ~~~~strncpy(fs.name, val, sizeof(fs.name));~~ fs~~.name[sizeof(fs.name)-1]~~ = ~~'\0'~~; conf_set_fontspec(conf, CONF_~~widebold~~font, &fs);~~ fs = fontspec_new(val); conf_set_fontspec(conf, CONF_font, fs); fontspec_free(fs); } else if (!strcmp(p, "-cs")) { EXPECTS_ARG; SECOND_PASS_ONLY; conf_set_str(conf, CONF_line_codepage, val); } else if (!strcmp(p, "-geometry")) {
︙