From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL 06/38] input: add core bits of the new input layer
Date: Fri, 28 Feb 2014 15:06:17 +0100 [thread overview]
Message-ID: <1393596409-28934-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1393596409-28934-1-git-send-email-kraxel@redhat.com>
Register and unregister handlers.
Event dispatcher code.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/ui/input.h | 32 +++++++++++++++++++++
ui/Makefile.objs | 2 +-
ui/input.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 116 insertions(+), 1 deletion(-)
create mode 100644 include/ui/input.h
create mode 100644 ui/input.c
diff --git a/include/ui/input.h b/include/ui/input.h
new file mode 100644
index 0000000..3cf3641
--- /dev/null
+++ b/include/ui/input.h
@@ -0,0 +1,32 @@
+#ifndef INPUT_H
+#define INPUT_H
+
+#include "qapi-types.h"
+
+#define INPUT_EVENT_MASK_KEY (1<<INPUT_EVENT_KIND_KEY)
+#define INPUT_EVENT_MASK_BTN (1<<INPUT_EVENT_KIND_BTN)
+#define INPUT_EVENT_MASK_REL (1<<INPUT_EVENT_KIND_REL)
+#define INPUT_EVENT_MASK_ABS (1<<INPUT_EVENT_KIND_ABS)
+
+typedef struct QemuInputHandler QemuInputHandler;
+typedef struct QemuInputHandlerState QemuInputHandlerState;
+
+typedef void (*QemuInputHandlerEvent)(DeviceState *dev, QemuConsole *src,
+ InputEvent *evt);
+typedef void (*QemuInputHandlerSync)(DeviceState *dev);
+
+struct QemuInputHandler {
+ const char *name;
+ uint32_t mask;
+ QemuInputHandlerEvent event;
+ QemuInputHandlerSync sync;
+};
+
+QemuInputHandlerState *qemu_input_handler_register(DeviceState *dev,
+ QemuInputHandler *handler);
+void qemu_input_handler_activate(QemuInputHandlerState *s);
+void qemu_input_handler_unregister(QemuInputHandlerState *s);
+void qemu_input_event_send(QemuConsole *src, InputEvent *evt);
+void qemu_input_event_sync(void);
+
+#endif /* INPUT_H */
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 39ceadc..27af551 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -7,7 +7,7 @@ vnc-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o
vnc-obj-$(CONFIG_VNC_WS) += vnc-ws.o
vnc-obj-y += vnc-jobs.o
-common-obj-y += keymaps.o console.o cursor.o input-legacy.o qemu-pixman.o
+common-obj-y += keymaps.o console.o cursor.o input.o input-legacy.o qemu-pixman.o
common-obj-$(CONFIG_SPICE) += spice-core.o spice-input.o spice-display.o
common-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o
common-obj-$(CONFIG_COCOA) += cocoa.o
diff --git a/ui/input.c b/ui/input.c
new file mode 100644
index 0000000..23c84f7
--- /dev/null
+++ b/ui/input.c
@@ -0,0 +1,83 @@
+#include "sysemu/sysemu.h"
+#include "qapi-types.h"
+#include "ui/input.h"
+
+struct QemuInputHandlerState {
+ DeviceState *dev;
+ QemuInputHandler *handler;
+ int id;
+ int events;
+ QTAILQ_ENTRY(QemuInputHandlerState) node;
+};
+static QTAILQ_HEAD(, QemuInputHandlerState) handlers =
+ QTAILQ_HEAD_INITIALIZER(handlers);
+
+QemuInputHandlerState *qemu_input_handler_register(DeviceState *dev,
+ QemuInputHandler *handler)
+{
+ QemuInputHandlerState *s = g_new0(QemuInputHandlerState, 1);
+ static int id = 1;
+
+ s->dev = dev;
+ s->handler = handler;
+ s->id = id++;
+ QTAILQ_INSERT_TAIL(&handlers, s, node);
+ return s;
+}
+
+void qemu_input_handler_activate(QemuInputHandlerState *s)
+{
+ QTAILQ_REMOVE(&handlers, s, node);
+ QTAILQ_INSERT_HEAD(&handlers, s, node);
+}
+
+void qemu_input_handler_unregister(QemuInputHandlerState *s)
+{
+ QTAILQ_REMOVE(&handlers, s, node);
+ g_free(s);
+}
+
+static QemuInputHandlerState*
+qemu_input_find_handler(uint32_t mask)
+{
+ QemuInputHandlerState *s;
+
+ QTAILQ_FOREACH(s, &handlers, node) {
+ if (mask & s->handler->mask) {
+ return s;
+ }
+ }
+ return NULL;
+}
+
+void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
+{
+ QemuInputHandlerState *s;
+
+ if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
+ return;
+ }
+
+ s = qemu_input_find_handler(1 << evt->kind);
+ s->handler->event(s->dev, src, evt);
+ s->events++;
+}
+
+void qemu_input_event_sync(void)
+{
+ QemuInputHandlerState *s;
+
+ if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) {
+ return;
+ }
+
+ QTAILQ_FOREACH(s, &handlers, node) {
+ if (!s->events) {
+ continue;
+ }
+ if (s->handler->sync) {
+ s->handler->sync(s->dev);
+ }
+ s->events = 0;
+ }
+}
--
1.8.3.1
next prev parent reply other threads:[~2014-02-28 14:08 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 14:06 [Qemu-devel] [PULL v3 00/38] rework input handling, sdl2 support Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 01/38] console: export QemuConsole index, width, height Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 02/38] input: rename file to legacy Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 03/38] input: qapi: define event types Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 04/38] input: qapi: add unmapped key Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 05/38] input: qapi: add pause key Gerd Hoffmann
2014-02-28 14:06 ` Gerd Hoffmann [this message]
2014-02-28 14:06 ` [Qemu-devel] [PULL 07/38] input: keyboard: add helper functions to core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 08/38] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 09/38] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 10/38] input: keyboard: switch gtk ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 11/38] input: keyboard: switch sdl " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 12/38] input: keyboard: switch vnc " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 13/38] input: keyboard: switch spice " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 14/38] input: keyboard: switch curses " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 15/38] input: mouse: add helpers functions to core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 16/38] input: mouse: add graphic_rotate support Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 17/38] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 18/38] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 19/38] input: mouse: switch gtk ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 20/38] input: mouse: switch sdl " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 21/38] input: mouse: switch vnc " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 22/38] input: mouse: switch spice " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 23/38] input: mouse: switch monitor " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 25/38] input: mouse: " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 26/38] input: trace events Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 27/38] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 28/38] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 29/38] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 30/38] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 31/38] input: move mouse mode notifier to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 32/38] input: add input_mouse_mode tracepoint Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 34/38] input: move do_mouse_set " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 35/38] input: remove index_from_keycode (no users) Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 36/38] console: add head to index to qemu consoles Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 37/38] console: add QemuUIInfo Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2014-03-04 15:54 ` [Qemu-devel] [PULL v3 00/38] rework input handling, sdl2 support Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393596409-28934-7-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).