shaba/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu.git synced 2024-12-06 06:00:22 +03:00
Code Issues Projects Releases Wiki Activity

ui: Split hmp_mouse_set() and move the HMP part to ui/

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230109190321.1056914-17-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Markus Armbruster 2023-01-09 20:03:20 +01:00
parent 006e79cdf4
commit ec843b97f2
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/monitor/hmp.h
View File

@ -88,6 +88,7 @@ void hmp_getfd(Monitor *mon, const QDict *qdict);
void hmp_closefd(Monitor *mon, const QDict *qdict);
void hmp_mouse_move(Monitor *mon, const QDict *qdict);
void hmp_mouse_button(Monitor *mon, const QDict *qdict);
void hmp_mouse_set(Monitor *mon, const QDict *qdict);
void hmp_sendkey(Monitor *mon, const QDict *qdict);
void coroutine_fn hmp_screendump(Monitor *mon, const QDict *qdict);
void hmp_chardev_add(Monitor *mon, const QDict *qdict);

2
include/ui/console.h
View File

@ -65,7 +65,7 @@ void qemu_remove_led_event_handler(QEMUPutLEDEntry *entry);
void kbd_put_ledstate(int ledstate);
void hmp_mouse_set(Monitor *mon, const QDict *qdict);
bool qemu_mouse_set(int index, Error **errp);
/* keysym is a unicode code except for special keys (see QEMU_KEY_xxx
constants) */

1
monitor/misc.c
View File

@ -33,7 +33,6 @@
#include "ui/qemu-spice.h"
#include "qemu/config-file.h"
#include "qemu/ctype.h"
#include "ui/console.h"
#include "audio/audio.h"
#include "disas/disas.h"
#include "qemu/timer.h"

15
ui/input.c
View File

@ -2,8 +2,6 @@
#include "sysemu/sysemu.h"
#include "qapi/error.h"
#include "qapi/qapi-commands-ui.h"
#include "qapi/qmp/qdict.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "ui/input.h"
#include "ui/console.h"
@ -594,10 +592,9 @@ MouseInfoList *qmp_query_mice(Error **errp)
return mice_list;
}
void hmp_mouse_set(Monitor *mon, const QDict *qdict)
bool qemu_mouse_set(int index, Error **errp)
{
QemuInputHandlerState *s;
int index = qdict_get_int(qdict, "index");
int found = 0;
QTAILQ_FOREACH(s, &handlers, node) {
@ -606,8 +603,9 @@ void hmp_mouse_set(Monitor *mon, const QDict *qdict)
}
if (!(s->handler->mask & (INPUT_EVENT_MASK_REL |
INPUT_EVENT_MASK_ABS))) {
error_report("Input device '%s' is not a mouse", s->handler->name);
return;
error_setg(errp, "Input device '%s' is not a mouse",
s->handler->name);
return false;
}
found = 1;
qemu_input_handler_activate(s);
@ -615,9 +613,10 @@ void hmp_mouse_set(Monitor *mon, const QDict *qdict)
}
if (!found) {
error_report("Mouse at index '%d' not found", index);
return;
error_setg(errp, "Mouse at index '%d' not found", index);
return false;
}
qemu_input_check_mode_change();
return true;
}

8
ui/ui-hmp-cmds.c
View File

@ -69,6 +69,14 @@ void hmp_mouse_button(Monitor *mon, const QDict *qdict)
mouse_button_state = button_state;
}
void hmp_mouse_set(Monitor *mon, const QDict *qdict)
{
Error *err = NULL;
qemu_mouse_set(qdict_get_int(qdict, "index"), &err);
hmp_handle_error(mon, err);
}
void hmp_info_mice(Monitor *mon, const QDict *qdict)
{
MouseInfoList *mice_list, *mouse;