tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove console resize (#336) 

remove the window resize logic in ssh-shellhost.exe
This commit is contained in:
bagajjal 2018-08-03 13:29:43 -07:00 committed by Yanbing
parent fde0994a30
commit 92f363bef1
1 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
contrib/win32/win32compat/shell-host.c
View File

@ -803,43 +803,54 @@ MonitorChild(_In_ LPVOID lpParameter)
unsigned __stdcall unsigned __stdcall
ControlThread(LPVOID p) ControlThread(LPVOID p)
{ {
short type, row, col;
DWORD len;
COORD coord;
SMALL_RECT rect;
while (1) {
if (!ReadFile(pipe_ctrl, &type, 2, &len, NULL))
break;
if (type != PTY_SIGNAL_RESIZE_WINDOW)
break;
if (!ReadFile(pipe_ctrl, &col, 2, &len, NULL))
break;
if (!ReadFile(pipe_ctrl, &row, 2, &len, NULL))
break;
/* /*
* when reducing width, console seemed to retain prior width * TODO - Enable the console resize logic.
* while increasing width, however, it behaves right * With the current resize logic, we have two issues
* 1) console screen buffer rows should be always 9999, irrespective of the user setting.
* 2) when ssh client window is resized it clears everything and gives a blank screen.
* For now we disable this logic.
* *
* hence setting it less by 1 and setting it again to the right * It looks to be a bug in our console hook event pty implementation.
* count
*/ */
coord.X = col - 1;
coord.Y = row;
rect.Top = 0;
rect.Left = 0;
rect.Bottom = row - 1;
rect.Right = col - 2;
SetConsoleScreenBufferSize(child_out, coord);
SetConsoleWindowInfo(child_out, TRUE, &rect);
coord.X = col;
rect.Right = col - 1;
SetConsoleScreenBufferSize(child_out, coord);
SetConsoleWindowInfo(child_out, TRUE, &rect);
}
return 0; return 0;
//short type, row, col;
//DWORD len;
//COORD coord;
//SMALL_RECT rect;
//while (1) {
// if (!ReadFile(pipe_ctrl, &type, 2, &len, NULL))
// break;
// if (type != PTY_SIGNAL_RESIZE_WINDOW)
// break;
// if (!ReadFile(pipe_ctrl, &col, 2, &len, NULL))
// break;
// if (!ReadFile(pipe_ctrl, &row, 2, &len, NULL))
// break;
//
// /*
// * when reducing width, console seemed to retain prior width
// * while increasing width, however, it behaves right
// *
// * hence setting it less by 1 and setting it again to the right
// * count
// */
//
// coord.X = col - 1;
// coord.Y = row;
// rect.Top = 0;
// rect.Left = 0;
// rect.Bottom = row - 1;
// rect.Right = col - 2;
// SetConsoleScreenBufferSize(child_out, coord);
// SetConsoleWindowInfo(child_out, TRUE, &rect);
// coord.X = col;
// rect.Right = col - 1;
// SetConsoleScreenBufferSize(child_out, coord);
// SetConsoleWindowInfo(child_out, TRUE, &rect);
//}
//return 0;
} }
DWORD DWORD