int platform_default_i(const char *name, int def)
{
- if (!strcmp(name, "TermWidth") ||
- !strcmp(name, "TermHeight")) {
- struct winsize size;
- if (ioctl(STDIN_FILENO, TIOCGWINSZ, (void *)&size) >= 0)
- return (!strcmp(name, "TermWidth") ? size.ws_col : size.ws_row);
- }
return def;
}
int errors;
int use_subsystem = 0;
int got_host = FALSE;
- long now;
+ unsigned long now;
+ struct winsize size;
fdlist = NULL;
fdcount = fdsize = 0;
}
putty_signal(SIGWINCH, sigwinch);
+ /*
+ * Now that we've got the SIGWINCH handler installed, try to find
+ * out the initial terminal size.
+ */
+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, &size) >= 0) {
+ conf_set_int(conf, CONF_width, size.ws_col);
+ conf_set_int(conf, CONF_height, size.ws_row);
+ }
+
sk_init();
uxsel_init();
}
do {
- long next, ticks;
+ unsigned long next, then;
+ long ticks;
struct timeval tv, *ptv;
if (run_timers(now, &next)) {
- ticks = next - GETTICKCOUNT();
- if (ticks < 0) ticks = 0; /* just in case */
+ then = now;
+ now = GETTICKCOUNT();
+ if (now - then > next - then)
+ ticks = 0;
+ else
+ ticks = next - now;
tv.tv_sec = ticks / 1000;
tv.tv_usec = ticks % 1000 * 1000;
ptv = &tv;
if (read(signalpipe[0], c, 1) <= 0)
/* ignore error */;
/* ignore its value; it'll be `x' */
- if (ioctl(0, TIOCGWINSZ, (void *)&size) >= 0)
+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, (void *)&size) >= 0)
back->size(backhandle, size.ws_col, size.ws_row);
}