[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core |
Date: |
Fri, 28 Feb 2014 15:06:44 +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] [PULL 14/38] input: keyboard: switch curses ui to new core, (continued)
- [Qemu-devel] [PULL 14/38] input: keyboard: switch curses ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 10/38] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 05/38] input: qapi: add pause key, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 19/38] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 27/38] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 21/38] input: mouse: switch vnc ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 31/38] input: move mouse mode notifier to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 29/38] input-legacy: remove kbd_mouse_is_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 26/38] input: trace events, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 30/38] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 35/38] input: remove index_from_keycode (no users), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 34/38] input: move do_mouse_set to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 28/38] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 25/38] input: mouse: switch cocoa ui to new core, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 32/38] input: add input_mouse_mode tracepoint, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 37/38] console: add QemuUIInfo, Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 36/38] console: add head to index to qemu consoles., Gerd Hoffmann, 2014/02/28
- [Qemu-devel] [PULL 02/38] input: rename file to legacy, Gerd Hoffmann, 2014/02/28