[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] usb: add input routing support for tablet and
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 09/10] usb: add input routing support for tablet and keyboard |
Date: |
Mon, 26 May 2014 09:51:25 +0200 |
Add display property to the keyboard.
Add display and head properties to the tablet.
If properties are set bind device to the display specified to
setup input routing.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/dev-hid.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index d097d93..67a57f1 100644
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -47,6 +47,8 @@ typedef struct USBHIDState {
USBEndpoint *intr;
HIDState hid;
uint32_t usb_version;
+ char *display;
+ uint32_t head;
} USBHIDState;
enum {
@@ -574,6 +576,9 @@ static int usb_hid_initfn(USBDevice *dev, int kind)
usb_desc_init(dev);
us->intr = usb_ep_get(dev, USB_TOKEN_IN, 1);
hid_init(&us->hid, kind, usb_hid_changed);
+ if (us->display && us->hid.s) {
+ qemu_input_handler_bind(us->hid.s, us->display, us->head, NULL);
+ }
return 0;
}
@@ -653,6 +658,8 @@ static void usb_hid_class_initfn(ObjectClass *klass, void
*data)
static Property usb_tablet_properties[] = {
DEFINE_PROP_UINT32("usb_version", USBHIDState, usb_version, 2),
+ DEFINE_PROP_STRING("display", USBHIDState, display),
+ DEFINE_PROP_UINT32("head", USBHIDState, head, 0),
DEFINE_PROP_END_OF_LIST(),
};
@@ -696,6 +703,11 @@ static const TypeInfo usb_mouse_info = {
.class_init = usb_mouse_class_initfn,
};
+static Property usb_keyboard_properties[] = {
+ DEFINE_PROP_STRING("display", USBHIDState, display),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void usb_keyboard_class_initfn(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -706,6 +718,7 @@ static void usb_keyboard_class_initfn(ObjectClass *klass,
void *data)
uc->product_desc = "QEMU USB Keyboard";
uc->usb_desc = &desc_keyboard;
dc->vmsd = &vmstate_usb_kbd;
+ dc->props = usb_keyboard_properties;
set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] input: add event routing and multiseat support., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/10] input (curses): mask keycodes to remove modifier bits, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 05/10] input: switch hid keyboard to new input layer api., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/10] input: keymap: add meta keys, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/10] usb: add input routing support for tablet and keyboard,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/10] input: add qemu_input_key_number_to_qcode, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 07/10] input: bind devices and input routing, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/10] sdl: pass key event source to input layer, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 06/10] input: switch hid mouse and tablet to the new input layer api., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/10] docs: add multiseat.txt, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/10] input: add name to input_event_key_number, Gerd Hoffmann, 2014/05/26
- Re: [Qemu-devel] [PULL 00/10] input: add event routing and multiseat support., Peter Maydell, 2014/05/28