[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 40/42] input: move qmp_query_mice to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 40/42] input: move qmp_query_mice to new core |
Date: |
Mon, 16 Dec 2013 11:49:16 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/input-legacy.c | 23 -----------------------
ui/input.c | 29 +++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 7f8e72b..7843482 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -483,29 +483,6 @@ void kbd_put_ledstate(int ledstate)
}
}
-MouseInfoList *qmp_query_mice(Error **errp)
-{
- MouseInfoList *mice_list = NULL;
- QEMUPutMouseEntry *cursor;
- bool current = true;
-
- QTAILQ_FOREACH(cursor, &mouse_handlers, node) {
- MouseInfoList *info = g_malloc0(sizeof(*info));
- info->value = g_malloc0(sizeof(*info->value));
- info->value->name = g_strdup(cursor->qemu_put_mouse_event_name);
- info->value->index = cursor->index;
- info->value->absolute = !!cursor->qemu_put_mouse_event_absolute;
- info->value->current = current;
-
- current = false;
-
- info->next = mice_list;
- mice_list = info;
- }
-
- return mice_list;
-}
-
void do_mouse_set(Monitor *mon, const QDict *qdict)
{
QEMUPutMouseEntry *cursor;
diff --git a/ui/input.c b/ui/input.c
index 55449dc..2945a3c 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,5 +1,6 @@
#include "sysemu/sysemu.h"
#include "qapi-types.h"
+#include "qmp-commands.h"
#include "trace.h"
#include "ui/input.h"
#include "ui/console.h"
@@ -307,3 +308,31 @@ void qemu_remove_mouse_mode_change_notifier(Notifier
*notify)
{
notifier_remove(notify);
}
+
+MouseInfoList *qmp_query_mice(Error **errp)
+{
+ MouseInfoList *mice_list = NULL;
+ MouseInfoList *info;
+ QemuInputHandlerState *s;
+ bool current = true;
+
+ QTAILQ_FOREACH(s, &handlers, node) {
+ if (!(s->handler->mask &
+ (INPUT_EVENT_MASK_REL | INPUT_EVENT_MASK_ABS))) {
+ continue;
+ }
+
+ info = g_new0(MouseInfoList, 1);
+ info->value = g_new0(MouseInfo, 1);
+ info->value->index = s->id;
+ info->value->name = g_strdup(s->handler->name);
+ info->value->absolute = s->handler->mask & INPUT_EVENT_MASK_ABS;
+ info->value->current = current;
+
+ current = false;
+ info->next = mice_list;
+ mice_list = info;
+ }
+
+ return mice_list;
+}
--
1.8.3.1
- [Qemu-devel] [PATCH 24/42] input: mouse: switch sdl ui to new core, (continued)
- [Qemu-devel] [PATCH 24/42] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 36/42] input: move mouse mode notifier to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 31/42] input: trace events, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 33/42] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 37/42] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 41/42] input: move do_mouse_set to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 34/42] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 30/42] input: mouse: switch cocoa ui to new core [untested], Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 07/42] input: qapi: add unmapped key, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 26/42] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 40/42] input: move qmp_query_mice to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 42/42] input: remove index_from_keycode (no users), Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 38/42] sdl2: simplify keymap handling, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 39/42] sdl2: codestyle fixups, Gerd Hoffmann, 2013/12/16
- [Qemu-devel] [PATCH 17/42] input: keyboard: switch spice ui to new core, Gerd Hoffmann, 2013/12/16