[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v4 34/38] input: move do_mouse_set to new core
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v4 34/38] input: move do_mouse_set to new core |
Date: |
Wed, 5 Mar 2014 12:53:36 +0100 |
This removes the last user of the lecagy input mouse handler list,
so we can remove more legacy bits with this.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/input-legacy.c | 43 -------------------------------------------
ui/input.c | 21 +++++++++++++++++++++
2 files changed, 21 insertions(+), 43 deletions(-)
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 7843482..b51e6ad 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -35,12 +35,6 @@ struct QEMUPutMouseEntry {
QEMUPutMouseEvent *qemu_put_mouse_event;
void *qemu_put_mouse_event_opaque;
int qemu_put_mouse_event_absolute;
- char *qemu_put_mouse_event_name;
-
- int index;
-
- /* used internally by qemu for handling mice */
- QTAILQ_ENTRY(QEMUPutMouseEntry) node;
/* new input core */
QemuInputHandler h;
@@ -412,17 +406,12 @@ QEMUPutMouseEntry
*qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
const char *name)
{
QEMUPutMouseEntry *s;
- static int mouse_index = 0;
s = g_malloc0(sizeof(QEMUPutMouseEntry));
s->qemu_put_mouse_event = func;
s->qemu_put_mouse_event_opaque = opaque;
s->qemu_put_mouse_event_absolute = absolute;
- s->qemu_put_mouse_event_name = g_strdup(name);
- s->index = mouse_index++;
-
- QTAILQ_INSERT_TAIL(&mouse_handlers, s, node);
s->h.name = name;
s->h.mask = INPUT_EVENT_MASK_BTN |
@@ -437,19 +426,13 @@ QEMUPutMouseEntry
*qemu_add_mouse_event_handler(QEMUPutMouseEvent *func,
void qemu_activate_mouse_event_handler(QEMUPutMouseEntry *entry)
{
- QTAILQ_REMOVE(&mouse_handlers, entry, node);
- QTAILQ_INSERT_HEAD(&mouse_handlers, entry, node);
-
qemu_input_handler_activate(entry->s);
}
void qemu_remove_mouse_event_handler(QEMUPutMouseEntry *entry)
{
- QTAILQ_REMOVE(&mouse_handlers, entry, node);
-
qemu_input_handler_unregister(entry->s);
- g_free(entry->qemu_put_mouse_event_name);
g_free(entry);
}
@@ -482,29 +465,3 @@ void kbd_put_ledstate(int ledstate)
cursor->put_led(cursor->opaque, ledstate);
}
}
-
-void do_mouse_set(Monitor *mon, const QDict *qdict)
-{
- QEMUPutMouseEntry *cursor;
- int index = qdict_get_int(qdict, "index");
- int found = 0;
-
- if (QTAILQ_EMPTY(&mouse_handlers)) {
- monitor_printf(mon, "No mouse devices connected\n");
- return;
- }
-
- QTAILQ_FOREACH(cursor, &mouse_handlers, node) {
- if (cursor->index == index) {
- found = 1;
- qemu_activate_mouse_event_handler(cursor);
- break;
- }
- }
-
- if (!found) {
- monitor_printf(mon, "Mouse at given index not found\n");
- }
-
- qemu_input_check_mode_change();
-}
diff --git a/ui/input.c b/ui/input.c
index 162e8d8..2761911 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -334,3 +334,24 @@ MouseInfoList *qmp_query_mice(Error **errp)
return mice_list;
}
+
+void do_mouse_set(Monitor *mon, const QDict *qdict)
+{
+ QemuInputHandlerState *s;
+ int index = qdict_get_int(qdict, "index");
+ int found = 0;
+
+ QTAILQ_FOREACH(s, &handlers, node) {
+ if (s->id == index) {
+ found = 1;
+ qemu_input_handler_activate(s);
+ break;
+ }
+ }
+
+ if (!found) {
+ monitor_printf(mon, "Mouse at given index not found\n");
+ }
+
+ qemu_input_check_mode_change();
+}
--
1.8.3.1
- [Qemu-devel] [PULL v4 22/38] input: mouse: switch spice ui to new core, (continued)
- [Qemu-devel] [PULL v4 22/38] input: mouse: switch spice ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 10/38] input: keyboard: switch gtk ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 06/38] input: add core bits of the new input layer, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 15/38] input: mouse: add helpers functions to core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 28/38] input-legacy: remove kbd_mouse_has_absolute, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 26/38] input: trace events, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 20/38] input: mouse: switch sdl ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 36/38] console: add head to index to qemu consoles., Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 07/38] input: keyboard: add helper functions to core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 12/38] input: keyboard: switch vnc ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 34/38] input: move do_mouse_set to new core,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v4 17/38] input: mouse: add qemu_input_is_absolute(), Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 19/38] input: mouse: switch gtk ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 27/38] input-legacy: remove kbd_put_keycode, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 30/38] input-legacy: remove kbd_mouse_event, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 31/38] input: move mouse mode notifier to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 25/38] input: mouse: switch cocoa ui to new core, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 37/38] console: add QemuUIInfo, Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0), Gerd Hoffmann, 2014/03/05
- [Qemu-devel] [PULL v4 13/38] input: keyboard: switch spice ui to new core, Gerd Hoffmann, 2014/03/05
- Re: [Qemu-devel] [PULL v4 00/38] rework input handling, sdl2 support, Peter Maydell, 2014/03/07