Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

[mirror_qemu.git] / ui / keymaps.h

diff --git a/ui/keymaps.h b/ui/keymaps.h
index 0693588225c82688991d83ec951d87a7727f9544..6473405485847278ca40dda42f4f5f5837972ae2 100644 (file)
--- a/ui/keymaps.h
+++ b/ui/keymaps.h
@@ -25,11 +25,11 @@
 #ifndef QEMU_KEYMAPS_H
 #define QEMU_KEYMAPS_H
 
-#include "qemu-common.h"
+#include "ui/kbd-state.h"
 
 typedef struct {
-       const char* name;
-       int keysym;
+    const char* name;
+    int keysym;
 } name2keysym_t;
 
 /* scancode without modifiers */
@@ -53,9 +53,9 @@ typedef struct {
 typedef struct kbd_layout_t kbd_layout_t;
 
 kbd_layout_t *init_keyboard_layout(const name2keysym_t *table,
-                                   const char *language);
+                                   const char *language, Error **errp);
 int keysym2scancode(kbd_layout_t *k, int keysym,
-                    bool shift, bool altgr, bool ctrl);
+                    QKbdState *kbd, bool down);
 int keycode_is_keypad(kbd_layout_t *k, int keycode);
 int keysym_is_numlock(kbd_layout_t *k, int keysym);