Commit 2c948221 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



ui and input patches.

# gpg: Signature made Fri 29 Sep 2017 11:21:45 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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-20170929-pull-request:
  ui: add tracing of VNC authentication process
  ui: add tracing of VNC operations related to QIOChannel
  virtio-input: send rel-wheel events for wheel buttons
  egl: misc framebuffer helper improvements.
  console: purge curses bits from console.h

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents be9d1997 7364dbda

hw/input/virtio-input-hid.c

+114 −5
Original line number Diff line number Diff line
@@ -190,6 +190,7 @@ static void virtio_input_key_config(VirtIOInput *vinput, 
static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src,

                                      InputEvent *evt)

{

    VirtIOInputHID *vhid = VIRTIO_INPUT_HID(dev);

    VirtIOInput *vinput = VIRTIO_INPUT(dev);

    virtio_input_event event;

    int qcode;
@@ -215,7 +216,14 @@ static void virtio_input_handle_event(DeviceState *dev, QemuConsole *src, 
        break;

    case INPUT_EVENT_KIND_BTN:

        btn = evt->u.btn.data;

        if (keymap_button[btn->button]) {

        if (vhid->wheel_axis && (btn->button == INPUT_BUTTON_WHEEL_UP ||

                                 btn->button == INPUT_BUTTON_WHEEL_DOWN)) {

            event.type  = cpu_to_le16(EV_REL);

            event.code  = cpu_to_le16(REL_WHEEL);

            event.value = cpu_to_le32(btn->button == INPUT_BUTTON_WHEEL_UP

                                      ? 1 : -1);

            virtio_input_send(vinput, &event);

        } else if (keymap_button[btn->button]) {

            event.type  = cpu_to_le16(EV_KEY);

            event.code  = cpu_to_le16(keymap_button[btn->button]);

            event.value = cpu_to_le32(btn->down ? 1 : 0);
@@ -407,7 +415,7 @@ static QemuInputHandler virtio_mouse_handler = { 
    .sync  = virtio_input_handle_sync,

};



static struct virtio_input_config virtio_mouse_config[] = {

static struct virtio_input_config virtio_mouse_config_v1[] = {

    {

        .select    = VIRTIO_INPUT_CFG_ID_NAME,

        .size      = sizeof(VIRTIO_ID_NAME_MOUSE),
@@ -432,13 +440,53 @@ static struct virtio_input_config virtio_mouse_config[] = { 
    { /* end of list */ },

};



static struct virtio_input_config virtio_mouse_config_v2[] = {

    {

        .select    = VIRTIO_INPUT_CFG_ID_NAME,

        .size      = sizeof(VIRTIO_ID_NAME_MOUSE),

        .u.string  = VIRTIO_ID_NAME_MOUSE,

    },{

        .select    = VIRTIO_INPUT_CFG_ID_DEVIDS,

        .size      = sizeof(struct virtio_input_devids),

        .u.ids     = {

            .bustype = const_le16(BUS_VIRTUAL),

            .vendor  = const_le16(0x0627), /* same we use for usb hid devices */

            .product = const_le16(0x0002),

            .version = const_le16(0x0002),

        },

    },{

        .select    = VIRTIO_INPUT_CFG_EV_BITS,

        .subsel    = EV_REL,

        .size      = 2,

        .u.bitmap  = {

            (1 << REL_X) | (1 << REL_Y),

            (1 << (REL_WHEEL - 8))

        },

    },

    { /* end of list */ },

};



static Property virtio_mouse_properties[] = {

    DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_mouse_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->props  = virtio_mouse_properties;

}



static void virtio_mouse_init(Object *obj)

{

    VirtIOInputHID *vhid = VIRTIO_INPUT_HID(obj);

    VirtIOInput *vinput = VIRTIO_INPUT(obj);



    vhid->handler = &virtio_mouse_handler;

    virtio_input_init_config(vinput, virtio_mouse_config);

    virtio_input_init_config(vinput, vhid->wheel_axis

                             ? virtio_mouse_config_v2

                             : virtio_mouse_config_v1);

    virtio_input_key_config(vinput, keymap_button,

                            ARRAY_SIZE(keymap_button));

}
@@ -448,6 +496,7 @@ static const TypeInfo virtio_mouse_info = { 
    .parent        = TYPE_VIRTIO_INPUT_HID,

    .instance_size = sizeof(VirtIOInputHID),

    .instance_init = virtio_mouse_init,

    .class_init    = virtio_mouse_class_init,

};



/* ----------------------------------------------------------------- */
@@ -459,7 +508,7 @@ static QemuInputHandler virtio_tablet_handler = { 
    .sync  = virtio_input_handle_sync,

};



static struct virtio_input_config virtio_tablet_config[] = {

static struct virtio_input_config virtio_tablet_config_v1[] = {

    {

        .select    = VIRTIO_INPUT_CFG_ID_NAME,

        .size      = sizeof(VIRTIO_ID_NAME_TABLET),
@@ -496,13 +545,72 @@ static struct virtio_input_config virtio_tablet_config[] = { 
    { /* end of list */ },

};



static struct virtio_input_config virtio_tablet_config_v2[] = {

    {

        .select    = VIRTIO_INPUT_CFG_ID_NAME,

        .size      = sizeof(VIRTIO_ID_NAME_TABLET),

        .u.string  = VIRTIO_ID_NAME_TABLET,

    },{

        .select    = VIRTIO_INPUT_CFG_ID_DEVIDS,

        .size      = sizeof(struct virtio_input_devids),

        .u.ids     = {

            .bustype = const_le16(BUS_VIRTUAL),

            .vendor  = const_le16(0x0627), /* same we use for usb hid devices */

            .product = const_le16(0x0003),

            .version = const_le16(0x0002),

        },

    },{

        .select    = VIRTIO_INPUT_CFG_EV_BITS,

        .subsel    = EV_ABS,

        .size      = 1,

        .u.bitmap  = {

            (1 << ABS_X) | (1 << ABS_Y),

        },

    },{

        .select    = VIRTIO_INPUT_CFG_EV_BITS,

        .subsel    = EV_REL,

        .size      = 2,

        .u.bitmap  = {

            0,

            (1 << (REL_WHEEL - 8))

        },

    },{

        .select    = VIRTIO_INPUT_CFG_ABS_INFO,

        .subsel    = ABS_X,

        .size      = sizeof(virtio_input_absinfo),

        .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),

    },{

        .select    = VIRTIO_INPUT_CFG_ABS_INFO,

        .subsel    = ABS_Y,

        .size      = sizeof(virtio_input_absinfo),

        .u.abs.min = const_le32(INPUT_EVENT_ABS_MIN),

        .u.abs.max = const_le32(INPUT_EVENT_ABS_MAX),

    },

    { /* end of list */ },

};



static Property virtio_tablet_properties[] = {

    DEFINE_PROP_BOOL("wheel-axis", VirtIOInputHID, wheel_axis, true),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_tablet_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);



    dc->props  = virtio_tablet_properties;

}



static void virtio_tablet_init(Object *obj)

{

    VirtIOInputHID *vhid = VIRTIO_INPUT_HID(obj);

    VirtIOInput *vinput = VIRTIO_INPUT(obj);



    vhid->handler = &virtio_tablet_handler;

    virtio_input_init_config(vinput, virtio_tablet_config);

    virtio_input_init_config(vinput, vhid->wheel_axis

                             ? virtio_tablet_config_v2

                             : virtio_tablet_config_v1);

    virtio_input_key_config(vinput, keymap_button,

                            ARRAY_SIZE(keymap_button));

}
@@ -512,6 +620,7 @@ static const TypeInfo virtio_tablet_info = { 
    .parent        = TYPE_VIRTIO_INPUT_HID,

    .instance_size = sizeof(VirtIOInputHID),

    .instance_init = virtio_tablet_init,

    .class_init    = virtio_tablet_class_init,

};



/* ----------------------------------------------------------------- */

include/hw/compat.h

+9 −1
Original line number Diff line number Diff line
@@ -2,7 +2,15 @@ 
#define HW_COMPAT_H



#define HW_COMPAT_2_10 \

    /* empty */

    {\

        .driver   = "virtio-mouse-device",\

        .property = "wheel-axis",\

        .value    = "false",\

    },{\

        .driver   = "virtio-tablet-device",\

        .property = "wheel-axis",\

        .value    = "false",\

    },



#define HW_COMPAT_2_9 \

    {\

include/hw/virtio/virtio-input.h

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct VirtIOInputHID { 
    QemuInputHandler                  *handler;

    QemuInputHandlerState             *hs;

    int                               ledstate;

    bool                              wheel_axis;

};



struct VirtIOInputHost {

include/ui/console.h

+2 −21
Original line number Diff line number Diff line
@@ -336,29 +336,10 @@ static inline pixman_format_code_t surface_format(DisplaySurface *s) 
    return s->format;

}



#ifdef CONFIG_CURSES

/* KEY_EVENT is defined in wincon.h and in curses.h. Avoid redefinition. */

#undef KEY_EVENT

#include <curses.h>

#undef KEY_EVENT

typedef chtype console_ch_t;

extern chtype vga_to_curses[];

#else

typedef unsigned long console_ch_t;

#endif

typedef uint32_t console_ch_t;



static inline void console_write_ch(console_ch_t *dest, uint32_t ch)

{

    uint8_t c = ch;

#ifdef CONFIG_CURSES

    if (vga_to_curses[c]) {

        ch &= ~(console_ch_t)0xff;

        ch |= vga_to_curses[c];

    }

#else

    if (c == '\0') {

        ch |= ' ';

    }

#endif

    *dest = ch;

}

include/ui/egl-helpers.h

+3 −2
Original line number Diff line number Diff line
@@ -18,8 +18,9 @@ typedef struct egl_fb { 


void egl_fb_destroy(egl_fb *fb);

void egl_fb_setup_default(egl_fb *fb, int width, int height);

void egl_fb_create_for_tex(egl_fb *fb, int width, int height, GLuint texture);

void egl_fb_create_new_tex(egl_fb *fb, int width, int height);

void egl_fb_setup_for_tex(egl_fb *fb, int width, int height,

                          GLuint texture, bool delete);

void egl_fb_setup_new_tex(egl_fb *fb, int width, int height);

void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip);

void egl_fb_read(void *dst, egl_fb *src);