Commit 0ce9cb91 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



ui: reverse keymap improvements.
sdl2: hotkey fix.
opengl: dmabuf fixes.

# gpg: Signature made Thu 22 Feb 2018 10:22:58 GMT
# 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-20180222-pull-request:
  keymap: consider modifier state when picking a mapping
  keymap: record multiple keysym -> keycode mappings
  keymap: numpad keysyms and keycodes are fixed
  keymap: use glib hash for kbd_layout_t
  keymap: make struct kbd_layout_t private to ui/keymaps.c
  egl-helpers: add alpha channel to texture format
  egl-headless: cursor_dmabuf: handle NULL cursor
  console/opengl: split up dpy_gl_cursor ops
  sdl2: fix hotkey keyup

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

include/ui/console.h

+8 −5
Original line number Diff line number Diff line
@@ -230,7 +230,9 @@ typedef struct DisplayChangeListenerOps { 
    void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl,

                                  QemuDmaBuf *dmabuf);

    void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl,

                                 QemuDmaBuf *dmabuf,

                                 QemuDmaBuf *dmabuf, bool have_hot,

                                 uint32_t hot_x, uint32_t hot_y);

    void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl,

                                   uint32_t pos_x, uint32_t pos_y);

    void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,

                                  QemuDmaBuf *dmabuf);
@@ -304,8 +306,9 @@ void dpy_gl_scanout_texture(QemuConsole *con, 
                            uint32_t x, uint32_t y, uint32_t w, uint32_t h);

void dpy_gl_scanout_dmabuf(QemuConsole *con,

                           QemuDmaBuf *dmabuf);

void dpy_gl_cursor_dmabuf(QemuConsole *con,

                          QemuDmaBuf *dmabuf,

void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,

                          bool have_hot, uint32_t hot_x, uint32_t hot_y);

void dpy_gl_cursor_position(QemuConsole *con,

                            uint32_t pos_x, uint32_t pos_y);

void dpy_gl_release_dmabuf(QemuConsole *con,

                           QemuDmaBuf *dmabuf);

ui/console.c

+14 −4
Original line number Diff line number Diff line
@@ -1760,14 +1760,24 @@ void dpy_gl_scanout_dmabuf(QemuConsole *con, 
    con->gl->ops->dpy_gl_scanout_dmabuf(con->gl, dmabuf);

}



void dpy_gl_cursor_dmabuf(QemuConsole *con,

                          QemuDmaBuf *dmabuf,

                          uint32_t pos_x, uint32_t pos_y)

void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,

                          bool have_hot, uint32_t hot_x, uint32_t hot_y)

{

    assert(con->gl);



    if (con->gl->ops->dpy_gl_cursor_dmabuf) {

        con->gl->ops->dpy_gl_cursor_dmabuf(con->gl, dmabuf, pos_x, pos_y);

        con->gl->ops->dpy_gl_cursor_dmabuf(con->gl, dmabuf,

                                           have_hot, hot_x, hot_y);

    }

}



void dpy_gl_cursor_position(QemuConsole *con,

                            uint32_t pos_x, uint32_t pos_y)

{

    assert(con->gl);



    if (con->gl->ops->dpy_gl_cursor_position) {

        con->gl->ops->dpy_gl_cursor_position(con->gl, pos_x, pos_y);

    }

}

ui/curses.c

+2 −1
Original line number Diff line number Diff line
@@ -271,7 +271,8 @@ static void curses_refresh(DisplayChangeListener *dcl) 
                    keysym = chr;

            }



            keycode = keysym2scancode(kbd_layout, keysym & KEYSYM_MASK);

            keycode = keysym2scancode(kbd_layout, keysym & KEYSYM_MASK,

                                      false, false, false);

            if (keycode == 0)

                continue;

ui/egl-headless.c

+20 −10
Original line number Diff line number Diff line
@@ -84,21 +84,30 @@ static void egl_scanout_dmabuf(DisplayChangeListener *dcl, 
}



static void egl_cursor_dmabuf(DisplayChangeListener *dcl,

                              QemuDmaBuf *dmabuf,

                              uint32_t pos_x, uint32_t pos_y)

                              QemuDmaBuf *dmabuf, bool have_hot,

                              uint32_t hot_x, uint32_t hot_y)

{

    egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);



    edpy->pos_x = pos_x;

    edpy->pos_y = pos_y;



    if (dmabuf) {

        egl_dmabuf_import_texture(dmabuf);

        if (!dmabuf->texture) {

            return;

        }



        egl_fb_setup_for_tex(&edpy->cursor_fb, dmabuf->width, dmabuf->height,

                             dmabuf->texture, false);

    } else {

        egl_fb_destroy(&edpy->cursor_fb);

    }

}



static void egl_cursor_position(DisplayChangeListener *dcl,

                                uint32_t pos_x, uint32_t pos_y)

{

    egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);



    edpy->pos_x = pos_x;

    edpy->pos_y = pos_y;

}



static void egl_release_dmabuf(DisplayChangeListener *dcl,
@@ -150,6 +159,7 @@ static const DisplayChangeListenerOps egl_ops = { 
    .dpy_gl_scanout_texture  = egl_scanout_texture,

    .dpy_gl_scanout_dmabuf   = egl_scanout_dmabuf,

    .dpy_gl_cursor_dmabuf    = egl_cursor_dmabuf,

    .dpy_gl_cursor_position  = egl_cursor_position,

    .dpy_gl_release_dmabuf   = egl_release_dmabuf,

    .dpy_gl_update           = egl_scanout_flush,

};

ui/egl-helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void egl_fb_setup_new_tex(egl_fb *fb, int width, int height) 


    glGenTextures(1, &texture);

    glBindTexture(GL_TEXTURE_2D, texture);

    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, width, height,

    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height,

                 0, GL_BGRA, GL_UNSIGNED_BYTE, 0);



    egl_fb_setup_for_tex(fb, width, height, texture, true);