aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeno Fischer <keno@juliacomputing.com>2018-06-13 19:51:56 -0400
committerGerd Hoffmann <kraxel@redhat.com>2018-06-14 09:52:23 +0200
commit656282d245b49b84d4a1a47d7b7ede482d541776 (patch)
tree0221c7cc6bc6ffb8e586cc1d811c20a024793812
parent2ab09bf2f9f55b9fb8d2de6eb2ba2a8570e268e2 (diff)
ui: darwin: gtk: Add missing input keymap
In appears the input keymap for osx was forgotten in the commit that converted the gtk frontend to keycodemapdb. Add it. Fixes: 2ec78706 ("ui: convert GTK and SDL1 frontends to keycodemapdb") CC: Daniel P. Berrange <berrange@redhat.com> Signed-off-by: Keno Fischer <keno@juliacomputing.com> Message-id: 1528933916-40670-1-git-send-email-keno@juliacomputing.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--Makefile1
-rw-r--r--include/ui/input.h3
-rw-r--r--ui/input-keymap.c1
3 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6c6664d9a3..bdae3133fb 100644
--- a/Makefile
+++ b/Makefile
@@ -322,6 +322,7 @@ KEYCODEMAP_FILES = \
ui/input-keymap-xorgkbd-to-qcode.c \
ui/input-keymap-xorgxquartz-to-qcode.c \
ui/input-keymap-xorgxwin-to-qcode.c \
+ ui/input-keymap-osx-to-qcode.c \
$(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES)
diff --git a/include/ui/input.h b/include/ui/input.h
index 16395ab8f2..34ebc67c5a 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -116,4 +116,7 @@ extern const guint16 qemu_input_map_xorgxquartz_to_qcode[];
extern const guint qemu_input_map_xorgxwin_to_qcode_len;
extern const guint16 qemu_input_map_xorgxwin_to_qcode[];
+extern const guint qemu_input_map_osx_to_qcode_len;
+extern const guint16 qemu_input_map_osx_to_qcode[];
+
#endif /* INPUT_H */
diff --git a/ui/input-keymap.c b/ui/input-keymap.c
index 87cc301b7a..db5ccff5ad 100644
--- a/ui/input-keymap.c
+++ b/ui/input-keymap.c
@@ -21,6 +21,7 @@
#include "ui/input-keymap-xorgkbd-to-qcode.c"
#include "ui/input-keymap-xorgxquartz-to-qcode.c"
#include "ui/input-keymap-xorgxwin-to-qcode.c"
+#include "ui/input-keymap-osx-to-qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx)
{