Commit 57cb38b
included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
170 lines
4.5 KiB
C
170 lines
4.5 KiB
C
/*
|
|
* replay-input.c
|
|
*
|
|
* Copyright (c) 2010-2015 Institute for System Programming
|
|
* of the Russian Academy of Sciences.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu/replay.h"
|
|
#include "replay-internal.h"
|
|
#include "qemu/notify.h"
|
|
#include "ui/input.h"
|
|
#include "qapi/qmp-output-visitor.h"
|
|
#include "qapi/qmp-input-visitor.h"
|
|
#include "qapi-visit.h"
|
|
|
|
static InputEvent *qapi_clone_InputEvent(InputEvent *src)
|
|
{
|
|
QmpOutputVisitor *qov;
|
|
QmpInputVisitor *qiv;
|
|
Visitor *ov, *iv;
|
|
QObject *obj;
|
|
InputEvent *dst = NULL;
|
|
|
|
qov = qmp_output_visitor_new();
|
|
ov = qmp_output_get_visitor(qov);
|
|
visit_type_InputEvent(ov, NULL, &src, &error_abort);
|
|
obj = qmp_output_get_qobject(qov);
|
|
qmp_output_visitor_cleanup(qov);
|
|
if (!obj) {
|
|
return NULL;
|
|
}
|
|
|
|
qiv = qmp_input_visitor_new(obj);
|
|
iv = qmp_input_get_visitor(qiv);
|
|
visit_type_InputEvent(iv, NULL, &dst, &error_abort);
|
|
qmp_input_visitor_cleanup(qiv);
|
|
qobject_decref(obj);
|
|
|
|
return dst;
|
|
}
|
|
|
|
void replay_save_input_event(InputEvent *evt)
|
|
{
|
|
InputKeyEvent *key;
|
|
InputBtnEvent *btn;
|
|
InputMoveEvent *move;
|
|
replay_put_dword(evt->type);
|
|
|
|
switch (evt->type) {
|
|
case INPUT_EVENT_KIND_KEY:
|
|
key = evt->u.key.data;
|
|
replay_put_dword(key->key->type);
|
|
|
|
switch (key->key->type) {
|
|
case KEY_VALUE_KIND_NUMBER:
|
|
replay_put_qword(key->key->u.number.data);
|
|
replay_put_byte(key->down);
|
|
break;
|
|
case KEY_VALUE_KIND_QCODE:
|
|
replay_put_dword(key->key->u.qcode.data);
|
|
replay_put_byte(key->down);
|
|
break;
|
|
case KEY_VALUE_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
break;
|
|
case INPUT_EVENT_KIND_BTN:
|
|
btn = evt->u.btn.data;
|
|
replay_put_dword(btn->button);
|
|
replay_put_byte(btn->down);
|
|
break;
|
|
case INPUT_EVENT_KIND_REL:
|
|
move = evt->u.rel.data;
|
|
replay_put_dword(move->axis);
|
|
replay_put_qword(move->value);
|
|
break;
|
|
case INPUT_EVENT_KIND_ABS:
|
|
move = evt->u.abs.data;
|
|
replay_put_dword(move->axis);
|
|
replay_put_qword(move->value);
|
|
break;
|
|
case INPUT_EVENT_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
}
|
|
|
|
InputEvent *replay_read_input_event(void)
|
|
{
|
|
InputEvent evt;
|
|
KeyValue keyValue;
|
|
InputKeyEvent key;
|
|
key.key = &keyValue;
|
|
InputBtnEvent btn;
|
|
InputMoveEvent rel;
|
|
InputMoveEvent abs;
|
|
|
|
evt.type = replay_get_dword();
|
|
switch (evt.type) {
|
|
case INPUT_EVENT_KIND_KEY:
|
|
evt.u.key.data = &key;
|
|
evt.u.key.data->key->type = replay_get_dword();
|
|
|
|
switch (evt.u.key.data->key->type) {
|
|
case KEY_VALUE_KIND_NUMBER:
|
|
evt.u.key.data->key->u.number.data = replay_get_qword();
|
|
evt.u.key.data->down = replay_get_byte();
|
|
break;
|
|
case KEY_VALUE_KIND_QCODE:
|
|
evt.u.key.data->key->u.qcode.data = (QKeyCode)replay_get_dword();
|
|
evt.u.key.data->down = replay_get_byte();
|
|
break;
|
|
case KEY_VALUE_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
break;
|
|
case INPUT_EVENT_KIND_BTN:
|
|
evt.u.btn.data = &btn;
|
|
evt.u.btn.data->button = (InputButton)replay_get_dword();
|
|
evt.u.btn.data->down = replay_get_byte();
|
|
break;
|
|
case INPUT_EVENT_KIND_REL:
|
|
evt.u.rel.data = &rel;
|
|
evt.u.rel.data->axis = (InputAxis)replay_get_dword();
|
|
evt.u.rel.data->value = replay_get_qword();
|
|
break;
|
|
case INPUT_EVENT_KIND_ABS:
|
|
evt.u.abs.data = &abs;
|
|
evt.u.abs.data->axis = (InputAxis)replay_get_dword();
|
|
evt.u.abs.data->value = replay_get_qword();
|
|
break;
|
|
case INPUT_EVENT_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
|
|
return qapi_clone_InputEvent(&evt);
|
|
}
|
|
|
|
void replay_input_event(QemuConsole *src, InputEvent *evt)
|
|
{
|
|
if (replay_mode == REPLAY_MODE_PLAY) {
|
|
/* Nothing */
|
|
} else if (replay_mode == REPLAY_MODE_RECORD) {
|
|
replay_add_input_event(qapi_clone_InputEvent(evt));
|
|
} else {
|
|
qemu_input_event_send_impl(src, evt);
|
|
}
|
|
}
|
|
|
|
void replay_input_sync_event(void)
|
|
{
|
|
if (replay_mode == REPLAY_MODE_PLAY) {
|
|
/* Nothing */
|
|
} else if (replay_mode == REPLAY_MODE_RECORD) {
|
|
replay_add_input_sync_event();
|
|
} else {
|
|
qemu_input_event_sync_impl();
|
|
}
|
|
}
|