Commit 1673e89e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-3' into staging 



sdl2: add support for text consoles

# gpg: Signature made Mon 02 Jun 2014 15:35:20 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-sdl-3:
  sdl2: textinput + terminal
  sdl2: make Ctrl-Alt-<nr> hotkeys show and hide windows
  console: add kbd_put_string_console
  console: add kbd_put_qcode_console

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 36f5db59 f2335791

include/ui/console.h

+2 −0
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ void do_mouse_set(Monitor *mon, const QDict *qdict); 
#define QEMU_KEY_CTRL_PAGEDOWN   0xe407



void kbd_put_keysym_console(QemuConsole *s, int keysym);

bool kbd_put_qcode_console(QemuConsole *s, int qcode);

void kbd_put_string_console(QemuConsole *s, const char *str, int len);

void kbd_put_keysym(int keysym);



/* consoles */

ui/console.c

+33 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,39 @@ void kbd_put_keysym_console(QemuConsole *s, int keysym) 
    }

}



static const int qcode_to_keysym[Q_KEY_CODE_MAX] = {

    [Q_KEY_CODE_UP]     = QEMU_KEY_UP,

    [Q_KEY_CODE_DOWN]   = QEMU_KEY_DOWN,

    [Q_KEY_CODE_RIGHT]  = QEMU_KEY_RIGHT,

    [Q_KEY_CODE_LEFT]   = QEMU_KEY_LEFT,

    [Q_KEY_CODE_HOME]   = QEMU_KEY_HOME,

    [Q_KEY_CODE_END]    = QEMU_KEY_END,

    [Q_KEY_CODE_PGUP]   = QEMU_KEY_PAGEUP,

    [Q_KEY_CODE_PGDN]   = QEMU_KEY_PAGEDOWN,

    [Q_KEY_CODE_DELETE] = QEMU_KEY_DELETE,

};



bool kbd_put_qcode_console(QemuConsole *s, int qcode)

{

    int keysym;



    keysym = qcode_to_keysym[qcode];

    if (keysym == 0) {

        return false;

    }

    kbd_put_keysym_console(s, keysym);

    return true;

}



void kbd_put_string_console(QemuConsole *s, const char *str, int len)

{

    int i;



    for (i = 0; i < len && str[i]; i++) {

        kbd_put_keysym_console(s, str[i]);

    }

}



void kbd_put_keysym(int keysym)

{

    kbd_put_keysym_console(active_console, keysym);

ui/sdl2.c

+66 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ static struct sdl2_state { 
    int idx;

    int last_vm_running; /* per console for caption reasons */

    int x, y;

    int hidden;

} *sdl2_console;



static SDL_Surface *guest_sprite_surface;
@@ -136,6 +137,9 @@ static void do_sdl_resize(struct sdl2_state *scon, int width, int height, 
        } else {

            flags |= SDL_WINDOW_RESIZABLE;

        }

        if (scon->hidden) {

            flags |= SDL_WINDOW_HIDDEN;

        }



        scon->real_window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED,

                                             SDL_WINDOWPOS_UNDEFINED,
@@ -210,6 +214,23 @@ static void sdl_process_key(struct sdl2_state *scon, 
    int qcode = sdl2_scancode_to_qcode[ev->keysym.scancode];

    QemuConsole *con = scon ? scon->dcl.con : NULL;



    if (!qemu_console_is_graphic(con)) {

        if (ev->type == SDL_KEYDOWN) {

            switch (ev->keysym.scancode) {

            case SDL_SCANCODE_RETURN:

                kbd_put_keysym_console(con, '\n');

                break;

            case SDL_SCANCODE_BACKSPACE:

                kbd_put_keysym_console(con, QEMU_KEY_BACKSPACE);

                break;

            default:

                kbd_put_qcode_console(con, qcode);

                break;

            }

        }

        return;

    }



    switch (ev->keysym.scancode) {

#if 0

    case SDL_SCANCODE_NUMLOCKCLEAR:
@@ -305,6 +326,11 @@ static void sdl_show_cursor(void) 


static void sdl_grab_start(struct sdl2_state *scon)

{

    QemuConsole *con = scon ? scon->dcl.con : NULL;



    if (!con || !qemu_console_is_graphic(con)) {

        return;

    }

    /*

     * If the application is not active, do not try to enter grab state. This

     * prevents 'SDL_WM_GrabInput(SDL_GRAB_ON)' from blocking all the
@@ -458,7 +484,7 @@ static void toggle_full_screen(struct sdl2_state *scon) 


static void handle_keydown(SDL_Event *ev)

{

    int mod_state;

    int mod_state, win;

    struct sdl2_state *scon = get_scon_from_window(ev->key.windowID);



    if (alt_grab) {
@@ -473,6 +499,27 @@ static void handle_keydown(SDL_Event *ev) 


    if (gui_key_modifier_pressed) {

        switch (ev->key.keysym.scancode) {

        case SDL_SCANCODE_2:

        case SDL_SCANCODE_3:

        case SDL_SCANCODE_4:

        case SDL_SCANCODE_5:

        case SDL_SCANCODE_6:

        case SDL_SCANCODE_7:

        case SDL_SCANCODE_8:

        case SDL_SCANCODE_9:

            win = ev->key.keysym.scancode - SDL_SCANCODE_1;

            if (win < sdl2_num_outputs) {

                sdl2_console[win].hidden = !sdl2_console[win].hidden;

                if (sdl2_console[win].real_window) {

                    if (sdl2_console[win].hidden) {

                        SDL_HideWindow(sdl2_console[win].real_window);

                    } else {

                        SDL_ShowWindow(sdl2_console[win].real_window);

                    }

                }

                gui_keysym = 1;

            }

            break;

        case SDL_SCANCODE_F:

            toggle_full_screen(scon);

            gui_keysym = 1;
@@ -544,6 +591,17 @@ static void handle_keyup(SDL_Event *ev) 
    }

}



static void handle_textinput(SDL_Event *ev)

{

    struct sdl2_state *scon = get_scon_from_window(ev->key.windowID);

    QemuConsole *con = scon ? scon->dcl.con : NULL;



    if (qemu_console_is_graphic(con)) {

        return;

    }

    kbd_put_string_console(con, ev->text.text, strlen(ev->text.text));

}



static void handle_mousemotion(SDL_Event *ev)

{

    int max_x, max_y;
@@ -680,6 +738,9 @@ static void sdl_refresh(DisplayChangeListener *dcl) 
        case SDL_KEYUP:

            handle_keyup(ev);

            break;

        case SDL_TEXTINPUT:

            handle_textinput(ev);

            break;

        case SDL_QUIT:

            if (!no_quit) {

                no_shutdown = 0;
@@ -808,7 +869,7 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 


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

        QemuConsole *con = qemu_console_lookup_by_index(i);

        if (!con || !qemu_console_is_graphic(con)) {

        if (!con) {

            break;

        }

    }
@@ -816,6 +877,9 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 
    sdl2_console = g_new0(struct sdl2_state, sdl2_num_outputs);

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

        QemuConsole *con = qemu_console_lookup_by_index(i);

        if (!qemu_console_is_graphic(con)) {

            sdl2_console[i].hidden = true;

        }

        sdl2_console[i].dcl.ops = &dcl_ops;

        sdl2_console[i].dcl.con = con;

        register_displaychangelistener(&sdl2_console[i].dcl);