Created
March 26, 2019 00:45
-
-
Save thnikk/13164df5f05718c5cb2012a927c5acb8 to your computer and use it in GitHub Desktop.
combined patch test
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ui/input-linux.c b/ui/input-linux.c | |
index 9720333..abb4e04 100644 | |
--- a/ui/input-linux.c | |
+++ b/ui/input-linux.c | |
@@ -335,12 +335,6 @@ static void input_linux_complete(UserCreatable *uc, Error **errp) | |
} | |
qemu_set_fd_handler(il->fd, input_linux_event, NULL, il); | |
- if (il->keycount) { | |
- /* delay grab until all keys are released */ | |
- il->grab_request = true; | |
- } else { | |
- input_linux_toggle_grab(il); | |
- } | |
QTAILQ_INSERT_TAIL(&inputs, il, next); | |
il->initialized = true; | |
return; | |
@@ -16,6 +16,14 @@ | |
#include <sys/ioctl.h> | |
#include "standard-headers/linux/input.h" | |
+#ifndef EVDEV_SWITCH_KEY_1 | |
+#define EVDEV_SWITCH_KEY_1 KEY_CAPSLOCK | |
+#endif | |
+ | |
static bool linux_is_button(unsigned int lnx) | |
{ | |
if (lnx < 0x100) { | |
@@ -134,8 +142,8 @@ static void input_linux_handle_keyboard(InputLinux *il, | |
} | |
/* hotkey -> record switch request ... */ | |
- if (il->keydown[KEY_LEFTCTRL] && | |
- il->keydown[KEY_RIGHTCTRL]) { | |
+ if (il->keydown[EVDEV_SWITCH_KEY_1] { | |
il->grab_request = true; | |
} | |
-- | |
2.20.1 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment