[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/7] input: use kbd delays for send_key monitor comma
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/7] input: use kbd delays for send_key monitor command |
Date: |
Wed, 4 Jun 2014 09:44:06 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/input-legacy.c | 45 ++++++---------------------------------------
1 file changed, 6 insertions(+), 39 deletions(-)
diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index 2a53860..3025f50 100644
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -74,27 +74,6 @@ int index_from_key(const char *key)
return i;
}
-static KeyValue **keyvalues;
-static int keyvalues_size;
-static QEMUTimer *key_timer;
-
-static void free_keyvalues(void)
-{
- g_free(keyvalues);
- keyvalues = NULL;
- keyvalues_size = 0;
-}
-
-static void release_keys(void *opaque)
-{
- while (keyvalues_size > 0) {
- qemu_input_event_send_key(NULL, keyvalues[--keyvalues_size],
- false);
- }
-
- free_keyvalues();
-}
-
static KeyValue *copy_key_value(KeyValue *src)
{
KeyValue *dst = g_new(KeyValue, 1);
@@ -107,30 +86,18 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time,
int64_t hold_time,
{
KeyValueList *p;
- if (!key_timer) {
- key_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, release_keys, NULL);
- }
-
- if (keyvalues != NULL) {
- timer_del(key_timer);
- release_keys(NULL);
- }
-
if (!has_hold_time) {
- hold_time = 100;
+ hold_time = 0; /* use default */
}
for (p = keys; p != NULL; p = p->next) {
qemu_input_event_send_key(NULL, copy_key_value(p->value), true);
-
- keyvalues = g_realloc(keyvalues, sizeof(KeyValue *) *
- (keyvalues_size + 1));
- keyvalues[keyvalues_size++] = copy_key_value(p->value);
+ qemu_input_event_send_key_delay(hold_time);
+ }
+ for (p = keys; p != NULL; p = p->next) {
+ qemu_input_event_send_key(NULL, copy_key_value(p->value), false);
+ qemu_input_event_send_key_delay(hold_time);
}
-
- /* delayed key up events */
- timer_mod(key_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
- muldiv64(get_ticks_per_sec(), hold_time, 1000));
}
static void legacy_kbd_event(DeviceState *dev, QemuConsole *src,
--
1.8.3.1
- [Qemu-devel] [PULL 0/7] input patch queue, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 5/7] docs/multiseat.txt: use autoseat, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 3/7] input/curses: add kbd delay between keydown and keyup events, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 4/7] input/vnc: use kbd delays in press_key, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 2/7] input: use kbd delays for send_key monitor command,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/7] input: add support for kbd delays, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 6/7] docs/multiseat.txt: gtk joined the party, Gerd Hoffmann, 2014/06/04
- [Qemu-devel] [PULL 7/7] docs/multiseat.txt: add note about spice, Gerd Hoffmann, 2014/06/04
- Re: [Qemu-devel] [PULL 0/7] input patch queue, Peter Maydell, 2014/06/05