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

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



vnc: keyboard delay, colormap support
ui: misc bugfixes

# gpg: Signature made Fri 03 Jun 2016 08:02:32 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-ui-20160603-1:
  vnc: add configurable keyboard delay
  sdl2: skip init without outputs
  vnc: Add support for color map
  SDL2: add bgrx pixel format
  gtk: fix unchecked vc dereference
  ui: spice: Exit if gl=on EGL init fails
  ui: egl: Replace fprintf with error_report

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents defbaec1 c5ce8333

qemu-options.hx

+8 −0
Original line number Diff line number Diff line
@@ -1410,6 +1410,14 @@ everybody else. 'ignore' completely ignores the shared flag and 
allows everybody connect unconditionally.  Doesn't conform to the rfb

spec but is traditional QEMU behavior.



@item key-delay-ms



Set keyboard delay, for key down and key up events, in milliseconds.

Default is 1.  Keyboards are low-bandwidth devices, so this slowdown

can help the device and guest to keep up and not lose events in case

events are arriving in bulk.  Possible causes for the latter are flaky

network connections, or scripts for automated testing.



@end table

ETEXI

ui/egl-helpers.c

+14 −13
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <glob.h>

#include <dirent.h>



#include "qemu/error-report.h"

#include "ui/egl-helpers.h"



EGLDisplay *qemu_egl_display;
@@ -74,13 +75,13 @@ int egl_rendernode_init(void) 


    qemu_egl_rn_fd = qemu_egl_rendernode_open();

    if (qemu_egl_rn_fd == -1) {

        fprintf(stderr, "egl: no drm render node available\n");

        error_report("egl: no drm render node available");

        goto err;

    }



    qemu_egl_rn_gbm_dev = gbm_create_device(qemu_egl_rn_fd);

    if (!qemu_egl_rn_gbm_dev) {

        fprintf(stderr, "egl: gbm_create_device failed\n");

        error_report("egl: gbm_create_device failed");

        goto err;

    }
@@ -88,18 +89,18 @@ int egl_rendernode_init(void) 


    if (!epoxy_has_egl_extension(qemu_egl_display,

                                 "EGL_KHR_surfaceless_context")) {

        fprintf(stderr, "egl: EGL_KHR_surfaceless_context not supported\n");

        error_report("egl: EGL_KHR_surfaceless_context not supported");

        goto err;

    }

    if (!epoxy_has_egl_extension(qemu_egl_display,

                                 "EGL_MESA_image_dma_buf_export")) {

        fprintf(stderr, "egl: EGL_MESA_image_dma_buf_export not supported\n");

        error_report("egl: EGL_MESA_image_dma_buf_export not supported");

        goto err;

    }



    qemu_egl_rn_ctx = qemu_egl_init_ctx();

    if (!qemu_egl_rn_ctx) {

        fprintf(stderr, "egl: egl_init_ctx failed\n");

        error_report("egl: egl_init_ctx failed");

        goto err;

    }
@@ -156,13 +157,13 @@ EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win) 
                                      qemu_egl_config,

                                      (EGLNativeWindowType)win, NULL);

    if (esurface == EGL_NO_SURFACE) {

        fprintf(stderr, "egl: eglCreateWindowSurface failed\n");

        error_report("egl: eglCreateWindowSurface failed");

        return NULL;

    }



    b = eglMakeCurrent(qemu_egl_display, esurface, esurface, ectx);

    if (b == EGL_FALSE) {

        fprintf(stderr, "egl: eglMakeCurrent failed\n");

        error_report("egl: eglMakeCurrent failed");

        return NULL;

    }
@@ -204,21 +205,21 @@ int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool gles, bool debug) 
    egl_dbg("eglGetDisplay (dpy %p) ...\n", dpy);

    qemu_egl_display = eglGetDisplay(dpy);

    if (qemu_egl_display == EGL_NO_DISPLAY) {

        fprintf(stderr, "egl: eglGetDisplay failed\n");

        error_report("egl: eglGetDisplay failed");

        return -1;

    }



    egl_dbg("eglInitialize ...\n");

    b = eglInitialize(qemu_egl_display, &major, &minor);

    if (b == EGL_FALSE) {

        fprintf(stderr, "egl: eglInitialize failed\n");

        error_report("egl: eglInitialize failed");

        return -1;

    }



    egl_dbg("eglBindAPI ...\n");

    b = eglBindAPI(gles ? EGL_OPENGL_ES_API : EGL_OPENGL_API);

    if (b == EGL_FALSE) {

        fprintf(stderr, "egl: eglBindAPI failed\n");

        error_report("egl: eglBindAPI failed");

        return -1;

    }
@@ -227,7 +228,7 @@ int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool gles, bool debug) 
                        gles ? conf_att_gles : conf_att_gl,

                        &qemu_egl_config, 1, &n);

    if (b == EGL_FALSE || n != 1) {

        fprintf(stderr, "egl: eglChooseConfig failed\n");

        error_report("egl: eglChooseConfig failed");

        return -1;

    }
@@ -252,13 +253,13 @@ EGLContext qemu_egl_init_ctx(void) 
    ectx = eglCreateContext(qemu_egl_display, qemu_egl_config, EGL_NO_CONTEXT,

                            egl_gles ? ctx_att_gles : ctx_att_gl);

    if (ectx == EGL_NO_CONTEXT) {

        fprintf(stderr, "egl: eglCreateContext failed\n");

        error_report("egl: eglCreateContext failed");

        return NULL;

    }



    b = eglMakeCurrent(qemu_egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, ectx);

    if (b == EGL_FALSE) {

        fprintf(stderr, "egl: eglMakeCurrent failed\n");

        error_report("egl: eglMakeCurrent failed");

        return NULL;

    }

ui/gtk.c

+2 −1
Original line number Diff line number Diff line
@@ -1477,13 +1477,14 @@ static void gd_grab_pointer(VirtualConsole *vc, const char *reason) 
static void gd_ungrab_pointer(GtkDisplayState *s)

{

    VirtualConsole *vc = s->ptr_owner;

    GdkDisplay *display = gtk_widget_get_display(vc->gfx.drawing_area);

    GdkDisplay *display;



    if (vc == NULL) {

        return;

    }

    s->ptr_owner = NULL;



    display = gtk_widget_get_display(vc->gfx.drawing_area);

#if GTK_CHECK_VERSION(3, 20, 0)

    gd_grab_update(vc, vc->s->kbd_owner == vc, false);

    gdk_device_warp(gd_get_pointer(display),

ui/sdl2-2d.c

+3 −0
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, 
    case PIXMAN_r8g8b8x8:

        format = SDL_PIXELFORMAT_RGBA8888;

        break;

    case PIXMAN_b8g8r8x8:

        format = SDL_PIXELFORMAT_BGRX8888;

        break;

    default:

        g_assert_not_reached();

    }

ui/sdl2.c

+3 −0
Original line number Diff line number Diff line
@@ -794,6 +794,9 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) 
        }

    }

    sdl2_num_outputs = i;

    if (sdl2_num_outputs == 0) {

        return;

    }

    sdl2_console = g_new0(struct sdl2_console, sdl2_num_outputs);

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

        QemuConsole *con = qemu_console_lookup_by_index(i);