Merge pull request elfmz#2651 from Dazzar56/auto-locale-fix

vt mouse refactoring

Author: elfmz

far2l/src/vt/IVTShell.h

@@ -1,19 +1,19 @@
 #pragma once
 #include <string>
 
-enum MouseExpectation
+enum MouseMode
 {
-	MEX_X10_MOUSE             = 0x00001,
-	MEX_VT200_MOUSE           = 0x00002,
-//	MEX_VT200_HIGHLIGHT_MOUSE = 0x00004, irrelevant???
-	MEX_BTN_EVENT_MOUSE       = 0x00008,
-	MEX_ANY_EVENT_MOUSE       = 0x00010,
-	MEX_SGR_EXT_MOUSE         = 0x00020
+	MODE_X10_MOUSE             = 0x00001,
+	MODE_VT200_MOUSE           = 0x00002,
+//	MODE_VT200_HIGHLIGHT_MOUSE = 0x00004, not used
+	MODE_BTN_EVENT_MOUSE       = 0x00008,
+	MODE_ANY_EVENT_MOUSE       = 0x00010,
+	MODE_SGR_EXT_MOUSE         = 0x00020
 };
 
 struct IVTShell
 {
-	virtual void OnMouseExpectation(MouseExpectation mex, bool enabled) = 0;
+	virtual void OnMouseExpectation(MouseMode mex, bool enabled) = 0;
 	virtual void OnBracketedPasteExpectation(bool enabled)              = 0;
 	virtual void OnFocusChangeExpectation(bool enabled)                 = 0;
 	virtual void OnWin32InputMode(bool enabled)                         = 0;

far2l/src/vt/vtansi.cpp

@@ -183,14 +183,14 @@ [email protected]
 
 #include "vtlog.h"
 
-enum AnsiMouseExpectation
+enum AnsiMouseModes
 {
-	AMEX_X10_MOUSE             = 9,
-	AMEX_VT200_MOUSE           = 1000,
-	AMEX_VT200_HIGHLIGHT_MOUSE = 1001,
-	AMEX_BTN_EVENT_MOUSE       = 1002,
-	AMEX_ANY_EVENT_MOUSE       = 1003,
-	AMEX_SGR_EXT_MOUSE         = 1006
+	SET_X10_MOUSE              = 9,
+	SET_VT200_MOUSE            = 1000,
+	SET_VT200_HIGHLIGHT_MOUSE  = 1001,
+	SET_BTN_EVENT_MOUSE        = 1002,
+	SET_ANY_EVENT_MOUSE        = 1003,
+	SET_SGR_EXT_MODE_MOUSE     = 1006
 };
 
 struct VTAnsiState
@@ -207,7 +207,7 @@ struct VTAnsiState
 		memset(&csbi, 0, sizeof(csbi));
 		memset(&cci, 0, sizeof(cci));
 	}
-	
+
 	void InitFromConsole(HANDLE con)
 	{
 		WINPORT(GetConsoleScreenBufferInfo)( con, &csbi );
@@ -405,7 +405,7 @@ struct VTAnsiContext
 				} while (++b, --chars_in_buffer);
 			} else {
 				fprintf(stderr, "TODODODODO\n");
-				
+
 
 				// To detect wrapping of multiple characters, create a new buffer, write
 				// to the top of it and see if the cursor changes line. This doesn't
@@ -780,21 +780,21 @@ struct VTAnsiContext
 			if (prefix2 == '?' && (suffix == 'h' || suffix == 'l')) {
 				for (i = 0; i < es_argc; ++i) {
 					switch (es_argv[i]) {
-					case AMEX_X10_MOUSE:
-						vt_shell->OnMouseExpectation(MEX_X10_MOUSE, suffix == 'h');
+					case SET_X10_MOUSE:
+						vt_shell->OnMouseExpectation(MODE_X10_MOUSE, suffix == 'h');
 						break;
-					case AMEX_VT200_MOUSE:
-					case AMEX_VT200_HIGHLIGHT_MOUSE:
-						vt_shell->OnMouseExpectation(MEX_VT200_MOUSE, suffix == 'h');
+					case SET_VT200_MOUSE:
+					case SET_VT200_HIGHLIGHT_MOUSE:
+						vt_shell->OnMouseExpectation(MODE_VT200_MOUSE, suffix == 'h');
 						break;
-					case AMEX_BTN_EVENT_MOUSE:
-						vt_shell->OnMouseExpectation(MEX_BTN_EVENT_MOUSE, suffix == 'h');
+					case SET_BTN_EVENT_MOUSE:
+						vt_shell->OnMouseExpectation(MODE_BTN_EVENT_MOUSE, suffix == 'h');
 						break;
-					case AMEX_ANY_EVENT_MOUSE:
-						vt_shell->OnMouseExpectation(MEX_ANY_EVENT_MOUSE, suffix == 'h');
+					case SET_ANY_EVENT_MOUSE:
+						vt_shell->OnMouseExpectation(MODE_ANY_EVENT_MOUSE, suffix == 'h');
 						break;
-					case AMEX_SGR_EXT_MOUSE:
-						vt_shell->OnMouseExpectation(MEX_SGR_EXT_MOUSE, suffix == 'h');
+					case SET_SGR_EXT_MODE_MOUSE:
+						vt_shell->OnMouseExpectation(MODE_SGR_EXT_MOUSE, suffix == 'h');
 						break;
 
 	//				case 47: case 1047:
@@ -870,7 +870,7 @@ struct VTAnsiContext
 			// Ignore any other private sequences.
 			if (prefix2 != 0) {
 				LogFailedEscSeq(StrPrintf("bad prefix2 %c", prefix2));
-				return;			
+				return;
 			}
 
 			WINPORT(GetConsoleScreenBufferInfo)( con_hnd, &Info );
@@ -974,7 +974,7 @@ struct VTAnsiContext
 					WINPORT(ScrollConsoleScreenBuffer)( con_hnd, &Rect, &Info.srWindow, Pos, &CharInfo );
 				}
 				return;
-				
+
 			case 'T':                 // ESC[#T Scroll down
 				if (es_argc == 0) es_argv[es_argc++] = 1; // ESC[T == ESC[1T
 				if (es_argc != 1) return;
@@ -985,16 +985,16 @@ struct VTAnsiContext
 					Rect.Right  = Info.srWindow.Right = (Info.dwSize.X - 1);
 					Rect.Top    = Info.srWindow.Top;
 					Rect.Bottom = Info.srWindow.Bottom - es_argv[0];
-					
+
 					Pos.X = 0;
 					Pos.Y = Rect.Top + es_argv[0];
 
 					CI_SET_WCATTR(CharInfo, blank_character, Info.wAttributes);
 					WINPORT(ScrollConsoleScreenBuffer)( con_hnd, &Rect, &Info.srWindow, Pos, &CharInfo );
 				}
 				return;
-				
-				
+
+
 			case 'M':                 // ESC[#M Delete # lines.
 				if (es_argc == 0) es_argv[es_argc++] = 1; // ESC[M == ESC[1M
 				if (es_argc != 1) return;
@@ -1227,14 +1227,14 @@ struct VTAnsiContext
 			case 'r':
 				if (es_argc < 2) {
 					es_argv[1] = MAXSHORT;
-					if (es_argc < 1) 
+					if (es_argc < 1)
 						es_argv[0] = 1;
 				}
-				fprintf(stderr, "VTAnsi: SET SCROLL REGION: %d %d (limits %d %d)\n", 
+				fprintf(stderr, "VTAnsi: SET SCROLL REGION: %d %d (limits %d %d)\n",
 					es_argv[0] - 1, es_argv[1] - 1, Info.srWindow.Top, Info.srWindow.Bottom);
 				WINPORT(SetConsoleScrollRegion)(con_hnd, es_argv[0] - 1, es_argv[1] - 1);
 				return;
-			
+
 			case 'c': // CSI P s c Send Device Attributes (Primary DA)
 				if (prefix2 == 0 && (es_argc < 1 || es_argv[0] == 0)) {
 					SendSequence("\e[?1;2c"); // → CSI ? 1 ; 2 c (‘‘VT100 with Advanced Video Option’’)
@@ -1336,32 +1336,32 @@ struct VTAnsiContext
 	void ForwardIndex()
 	{
 		fprintf(stderr, "ANSI: ForwardIndex\n");
-		FlushBuffer();	
+		FlushBuffer();
 	}
 
 	void ReverseIndex()
 	{
 		fprintf(stderr, "ANSI: ReverseIndex\n");
 		FlushBuffer();
-		HANDLE con_hnd = vt_shell->ConsoleHandle();		
+		HANDLE con_hnd = vt_shell->ConsoleHandle();
 		CONSOLE_SCREEN_BUFFER_INFO info;
 		WINPORT(GetConsoleScreenBufferInfo)( con_hnd, &info );
 		SHORT scroll_top = 0, scroll_bottom = 0x7fff;
 		WINPORT(GetConsoleScrollRegion)(con_hnd, &scroll_top, &scroll_bottom);
-		
+
 		if (scroll_top < info.srWindow.Top) scroll_top = info.srWindow.Top;
 		if (scroll_bottom < info.srWindow.Top) scroll_bottom = info.srWindow.Top;
-		
+
 		if (scroll_top > info.srWindow.Bottom) scroll_top = info.srWindow.Bottom;
-		
+
 		if (scroll_bottom > info.srWindow.Bottom) scroll_bottom = info.srWindow.Bottom;
-			
-		if (info.dwCursorPosition.Y != scroll_top) { 
+
+		if (info.dwCursorPosition.Y != scroll_top) {
 			info.dwCursorPosition.Y--;
 			WINPORT(SetConsoleCursorPosition)(con_hnd, info.dwCursorPosition);
 			return;
 		}
-		
+
 		if (scroll_top>=scroll_bottom)
 			return;
 
@@ -1547,8 +1547,8 @@ struct VTAnsiContext
 				}
 
 				if (done) {
-					if (state == 6) 
-						InterpretControlString();					
+					if (state == 6)
+						InterpretControlString();
 					else
 						InterpretEscSeq();
 					state = 1;
@@ -1595,7 +1595,7 @@ struct VTAnsiContext
 	VTAnsiContext()
 		: alternative_screen_buffer(*this)
 	{
-	}	
+	}
 };
 
 
@@ -1606,9 +1606,9 @@ VTAnsi::VTAnsi(IVTShell *vtsh)
 	_ctx->ResetTerminal();
 	_ctx->saved_state.InitFromConsole(_ctx->vt_shell->ConsoleHandle());
 	_ctx->ansi_state.font_state.FromConsoleAttributes(_ctx->saved_state.csbi.wAttributes);
-	
+
 	VTLog::Start();
-	
+
 //	get_state();
 }