[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/10] input: bind devices and input routing
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 07/10] input: bind devices and input routing |
Date: |
Mon, 26 May 2014 09:51:23 +0200 |
Add function to bind input devices to display devices. Implementing
input routing on top of this: Events coming from the display device in
question are routed to the input device bound to it (if there is one).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/input.h | 3 +++
ui/input.c | 43 ++++++++++++++++++++++++++++++++++++++++---
2 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/include/ui/input.h b/include/ui/input.h
index d84ed8b..aa99b0c 100644
--- a/include/ui/input.h
+++ b/include/ui/input.h
@@ -29,6 +29,9 @@ QemuInputHandlerState
*qemu_input_handler_register(DeviceState *dev,
void qemu_input_handler_activate(QemuInputHandlerState *s);
void qemu_input_handler_deactivate(QemuInputHandlerState *s);
void qemu_input_handler_unregister(QemuInputHandlerState *s);
+void qemu_input_handler_bind(QemuInputHandlerState *s,
+ const char *device_id, int head,
+ Error **errp);
void qemu_input_event_send(QemuConsole *src, InputEvent *evt);
void qemu_input_event_sync(void);
diff --git a/ui/input.c b/ui/input.c
index 9d63035..14c9434 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,3 +1,4 @@
+#include "hw/qdev.h"
#include "sysemu/sysemu.h"
#include "qapi-types.h"
#include "qmp-commands.h"
@@ -10,6 +11,7 @@ struct QemuInputHandlerState {
QemuInputHandler *handler;
int id;
int events;
+ QemuConsole *con;
QTAILQ_ENTRY(QemuInputHandlerState) node;
};
static QTAILQ_HEAD(, QemuInputHandlerState) handlers =
@@ -53,12 +55,46 @@ void qemu_input_handler_unregister(QemuInputHandlerState *s)
qemu_input_check_mode_change();
}
+void qemu_input_handler_bind(QemuInputHandlerState *s,
+ const char *device_id, int head,
+ Error **errp)
+{
+ DeviceState *dev;
+ QemuConsole *con;
+
+ dev = qdev_find_recursive(sysbus_get_default(), device_id);
+ if (dev == NULL) {
+ error_set(errp, QERR_DEVICE_NOT_FOUND, device_id);
+ return;
+ }
+
+ con = qemu_console_lookup_by_device(dev, head);
+ if (con == NULL) {
+ error_setg(errp, "Device %s is not bound to a QemuConsole", device_id);
+ return;
+ }
+
+ s->con = con;
+}
+
static QemuInputHandlerState*
-qemu_input_find_handler(uint32_t mask)
+qemu_input_find_handler(uint32_t mask, QemuConsole *con)
{
QemuInputHandlerState *s;
QTAILQ_FOREACH(s, &handlers, node) {
+ if (s->con == NULL || s->con != con) {
+ continue;
+ }
+ if (mask & s->handler->mask) {
+ return s;
+ }
+ }
+
+ QTAILQ_FOREACH(s, &handlers, node) {
+ if (s->con != NULL) {
+ continue;
+ }
if (mask & s->handler->mask) {
return s;
}
@@ -151,7 +187,7 @@ void qemu_input_event_send(QemuConsole *src, InputEvent
*evt)
}
/* send event */
- s = qemu_input_find_handler(1 << evt->kind);
+ s = qemu_input_find_handler(1 << evt->kind, src);
if (!s) {
return;
}
@@ -252,7 +288,8 @@ bool qemu_input_is_absolute(void)
{
QemuInputHandlerState *s;
- s = qemu_input_find_handler(INPUT_EVENT_MASK_REL | INPUT_EVENT_MASK_ABS);
+ s = qemu_input_find_handler(INPUT_EVENT_MASK_REL | INPUT_EVENT_MASK_ABS,
+ NULL);
return (s != NULL) && (s->handler->mask & INPUT_EVENT_MASK_ABS);
}
--
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, 2014/05/26
- [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 <=
- [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