tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-25 15:04:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Manual Merge change f26780ecfb8f6ebff742360c96ebe51285bb4a35

Browse Source 
ID Author Date Message
f26780ecfb8f6ebff742360c96ebe51285bb4a35 Ray Hayes <rayhayes@rhbe.net>
9/16/2016 3:26:06 PM -07:00 Fix ESC character parsing when # missing.
This commit is contained in:
Manoj Ampalam 2016-09-22 19:34:38 -07:00
parent d81a9834e2
commit 3e23785c66
3 changed files with 523 additions and 514 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/win32/win32compat/ansiprsr.c
View File

@ -55,6 +55,7 @@ extern int ScreenX;
extern int ScreenY; extern int ScreenY;
extern int ScrollTop; extern int ScrollTop;
extern int ScrollBottom; extern int ScrollBottom;
// end of imports from outside module // end of imports from outside module
bool gbVTAppMode = false; bool gbVTAppMode = false;
@ -80,7 +81,8 @@ int bCS0 = 0;
int bCS1 = 0; int bCS1 = 0;
int bBkMode = 0; int bBkMode = 0;
int bCharMode = 0; int bCharMode = 0;
int ReportedX = 0;
int ReportedY = 0;
BOOL fShiftOut = FALSE; BOOL fShiftOut = FALSE;
BOOL InPrintMode = FALSE; BOOL InPrintMode = FALSE;
@ -544,6 +546,8 @@ unsigned char * ParseANSI(unsigned char * pszBuffer, unsigned char * pszBufferEn
if (bMode & MODE_BRK) if (bMode & MODE_BRK)
{ {
// Cursor left // Cursor left
if (iParam[0] == 0)
iParam[0] = 1;
ConMoveCursorPosition(-iParam[0], 0); ConMoveCursorPosition(-iParam[0], 0);
} }
else if (bMode == 0) else if (bMode == 0)
@ -570,15 +574,27 @@ unsigned char * ParseANSI(unsigned char * pszBuffer, unsigned char * pszBufferEn
break; break;
case 'h': case 'h':
if (bMode & MODE_EXT)
{
if (iParam[0] == 4 && iParam[1] == 7) {
ConSaveScreen();
}
}
case 'l': // ^[?25h case 'l': // ^[?25h
if (bMode & MODE_EXT) if (bMode & MODE_EXT)
{ {
if (iParam[0] == 4 && iParam[1] == 7) {
ConRestoreScreen();
}
else
{
if (iParam[0] == 4) { if (iParam[0] == 4) {
VTMode |= MODE_IRM_INSERT; VTMode |= MODE_IRM_INSERT;
} }
int i; int i;
for ( i = 0; i < iCurrentParam; i++ ) for (i = 0; i < iCurrentParam; i++)
ConSetExtendedMode(iParam[i], *pszCurrent=='h' ? 1 : 0); ConSetExtendedMode(iParam[i], *pszCurrent == 'h' ? 1 : 0);
}
} }
else if (bMode & MODE_BRK) else if (bMode & MODE_BRK)
{ {
@ -618,11 +634,13 @@ unsigned char * ParseANSI(unsigned char * pszBuffer, unsigned char * pszBufferEn
ConSetAttribute(iParam, iCurrentParam); ConSetAttribute(iParam, iCurrentParam);
fcompletion = 1; fcompletion = 1;
break; break;
case 'r': case 'r':
fcompletion = 1; fcompletion = 1;
break; break;
case 'R':
ReportedX = iParam[1];
ReportedY = iParam[0];
break;
case 'H': case 'H':
case 'f': case 'f':
if (bMode & MODE_BRK) if (bMode & MODE_BRK)

48
contrib/win32/win32compat/tncon.c
View File

@ -165,8 +165,6 @@ int ReadConsoleForTermEmul(HANDLE hInput, char *destin, int destinlen)
dwControlKeyState = InputRecord.Event.KeyEvent.dwControlKeyState & dwControlKeyState = InputRecord.Event.KeyEvent.dwControlKeyState &
~(CAPSLOCK_ON | ENHANCED_KEY | NUMLOCK_ON | SCROLLLOCK_ON); ~(CAPSLOCK_ON | ENHANCED_KEY | NUMLOCK_ON | SCROLLLOCK_ON);
if (InputRecord.Event.KeyEvent.uChar.UnicodeChar)
{
if (InputRecord.Event.KeyEvent.bKeyDown) if (InputRecord.Event.KeyEvent.bKeyDown)
{ {
int n = WideCharToMultiByte( int n = WideCharToMultiByte(
@ -201,15 +199,6 @@ int ReadConsoleForTermEmul(HANDLE hInput, char *destin, int destinlen)
break; break;
default: default:
NetWriteString2(pParams->Socket, (char *)octets, n, 0);
break;
}
}
}
else
{
if (InputRecord.Event.KeyEvent.bKeyDown)
{
switch (InputRecord.Event.KeyEvent.wVirtualKeyCode) switch (InputRecord.Event.KeyEvent.wVirtualKeyCode)
{ {
case VK_UP: case VK_UP:
@ -619,44 +608,46 @@ int ReadConsoleForTermEmul(HANDLE hInput, char *destin, int destinlen)
NetWriteString2(pParams->Socket, (char *)SHIFT_CTRL_PF12_KEY, strlen(SHIFT_CTRL_PF12_KEY), 0); NetWriteString2(pParams->Socket, (char *)SHIFT_CTRL_PF12_KEY, strlen(SHIFT_CTRL_PF12_KEY), 0);
break; break;
case VK_PRIOR: case VK_PRIOR:
#ifdef PHYS_KEY_MAP #ifdef PHYS_KEY_MAP
NetWriteString2(pParams->Socket, (char *)REMOVE_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)REMOVE_KEY, 4, 0);
#else #else
NetWriteString2(pParams->Socket, (char *)PREV_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)PREV_KEY, 4, 0);
#endif #endif
break; break;
case VK_NEXT: case VK_NEXT:
NetWriteString2(pParams->Socket, (char *)NEXT_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)NEXT_KEY, 4, 0);
break; break;
case VK_END: case VK_END:
#ifdef PHYS_KEY_MAP #ifdef PHYS_KEY_MAP
NetWriteString2(pParams->Socket, (char *)PREV_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)PREV_KEY, 4, 0);
#else #else
NetWriteString2(pParams->Socket, (char *)SELECT_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)SELECT_KEY, 4, 0);
#endif #endif
break; break;
case VK_HOME: case VK_HOME:
#ifdef PHYS_KEY_MAP #ifdef PHYS_KEY_MAP
NetWriteString2(pParams->Socket, (char *)INSERT_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)INSERT_KEY, 4, 0);
#else #else
NetWriteString2(pParams->Socket, (char *)FIND_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)FIND_KEY, 4, 0);
#endif #endif
break; break;
case VK_INSERT: case VK_INSERT:
#ifdef PHYS_KEY_MAP #ifdef PHYS_KEY_MAP
NetWriteString2(pParams->Socket, (char *)FIND_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)FIND_KEY, 4, 0);
#else #else
NetWriteString2(pParams->Socket, (char *)INSERT_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)INSERT_KEY, 4, 0);
#endif
#endif
break; break;
case VK_DELETE: case VK_DELETE:
#ifdef PHYS_KEY_MAP #ifdef PHYS_KEY_MAP
NetWriteString2(pParams->Socket, (char *)SELECT_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)SELECT_KEY, 4, 0);
#else #else
NetWriteString2(pParams->Socket, (char *)REMOVE_KEY, 4, 0); NetWriteString2(pParams->Socket, (char *)REMOVE_KEY, 4, 0);
#endif #endif
break;
case VK_BACK:
NetWriteString2(pParams->Socket, (char *)BACKSPACE_KEY, 1, 0);
break; break;
case VK_TAB: case VK_TAB:
if (dwControlKeyState == SHIFT_PRESSED) if (dwControlKeyState == SHIFT_PRESSED)
@ -672,8 +663,7 @@ int ReadConsoleForTermEmul(HANDLE hInput, char *destin, int destinlen)
break; break;
default: default:
{ {
aChar = InputRecord.Event.KeyEvent.uChar.AsciiChar; NetWriteString2(pParams->Socket, (char *)octets, n, 0);
NetWriteString2(pParams->Socket, (char *)&aChar, 1, 0);
break; break;
} }
} }

1
contrib/win32/win32compat/tncon.h
View File

@ -172,6 +172,7 @@
#define NEXT_KEY "\x1b[6~" #define NEXT_KEY "\x1b[6~"
#define SHIFT_TAB_KEY "\x1b[~" #define SHIFT_TAB_KEY "\x1b[~"
#define ESCAPE_KEY "\x1b" #define ESCAPE_KEY "\x1b"
#define BACKSPACE_KEY "\b"
#define TERMINAL_ID "\x1b[?1;2c" #define TERMINAL_ID "\x1b[?1;2c"
#define STATUS_REPORT "\x1b[2;5R" #define STATUS_REPORT "\x1b[2;5R"