Message ID | 1348691138-12879-2-git-send-email-lcapitulino@redhat.com |
---|---|
State | New |
Headers | show |
Luiz Capitulino <lcapitulino@redhat.com> writes: > 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> > --- > input.c | 36 ++++++++++++++---------------------- > 1 file changed, 14 insertions(+), 22 deletions(-) > > diff --git a/input.c b/input.c > index c4b0619..32c6057 100644 > --- a/input.c > +++ b/input.c > @@ -224,30 +224,31 @@ int index_from_keycode(int code) > return i; > } > > -static QKeyCodeList *keycodes; > +static int *keycodes; > +static int keycodes_size; > static QEMUTimer *key_timer; > > static void release_keys(void *opaque) > { > - int keycode; > - QKeyCodeList *p; > + int i; > > - for (p = keycodes; p != NULL; p = p->next) { > - keycode = key_defs[p->value]; > - if (keycode & 0x80) { > + for (i = 0; i < keycodes_size; i++) { > + if (keycodes[i] & 0x80) { > 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_size = 0; > } > > void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time, > Error **errp) > { > int keycode; > - QKeyCodeList *p, *keylist, *head = NULL, *tmp = NULL; > + QKeyCodeList *p; > > if (!key_timer) { > 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); > release_keys(NULL); > } > + > if (!has_hold_time) { > hold_time = 100; > } > > 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 */ > keycode = key_defs[p->value]; > if (keycode & 0x80) { > kbd_put_keycode(0xe0); > } > kbd_put_keycode(keycode & 0x7f); > + > + keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1)); > + keycodes[keycodes_size++] = keycode; One realloc per key is a bit wasteful (the common efficient way to grow a flexible array is to double it), but it takes a mighty fast typist to make that matter. > } > - keycodes = head; > > /* delayed key up events */ > qemu_mod_timer(key_timer, qemu_get_clock_ns(vm_clock) +
diff --git a/input.c b/input.c index c4b0619..32c6057 100644 --- a/input.c +++ b/input.c @@ -224,30 +224,31 @@ int index_from_keycode(int code) return i; } -static QKeyCodeList *keycodes; +static int *keycodes; +static int keycodes_size; static QEMUTimer *key_timer; static void release_keys(void *opaque) { - int keycode; - QKeyCodeList *p; + int i; - for (p = keycodes; p != NULL; p = p->next) { - keycode = key_defs[p->value]; - if (keycode & 0x80) { + for (i = 0; i < keycodes_size; i++) { + if (keycodes[i] & 0x80) { 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_size = 0; } void qmp_send_key(QKeyCodeList *keys, bool has_hold_time, int64_t hold_time, Error **errp) { int keycode; - QKeyCodeList *p, *keylist, *head = NULL, *tmp = NULL; + QKeyCodeList *p; if (!key_timer) { 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); release_keys(NULL); } + if (!has_hold_time) { hold_time = 100; } 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 */ keycode = key_defs[p->value]; if (keycode & 0x80) { kbd_put_keycode(0xe0); } kbd_put_keycode(keycode & 0x7f); + + keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1)); + keycodes[keycodes_size++] = keycode; } - keycodes = head; /* delayed key up events */ qemu_mod_timer(key_timer, qemu_get_clock_ns(vm_clock) +
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> --- input.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)