diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2014-05-21 13:49:59 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-05-26 08:42:42 +0200 |
| commit | 2386a907301134d344649426e6928614567d1235 (patch) | |
| tree | ce4bfb9e23d61cdf3b9935a5cd71018240991d07 | |
| parent | 11c7fa7fa602704d9673ea59c575f58777008d93 (diff) | |
| download | focaccia-qemu-2386a907301134d344649426e6928614567d1235.tar.gz focaccia-qemu-2386a907301134d344649426e6928614567d1235.zip | |
input: add name to input_event_key_number
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | trace-events | 2 | ||||
| -rw-r--r-- | ui/input.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/trace-events b/trace-events index b6d289d720..0870204736 100644 --- a/trace-events +++ b/trace-events @@ -1050,7 +1050,7 @@ gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d" gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)" # ui/input.c -input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%x, down %d" +input_event_key_number(int conidx, int number, const char *qcode, bool down) "con %d, key number 0x%x [%s], down %d" input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d" input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d" input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d" diff --git a/ui/input.c b/ui/input.c index fc91fba83c..9d630355e8 100644 --- a/ui/input.c +++ b/ui/input.c @@ -94,7 +94,7 @@ static void qemu_input_transform_abs_rotate(InputEvent *evt) static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt) { const char *name; - int idx = -1; + int qcode, idx = -1; if (src) { idx = qemu_console_get_index(src); @@ -103,8 +103,10 @@ static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt) case INPUT_EVENT_KIND_KEY: switch (evt->key->key->kind) { case KEY_VALUE_KIND_NUMBER: + qcode = qemu_input_key_number_to_qcode(evt->key->key->number); + name = QKeyCode_lookup[qcode]; trace_input_event_key_number(idx, evt->key->key->number, - evt->key->down); + name, evt->key->down); break; case KEY_VALUE_KIND_QCODE: name = QKeyCode_lookup[evt->key->key->qcode]; |