Merge branch 'main' into main

Author: kaxonomy

.gitignore

@@ -0,0 +1,7 @@
+README.md
+LICENSE
+.idea/
+*.bat
+*.txt
+*.exe
+*.o

README.md

@@ -1,7 +1,11 @@
-<img width="1200" height="675" alt="disconnected_with_ban_centered_aa" src="https://github.com/user-attachments/assets/6785c5cd-f4ab-4752-aa66-b64544b8fb92" />
+[![testsnap](https://github.com/user-attachments/assets/ca177c81-72a4-45cf-9ac3-83f63a4d6ed2)](https://github.com/kaxlabs/SnapKeyPlus/releases)
 
-**About SnapKey** 
+**About SnapKeyPlus** 
 --------------------------------------------------------------------------------------------------
+SnapKeyPlus extends the functionality of SnapKey by adding the pull requests everyone actually wants. 100% less self-righteousness!
+
+**SnapKeyPlus enables you to play a wide variety of games. Including Marvel Rivals and CS:GO! Just run as Administrator.**
+
 SnapKey provides a user-friendly alternative to the Razer Snap Tap function, making it accessible across all keyboards!
 
 SnapKey is a lightweight, open-source tool that operates from the system tray and is designed to track inputs from the WASD keys, without interfering with any game files. Its main role is to recognize when these keys are pressed and automatically release any previously engaged commands for them. This guarantees responsive and precise input handling. SnapKey handles the WASD keys by default and lets you rebind them to your liking via the config file.
@@ -11,10 +15,8 @@ SnapKey is a lightweight, open-source tool that operates from the system tray an
 [![COMPATIBLE](https://github.com/user-attachments/assets/069a7a23-cfe4-47eb-8ac2-05872fcc2028)](https://github.com/cafali/SnapKey/wiki/Compatibility-List)
 
 ### **New in v1.2.9 – Experimental VAC/CS2 Bypass Modes 🚫🎮**
-
----
-
-SnapKey v1.2.9 introduces two **experimental bypass modes** aimed at improving compatibility with games that impose stricter input policies, such as **Counter-Strike 2 (CS2)**. These modes can be toggled independently in the configuration file and allow SnapKey to remain active while circumventing CS2’s built-in restrictions on background input automation.
+--------------------------------------------------------------------------------------------------
+SnapKeyPlus v1.2.9 introduces two **experimental bypass modes** aimed at improving compatibility with games that impose stricter input policies, such as **Counter-Strike 2 (CS2)**. These modes can be toggled independently in the configuration file and allow SnapKey to remain active while circumventing CS2’s built-in restrictions on background input automation.
 
 > ⚙️ **VAC Bypass A** — Simulates real-time user input using a lower-level system call chain.
 > ⚙️ **VAC Bypass B** — Uses synthetic input injection with randomized timings to mimic human behavior more accurately.
@@ -29,19 +31,14 @@ Both modes are entirely optional and **disabled by default**. When enabled, Snap
 > These features are **experimental** and **not officially endorsed by Valve or any game publisher**. While SnapKey does not directly modify any game files or memory, **use of automation tools may still violate Terms of Service** for certain games.
 > **Use at your own risk.**
 
-For details on how these bypass modes work and how to enable them, refer to the [**Bypass Modes Wiki Page**](https://github.com/cafali/SnapKey/wiki/VAC-Bypass-Modes).
-
----
-
 Download
 --------------------------------------------------------------------------------------------------
 <p align="center">
-  <a href="https://github.com/cafali/SnapKey/releases">Download from GitHub</a> |
+  <a href="https://github.com/kaxlabs/SnapKeyPlus/releases">Download from GitHub</a> |
   <a href="https://sourceforge.net/projects/snapkey/">Download from SourceForge</a> |
   <a href="https://www.softpedia.com/get/Tweak/System-Tweak/SnapKey.shtml">Download from Softpedia</a>
 </p>
 
-
 [![latesver](https://github.com/user-attachments/assets/09694f7c-6eeb-4c80-9a02-1d777956d181)](https://github.com/cafali/SnapKey/wiki/Updates)
 
 **SnapKey Features**
@@ -91,6 +88,38 @@ press **"A"** instead.
 
 <img src="https://github.com/user-attachments/assets/4453aba4-b9bc-45e8-8a80-80caad39347b" width="600" height="338" alt="STRAFE">
 
+**Quick Guide to Using SnapKey**
+--------------------------------------------------------------------------------------------------
+![use](https://github.com/user-attachments/assets/4d9fdf11-ec72-459c-995e-364bf1fc8d66)
+
+1. Get SnapKey:
+   - [Download](https://github.com/kaxlabs/SnapKeyPlus/releases), Unzip and Launch SnapKey.exe
+
+<img src="https://github.com/user-attachments/assets/7f8f1b06-01a8-4bc9-af9f-87d0b19b4e15" alt="Folder" width="80%">
+
+2. System Tray:
+   - SnapKey will appear in your system tray
+
+![tray](https://github.com/user-attachments/assets/26c08735-76f2-4bc0-aa75-44c9a866b453)
+
+3. You're All Set:
+   - SnapKey is now running and is ready to use
+ 
+4. Rebind Keys (Optional):
+   - [Rebind your keys](https://github.com/cafali/SnapKey/wiki/Rebinding-Keys) if you're using a nonstandard keyboard layout or if you want to map different keys
+
+Disable SnapKey
+--------------------------------------------------------------------------------------------------
+- Double-click the tray icon to disable SnapKey directly or Right-click the SnapKey icon in the system tray and select "Disable SnapKey". This option disables the entire SnapKey functionality of the keys that are set in the config file while keeping the SnapKey process and the software running in the tray.
+
+![image](https://github.com/user-attachments/assets/4f9d8d30-4674-4361-bc87-84ee70ce4116)
+
+Exit SnapKey
+--------------------------------------------------------------------------------------------------
+   - Right-click the SnapKey icon in the system tray and select "Exit SnapKey"
+
+![image](https://github.com/user-attachments/assets/c3a9534e-ed8b-4258-be56-37b6117c1814)
+
 **Linux Support**
 --------------------------------------------------------------------------------------------------
 Since SnapKey isn’t natively supported on Linux, it’s recommended to check out @Dillacorn's guide on **[running SnapKey on Linux](https://github.com/cafali/SnapKey/issues/4#issuecomment-2251568839)**.
@@ -136,17 +165,19 @@ Looking for More Information? Got Questions or Need Help?
 ----
 
 <p align="center">
-  SnapKey by
+  SnapKeyPlus by
 </p>
 
 <p align="center">
   <a href="https://github.com/cafali">@cafali</a> 
-  <a href="https://github.com/minteeaa">@minteeaa</a> 
+  <a href="https://github.com/minteeaa">@minteeaa</a>
+  <a href="https://github.com/kaxonomy">@kaxonomy</a> 
   <a href="https://github.com/Yaw-Dev">@Yaw-Dev</a>
+  <a href="https://github.com/fazildgr8">@fazildgr8</a> 
 </p>
 
 <p align="center">
-  <a href="https://github.com/cafali/Snapkey/graphs/contributors">
-    <img src="https://contrib.rocks/image?repo=cafali/Snapkey" />
+  <a href="https://github.com/kaxonomy/SnapKeyPlus/graphs/contributors">
+    <img src="https://contrib.rocks/image?repo=kaxlabs/SnapKeyPlus" />
   </a>
 </p>

SnapKey.cpp

@@ -69,6 +69,22 @@ void SendKey(int target, bool keyDown);
 void UpdateTrayIcon();
 void WriteConfigValue(const std::string& filename, const std::string& key, int value);
 
+// Random delay settings
+int minDelay = 1;
+int maxDelay = 2;
+
+void addRandomDelay()
+{
+    // Create a random number generator
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(minDelay, maxDelay);
+    int delayDuration = dis(gen);
+
+    // Sleep for the random duration
+    std::this_thread::sleep_for(std::chrono::milliseconds(delayDuration));
+}
+
 int main()
 {
     // Load key bindings (config file)
@@ -196,23 +212,25 @@ void handleKeyDown(int keyCode)
 }
 
 void handleKeyUp(int keyCode)
+
 {
     KeyState& currentKeyInfo = KeyInfo[keyCode];
+
     GroupState& currentGroupInfo = GroupInfo[currentKeyInfo.group];
+
     if (currentGroupInfo.previousKey == keyCode && !currentKeyInfo.keyDown)
     {
         currentGroupInfo.previousKey = 0;
     }
+
     if (currentKeyInfo.keyDown)
     {
         currentKeyInfo.keyDown = false;
         if (currentGroupInfo.activeKey == keyCode && currentGroupInfo.previousKey != 0)
         {
             SendKey(keyCode, false);
-
             currentGroupInfo.activeKey = currentGroupInfo.previousKey;
             currentGroupInfo.previousKey = 0;
-
             SendKey(currentGroupInfo.activeKey, true);
         }
         else
@@ -230,13 +248,13 @@ bool isSimulatedKeyEvent(DWORD flags) {
 
 void SendKey(int targetKey, bool keyDown)
 {
-    INPUT input = {0};
+    static INPUT input = {0};
     input.ki.wVk = targetKey;
     input.ki.wScan = MapVirtualKey(targetKey, 0);
     input.type = INPUT_KEYBOARD;
-
     DWORD flags = KEYEVENTF_SCANCODE;
     input.ki.dwFlags = keyDown ? flags : flags | KEYEVENTF_KEYUP;
+    addRandomDelay();
     SendInput(1, &input, sizeof(INPUT));
 }
 
@@ -245,11 +263,18 @@ LRESULT CALLBACK KeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
     if (!isLocked && nCode >= 0)
     {
         KBDLLHOOKSTRUCT *pKeyBoard = (KBDLLHOOKSTRUCT *)lParam;
-        if (!isSimulatedKeyEvent(pKeyBoard -> flags)) {
-            if (KeyInfo[pKeyBoard -> vkCode].registered)
+        if (!isSimulatedKeyEvent(pKeyBoard->flags))
+        {
+            if (KeyInfo[pKeyBoard->vkCode].registered)
             {
-                if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN) handleKeyDown(pKeyBoard -> vkCode);
-                if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP) handleKeyUp(pKeyBoard -> vkCode);
+                if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN)
+                {
+                    handleKeyDown(pKeyBoard->vkCode);
+                }
+                if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP)
+                {
+                    handleKeyUp(pKeyBoard->vkCode);
+                }
                 return 1;
             }
         }
@@ -366,7 +391,12 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             break;
         case ID_TRAY_REBIND_KEYS: // rebind keys - open cfg
             {
-                ShellExecute(NULL, TEXT("open"), TEXT("config.cfg"), NULL, NULL, SW_SHOWNORMAL);
+                TCHAR szExeFileName[MAX_PATH];
+                GetModuleFileName(NULL, szExeFileName, MAX_PATH);
+                std::string exePath = std::string(szExeFileName);
+                std::string exeDir = exePath.substr(0, exePath.find_last_of("\\/"));
+                std::string configPath = exeDir + "\\config.cfg";
+                ShellExecute(NULL, TEXT("open"), configPath.c_str(), NULL, NULL, SW_SHOWNORMAL);
             }
             break;
 
@@ -442,16 +472,22 @@ std::string GetVersionInfo() {
 // Function to copy snapkey.backup (meta folder) to the main directory
 void RestoreConfigFromBackup(const std::string& backupFilename, const std::string& destinationFilename)
 {
-    std::string sourcePath = "meta\\" + backupFilename;
-    std::string destinationPath = destinationFilename;
+    // Get the executable path
+    char exePath[MAX_PATH];
+    GetModuleFileName(NULL, exePath, MAX_PATH);
+    std::string exeDir = std::string(exePath);
+    exeDir = exeDir.substr(0, exeDir.find_last_of("\\/"));
+    
+    std::string sourcePath = exeDir + "\\meta\\" + backupFilename;
+    std::string destinationPath = exeDir + "\\" + destinationFilename;
 
     if (CopyFile(sourcePath.c_str(), destinationPath.c_str(), FALSE)) {
         // Copy successful
         MessageBox(NULL, TEXT("Default config restored from backup successfully."), TEXT("SnapKey"), MB_ICONINFORMATION | MB_OK);
     } else {
         // backup.snapkey copy failed
         DWORD error = GetLastError();
-        std::string errorMsg = "Failed to restore config from backup.";
+        std::string errorMsg = "Failed to restore config from backup. Error code: " + std::to_string(error);
         MessageBox(NULL, errorMsg.c_str(), TEXT("SnapKey Error"), MB_ICONERROR | MB_OK);
     }
 }
@@ -460,6 +496,7 @@ void RestoreConfigFromBackup(const std::string& backupFilename, const std::strin
 void CreateDefaultConfig(const std::string& filename)
 {
     std::string backupFilename = "backup.snapkey";
+    // Just pass the filenames, as RestoreConfigFromBackup now handles the full paths
     RestoreConfigFromBackup(backupFilename, filename);
 }
 
@@ -495,7 +532,15 @@ void WriteConfigValue(const std::string& filename, const std::string& key, int v
 // Check for config.cfg
 bool LoadConfig(const std::string& filename)
 {
-    std::ifstream configFile(filename);
+    // Get the executable path
+    char exePath[MAX_PATH];
+    GetModuleFileName(NULL, exePath, MAX_PATH);
+    std::string exeDir = std::string(exePath);
+    exeDir = exeDir.substr(0, exeDir.find_last_of("\\/"));
+    
+    std::string fullPath = exeDir + "\\" + filename;
+    
+    std::ifstream configFile(fullPath);
     if (!configFile.is_open()) {
         CreateDefaultConfig(filename);  // Restore config from backup.snapkey if file doesn't exist
         return false;
@@ -552,6 +597,15 @@ bool LoadConfig(const std::string& filename)
                 vacBMaxDelay = value; foundBMax = true;
             }
         }
+        if (line.find("random_delay_ms=") == 0)
+        {
+            std::smatch match;
+            std::regex delayPattern(R"(\s*(\d+)\s*,\s*(\d+)\s*)");
+            if (std::regex_search(line, match, delayPattern) && match.size()) {
+                minDelay = std::stoi(match[1].str());
+                maxDelay = std::stoi(match[2].str());
+            }
+        }
     }
     configFile.close();
 

config.cfg

@@ -6,6 +6,7 @@ key2=68
 key3=83
 key4=87
 
+random_delay_ms=(1,2)
 
 # After applying the changes, please restart SnapKey.
 # For further help, visit the README.pdf file.

meta/backup.snapkey

@@ -6,6 +6,7 @@ key2=68
 key3=83
 key4=87
 
+random_delay_ms=(1,2)
 
 # After applying the changes, please restart SnapKey.
 # For further help, visit the README.pdf file.