From 6c2125fb972035375f4706c037e56a3b899d0c90 Mon Sep 17 00:00:00 2001
From: Victor Homyakov <vkhomyackov@gmail.com>
Date: Wed, 22 Oct 2014 19:13:04 +0300
Subject: [PATCH] Code cleanup

---
 dist/recaps.exe | Bin 66560 -> 66560 bytes
 recaps.cpp      |  64 ++++++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/dist/recaps.exe b/dist/recaps.exe
index 2f93740391589f234f4366495066a0f376384cb7..befa5fc39de58a53b2320bae7a57850b961b1522 100644
GIT binary patch
delta 4586
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
N(NVP9`miqOe*lOFu>$}A

delta 4560
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

diff --git a/recaps.cpp b/recaps.cpp
index 17ca1c5..6ff6aad 100644
--- a/recaps.cpp
+++ b/recaps.cpp
@@ -320,19 +320,31 @@ HKL GetCurrentLayout() {
     return GetKeyboardLayout(threadId);
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// Activate the selected language
+HKL ChangeInputLanguage(UINT newLanguage) {
+    HWND hwnd = RemoteGetFocus();
+    g_keyboardInfo.current = newLanguage;
+    PostMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, (LPARAM)(g_keyboardInfo.hkls[g_keyboardInfo.current]));
+#ifdef _DEBUG
+    PrintDebugString("Language set to %S", g_keyboardInfo.names[g_keyboardInfo.current]);
+#endif
+    return g_keyboardInfo.hkls[g_keyboardInfo.current];
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Switches the current language
 HKL SwitchLayout() {
     HKL currentLayout = GetCurrentLayout();
 
     // Find the current keyboard layout's index
-    UINT i;
-    for (i = 0; i < g_keyboardInfo.count; i++) {
+    UINT currentLanguageIndex = 0;
+    for (UINT i = 0; i < g_keyboardInfo.count; i++) {
         if (g_keyboardInfo.hkls[i] == currentLayout) {
+            currentLanguageIndex = i;
             break;
         }
     }
-    UINT currentLanguageIndex = i;
 
     // Find the next active layout
     BOOL found = FALSE;
@@ -345,18 +357,7 @@ HKL SwitchLayout() {
         }
     }
 
-    // Activate the selected language
-    if (found) {
-        HWND hwnd = RemoteGetFocus();
-        g_keyboardInfo.current = newLanguage;
-        PostMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, (LPARAM)(g_keyboardInfo.hkls[g_keyboardInfo.current]));
-        #ifdef _DEBUG
-            PrintDebugString("Language set to %S", g_keyboardInfo.names[g_keyboardInfo.current]);
-        #endif
-        return g_keyboardInfo.hkls[g_keyboardInfo.current];
-    }
-
-    return NULL;
+    return found ? ChangeInputLanguage(newLanguage) : NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -368,6 +369,12 @@ void SwitchAndConvert(void*) {
     ConvertSelectedTextInActiveWindow(sourceLayout, targetLayout);
 }
 
+///////////////////////////////////////////////////////////////////////////////
+// Checks key state
+BOOL IsKeyPressed(int nVirtKey) {
+    return (GetKeyState(nVirtKey) & 0x80000000) > 0;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // A LowLevelHookProc implementation that captures the CapsLock key
 LRESULT CALLBACK LowLevelHookProc(int nCode, WPARAM wParam, LPARAM lParam) {
@@ -377,21 +384,20 @@ LRESULT CALLBACK LowLevelHookProc(int nCode, WPARAM wParam, LPARAM lParam) {
 
     // ignore injected keystrokes
     if ((data->flags & LLKHF_INJECTED) == 0) {
-        BOOL ctrl =  (GetKeyState(VK_CONTROL) & 0x80000000) > 0;
-        BOOL caps =  data->vkCode == VK_CAPITAL && wParam == WM_KEYDOWN;
-
-        if (caps && !ctrl) {
-            // Handle CapsLock - only switch current layout
-            SwitchLayout();
-            return 1;
-        } else if (caps && ctrl) {
-            // Handle Ctrl-CapsLock - switch current layout and convert text in current field
-            // We start SwitchLayoutAndConvertSelected in another thread since it simulates 
-            // keystrokes to copy and paste the teset which call back into this hook.
-            // That isn't good..
-            _beginthread(SwitchAndConvert, 0, NULL);
+        BOOL caps = wParam == WM_KEYDOWN && data->vkCode == VK_CAPITAL;
+        if (caps) {
+            if (IsKeyPressed(VK_CONTROL)) {
+                // Handle Ctrl-CapsLock - switch current layout and convert text in current field
+                // We start SwitchLayoutAndConvertSelected in another thread since it simulates 
+                // keystrokes to copy and paste the teset which call back into this hook.
+                // That isn't good.
+                _beginthread(SwitchAndConvert, 0, NULL);
+            } else {
+                // Handle CapsLock - only switch current layout
+                SwitchLayout();
+            }
             return 1; // prevent windows from handling the keystroke
-        }
+		}
     }
 
     return CallNextHookEx(g_hHook, nCode, wParam, lParam);