gh-629: Don't imply ‘AppKeys’ mode (DECCKM) by -cur_console:p or `E…

…NABLE_VIRTUAL_TERMINAL_INPUT`.
Maximus5 · Apr 16, 2018 · 56e771f · 56e771f
1 parent 160bfb7
commit 56e771f
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 17 deletions.
diff --git a/src/ConEmu/RealConsole.cpp b/src/ConEmu/RealConsole.cpp
@@ -4436,11 +4436,11 @@ void CRealConsole::UpdateRootInfo(const CESERVER_ROOT_INFO& RootInfo)
 		if (m_Args.nPTY)
 		{
 			// xterm keys notation
-			StartStopXTerm(RootInfo.nPID, ((m_Args.nPTY & 1) == 1));
+			StartStopXTerm(RootInfo.nPID, (m_Args.nPTY & pty_XTerm));
 			// Bracketed paste
-			StartStopBracketedPaste(RootInfo.nPID, ((m_Args.nPTY & 2) == 2));
+			StartStopBracketedPaste(RootInfo.nPID, (m_Args.nPTY & pty_BrPaste));
 			// Application cursor keys
-			StartStopAppCursorKeys(RootInfo.nPID, ((m_Args.nPTY & 4) == 4));
+			StartStopAppCursorKeys(RootInfo.nPID, (m_Args.nPTY & pty_AppKeys));
 		}
 	}
 
@@ -6287,7 +6287,7 @@ bool CRealConsole::StartStopTermMode(TermModeCommand mode, ChangeTermAction acti
 
 	switch (mode)
 	{
-	case tmc_Keyboard:
+	case tmc_TerminalType:
 		if (action == cta_Switch)
 			bValue = (GetTermType() == te_win32);
 		StartStopXTerm(nActivePID, bValue);

diff --git a/src/ConEmu/RealServer.cpp b/src/ConEmu/RealServer.cpp
@@ -1415,7 +1415,7 @@ CESERVER_REQ* CRealServer::cmdStartXTerm(LPVOID pInst, CESERVER_REQ* pIn, UINT n
 
 	switch (mode)
 	{
-	case tmc_Keyboard:
+	case tmc_TerminalType:
 		_ASSERTE(value == te_win32 || value == te_xterm);
 		mp_RCon->StartStopXTerm(nPID, (value != te_win32));
 		break;

diff --git a/src/ConEmu/Status.cpp b/src/ConEmu/Status.cpp
@@ -2196,7 +2196,7 @@ bool CStatus::ProcessTermModeMenuId(WORD nCmd)
 		switch (nCmd)
 		{
 		case 1: case 2:
-			mode = tmc_Keyboard;
+			mode = tmc_TerminalType;
 			action = (nCmd == 2) ? cta_Enable : cta_Disable;
 			break;
 		case 3:

diff --git a/src/ConEmuHk/Ansi.cpp b/src/ConEmuHk/Ansi.cpp
@@ -3983,7 +3983,7 @@ void CEAnsi::StartXTermMode(bool bStart)
 
 	// Remember last mode
 	gbWasXTermOutput = bStart;
-	ChangeTermMode(tmc_Keyboard, bStart ? te_xterm : te_win32);
+	ChangeTermMode(tmc_TerminalType, bStart ? te_xterm : te_win32);
 }
 
 // This is useful when user press Shift+Home,

diff --git a/src/ConEmuHk/ShellProcessor.cpp b/src/ConEmuHk/ShellProcessor.cpp
@@ -3030,7 +3030,7 @@ void CShellProc::OnCreateProcessFinished(BOOL abSucceeded, PROCESS_INFORMATION *
 
 		if (m_Args.nPTY)
 		{
-			CEAnsi::ChangeTermMode(tmc_Keyboard, (m_Args.nPTY == 1), lpPI->dwProcessId);
+			CEAnsi::ChangeTermMode(tmc_TerminalType, (m_Args.nPTY & pty_XTerm) ? 1 : 0, lpPI->dwProcessId);
 		}
 
 		if (isDefTermEnabled())

diff --git a/src/ConEmuHk/hkConsoleOutput.cpp b/src/ConEmuHk/hkConsoleOutput.cpp
@@ -129,8 +129,8 @@ BOOL WINAPI OnSetConsoleMode(HANDLE hConsoleHandle, DWORD dwMode)
 			{
 				_ASSERT(HandleKeeper::IsInputHandle(hConsoleHandle));
 				CEAnsi::StartXTermMode((dwMode & ENABLE_VIRTUAL_TERMINAL_INPUT) != 0);
-				if (dwMode & ENABLE_VIRTUAL_TERMINAL_INPUT)
-					CEAnsi::ChangeTermMode(tmc_AppCursorKeys, true);
+				//if (dwMode & ENABLE_VIRTUAL_TERMINAL_INPUT)
+				//	CEAnsi::ChangeTermMode(tmc_AppCursorKeys, true);
 			}
 		}
 	}

diff --git a/src/common/Common.h b/src/common/Common.h
@@ -368,7 +368,7 @@ enum RealBufferScroll
 //   `console` - survive on process termination
 enum TermModeCommand
 {
-	tmc_Keyboard       = 0, // TermEmulationType    - process life-time
+	tmc_TerminalType   = 0, // TermEmulationType    - process life-time
 	tmc_BracketedPaste = 1, // true/false           - process life-time
 	tmc_AppCursorKeys  = 2, // true/false           - process life-time
 	tmc_CursorShape    = 3, // TermCursorShapes     - ***console*** life-time
@@ -378,7 +378,7 @@ enum TermModeCommand
 	tmc_Last
 };
 
-// tmc_Keyboard: used for control keys (arrows e.g.) translation
+// tmc_TerminalType: used for control keys (arrows e.g.) translation
 enum TermEmulationType
 {
 	te_win32 = 0,
@@ -507,7 +507,7 @@ const CECMD
 	CECMD_GUICLIENTSHIFT = 71, // GuiStylesAndShifts
 	CECMD_ALTBUFFER      = 72, // CESERVER_REQ_ALTBUFFER: CmdOutputStore/Restore
 	CECMD_ALTBUFFERSTATE = 73, // Проверить, разрешен ли Alt.Buffer?
-	CECMD_STARTXTERM     = 74, // dwData[0]=TermModeCommand, dwData[1]=value (TermEmulationType for tmc_Keyboard, and so on), dwData[2]=the PID (may differ from hdr's one).
+	CECMD_STARTXTERM     = 74, // dwData[0]=TermModeCommand, dwData[1]=value (TermEmulationType for tmc_TerminalType, and so on), dwData[2]=the PID (may differ from hdr's one).
 	//CECMD_DEFTERMSTARTED = 75, // Уведомить GUI, что инициализация хуков для Default Terminal была завершена -- не требуется, ConEmuC ждет успеха
 	CECMD_UPDCONMAPHDR   = 76, // AltServer не может менять CESERVER_CONSOLE_MAPPING_HDR во избежание конфликтов. Это делает только RM_MAINSERVER (req.ConInfo)
 	CECMD_SETCONSCRBUF   = 77, // CESERVER_REQ_SETCONSCRBUF - temporarily block active server reading thread to change console buffer size

diff --git a/src/common/RConStartArgs.cpp b/src/common/RConStartArgs.cpp
@@ -433,7 +433,7 @@ int RConStartArgs::ProcessNewConArg(bool bForceCurConsole /*= false*/)
 						}
 						else
 						{
-							nPTY = DefaultPtyFlags; // xterm + app cursor keys
+							nPTY = pty_Default; // xterm mode
 						}
 						break;
 

diff --git a/src/common/RConStartArgs.h b/src/common/RConStartArgs.h
@@ -44,7 +44,13 @@ enum RConBoolArg
 };
 
 #define DefaultSplitValue 500
-#define DefaultPtyFlags (1|4)
+
+typedef UINT PtyFlags;
+const PtyFlags
+	pty_XTerm    = 1,
+	pty_BrPaste  = 2,
+	pty_AppKeys  = 4,
+	pty_Default  = pty_XTerm;
 
 struct RConStartArgs
 {
@@ -86,7 +92,7 @@ struct RConStartArgs
 
 	RConBoolArg     OverwriteMode;      // -new_console:w - enable "Overwrite" mode in console prompt
 
-	UINT     		nPTY;               // -new_console:p[N] - change pty modes, N is bitmask: 1 - xterm keyboard, 2 - bracketed paste, 4 - app cursor keys
+	PtyFlags		nPTY;               // -new_console:p[N] - change pty modes, N is bitmask: 1 - xterm keyboard, 2 - bracketed paste, 4 - app cursor keys
 
 	RConBoolArg     BufHeight;          // -new_console:h<lines>
 	UINT     		nBufHeight;         //

diff --git a/src/common/RConStartArgsEx.cpp b/src/common/RConStartArgsEx.cpp
@@ -562,7 +562,7 @@ wchar_t* RConStartArgsEx::CreateCommandLine(bool abForTasks /*= false*/) const
 	else if (OverwriteMode == crb_Off)
 		wcscat_c(szAdd, L"w0");
 
-	if (nPTY == DefaultPtyFlags)
+	if (nPTY == pty_Default)
 		wcscat_c(szAdd, L"p");
 	else if (nPTY)
 		msprintf(szAdd+lstrlen(szAdd), 15, L"p%u", nPTY);