Commit a73549f9 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20181012-pull-request' into staging 



ui: gtk fixes, support more formats in sdl2.

# gpg: Signature made Fri 12 Oct 2018 14:21:24 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20181012-pull-request:
  gtk: fix uninitialized variable
  sdl2: Support all virtio-gpu formats
  gtk: Don't vte_terminal_set_encoding() on new VTE versions

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 69ac8c4c 1d454c3f

ui/gtk.c

+5 −3
Original line number Diff line number Diff line
@@ -1951,12 +1951,14 @@ static GSList *gd_vc_vte_init(GtkDisplayState *s, VirtualConsole *vc, 
    g_signal_connect(vc->vte.terminal, "commit", G_CALLBACK(gd_vc_in), vc);



    /* The documentation says that the default is UTF-8, but actually it is

     * 7-bit ASCII at least in VTE 0.38.

     */

     * 7-bit ASCII at least in VTE 0.38. The function is deprecated since

     * VTE 0.54 (only UTF-8 is supported now). */

#if !VTE_CHECK_VERSION(0, 54, 0)

#if VTE_CHECK_VERSION(0, 38, 0)

    vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8", NULL);

#else

    vte_terminal_set_encoding(VTE_TERMINAL(vc->vte.terminal), "UTF-8");

#endif

#endif



    vte_terminal_set_scrollback_lines(VTE_TERMINAL(vc->vte.terminal), -1);
@@ -2136,7 +2138,7 @@ static GSList *gd_vc_gfx_init(GtkDisplayState *s, VirtualConsole *vc, 
                              QemuConsole *con, int idx,

                              GSList *group, GtkWidget *view_menu)

{

    bool zoom_to_fit;

    bool zoom_to_fit = false;



    vc->label = qemu_console_get_label(con);

    vc->s = s;

ui/sdl2-2d.c

+15 −0
Original line number Diff line number Diff line
@@ -101,15 +101,24 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, 
    case PIXMAN_r5g6b5:

        format = SDL_PIXELFORMAT_RGB565;

        break;

    case PIXMAN_a8r8g8b8:

    case PIXMAN_x8r8g8b8:

        format = SDL_PIXELFORMAT_ARGB8888;

        break;

    case PIXMAN_a8b8g8r8:

    case PIXMAN_x8b8g8r8:

        format = SDL_PIXELFORMAT_ABGR8888;

        break;

    case PIXMAN_r8g8b8a8:

    case PIXMAN_r8g8b8x8:

        format = SDL_PIXELFORMAT_RGBA8888;

        break;

    case PIXMAN_b8g8r8x8:

        format = SDL_PIXELFORMAT_BGRX8888;

        break;

    case PIXMAN_b8g8r8a8:

        format = SDL_PIXELFORMAT_BGRA8888;

        break;

    default:

        g_assert_not_reached();

    }
@@ -149,7 +158,13 @@ bool sdl2_2d_check_format(DisplayChangeListener *dcl, 
     * the native ones. Thes are the ones I have tested.

     */

    return (format == PIXMAN_x8r8g8b8 ||

            format == PIXMAN_a8r8g8b8 ||

            format == PIXMAN_a8b8g8r8 ||

            format == PIXMAN_x8b8g8r8 ||

            format == PIXMAN_b8g8r8x8 ||

            format == PIXMAN_b8g8r8a8 ||

            format == PIXMAN_r8g8b8x8 ||

            format == PIXMAN_r8g8b8a8 ||

            format == PIXMAN_x1r5g5b5 ||

            format == PIXMAN_r5g6b5);

}