Bugfix/94/lost keypresses (#95)

* Switch to using virtual keycodes instead of scancodes, rework ordering of key presses / releases

* Use similar scheme as for Windows key presses / releases

Author: s1hofmann

src/linux/keypress.c

@@ -7,31 +7,48 @@
 #include <X11/extensions/XTest.h>
 #include "../xdisplay.h"
 
-#define X_KEY_EVENT(display, key, is_press)            \
+#define X_KEY_EVENT(display, key, is_press)                \
 	(XTestFakeKeyEvent(display,                        \
-					   XKeysymToKeycode(display, key), \
-					   is_press, CurrentTime),         \
+			   XKeysymToKeycode(display, key), \
+			   is_press, CurrentTime),         \
 	 XSync(display, false))
 #define X_KEY_EVENT_WAIT(display, key, is_press) \
-	(X_KEY_EVENT(display, key, is_press),        \
+	(X_KEY_EVENT(display, key, is_press),    \
 	 microsleep(DEADBEEF_UNIFORM(0.0, 62.5)))
 
 void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
 {
 	Display *display = XGetMainDisplay();
 	const Bool is_press = down ? True : False; /* Just to be safe. */
 
-	/* Parse modifier keys. */
-	if (flags & MOD_META)
-		X_KEY_EVENT_WAIT(display, K_META, is_press);
-	if (flags & MOD_ALT)
-		X_KEY_EVENT_WAIT(display, K_ALT, is_press);
-	if (flags & MOD_CONTROL)
-		X_KEY_EVENT_WAIT(display, K_CONTROL, is_press);
-	if (flags & MOD_SHIFT)
-		X_KEY_EVENT_WAIT(display, K_SHIFT, is_press);
-
-	X_KEY_EVENT(display, code, is_press);
+	if (down)
+	{
+		/* Parse modifier keys. */
+		if (flags & MOD_META)
+			X_KEY_EVENT_WAIT(display, K_META, is_press);
+		if (flags & MOD_ALT)
+			X_KEY_EVENT_WAIT(display, K_ALT, is_press);
+		if (flags & MOD_CONTROL)
+			X_KEY_EVENT_WAIT(display, K_CONTROL, is_press);
+		if (flags & MOD_SHIFT)
+			X_KEY_EVENT_WAIT(display, K_SHIFT, is_press);
+
+		X_KEY_EVENT_WAIT(display, code, is_press);
+	}
+	else
+	{
+		X_KEY_EVENT_WAIT(display, code, is_press);
+
+		/* Parse modifier keys. */
+		if (flags & MOD_META)
+			X_KEY_EVENT(display, K_META, is_press);
+		if (flags & MOD_ALT)
+			X_KEY_EVENT(display, K_ALT, is_press);
+		if (flags & MOD_CONTROL)
+			X_KEY_EVENT(display, K_CONTROL, is_press);
+		if (flags & MOD_SHIFT)
+			X_KEY_EVENT(display, K_SHIFT, is_press);
+	}
 }
 
 void tapKeyCode(MMKeyCode code, MMKeyFlags flags)

src/win32/keypress.c

@@ -10,8 +10,6 @@
 
 void win32KeyEvent(int key, MMKeyFlags flags)
 {
-	int scan = MapVirtualKey(key & 0xff, MAPVK_VK_TO_VSC);
-
 	/* Set the scan code for extended keys */
 	switch (key)
 	{
@@ -55,27 +53,44 @@ void win32KeyEvent(int key, MMKeyFlags flags)
 
 	INPUT keyboardInput;
 	keyboardInput.type = INPUT_KEYBOARD;
-	keyboardInput.ki.wScan = (WORD)scan;
-	keyboardInput.ki.dwFlags = KEYEVENTF_SCANCODE | flags;
-	keyboardInput.ki.time = 0;
-	SendInput(1, &keyboardInput, sizeof(keyboardInput));
+	keyboardInput.ki.wVk = (WORD)key;
+	keyboardInput.ki.dwFlags = flags;
+	SendInput(1, &keyboardInput, sizeof(INPUT));
 }
 
 void toggleKeyCode(MMKeyCode code, const bool down, MMKeyFlags flags)
 {
 	const DWORD dwFlags = down ? 0 : KEYEVENTF_KEYUP;
 
-	/* Parse modifier keys. */
-	if (flags & MOD_META)
-		WIN32_KEY_EVENT_WAIT(K_META, dwFlags);
-	if (flags & MOD_ALT)
-		WIN32_KEY_EVENT_WAIT(K_ALT, dwFlags);
-	if (flags & MOD_CONTROL)
-		WIN32_KEY_EVENT_WAIT(K_CONTROL, dwFlags);
-	if (flags & MOD_SHIFT)
-		WIN32_KEY_EVENT_WAIT(K_SHIFT, dwFlags);
-
-	win32KeyEvent(code, dwFlags);
+	if (down)
+	{
+		/* Parse modifier keys. */
+		if (flags & MOD_META)
+			WIN32_KEY_EVENT_WAIT(K_META, dwFlags);
+		if (flags & MOD_ALT)
+			WIN32_KEY_EVENT_WAIT(K_ALT, dwFlags);
+		if (flags & MOD_CONTROL)
+			WIN32_KEY_EVENT_WAIT(K_CONTROL, dwFlags);
+		if (flags & MOD_SHIFT)
+			WIN32_KEY_EVENT_WAIT(K_SHIFT, dwFlags);
+
+		WIN32_KEY_EVENT_WAIT(code, dwFlags);
+	}
+	else
+	{
+		WIN32_KEY_EVENT_WAIT(code, dwFlags);
+
+		/* Parse modifier keys. */
+		if (flags & MOD_META)
+			win32KeyEvent(K_META, dwFlags);
+		if (flags & MOD_ALT)
+			win32KeyEvent(K_ALT, dwFlags);
+		if (flags & MOD_CONTROL)
+			win32KeyEvent(K_CONTROL, dwFlags);
+		if (flags & MOD_SHIFT)
+			win32KeyEvent(K_SHIFT, dwFlags);
+
+	}
 }
 
 void tapKeyCode(MMKeyCode code, MMKeyFlags flags)
@@ -88,17 +103,9 @@ void toggleKey(char c, const bool down, MMKeyFlags flags)
 {
 	MMKeyCode keyCode = keyCodeForChar(c);
 
-	//Prevent unused variable warning for Mac and Linux.
-	int modifiers;
-
-	if (isupper(c) && !(flags & MOD_SHIFT))
-	{
-		flags |= MOD_SHIFT; /* Not sure if this is safe for all layouts. */
-	}
-
-	modifiers = keyCode >> 8; // Pull out modifers.
+	int modifiers = keyCode >> 8; // Pull out modifers.
 	if ((modifiers & 1) != 0)
-		flags |= MOD_SHIFT; // Uptdate flags from keycode modifiers.
+		flags |= MOD_SHIFT; // Update flags from keycode modifiers.
 	if ((modifiers & 2) != 0)
 		flags |= MOD_CONTROL;
 	if ((modifiers & 4) != 0)