nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Improve window-size handling in Unix Plink.

Browse Source 
Unconditionally override the configured terminal size with the one
from stdin if it's available.  This avoids the silliness whereby if
Default Settings had a terminal size set, Plink used this and thus
caused the server to use the wrong size.

[originally from svn r9624]
This commit is contained in:
Ben Harris 2012-08-25 22:57:39 +00:00
parent 3d466aec90
commit 3fad1f402b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
unix/uxplink.c
View File

@ -116,12 +116,6 @@ char *platform_default_s(const char *name)
int platform_default_i(const char *name, int def) 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; return def;
} }
@ -600,6 +594,7 @@ int main(int argc, char **argv)
int use_subsystem = 0; int use_subsystem = 0;
int got_host = FALSE; int got_host = FALSE;
long now; long now;
struct winsize size;
fdlist = NULL; fdlist = NULL;
fdcount = fdsize = 0; fdcount = fdsize = 0;
@ -902,6 +897,15 @@ int main(int argc, char **argv)
} }
putty_signal(SIGWINCH, sigwinch); 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(); sk_init();
uxsel_init(); uxsel_init();
@ -1057,7 +1061,7 @@ int main(int argc, char **argv)
if (read(signalpipe[0], c, 1) <= 0) if (read(signalpipe[0], c, 1) <= 0)
/* ignore error */; /* ignore error */;
/* ignore its value; it'll be `x' */ /* 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); back->size(backhandle, size.ws_col, size.ws_row);
} }