proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-06-15 11:15:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

input: qmp_send_key(): simplify

Browse Source 
The current code duplicates the QKeyCodeList keys in order to store
the key values for release_keys() late run. This is a bit complicated
though, as we have to care about correct ordering and then release_keys()
will have to index key_defs[] over again.

Switch to an array of integers, which is dynamically allocated and stores
the already converted key value.

This simplifies the current code and the next commit.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Luiz Capitulino 2012-09-20 13:44:28 -03:00
parent 753637695b
commit 05a3543dbd
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
input.c
View File

@ -224,30 +224,31 @@ int index_from_keycode(int code)
return i; return i;
} }
static QKeyCodeList *keycodes; static int *keycodes;
static int keycodes_size;
static QEMUTimer *key_timer; static QEMUTimer *key_timer;
static void release_keys(void *opaque) static void release_keys(void *opaque)
{ {
int keycode; int i;
QKeyCodeList *p;
for (p = keycodes; p != NULL; p = p->next) { for (i = 0; i < keycodes_size; i++) {
keycode = key_defs[p->value]; if (keycodes[i] & 0x80) {
if (keycode & 0x80) {
kbd_put_keycode(0xe0); kbd_put_keycode(0xe0);
} }
kbd_put_keycode(keycode | 0x80); kbd_put_keycode(keycodes[i]| 0x80);
} }
qapi_free_QKeyCodeList(keycodes);
g_free(keycodes);
keycodes = NULL; keycodes = NULL;
keycodes_size = 0;
} }
void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time, void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time,
Error **errp) Error **errp)
{ {
int keycode; int keycode;
QKeyCodeList *p, *keylist, *head = NULL, *tmp = NULL; QKeyCodeList *p;
if (!key_timer) { if (!key_timer) {
key_timer = qemu_new_timer_ns(vm_clock, release_keys, NULL); key_timer = qemu_new_timer_ns(vm_clock, release_keys, NULL);
@ -257,31 +258,22 @@ void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time,
qemu_del_timer(key_timer); qemu_del_timer(key_timer);
release_keys(NULL); release_keys(NULL);
} }
if (!has_hold_time) { if (!has_hold_time) {
hold_time = 100; hold_time = 100;
} }
for (p = keys; p != NULL; p = p->next) { for (p = keys; p != NULL; p = p->next) {
keylist = g_malloc0(sizeof(*keylist));
keylist->value = p->value;
keylist->next = NULL;
if (!head) {
head = keylist;
}
if (tmp) {
tmp->next = keylist;
}
tmp = keylist;
/* key down events */ /* key down events */
keycode = key_defs[p->value]; keycode = key_defs[p->value];
if (keycode & 0x80) { if (keycode & 0x80) {
kbd_put_keycode(0xe0); kbd_put_keycode(0xe0);
} }
kbd_put_keycode(keycode & 0x7f); kbd_put_keycode(keycode & 0x7f);
keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));
keycodes[keycodes_size++] = keycode;
} }
keycodes = head;
/* delayed key up events */ /* delayed key up events */
qemu_mod_timer(key_timer, qemu_get_clock_ns(vm_clock) + qemu_mod_timer(key_timer, qemu_get_clock_ns(vm_clock) +