Commit ce53f2f9 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

input: use KeyValue directly in sendkey monitor command 



Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 528728fd

ui/input-legacy.c

+23 −24
Original line number Diff line number Diff line
@@ -74,38 +74,44 @@ int index_from_key(const char *key) 
    return i;

}



static int *keycodes;

static int keycodes_size;

static KeyValue **keyvalues;

static int keyvalues_size;

static QEMUTimer *key_timer;



static void free_keycodes(void)

static void free_keyvalues(void)

{

    g_free(keycodes);

    keycodes = NULL;

    keycodes_size = 0;

    g_free(keyvalues);

    keyvalues = NULL;

    keyvalues_size = 0;

}



static void release_keys(void *opaque)

{

    while (keycodes_size > 0) {

        qemu_input_event_send_key_number(NULL, keycodes[--keycodes_size],

    while (keyvalues_size > 0) {

        qemu_input_event_send_key(NULL, keyvalues[--keyvalues_size],

                                  false);

    }



    free_keycodes();

    free_keyvalues();

}



static KeyValue *copy_key_value(KeyValue *src)

{

    KeyValue *dst = g_new(KeyValue, 1);

    memcpy(dst, src, sizeof(*src));

    return dst;

}



void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time,

                  Error **errp)

{

    int keycode;

    KeyValueList *p;



    if (!key_timer) {

        key_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, release_keys, NULL);

    }



    if (keycodes != NULL) {

    if (keyvalues != NULL) {

        timer_del(key_timer);

        release_keys(NULL);

    }
@@ -115,18 +121,11 @@ void qmp_send_key(KeyValueList *keys, bool has_hold_time, int64_t hold_time, 
    }



    for (p = keys; p != NULL; p = p->next) {

        /* key down events */

        keycode = qemu_input_key_value_to_number(p->value);

        if (keycode < 0x01 || keycode > 0xff) {

            error_setg(errp, "invalid hex keycode 0x%x", keycode);

            free_keycodes();

            return;

        }



        qemu_input_event_send_key_number(NULL, keycode, true);

        qemu_input_event_send_key(NULL, copy_key_value(p->value), true);



        keycodes = g_realloc(keycodes, sizeof(int) * (keycodes_size + 1));

        keycodes[keycodes_size++] = keycode;

        keyvalues = g_realloc(keyvalues, sizeof(KeyValue *) *

                              (keyvalues_size + 1));

        keyvalues[keyvalues_size++] = copy_key_value(p->value);

    }



    /* delayed key up events */