Merge pull request #14 from nut-tree/fix/12/hanging-shift-key

s1hofmann · web-flow · commit ee33ca8acd55 · 2020-07-23T09:31:41.000+02:00
Fix/12/hanging shift key
diff --git a/src/keypress.c b/src/keypress.c
@@ -102,7 +102,12 @@ void win32KeyEvent(int key, MMKeyFlags flags)
 		scan |= 0x80;
 	}
 
-	keybd_event(key, scan, flags, 0);
+	INPUT keyboardInput;
+	keyboardInput.type = INPUT_KEYBOARD;
+	keyboardInput.ki.wScan = scan;
+	keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE | flags;
+	keyboardInput.ki.time = 0;
+	SendInput(1, &keyboardInput, sizeof(keyboardInput));
 }
 #endif
 
diff --git a/src/mouse.c b/src/mouse.c
@@ -201,7 +201,14 @@ void toggleMouse(bool down, MMMouseButton button)
 	XTestFakeButtonEvent(display, button, down ? True : False, CurrentTime);
 	XSync(display, false);
 #elif defined(IS_WINDOWS)
-	mouse_event(MMMouseToMEventF(down, button), 0, 0, 0, 0);
+	INPUT mouseInput;
+	mouseInput.type = INPUT_MOUSE;
+	mouseInput.mi.mouseData = 0;
+	mouseInput.mi.dx = 0;
+	mouseInput.mi.dy = 0;
+	mouseInput.mi.time = 0;
+	mouseInput.mi.dwFlags = MMMouseToMEventF(down, button);
+	SendInput(1, &mouseInput, sizeof(mouseInput));
 #endif
 }
 
diff --git a/src/screen.c b/src/screen.c

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,12 @@ void win32KeyEvent(int key, MMKeyFlags flags)`
`102`	`102`	`scan \|= 0x80;`
`103`	`103`	`}`
`104`	`104`
`105`		`- keybd_event(key, scan, flags, 0);`
	`105`	`+ INPUT keyboardInput;`
	`106`	`+ keyboardInput.type = INPUT_KEYBOARD;`
	`107`	`+ keyboardInput.ki.wScan = scan;`
	`108`	`+ keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE \| flags;`
	`109`	`+ keyboardInput.ki.time = 0;`
	`110`	`+ SendInput(1, &keyboardInput, sizeof(keyboardInput));`
`106`	`111`	`}`
`107`	`112`	`#endif`
`108`	`113`