Commit 1048c88f authored by Amos Kong's avatar Amos Kong Committed by Luiz Capitulino
Browse files

monitor: move key_defs[] table and introduce two help functions 



This patch added two help functions to convert key/code to index of
mapping table, those functions will return Q_KEY_CODE_MAX if the
code/key is invalid.

Patch also moved key_defs[] to input.c, and removed useless KeyDef struct.
Key's index in QKeyCode enmu is same as keycode's index in new key_defs[].
Monitor functions were changed to access key_defs[] directly.

key_defs[] is used in do_send_key(), so export key_defs[]. It will be
changed to static in next patch.

Signed-off-by: default avatarAmos Kong <akong@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 411656f4

console.h

+6 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "notify.h"

#include "monitor.h"

#include "trace.h"

#include "qapi-types.h"



/* keyboard/mouse support */
@@ -397,4 +398,9 @@ static inline int vnc_display_pw_expire(DisplayState *ds, time_t expires) 
/* curses.c */

void curses_display_init(DisplayState *ds, int full_screen);



/* input.c */

extern const int key_defs[];

int index_from_key(const char *key);

int index_from_keycode(int code);



#endif

input.c

+186 −0
Original line number Diff line number Diff line
@@ -37,6 +37,192 @@ static QTAILQ_HEAD(, QEMUPutMouseEntry) mouse_handlers = 
static NotifierList mouse_mode_notifiers = 

    NOTIFIER_LIST_INITIALIZER(mouse_mode_notifiers);



const int key_defs[] = {

    [Q_KEY_CODE_SHIFT] = 0x2a,

    [Q_KEY_CODE_SHIFT_R] = 0x36,



    [Q_KEY_CODE_ALT] = 0x38,

    [Q_KEY_CODE_ALT_R] = 0xb8,

    [Q_KEY_CODE_ALTGR] = 0x64,

    [Q_KEY_CODE_ALTGR_R] = 0xe4,

    [Q_KEY_CODE_CTRL] = 0x1d,

    [Q_KEY_CODE_CTRL_R] = 0x9d,



    [Q_KEY_CODE_MENU] = 0xdd,



    [Q_KEY_CODE_ESC] = 0x01,



    [Q_KEY_CODE_1] = 0x02,

    [Q_KEY_CODE_2] = 0x03,

    [Q_KEY_CODE_3] = 0x04,

    [Q_KEY_CODE_4] = 0x05,

    [Q_KEY_CODE_5] = 0x06,

    [Q_KEY_CODE_6] = 0x07,

    [Q_KEY_CODE_7] = 0x08,

    [Q_KEY_CODE_8] = 0x09,

    [Q_KEY_CODE_9] = 0x0a,

    [Q_KEY_CODE_0] = 0x0b,

    [Q_KEY_CODE_MINUS] = 0x0c,

    [Q_KEY_CODE_EQUAL] = 0x0d,

    [Q_KEY_CODE_BACKSPACE] = 0x0e,



    [Q_KEY_CODE_TAB] = 0x0f,

    [Q_KEY_CODE_Q] = 0x10,

    [Q_KEY_CODE_W] = 0x11,

    [Q_KEY_CODE_E] = 0x12,

    [Q_KEY_CODE_R] = 0x13,

    [Q_KEY_CODE_T] = 0x14,

    [Q_KEY_CODE_Y] = 0x15,

    [Q_KEY_CODE_U] = 0x16,

    [Q_KEY_CODE_I] = 0x17,

    [Q_KEY_CODE_O] = 0x18,

    [Q_KEY_CODE_P] = 0x19,

    [Q_KEY_CODE_BRACKET_LEFT] = 0x1a,

    [Q_KEY_CODE_BRACKET_RIGHT] = 0x1b,

    [Q_KEY_CODE_RET] = 0x1c,



    [Q_KEY_CODE_A] = 0x1e,

    [Q_KEY_CODE_S] = 0x1f,

    [Q_KEY_CODE_D] = 0x20,

    [Q_KEY_CODE_F] = 0x21,

    [Q_KEY_CODE_G] = 0x22,

    [Q_KEY_CODE_H] = 0x23,

    [Q_KEY_CODE_J] = 0x24,

    [Q_KEY_CODE_K] = 0x25,

    [Q_KEY_CODE_L] = 0x26,

    [Q_KEY_CODE_SEMICOLON] = 0x27,

    [Q_KEY_CODE_APOSTROPHE] = 0x28,

    [Q_KEY_CODE_GRAVE_ACCENT] = 0x29,



    [Q_KEY_CODE_BACKSLASH] = 0x2b,

    [Q_KEY_CODE_Z] = 0x2c,

    [Q_KEY_CODE_X] = 0x2d,

    [Q_KEY_CODE_C] = 0x2e,

    [Q_KEY_CODE_V] = 0x2f,

    [Q_KEY_CODE_B] = 0x30,

    [Q_KEY_CODE_N] = 0x31,

    [Q_KEY_CODE_M] = 0x32,

    [Q_KEY_CODE_COMMA] = 0x33,

    [Q_KEY_CODE_DOT] = 0x34,

    [Q_KEY_CODE_SLASH] = 0x35,



    [Q_KEY_CODE_ASTERISK] = 0x37,



    [Q_KEY_CODE_SPC] = 0x39,

    [Q_KEY_CODE_CAPS_LOCK] = 0x3a,

    [Q_KEY_CODE_F1] = 0x3b,

    [Q_KEY_CODE_F2] = 0x3c,

    [Q_KEY_CODE_F3] = 0x3d,

    [Q_KEY_CODE_F4] = 0x3e,

    [Q_KEY_CODE_F5] = 0x3f,

    [Q_KEY_CODE_F6] = 0x40,

    [Q_KEY_CODE_F7] = 0x41,

    [Q_KEY_CODE_F8] = 0x42,

    [Q_KEY_CODE_F9] = 0x43,

    [Q_KEY_CODE_F10] = 0x44,

    [Q_KEY_CODE_NUM_LOCK] = 0x45,

    [Q_KEY_CODE_SCROLL_LOCK] = 0x46,



    [Q_KEY_CODE_KP_DIVIDE] = 0xb5,

    [Q_KEY_CODE_KP_MULTIPLY] = 0x37,

    [Q_KEY_CODE_KP_SUBTRACT] = 0x4a,

    [Q_KEY_CODE_KP_ADD] = 0x4e,

    [Q_KEY_CODE_KP_ENTER] = 0x9c,

    [Q_KEY_CODE_KP_DECIMAL] = 0x53,

    [Q_KEY_CODE_SYSRQ] = 0x54,



    [Q_KEY_CODE_KP_0] = 0x52,

    [Q_KEY_CODE_KP_1] = 0x4f,

    [Q_KEY_CODE_KP_2] = 0x50,

    [Q_KEY_CODE_KP_3] = 0x51,

    [Q_KEY_CODE_KP_4] = 0x4b,

    [Q_KEY_CODE_KP_5] = 0x4c,

    [Q_KEY_CODE_KP_6] = 0x4d,

    [Q_KEY_CODE_KP_7] = 0x47,

    [Q_KEY_CODE_KP_8] = 0x48,

    [Q_KEY_CODE_KP_9] = 0x49,



    [Q_KEY_CODE_LESS] = 0x56,



    [Q_KEY_CODE_F11] = 0x57,

    [Q_KEY_CODE_F12] = 0x58,



    [Q_KEY_CODE_PRINT] = 0xb7,



    [Q_KEY_CODE_HOME] = 0xc7,

    [Q_KEY_CODE_PGUP] = 0xc9,

    [Q_KEY_CODE_PGDN] = 0xd1,

    [Q_KEY_CODE_END] = 0xcf,



    [Q_KEY_CODE_LEFT] = 0xcb,

    [Q_KEY_CODE_UP] = 0xc8,

    [Q_KEY_CODE_DOWN] = 0xd0,

    [Q_KEY_CODE_RIGHT] = 0xcd,



    [Q_KEY_CODE_INSERT] = 0xd2,

    [Q_KEY_CODE_DELETE] = 0xd3,

#ifdef NEED_CPU_H

#if defined(TARGET_SPARC) && !defined(TARGET_SPARC64)

    [Q_KEY_CODE_STOP] = 0xf0,

    [Q_KEY_CODE_AGAIN] = 0xf1,

    [Q_KEY_CODE_PROPS] = 0xf2,

    [Q_KEY_CODE_UNDO] = 0xf3,

    [Q_KEY_CODE_FRONT] = 0xf4,

    [Q_KEY_CODE_COPY] = 0xf5,

    [Q_KEY_CODE_OPEN] = 0xf6,

    [Q_KEY_CODE_PASTE] = 0xf7,

    [Q_KEY_CODE_FIND] = 0xf8,

    [Q_KEY_CODE_CUT] = 0xf9,

    [Q_KEY_CODE_LF] = 0xfa,

    [Q_KEY_CODE_HELP] = 0xfb,

    [Q_KEY_CODE_META_L] = 0xfc,

    [Q_KEY_CODE_META_R] = 0xfd,

    [Q_KEY_CODE_COMPOSE] = 0xfe,

#endif

#endif

    [Q_KEY_CODE_MAX] = 0,

};



int index_from_key(const char *key)

{

    int i, keycode;

    char *endp;



    for (i = 0; QKeyCode_lookup[i] != NULL; i++) {

        if (!strcmp(key, QKeyCode_lookup[i])) {

            break;

        }

    }



    if (strstart(key, "0x", NULL)) {

        keycode = strtoul(key, &endp, 0);

        if (*endp == '\0' && keycode >= 0x01 && keycode <= 0xff) {

            for (i = 0; i < Q_KEY_CODE_MAX; i++) {

                if (keycode == key_defs[i]) {

                    break;

                }

            }

        }

    }



    /* Return Q_KEY_CODE_MAX if the key is invalid */

    return i;

}



int index_from_keycode(int code)

{

    int i;



    for (i = 0; i < Q_KEY_CODE_MAX; i++) {

        if (key_defs[i] == code) {

            break;

        }

    }



    /* Return Q_KEY_CODE_MAX if the code is invalid */

    return i;

}



void qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)

{

    qemu_put_kbd_event_opaque = opaque;

monitor.c

+11 −172
Original line number Diff line number Diff line
@@ -1290,173 +1290,6 @@ static void do_sum(Monitor *mon, const QDict *qdict) 
    monitor_printf(mon, "%05d\n", sum);

}



typedef struct {

    int keycode;

    const char *name;

} KeyDef;



static const KeyDef key_defs[] = {

    { 0x2a, "shift" },

    { 0x36, "shift_r" },



    { 0x38, "alt" },

    { 0xb8, "alt_r" },

    { 0x64, "altgr" },

    { 0xe4, "altgr_r" },

    { 0x1d, "ctrl" },

    { 0x9d, "ctrl_r" },



    { 0xdd, "menu" },



    { 0x01, "esc" },



    { 0x02, "1" },

    { 0x03, "2" },

    { 0x04, "3" },

    { 0x05, "4" },

    { 0x06, "5" },

    { 0x07, "6" },

    { 0x08, "7" },

    { 0x09, "8" },

    { 0x0a, "9" },

    { 0x0b, "0" },

    { 0x0c, "minus" },

    { 0x0d, "equal" },

    { 0x0e, "backspace" },



    { 0x0f, "tab" },

    { 0x10, "q" },

    { 0x11, "w" },

    { 0x12, "e" },

    { 0x13, "r" },

    { 0x14, "t" },

    { 0x15, "y" },

    { 0x16, "u" },

    { 0x17, "i" },

    { 0x18, "o" },

    { 0x19, "p" },

    { 0x1a, "bracket_left" },

    { 0x1b, "bracket_right" },

    { 0x1c, "ret" },



    { 0x1e, "a" },

    { 0x1f, "s" },

    { 0x20, "d" },

    { 0x21, "f" },

    { 0x22, "g" },

    { 0x23, "h" },

    { 0x24, "j" },

    { 0x25, "k" },

    { 0x26, "l" },

    { 0x27, "semicolon" },

    { 0x28, "apostrophe" },

    { 0x29, "grave_accent" },



    { 0x2b, "backslash" },

    { 0x2c, "z" },

    { 0x2d, "x" },

    { 0x2e, "c" },

    { 0x2f, "v" },

    { 0x30, "b" },

    { 0x31, "n" },

    { 0x32, "m" },

    { 0x33, "comma" },

    { 0x34, "dot" },

    { 0x35, "slash" },



    { 0x37, "asterisk" },



    { 0x39, "spc" },

    { 0x3a, "caps_lock" },

    { 0x3b, "f1" },

    { 0x3c, "f2" },

    { 0x3d, "f3" },

    { 0x3e, "f4" },

    { 0x3f, "f5" },

    { 0x40, "f6" },

    { 0x41, "f7" },

    { 0x42, "f8" },

    { 0x43, "f9" },

    { 0x44, "f10" },

    { 0x45, "num_lock" },

    { 0x46, "scroll_lock" },



    { 0xb5, "kp_divide" },

    { 0x37, "kp_multiply" },

    { 0x4a, "kp_subtract" },

    { 0x4e, "kp_add" },

    { 0x9c, "kp_enter" },

    { 0x53, "kp_decimal" },

    { 0x54, "sysrq" },



    { 0x52, "kp_0" },

    { 0x4f, "kp_1" },

    { 0x50, "kp_2" },

    { 0x51, "kp_3" },

    { 0x4b, "kp_4" },

    { 0x4c, "kp_5" },

    { 0x4d, "kp_6" },

    { 0x47, "kp_7" },

    { 0x48, "kp_8" },

    { 0x49, "kp_9" },



    { 0x56, "less" },



    { 0x57, "f11" },

    { 0x58, "f12" },



    { 0xb7, "print" },



    { 0xc7, "home" },

    { 0xc9, "pgup" },

    { 0xd1, "pgdn" },

    { 0xcf, "end" },



    { 0xcb, "left" },

    { 0xc8, "up" },

    { 0xd0, "down" },

    { 0xcd, "right" },



    { 0xd2, "insert" },

    { 0xd3, "delete" },

#if defined(TARGET_SPARC) && !defined(TARGET_SPARC64)

    { 0xf0, "stop" },

    { 0xf1, "again" },

    { 0xf2, "props" },

    { 0xf3, "undo" },

    { 0xf4, "front" },

    { 0xf5, "copy" },

    { 0xf6, "open" },

    { 0xf7, "paste" },

    { 0xf8, "find" },

    { 0xf9, "cut" },

    { 0xfa, "lf" },

    { 0xfb, "help" },

    { 0xfc, "meta_l" },

    { 0xfd, "meta_r" },

    { 0xfe, "compose" },

#endif

    { 0, NULL },

};



static int get_keycode(const char *key)

{

    const KeyDef *p;

    char *endp;

    int ret;



    for(p = key_defs; p->name != NULL; p++) {

        if (!strcmp(key, p->name))

            return p->keycode;

    }

    if (strstart(key, "0x", NULL)) {

        ret = strtoul(key, &endp, 0);

        if (*endp == '\0' && ret >= 0x01 && ret <= 0xff)

            return ret;

    }

    return -1;

}



#define MAX_KEYCODES 16

static uint8_t keycodes[MAX_KEYCODES];

static int nb_pending_keycodes;
@@ -1479,7 +1312,7 @@ static void do_sendkey(Monitor *mon, const QDict *qdict) 
{

    char keyname_buf[16];

    char *separator;

    int keyname_len, keycode, i;

    int keyname_len, keycode, i, idx;

    const char *keys = qdict_get_str(qdict, "keys");

    int has_hold_time = qdict_haskey(qdict, "hold-time");

    int hold_time = qdict_get_try_int(qdict, "hold-time", -1);
@@ -1512,7 +1345,14 @@ static void do_sendkey(Monitor *mon, const QDict *qdict) 
            }



            keyname_buf[keyname_len] = 0;

            keycode = get_keycode(keyname_buf);



            idx = index_from_key(keyname_buf);

            if (idx == Q_KEY_CODE_MAX) {

                monitor_printf(mon, "invalid parameter: %s\n", keyname_buf);

                return;

            }



            keycode = key_defs[idx];

            if (keycode < 0) {

                monitor_printf(mon, "unknown key: '%s'\n", keyname_buf);

                return;
@@ -4322,7 +4162,6 @@ static void monitor_find_completion(const char *cmdline) 
    int nb_args, i, len;

    const char *ptype, *str;

    const mon_cmd_t *cmd;

    const KeyDef *key;



    parse_cmdline(cmdline, &nb_args, args);

#ifdef DEBUG_COMPLETION
@@ -4396,8 +4235,8 @@ static void monitor_find_completion(const char *cmdline) 
                if (sep)

                    str = sep + 1;

                readline_set_completion_index(cur_mon->rs, strlen(str));

                for(key = key_defs; key->name != NULL; key++) {

                    cmd_completion(str, key->name);

                for (i = 0; i < Q_KEY_CODE_MAX; i++) {

                    cmd_completion(str, QKeyCode_lookup[i]);

                }

            } else if (!strcmp(cmd->name, "help|?")) {

                readline_set_completion_index(cur_mon->rs, strlen(str));