Commit 6bb9ead7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into staging 



sdl2/opengl: add opengl context and scanout support
ui/curses: Fix color attribute of monitor for curses

# gpg: Signature made Fri 08 Jan 2016 12:42:02 GMT 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-ui-20160108-1:
  sdl2/opengl: add opengl context and scanout support
  ui/curses: Fix color attribute of monitor for curses

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9df25137 cb47dc9a

hw/display/jazz_led.c

+4 −2
Original line number Diff line number Diff line
@@ -233,8 +233,10 @@ static void jazz_led_text_update(void *opaque, console_ch_t *chardata) 


    /* TODO: draw the segments */

    snprintf(buf, 2, "%02hhx\n", s->segments);

    console_write_ch(chardata++, 0x00200100 | buf[0]);

    console_write_ch(chardata++, 0x00200100 | buf[1]);

    console_write_ch(chardata++, ATTR2CHTYPE(buf[0], QEMU_COLOR_BLUE,

                                             QEMU_COLOR_BLACK, 1));

    console_write_ch(chardata++, ATTR2CHTYPE(buf[1], QEMU_COLOR_BLUE,

                                             QEMU_COLOR_BLACK, 1));



    dpy_text_update(s->con, 0, 0, 2, 1);

}

hw/display/vga.c

+2 −1
Original line number Diff line number Diff line
@@ -1979,7 +1979,8 @@ static void vga_update_text(void *opaque, console_ch_t *chardata) 
    width = (s->last_width - size) / 2;

    dst = chardata + s->last_width + width;

    for (i = 0; i < size; i ++)

        console_write_ch(dst ++, 0x00200100 | msg_buffer[i]);

        console_write_ch(dst ++, ATTR2CHTYPE(msg_buffer[i], QEMU_COLOR_BLUE,

                                             QEMU_COLOR_BLACK, 1));



    dpy_text_update(s->con, 0, 0, s->last_width, height);

}

include/ui/console.h

+15 −0
Original line number Diff line number Diff line
@@ -30,6 +30,21 @@ 
#define GUI_REFRESH_INTERVAL_DEFAULT    30

#define GUI_REFRESH_INTERVAL_IDLE     3000



/* Color number is match to standard vga palette */

enum qemu_color_names {

    QEMU_COLOR_BLACK   = 0,

    QEMU_COLOR_BLUE    = 1,

    QEMU_COLOR_GREEN   = 2,

    QEMU_COLOR_CYAN    = 3,

    QEMU_COLOR_RED     = 4,

    QEMU_COLOR_MAGENTA = 5,

    QEMU_COLOR_YELLOW  = 6,

    QEMU_COLOR_WHITE   = 7

};

/* Convert to curses char attributes */

#define ATTR2CHTYPE(c, fg, bg, bold) \

    ((bold) << 21 | (bg) << 11 | (fg) << 8 | (c))



typedef void QEMUPutKBDEvent(void *opaque, int keycode);

typedef void QEMUPutLEDEvent(void *opaque, int ledstate);

typedef void QEMUPutMouseEvent(void *opaque, int dx, int dy, int dz, int buttons_state);

include/ui/sdl2.h

+21 −1
Original line number Diff line number Diff line
@@ -15,12 +15,18 @@ struct sdl2_console { 
    SDL_Renderer *real_renderer;

    int idx;

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

    int x, y;

    int x, y, w, h;

    int hidden;

    int opengl;

    int updates;

    SDL_GLContext winctx;

#ifdef CONFIG_OPENGL

    ConsoleGLState *gls;

    GLuint tex_id;

    GLuint fbo_id;

    bool y0_top;

    bool scanout_mode;

#endif

};



void sdl2_window_create(struct sdl2_console *scon);
@@ -48,4 +54,18 @@ void sdl2_gl_switch(DisplayChangeListener *dcl, 
void sdl2_gl_refresh(DisplayChangeListener *dcl);

void sdl2_gl_redraw(struct sdl2_console *scon);



QEMUGLContext sdl2_gl_create_context(DisplayChangeListener *dcl,

                                     QEMUGLParams *params);

void sdl2_gl_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx);

int sdl2_gl_make_context_current(DisplayChangeListener *dcl,

                                 QEMUGLContext ctx);

QEMUGLContext sdl2_gl_get_current_context(DisplayChangeListener *dcl);



void sdl2_gl_scanout(DisplayChangeListener *dcl,

                     uint32_t backing_id, bool backing_y_0_top,

                     uint32_t x, uint32_t y,

                     uint32_t w, uint32_t h);

void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,

                           uint32_t x, uint32_t y, uint32_t w, uint32_t h);



#endif /* SDL2_H */

ui/console.c

+45 −56
Original line number Diff line number Diff line
@@ -376,42 +376,29 @@ static void vga_bitblt(QemuConsole *con, 


#include "vgafont.h"



#ifndef CONFIG_CURSES

enum color_names {

    COLOR_BLACK   = 0,

    COLOR_RED     = 1,

    COLOR_GREEN   = 2,

    COLOR_YELLOW  = 3,

    COLOR_BLUE    = 4,

    COLOR_MAGENTA = 5,

    COLOR_CYAN    = 6,

    COLOR_WHITE   = 7

};

#endif



#define QEMU_RGB(r, g, b)                                               \

    { .red = r << 8, .green = g << 8, .blue = b << 8, .alpha = 0xffff }



static const pixman_color_t color_table_rgb[2][8] = {

    {   /* dark */

        QEMU_RGB(0x00, 0x00, 0x00),  /* black */

        QEMU_RGB(0xaa, 0x00, 0x00),  /* red */

        QEMU_RGB(0x00, 0xaa, 0x00),  /* green */

        QEMU_RGB(0xaa, 0xaa, 0x00),  /* yellow */

        QEMU_RGB(0x00, 0x00, 0xaa),  /* blue */

        QEMU_RGB(0xaa, 0x00, 0xaa),  /* magenta */

        QEMU_RGB(0x00, 0xaa, 0xaa),  /* cyan */

        QEMU_RGB(0xaa, 0xaa, 0xaa),  /* white */

        [QEMU_COLOR_BLACK]   = QEMU_RGB(0x00, 0x00, 0x00),  /* black */

        [QEMU_COLOR_BLUE]    = QEMU_RGB(0x00, 0x00, 0xaa),  /* blue */

        [QEMU_COLOR_GREEN]   = QEMU_RGB(0x00, 0xaa, 0x00),  /* green */

        [QEMU_COLOR_CYAN]    = QEMU_RGB(0x00, 0xaa, 0xaa),  /* cyan */

        [QEMU_COLOR_RED]     = QEMU_RGB(0xaa, 0x00, 0x00),  /* red */

        [QEMU_COLOR_MAGENTA] = QEMU_RGB(0xaa, 0x00, 0xaa),  /* magenta */

        [QEMU_COLOR_YELLOW]  = QEMU_RGB(0xaa, 0xaa, 0x00),  /* yellow */

        [QEMU_COLOR_WHITE]   = QEMU_RGB(0xaa, 0xaa, 0xaa),  /* white */

    },

    {   /* bright */

        QEMU_RGB(0x00, 0x00, 0x00),  /* black */

        QEMU_RGB(0xff, 0x00, 0x00),  /* red */

        QEMU_RGB(0x00, 0xff, 0x00),  /* green */

        QEMU_RGB(0xff, 0xff, 0x00),  /* yellow */

        QEMU_RGB(0x00, 0x00, 0xff),  /* blue */

        QEMU_RGB(0xff, 0x00, 0xff),  /* magenta */

        QEMU_RGB(0x00, 0xff, 0xff),  /* cyan */

        QEMU_RGB(0xff, 0xff, 0xff),  /* white */

        [QEMU_COLOR_BLACK]   = QEMU_RGB(0x00, 0x00, 0x00),  /* black */

        [QEMU_COLOR_BLUE]    = QEMU_RGB(0x00, 0x00, 0xff),  /* blue */

        [QEMU_COLOR_GREEN]   = QEMU_RGB(0x00, 0xff, 0x00),  /* green */

        [QEMU_COLOR_CYAN]    = QEMU_RGB(0x00, 0xff, 0xff),  /* cyan */

        [QEMU_COLOR_RED]     = QEMU_RGB(0xff, 0x00, 0x00),  /* red */

        [QEMU_COLOR_MAGENTA] = QEMU_RGB(0xff, 0x00, 0xff),  /* magenta */

        [QEMU_COLOR_YELLOW]  = QEMU_RGB(0xff, 0xff, 0x00),  /* yellow */

        [QEMU_COLOR_WHITE]   = QEMU_RGB(0xff, 0xff, 0xff),  /* white */

    }

};
@@ -560,7 +547,7 @@ static void console_refresh(QemuConsole *s) 
    }



    vga_fill_rect(s, 0, 0, surface_width(surface), surface_height(surface),

                  color_table_rgb[0][COLOR_BLACK]);

                  color_table_rgb[0][QEMU_COLOR_BLACK]);

    y1 = s->y_displayed;

    for (y = 0; y < s->height; y++) {

        c = s->cells + y1 * s->width;
@@ -698,53 +685,53 @@ static void console_handle_escape(QemuConsole *s) 
                break;

            /* set foreground color */

            case 30:

                s->t_attrib.fgcol=COLOR_BLACK;

                s->t_attrib.fgcol = QEMU_COLOR_BLACK;

                break;

            case 31:

                s->t_attrib.fgcol=COLOR_RED;

                s->t_attrib.fgcol = QEMU_COLOR_RED;

                break;

            case 32:

                s->t_attrib.fgcol=COLOR_GREEN;

                s->t_attrib.fgcol = QEMU_COLOR_GREEN;

                break;

            case 33:

                s->t_attrib.fgcol=COLOR_YELLOW;

                s->t_attrib.fgcol = QEMU_COLOR_YELLOW;

                break;

            case 34:

                s->t_attrib.fgcol=COLOR_BLUE;

                s->t_attrib.fgcol = QEMU_COLOR_BLUE;

                break;

            case 35:

                s->t_attrib.fgcol=COLOR_MAGENTA;

                s->t_attrib.fgcol = QEMU_COLOR_MAGENTA;

                break;

            case 36:

                s->t_attrib.fgcol=COLOR_CYAN;

                s->t_attrib.fgcol = QEMU_COLOR_CYAN;

                break;

            case 37:

                s->t_attrib.fgcol=COLOR_WHITE;

                s->t_attrib.fgcol = QEMU_COLOR_WHITE;

                break;

            /* set background color */

            case 40:

                s->t_attrib.bgcol=COLOR_BLACK;

                s->t_attrib.bgcol = QEMU_COLOR_BLACK;

                break;

            case 41:

                s->t_attrib.bgcol=COLOR_RED;

                s->t_attrib.bgcol = QEMU_COLOR_RED;

                break;

            case 42:

                s->t_attrib.bgcol=COLOR_GREEN;

                s->t_attrib.bgcol = QEMU_COLOR_GREEN;

                break;

            case 43:

                s->t_attrib.bgcol=COLOR_YELLOW;

                s->t_attrib.bgcol = QEMU_COLOR_YELLOW;

                break;

            case 44:

                s->t_attrib.bgcol=COLOR_BLUE;

                s->t_attrib.bgcol = QEMU_COLOR_BLUE;

                break;

            case 45:

                s->t_attrib.bgcol=COLOR_MAGENTA;

                s->t_attrib.bgcol = QEMU_COLOR_MAGENTA;

                break;

            case 46:

                s->t_attrib.bgcol=COLOR_CYAN;

                s->t_attrib.bgcol = QEMU_COLOR_CYAN;

                break;

            case 47:

                s->t_attrib.bgcol=COLOR_WHITE;

                s->t_attrib.bgcol = QEMU_COLOR_WHITE;

                break;

        }

    }
@@ -1165,11 +1152,13 @@ static void text_console_update(void *opaque, console_ch_t *chardata) 
        src = (s->y_base + s->text_y[0]) * s->width;

        chardata += s->text_y[0] * s->width;

        for (i = s->text_y[0]; i <= s->text_y[1]; i ++)

            for (j = 0; j < s->width; j ++, src ++)

                console_write_ch(chardata ++, s->cells[src].ch |

                                (s->cells[src].t_attrib.fgcol << 12) |

                                (s->cells[src].t_attrib.bgcol << 8) |

                                (s->cells[src].t_attrib.bold << 21));

            for (j = 0; j < s->width; j++, src++) {

                console_write_ch(chardata ++,

                                 ATTR2CHTYPE(s->cells[src].ch,

                                             s->cells[src].t_attrib.fgcol,

                                             s->cells[src].t_attrib.bgcol,

                                             s->cells[src].t_attrib.bold));

            }

        dpy_text_update(s, s->text_x[0], s->text_y[0],

                        s->text_x[1] - s->text_x[0], i - s->text_y[0]);

        s->text_x[0] = s->width;
@@ -1306,8 +1295,8 @@ static DisplaySurface *qemu_create_message_surface(int w, int h, 
                                                   const char *msg)

{

    DisplaySurface *surface = qemu_create_displaysurface(w, h);

    pixman_color_t bg = color_table_rgb[0][COLOR_BLACK];

    pixman_color_t fg = color_table_rgb[0][COLOR_WHITE];

    pixman_color_t bg = color_table_rgb[0][QEMU_COLOR_BLACK];

    pixman_color_t fg = color_table_rgb[0][QEMU_COLOR_WHITE];

    pixman_image_t *glyph;

    int len, x, y, i;
@@ -1941,8 +1930,8 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds) 
    s->t_attrib_default.blink = 0;

    s->t_attrib_default.invers = 0;

    s->t_attrib_default.unvisible = 0;

    s->t_attrib_default.fgcol = COLOR_WHITE;

    s->t_attrib_default.bgcol = COLOR_BLACK;

    s->t_attrib_default.fgcol = QEMU_COLOR_WHITE;

    s->t_attrib_default.bgcol = QEMU_COLOR_BLACK;

    /* set current text attributes to default */

    s->t_attrib = s->t_attrib_default;

    text_console_resize(s);
@@ -1951,7 +1940,7 @@ static void text_console_do_init(CharDriverState *chr, DisplayState *ds) 
        char msg[128];

        int len;



        s->t_attrib.bgcol = COLOR_BLUE;

        s->t_attrib.bgcol = QEMU_COLOR_BLUE;

        len = snprintf(msg, sizeof(msg), "%s console\r\n", chr->label);

        console_puts(chr, (uint8_t*)msg, len);

        s->t_attrib = s->t_attrib_default;