Commit 58aa7d8e authored by Ren Kimura's avatar Ren Kimura Committed by Gerd Hoffmann
Browse files

ui/console: add escape sequence \e[5, 6n 



Add support of escape sequence "\e[5n" and "\e[6n" to console.
"\e[5n" reports status of console and it always succeed
in virtual console.
"\e[6n" reports now cursor position in console.

Signed-off-by: default avatarRen Kimura <rkx1209dev@gmail.com>
Message-id: 1457466681-7714-2-git-send-email-rkx1209dev@gmail.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent a6ccabd6

ui/console.c

+41 −15
Original line number Diff line number Diff line
@@ -757,6 +757,31 @@ static void console_clear_xy(QemuConsole *s, int x, int y) 
    update_xy(s, x, y);

}



static void console_put_one(QemuConsole *s, int ch)

{

    TextCell *c;

    int y1;

    if (s->x >= s->width) {

        /* line wrap */

        s->x = 0;

        console_put_lf(s);

    }

    y1 = (s->y_base + s->y) % s->total_height;

    c = &s->cells[y1 * s->width + s->x];

    c->ch = ch;

    c->t_attrib = s->t_attrib;

    update_xy(s, s->x, s->y);

    s->x++;

}



static void console_respond_str(QemuConsole *s, const char *buf)

{

    while (*buf) {

        console_put_one(s, *buf);

        buf++;

    }

}



/* set cursor, checking bounds */

static void set_cursor(QemuConsole *s, int x, int y)

{
@@ -779,9 +804,9 @@ static void set_cursor(QemuConsole *s, int x, int y) 


static void console_putchar(QemuConsole *s, int ch)

{

    TextCell *c;

    int y1, i;

    int i;

    int x, y;

    char response[40];



    switch(s->state) {

    case TTY_STATE_NORM:
@@ -817,17 +842,7 @@ static void console_putchar(QemuConsole *s, int ch) 
            s->state = TTY_STATE_ESC;

            break;

        default:

            if (s->x >= s->width) {

                /* line wrap */

                s->x = 0;

                console_put_lf(s);

            }

            y1 = (s->y_base + s->y) % s->total_height;

            c = &s->cells[y1 * s->width + s->x];

            c->ch = ch;

            c->t_attrib = s->t_attrib;

            update_xy(s, s->x, s->y);

            s->x++;

            console_put_one(s, ch);

            break;

        }

        break;
@@ -956,8 +971,19 @@ static void console_putchar(QemuConsole *s, int ch) 
                console_handle_escape(s);

                break;

            case 'n':

                switch (s->esc_params[0]) {

                case 5:

                    /* report console status (always succeed)*/

                    console_respond_str(s, "\033[0n");

                    break;

                case 6:

                    /* report cursor position */

                /* TODO: send ESC[row;colR */

                    sprintf(response, "\033[%d;%dR",

                           (s->y_base + s->y) % s->total_height + 1,

                            s->x + 1);

                    console_respond_str(s, response);

                    break;

                }

                break;

            case 's':

                /* save cursor position */