Bug fixes from testing envar combinations

Author: kevinjmills

LittleBigMouse.Daemon/LittleBigMouse.Engine/MouseEngine.cpp

@@ -236,9 +236,9 @@ void MouseEngine::OnMouseMoveCross(MouseEventArg& e)
 	NoZoneMatches(e);
 }
 
-int stallCount = 0;
+static int stallCount = 0;
 
-bool canCross(bool checkEdge, MouseEngine* engine, MouseEventArg& e) {
+static bool canCross(bool checkEdge, MouseEngine* engine, MouseEventArg& e) {
 	if (!checkEdge) {
 #if defined(_DEBUG)
 		std::cout << "edge not checked\n";
@@ -248,28 +248,35 @@ bool canCross(bool checkEdge, MouseEngine* engine, MouseEventArg& e) {
 		return true;
 	}
 
-	bool isTriggerKeyPressed = engine->enableCtrlKeyCrossing && ((GetAsyncKeyState(VK_CONTROL) & 0x8000) == 0x8000);
-	if (isTriggerKeyPressed) {
+	if (engine->enableCtrlKeyCrossing) {
+		bool isTriggerKeyPressed = ((GetAsyncKeyState(VK_CONTROL) & 0x8000) == 0x8000);
+		if (isTriggerKeyPressed) {
 #if defined(_DEBUG)
-		std::cout << "trigger key pressed\n";
+			std::cout << "trigger key pressed\n";
 #endif
-		stallCount = 0;
-		// Allow transistion
-		return true;
+			stallCount = 0;
+			// Allow transistion
+			return true;
+		}
+	}
+
+	
+	if (engine->controlCrossingThreshold < 1) {
+		// Cannot cross
+		return false;
 	}
 
 	stallCount++;
 #if defined(_DEBUG)
-	std::cout << "count " << stallCount << "\n";
+	std::cout << "threshold: " << stallCount << " of " << engine->controlCrossingThreshold << "\n";
 #endif
-	if (stallCount < engine->controlCrossingThreshold) {
-		// Cannot cross yet
-		return false;
+	if (stallCount > engine->controlCrossingThreshold) {
+		stallCount = 0;
+		// Can cross now
+		return true;
 	}
-
-	stallCount = 0;
-	// Allow transistion
-	return true;
+	// Cannot cross
+	return false;
 }
 
 void MouseEngine::OnMouseMoveStraight(MouseEventArg& e)

LittleBigMouse.Daemon/LittleBigMouse.Engine/MouseEngine.h

@@ -52,10 +52,10 @@ class MouseEngine
 
 	ZonesLayout Layout = ZonesLayout();
 
-	bool enableControlHorzEdgeCrossing = false;
-	bool enableControlVertEdgeCrossing = false;
-	bool enableCtrlKeyCrossing = false;
-	int  controlCrossingThreshold = 0;
+	bool enableControlHorzEdgeCrossing;
+	bool enableControlVertEdgeCrossing;
+	bool enableCtrlKeyCrossing;
+	int  controlCrossingThreshold;
 
 };
 

LittleBigMouse.Daemon/LittleBigMouse.Hook/LittleBigMouse.Hook.cpp

@@ -78,7 +78,7 @@ static std::string GetEnv(const std::wstring& varName)
     return std::string(str.begin(), str.end());
 }
 
-static int GetEnvInt(const std::wstring& varName, int def = -1)
+static int GetEnvInt(const std::wstring& varName, int def = 0)
 {
     int num = def;
     std::string envar = GetEnv(varName);
@@ -124,14 +124,16 @@ int main(int argc, char *argv[]){
 
     // Gather environment variables for the engine
 
+    engine.controlCrossingThreshold = 0;
     int thresh = GetEnvInt(L"LBM_CC_THRESHOLD");
 #if defined(_DEBUG)
     std::cout << "LBM_CC_THRESHOLD is: " << thresh << '\n';
 #endif
-    if (thresh != -1) {
+    if (thresh > 1) {
         engine.controlCrossingThreshold = thresh;
     }
 
+    engine.enableControlHorzEdgeCrossing = false;
     std::string envar = GetEnv(L"LBM_CC_HORZ_EDGE");
 #if defined(_DEBUG)
     std::cout << "LBM_CC_THRESHOLD is: " << envar << '\n';
@@ -140,6 +142,7 @@ int main(int argc, char *argv[]){
         engine.enableControlHorzEdgeCrossing = true;
     }
 
+    engine.enableControlVertEdgeCrossing = false;
     envar = GetEnv(L"LBM_CC_VERT_EDGE");
 #if defined(_DEBUG)
     std::cout << "LBM_CC_VERT_EDGE is: " << envar << '\n';
@@ -148,6 +151,7 @@ int main(int argc, char *argv[]){
         engine.enableControlVertEdgeCrossing = true;
     }
 
+    engine.enableCtrlKeyCrossing = false;
     envar = GetEnv(L"LBM_CC_CTRL_KEY");
 #if defined(_DEBUG)
     std::cout << "LBM_CC_CTRL_KEY is: " << envar << '\n';
@@ -156,6 +160,14 @@ int main(int argc, char *argv[]){
         engine.enableCtrlKeyCrossing = true;
     }
 
+    // Make sure the user does not configure in a way that prevent all edge crossings.
+    // If so, then disable edge crossing checks completely.
+    if (engine.enableControlHorzEdgeCrossing || engine.enableControlVertEdgeCrossing) {
+        if (!engine.enableCtrlKeyCrossing && engine.controlCrossingThreshold < 1) {
+            engine.enableControlHorzEdgeCrossing = false;
+            engine.enableControlVertEdgeCrossing = false;
+        }
+    }
     auto p = GetParentProcess();
 
     // Test if daemon was started from UI

LittleBigMouse.sln

@@ -391,6 +391,7 @@ Global
 		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|Any CPU.Build.0 = Debug|Win32
 		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|x64.ActiveCfg = Debug|x64
+		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|x64.Build.0 = Debug|x64
 		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|x86.ActiveCfg = Debug|Win32
 		{CB83115D-78BA-490D-AABD-31949F013F78}.Debug|x86.Build.0 = Debug|Win32
 		{CB83115D-78BA-490D-AABD-31949F013F78}.DebugRelease|Any CPU.ActiveCfg = Release|x64
@@ -732,6 +733,7 @@ Global
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|x64.ActiveCfg = Debug|x64
+		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|x64.Build.0 = Debug|x64
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|x86.ActiveCfg = Debug|x86
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|x86.Build.0 = Debug|x86
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.DebugRelease|Any CPU.ActiveCfg = Release|Any CPU
@@ -746,7 +748,6 @@ Global
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Release|x64.Build.0 = Release|x64
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Release|x86.ActiveCfg = Release|x86
 		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Release|x86.Build.0 = Release|x86
-		{9BAC842F-54A9-4104-859F-43C8AE7CC8F4}.Debug|x64.Build.0 = Debug|x64
 		{DF43E1E0-D8B8-44DA-9F4F-D25E161A48EB}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{DF43E1E0-D8B8-44DA-9F4F-D25E161A48EB}.Debug|Any CPU.Build.0 = Debug|Win32
 		{DF43E1E0-D8B8-44DA-9F4F-D25E161A48EB}.Debug|x64.ActiveCfg = Debug|x64
@@ -767,6 +768,7 @@ Global
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|Any CPU.Build.0 = Debug|Win32
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|x64.ActiveCfg = Debug|x64
+		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|x64.Build.0 = Debug|x64
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|x86.ActiveCfg = Debug|Win32
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.Debug|x86.Build.0 = Debug|Win32
 		{109D43C0-AF82-4A09-B149-55612D7D7142}.DebugRelease|Any CPU.ActiveCfg = Release|x64