summaryrefslogtreecommitdiffstats
path: root/include/hw/input
diff options
context:
space:
mode:
authorGerd Hoffmann2014-03-11 13:52:27 +0100
committerGerd Hoffmann2014-05-26 08:42:43 +0200
commit1ff5eedd1d0facf94b2f272058b83856b361b079 (patch)
tree2e10692c0c1a03df63262483b6c604f851356479 /include/hw/input
parentinput: keymap: add meta keys (diff)
downloadqemu-1ff5eedd1d0facf94b2f272058b83856b361b079.tar.gz
qemu-1ff5eedd1d0facf94b2f272058b83856b361b079.tar.xz
qemu-1ff5eedd1d0facf94b2f272058b83856b361b079.zip
input: switch hid keyboard to new input layer api.
Minimal patch to get the switchover done. We continue processing ps/2 scancodes for now as they are part of the live migration stream. Fixing that, then mapping directly from QKeyValue to HID keycodes is left as excercise for another day. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'include/hw/input')
-rw-r--r--include/hw/input/hid.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/hw/input/hid.h b/include/hw/input/hid.h
index 2567879399..fb913ba3bb 100644
--- a/include/hw/input/hid.h
+++ b/include/hw/input/hid.h
@@ -2,6 +2,7 @@
#define QEMU_HID_H
#include "migration/vmstate.h"
+#include "ui/input.h"
#define HID_MOUSE 1
#define HID_TABLET 2
@@ -31,7 +32,6 @@ typedef struct HIDKeyboardState {
uint8_t leds;
uint8_t key[16];
int32_t keys;
- QEMUPutKbdEntry *eh_entry;
} HIDKeyboardState;
struct HIDState {
@@ -47,6 +47,7 @@ struct HIDState {
bool idle_pending;
QEMUTimer *idle_timer;
HIDEventFunc event;
+ QemuInputHandlerState *s;
};
void hid_init(HIDState *hs, int kind, HIDEventFunc event);