fixed editor completion plugin that was resently broken

elfmz · Apr 27, 2023 · 14e32e6 · 14e32e6
1 parent 30cdf82
commit 14e32e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/editorcomp/src/editorcomp.cpp b/editorcomp/src/editorcomp.cpp
@@ -73,7 +73,6 @@ SHAREDSYMBOL int WINAPI ProcessEditorEventW(int Event, void *Param) {
 
 SHAREDSYMBOL int WINAPI ProcessEditorInputW(const INPUT_RECORD *ir) {
     if (ir->EventType == KEY_EVENT && (ir->Event.KeyEvent.dwControlKeyState & RELEVANT_MODIFIERS) == 0
-        && ir->Event.KeyEvent.wVirtualScanCode == 0
         && !ir->Event.KeyEvent.bKeyDown
         && ir->Event.KeyEvent.wVirtualKeyCode == 0) {
         return 0;
@@ -96,7 +95,7 @@ SHAREDSYMBOL int WINAPI ProcessEditorInputW(const INPUT_RECORD *ir) {
     } else if (ir->EventType == KEY_EVENT) { // Is regular key event?
         DWORD relevant_modifiers = (ir->Event.KeyEvent.dwControlKeyState & RELEVANT_MODIFIERS);
 
-        if (ir->Event.KeyEvent.bKeyDown && ir->Event.KeyEvent.wVirtualScanCode == 0) {
+        if (ir->Event.KeyEvent.bKeyDown) {
             // Tab or Shift+Tab ?
             if (ir->Event.KeyEvent.wVirtualKeyCode == VK_TAB && editor->getState() == DO_ACTION) {
                 switch (relevant_modifiers) {
@@ -129,7 +128,7 @@ SHAREDSYMBOL int WINAPI ProcessEditorInputW(const INPUT_RECORD *ir) {
         }
 
         // Is character-typing key event?
-        if (!ir->Event.KeyEvent.bKeyDown && ir->Event.KeyEvent.wVirtualScanCode == 0
+        if (!ir->Event.KeyEvent.bKeyDown
             && (relevant_modifiers == 0 || relevant_modifiers == SHIFT_PRESSED)
             && ir->Event.KeyEvent.wVirtualKeyCode != VK_TAB && ir->Event.KeyEvent.wVirtualKeyCode != VK_BACK
             && ir->Event.KeyEvent.wVirtualKeyCode != VK_ESCAPE && ir->Event.KeyEvent.wVirtualKeyCode != VK_DELETE

diff --git a/far2l/src/console/keyboard.cpp b/far2l/src/console/keyboard.cpp
@@ -608,7 +608,7 @@ DWORD GetInputRecord(INPUT_RECORD *rec, bool ExcludeMacro, bool ProcessMouse, bo
 		*/
 		if (Console.PeekInput(*rec)) {
 			// cheat for flock
-			if (rec->EventType == KEY_EVENT && !rec->Event.KeyEvent.wVirtualScanCode
+			if (rec->EventType == KEY_EVENT
 					&& (rec->Event.KeyEvent.wVirtualKeyCode == VK_NUMLOCK
 							|| rec->Event.KeyEvent.wVirtualKeyCode == VK_CAPITAL
 							|| rec->Event.KeyEvent.wVirtualKeyCode == VK_SCROLL)) {

diff --git a/far2l/src/ctrlobj.cpp b/far2l/src/ctrlobj.cpp
@@ -189,7 +189,6 @@ void ControlObject::ShowStartupBanner(LPCWSTR EmergencyMsg)
 {
 	std::vector<FARString> Lines;
 
-	char Xor = 17;
 	std::string tmp_mb;
 	for (const char *p = Copyright; *p; ++p) {
 		//const char c = (*p & 0x7f) ^ Xor;