nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-21 13:05:04 -05:00
Code Issues Projects Releases Wiki Activity

Changes in startup order to ensure any subsystem which might attempt

Browse Source 
to schedule timers is not started until after hwnd is initialised.

[originally from svn r4912]
This commit is contained in:
Simon Tatham 2004-11-27 19:41:24 +00:00
parent 92f3b101f5
commit 9fc67313fb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
windows/window.c
View File

@ -588,10 +588,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
memset(&ucsdata, 0, sizeof(ucsdata)); memset(&ucsdata, 0, sizeof(ucsdata));
term = term_init(&cfg, &ucsdata, NULL);
logctx = log_init(NULL, &cfg);
term_provide_logctx(term, logctx);
cfgtopalette(); cfgtopalette();
/* /*
@ -605,9 +601,8 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
font_height = 20; font_height = 20;
extra_width = 25; extra_width = 25;
extra_height = 28; extra_height = 28;
term_size(term, cfg.height, cfg.width, cfg.savelines); guess_width = extra_width + font_width * cfg.width;
guess_width = extra_width + font_width * term->cols; guess_height = extra_height + font_height * cfg.height;
guess_height = extra_height + font_height * term->rows;
{ {
RECT r; RECT r;
get_fullscreen_rect(&r); get_fullscreen_rect(&r);
@ -634,6 +629,17 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
NULL, NULL, inst, NULL); NULL, NULL, inst, NULL);
} }
/*
* Initialise the terminal. (We have to do this _after_
* creating the window, since the terminal is the first thing
* which will call schedule_timer(), which will in turn call
* timer_change_notify() which will expect hwnd to exist.
*/
term = term_init(&cfg, &ucsdata, NULL);
logctx = log_init(NULL, &cfg);
term_provide_logctx(term, logctx);
term_size(term, cfg.height, cfg.width, cfg.savelines);
/* /*
* Initialise the fonts, simultaneously correcting the guesses * Initialise the fonts, simultaneously correcting the guesses
* for font_{width,height}. * for font_{width,height}.