Merge pull request #3 from Felix3322/codex/modify-code-according-to-agents.md-requirements

Better config

Author: Felix3322

SnapKey.cpp

@@ -8,8 +8,9 @@
 #include <string>
 #include <unordered_map>
 #include <regex>
-#include <cstdlib>
-#include <ctime>
+#include <random>
+#include <chrono>
+#include <thread>
 
 using namespace std;
 
@@ -49,16 +50,24 @@ bool isLocked = false; // Variable to track the lock state
 bool vacBypassAEnabled = false; // VAC bypass A toggle
 bool vacBypassBEnabled = false; // VAC bypass B toggle
 int vacCounter = 0;    // counter for imperfect snaptap
+int vacAMinDelay = 15; // A mode minimum overlap delay
+int vacAMaxDelay = 35; // A mode maximum overlap delay
+int vacBMinDelay = 5;  // B mode minimum release-press interval
+int vacBMaxDelay = 15; // B mode maximum release-press interval
+
+static std::mt19937 rng(std::random_device{}());
 
 // Function declarations
 LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam);
 LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 void InitNotifyIconData(HWND hwnd);
 bool LoadConfig(const std::string& filename);
 void CreateDefaultConfig(const std::string& filename); 
-void RestoreConfigFromBackup(const std::string& backupFilename, const std::string& destinationFilename); 
-std::string GetVersionInfo(); 
+void RestoreConfigFromBackup(const std::string& backupFilename, const std::string& destinationFilename);
+std::string GetVersionInfo();
 void SendKey(int target, bool keyDown);
+void UpdateTrayIcon();
+void WriteConfigValue(const std::string& filename, const std::string& key, int value);
 
 int main()
 {
@@ -107,9 +116,7 @@ int main()
 
     // Initialize and add the system tray icon
     InitNotifyIconData(hwnd);
-
-    // Seed RNG for VAC bypass delay
-    srand(static_cast<unsigned int>(time(NULL)));
+    UpdateTrayIcon();
 
     // Set the hook
     hHook = SetWindowsHookEx(WH_KEYBOARD_LL, KeyboardProc, NULL, 0);
@@ -159,10 +166,11 @@ void handleKeyDown(int keyCode)
             currentGroupInfo.previousKey = currentGroupInfo.activeKey;
             currentGroupInfo.activeKey = keyCode;
 
-            if (vacBypassBEnabled && (rand() % 2 == 0))
+            if (vacBypassBEnabled && std::uniform_int_distribution<int>(0,1)(rng) == 0)
             {
                 SendKey(currentGroupInfo.previousKey, false);
-                Sleep((rand() % 11) + 5); // 5-15ms delay
+                std::this_thread::sleep_for(std::chrono::milliseconds(
+                    std::uniform_int_distribution<int>(vacBMinDelay, vacBMaxDelay)(rng)));
                 SendKey(keyCode, true);
             }
             else
@@ -172,7 +180,8 @@ void handleKeyDown(int keyCode)
                 {
                     if (vacCounter >= 17)
                     {
-                        Sleep((rand() % 21) + 15); // 15-35ms overlap
+                        std::this_thread::sleep_for(std::chrono::milliseconds(
+                            std::uniform_int_distribution<int>(vacAMinDelay, vacAMaxDelay)(rng)));
                         vacCounter = 0;
                     }
                     else
@@ -275,6 +284,32 @@ void InitNotifyIconData(HWND hwnd)
     Shell_NotifyIcon(NIM_ADD, &nid);
 }
 
+void UpdateTrayIcon()
+{
+    const TCHAR* iconFile = TEXT("icon.ico");
+    if (isLocked)
+    {
+        iconFile = TEXT("icon_off.ico");
+    }
+    else if (vacBypassAEnabled || vacBypassBEnabled)
+    {
+        iconFile = TEXT("icon_vac_bypass.ico");
+    }
+
+    HICON hIcon = (HICON)LoadImage(NULL, iconFile, IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+    if (!hIcon)
+    {
+        hIcon = (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
+    }
+
+    if (hIcon)
+    {
+        nid.hIcon = hIcon;
+        Shell_NotifyIcon(NIM_MODIFY, &nid);
+        DestroyIcon(hIcon);
+    }
+}
+
 LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     switch (msg)
@@ -313,28 +348,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             isLocked = !isLocked;
 
             // Update the tray icon
-            if (isLocked)
-            {
-                // Load icon_off.ico (OFF)
-                HICON hIconOff = (HICON)LoadImage(NULL, TEXT("icon_off.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-                if (hIconOff)
-                {
-                    nid.hIcon = hIconOff;
-                    Shell_NotifyIcon(NIM_MODIFY, &nid);
-                    DestroyIcon(hIconOff);
-                }
-            }
-            else
-            {
-                // Load icon.ico (ON)
-                HICON hIconOn = (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-                if (hIconOn)
-                {
-                    nid.hIcon = hIconOn;
-                    Shell_NotifyIcon(NIM_MODIFY, &nid);
-                    DestroyIcon(hIconOn);
-                }
-            }
+            UpdateTrayIcon();
         }
         break;
 
@@ -387,25 +401,21 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         case ID_TRAY_LOCK_FUNCTION: // lock sticky keys
             {
                 isLocked = !isLocked;
-                HICON hIcon = isLocked
-                    ? (HICON)LoadImage(NULL, TEXT("icon_off.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE)
-                    : (HICON)LoadImage(NULL, TEXT("icon.ico"), IMAGE_ICON, 0, 0, LR_LOADFROMFILE);
-                if (hIcon)
-                {
-                    nid.hIcon = hIcon;
-                    Shell_NotifyIcon(NIM_MODIFY, &nid);
-                    DestroyIcon(hIcon);
-                }
+                UpdateTrayIcon();
             }
             break;
         case ID_TRAY_VAC_BYPASS_A: // toggle VAC bypass A
             {
                 vacBypassAEnabled = !vacBypassAEnabled;
+                WriteConfigValue("config.cfg", "vac_bypass_a", vacBypassAEnabled ? 1 : 0);
+                UpdateTrayIcon();
             }
             break;
         case ID_TRAY_VAC_BYPASS_B: // toggle VAC bypass B
             {
                 vacBypassBEnabled = !vacBypassBEnabled;
+                WriteConfigValue("config.cfg", "vac_bypass_b", vacBypassBEnabled ? 1 : 0);
+                UpdateTrayIcon();
             }
             break;
         }
@@ -453,6 +463,35 @@ void CreateDefaultConfig(const std::string& filename)
     RestoreConfigFromBackup(backupFilename, filename);
 }
 
+void WriteConfigValue(const std::string& filename, const std::string& key, int value)
+{
+    std::ifstream inFile(filename);
+    std::vector<std::string> lines;
+    bool found = false;
+    if (inFile.is_open()) {
+        std::string line;
+        std::regex pat("^\\s*" + key + "\\s*=");
+        while (getline(inFile, line)) {
+            if (std::regex_search(line, pat)) {
+                lines.push_back(key + " = " + std::to_string(value));
+                found = true;
+            } else {
+                lines.push_back(line);
+            }
+        }
+        inFile.close();
+    }
+
+    if (!found) {
+        lines.push_back(key + " = " + std::to_string(value));
+    }
+
+    std::ofstream outFile(filename, std::ios::trunc);
+    for (const auto& l : lines) {
+        outFile << l << "\n";
+    }
+}
+
 // Check for config.cfg
 bool LoadConfig(const std::string& filename)
 {
@@ -464,6 +503,10 @@ bool LoadConfig(const std::string& filename)
 
     string line; // Check for duplicated keys in the config file
     int id = 0;
+    bool foundA = false, foundB = false;
+    bool foundAMin = false, foundAMax = false;
+    bool foundBMin = false, foundBMax = false;
+
     while (getline(configFile, line)) {
         istringstream iss(line);
         string key;
@@ -475,6 +518,7 @@ bool LoadConfig(const std::string& filename)
         }
         else if (getline(iss, key, '=') && (iss >> value))
         {
+            key = regex_replace(key, regex("^\\s+|\\s+$"), "");
             if (key.find("key") != string::npos)
             {
                 if (!KeyInfo[value].registered)
@@ -489,7 +533,43 @@ bool LoadConfig(const std::string& filename)
                     return false;
                 }
             }
+            else if (key == "vac_bypass_a") {
+                vacBypassAEnabled = (value != 0); foundA = true;
+            }
+            else if (key == "vac_bypass_b") {
+                vacBypassBEnabled = (value != 0); foundB = true;
+            }
+            else if (key == "vac_a_min_delay") {
+                vacAMinDelay = value; foundAMin = true;
+            }
+            else if (key == "vac_a_max_delay") {
+                vacAMaxDelay = value; foundAMax = true;
+            }
+            else if (key == "vac_b_min_delay") {
+                vacBMinDelay = value; foundBMin = true;
+            }
+            else if (key == "vac_b_max_delay") {
+                vacBMaxDelay = value; foundBMax = true;
+            }
         }
     }
+    configFile.close();
+
+    if (vacAMinDelay < 0 || vacAMaxDelay < 0 || vacAMaxDelay < vacAMinDelay) {
+        vacAMinDelay = 15;
+        vacAMaxDelay = 35;
+    }
+    if (vacBMinDelay < 0 || vacBMaxDelay < 0 || vacBMaxDelay < vacBMinDelay) {
+        vacBMinDelay = 5;
+        vacBMaxDelay = 15;
+    }
+
+    if (!foundA) WriteConfigValue(filename, "vac_bypass_a", vacBypassAEnabled ? 1 : 0);
+    if (!foundB) WriteConfigValue(filename, "vac_bypass_b", vacBypassBEnabled ? 1 : 0);
+    if (!foundAMin) WriteConfigValue(filename, "vac_a_min_delay", vacAMinDelay);
+    if (!foundAMax) WriteConfigValue(filename, "vac_a_max_delay", vacAMaxDelay);
+    if (!foundBMin) WriteConfigValue(filename, "vac_b_min_delay", vacBMinDelay);
+    if (!foundBMax) WriteConfigValue(filename, "vac_b_max_delay", vacBMaxDelay);
+
     return true;
-}
+}

config.cfg

@@ -82,5 +82,16 @@ key4=87
 # NUM5 - 101
 # NUM6 - 102
 # NUM7 - 103
-# NUM8 - 104
-# NUM9 - 105
+# NUM8 - 104
+# NUM9 - 105
+
+# VAC Bypass config
+vac_bypass_a = 1        # 1=enable 0=disable
+vac_bypass_b = 0        # 1=enable 0=disable
+
+# VAC Bypass delay settings (ms)
+vac_a_min_delay = 15    # A mode minimum overlap delay
+vac_a_max_delay = 35    # A mode maximum overlap delay
+
+vac_b_min_delay = 5     # B mode minimum release-press interval
+vac_b_max_delay = 15    # B mode maximum release-press interval

meta/backup.snapkey

@@ -82,5 +82,16 @@ key4=87
 # NUM5 - 101
 # NUM6 - 102
 # NUM7 - 103
-# NUM8 - 104
-# NUM9 - 105
+# NUM8 - 104
+# NUM9 - 105
+
+# VAC Bypass config
+vac_bypass_a = 1        # 1=enable 0=disable
+vac_bypass_b = 0        # 1=enable 0=disable
+
+# VAC Bypass delay settings (ms)
+vac_a_min_delay = 15    # A mode minimum overlap delay
+vac_a_max_delay = 35    # A mode maximum overlap delay
+
+vac_b_min_delay = 5     # B mode minimum release-press interval
+vac_b_max_delay = 15    # B mode maximum release-press interval