PuTTy: Diff

Differences From Artifact [98a0fb0960]:

File windows/window.c — part of check-in [76941fa153] at 2006-11-18 09:10:48 on branch trunk — Reinstate as much of the Windows font-linking behaviour as I can easily manage, by adopting a hybrid approach to Unicode text display. The old approach of simply calling ExtTextOutW provided font linking without us having to lift a finger, but didn't do the right thing when it came to bidirectional or Arabic-shaped text. Arabeyes' replacement exact_textout() supported the latter, but turned out to break the former (with no warning from the Windows API documentation, so it's not their fault). So now I've got a second wrapper layer called general_textout(), which splits the input string into substrings based on bidi character class. Any character liable to cause bidi or shaping behaviour if fed straight to ExtTextOutW is instead fed through Arabeyes' exact_textout(), but the rest is fed straight to ExtTextOutW as it used to be. The effect appears to be that font linking is restored for all characters _except_ Arabic and other bidi scripts, which means in particular that we are no longer in a state of regression over 0.57. (0.57 would have done font linking on Arabic as well, but would also have misbidied it, so we've merely exchanged one failure mode for another slightly less harmful one in that situation.) (user: simon size: 141872)

To Artifact [6ef0bca9d0]:

File windows/window.c — part of check-in [e861af5aa9] at 2006-12-17 05:16:07 on branch trunk — Initial support for HTML Help. All the ad-hoc help-file finding code and various calls to WinHelp() have been centralised into a new file winhelp.c, which in turn has been modified to detect a .CHM file as well as .HLP and select between them as appropriate. It explicitly tries to load HHCTRL.OCX and use GetProcAddress, meaning that it _should_ still work correctly on pre-HTML-Help platforms, falling gracefully back to WinHelp, but although I tested this by temporarily renaming my own HHCTRL.OCX I haven't yet been able to test it on a real HTML-Help-free platform. Also in this checkin: a new .but file and docs makefile changes to make it convenient to build the sources for a .CHM. As yet, owing to limitations of Halibut's CHM support, I'm not able to write a .CHM directly, more's the pity. (user: simon size: 141139)

︙			︙
341 342 343 344 345 346 347 ~~348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372~~ 373 374 375 376 377 378 379	* using instead. / if (osVersion.dwMajorVersion < 4 \|\| (osVersion.dwMajorVersion == 4 && osVersion.dwPlatformId != VER_PLATFORM_WIN32_NT)) wm_mousewheel = RegisterWindowMessage("MSWHEEL_ROLLMSG"); / * See if we can find our Help file. / { ~~char b[2048], p, q, r;~~ ~~FILE fp;~~ ~~GetModuleFileName(NULL, b, sizeof(b) - 1);~~ ~~r = b;~~ ~~p = strrchr(b, '\\');~~ ~~if (p && p >= r) r = p+1;~~ ~~q = strrchr(b, ':');~~ ~~if (q && q >= r) r = q+1;~~ ~~strcpy(r, PUTTY_HELP_FILE);~~ ~~if ( (fp = fopen(b, "r")) != NULL) {~~ ~~help_path = dupstr(b);~~ ~~fclose(fp);~~ ~~} else~~ help~~_path = NULL~~; ~~strcpy(r, PUTTY_HELP_CONTENTS);~~ ~~if ( (fp = fopen(b, "r")) != NULL) {~~ ~~help_has_contents = TRUE;~~ ~~fclose(fp);~~ ~~} else~~ ~~help_has_contents = FALSE;~~ } / * Process the command line. / { char p; int got_host = 0;	< < < < < < < < < < < < < < < < < \| < < < < < < <	341 342 343 344 345 346 347 348 349 350 351 352 353 354 355	* using instead. / if (osVersion.dwMajorVersion < 4 \|\| (osVersion.dwMajorVersion == 4 && osVersion.dwPlatformId != VER_PLATFORM_WIN32_NT)) wm_mousewheel = RegisterWindowMessage("MSWHEEL_ROLLMSG"); init_help(); / * Process the command line. / { char p; int got_host = 0;
︙			︙
783 784 785 786 787 788 789 ~~790~~ 791 792 793 794 795 796 797	AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard"); AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback"); AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal"); AppendMenu(m, MF_SEPARATOR, 0, 0); AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ? MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen"); AppendMenu(m, MF_SEPARATOR, 0, 0); ~~if (help~~_path~~)~~ AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help"); str = dupprintf("&About %s", appname); AppendMenu(m, MF_ENABLED, IDM_ABOUT, str); sfree(str); } }	\|	759 760 761 762 763 764 765 766 767 768 769 770 771 772 773	AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard"); AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback"); AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal"); AppendMenu(m, MF_SEPARATOR, 0, 0); AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ? MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen"); AppendMenu(m, MF_SEPARATOR, 0, 0); if (has_help()) AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help"); str = dupprintf("&About %s", appname); AppendMenu(m, MF_ENABLED, IDM_ABOUT, str); sfree(str); } }
︙			︙
880 881 882 883 884 885 886 887 888 889 890 891 892 893	if (cfg.protocol == PROT_SSH) { random_save_seed(); #ifdef MSCRYPTOAPI crypto_wrapup(); #endif } exit(code); } /* * Set up, or shut down, an AsyncSelect. Called from winnet.c. */	>	856 857 858 859 860 861 862 863 864 865 866 867 868 869 870	if (cfg.protocol == PROT_SSH) { random_save_seed(); #ifdef MSCRYPTOAPI crypto_wrapup(); #endif } shutdown_help(); exit(code); } /* * Set up, or shut down, an AsyncSelect. Called from winnet.c. */
︙			︙
2272 2273 2274 2275 2276 2277 2278 ~~2279 2280~~ 2281 2282 2283 2284 2285 2286 2287	if (ldisc) ldisc_send(ldisc, NULL, 0, 0); break; case IDM_ABOUT: showabout(hwnd); break; case IDM_HELP: ~~WinH~~elp(hwnd, ~~help_path,~~ ~~help_has_contents ? HELP_FINDER : HELP_CONTENTS, 0);~~ break; case SC_MOUSEMENU: /* * We get this if the System menu has been activated * using the mouse. */ show_mouseptr(1);	\| <	2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263	if (ldisc) ldisc_send(ldisc, NULL, 0, 0); break; case IDM_ABOUT: showabout(hwnd); break; case IDM_HELP: launch_help(hwnd, NULL); break; case SC_MOUSEMENU: /* * We get this if the System menu has been activated * using the mouse. */ show_mouseptr(1);
︙			︙