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

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170131-2' into staging 



ui: bugfixes and small improvements all over the place.

# gpg: Signature made Tue 31 Jan 2017 15:48:20 GMT
# 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/pull-ui-20170131-2:
  console: fix console resize
  gtk: Hardcode LC_CTYPE as C.utf-8
  vnc: fix overflow in vnc_update_stats
  spice: wakeup QXL worker to pick up mouse changes
  ui/gtk.c: add ctrl-alt-= support for zoom in acceleration
  ui: fix format specfier in vnc to avoid break in build.
  ui/gtk: Fix mouse wheel on 3.4.0 or later
  vnc: track LED state separately
  ui: add support for mice with extra/side buttons
  ps2: add support for mice with extra/side buttons
  qapi: add support for mice with extra/side buttons

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents a0def594 3ef0c573

hw/input/ps2.c

+5 −3
Original line number Diff line number Diff line
@@ -881,9 +881,11 @@ static void ps2_mouse_event(DeviceState *dev, QemuConsole *src, 
                            InputEvent *evt)

{

    static const int bmap[INPUT_BUTTON__MAX] = {

        [INPUT_BUTTON_LEFT]   = MOUSE_EVENT_LBUTTON,

        [INPUT_BUTTON_MIDDLE] = MOUSE_EVENT_MBUTTON,

        [INPUT_BUTTON_RIGHT]  = MOUSE_EVENT_RBUTTON,

        [INPUT_BUTTON_LEFT]   = PS2_MOUSE_BUTTON_LEFT,

        [INPUT_BUTTON_MIDDLE] = PS2_MOUSE_BUTTON_MIDDLE,

        [INPUT_BUTTON_RIGHT]  = PS2_MOUSE_BUTTON_RIGHT,

        [INPUT_BUTTON_SIDE]   = PS2_MOUSE_BUTTON_SIDE,

        [INPUT_BUTTON_EXTRA]  = PS2_MOUSE_BUTTON_EXTRA,

    };

    PS2MouseState *s = (PS2MouseState *)dev;

    InputMoveEvent *move;

include/hw/input/ps2.h

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,12 @@ 
#ifndef HW_PS2_H

#define HW_PS2_H



#define PS2_MOUSE_BUTTON_LEFT   0x01

#define PS2_MOUSE_BUTTON_MIDDLE 0x02

#define PS2_MOUSE_BUTTON_RIGHT  0x04

#define PS2_MOUSE_BUTTON_SIDE   0x08

#define PS2_MOUSE_BUTTON_EXTRA  0x10



/* ps2.c */

void *ps2_kbd_init(void (*update_irq)(void *, int), void *update_arg);

void *ps2_mouse_init(void (*update_irq)(void *, int), void *update_arg);

qapi-schema.json

+6 −1
Original line number Diff line number Diff line
@@ -5390,10 +5390,15 @@ 
#

# Button of a pointer input device (mouse, tablet).

#

# @side: front side button of a 5-button mouse (since 2.9)

#

# @extra: rear side button of a 5-button mouse (since 2.9)

#

# Since: 2.0

##

{ 'enum'  : 'InputButton',

  'data'  : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down' ] }

  'data'  : [ 'left', 'middle', 'right', 'wheel-up', 'wheel-down', 'side',

  'extra' ] }



##

# @InputAxis:

ui/console.c

+1 −1
Original line number Diff line number Diff line
@@ -2116,7 +2116,7 @@ void qemu_console_resize(QemuConsole *s, int width, int height) 


    assert(s->console_type == GRAPHIC_CONSOLE);



    if (s->surface &&

    if (s->surface && (s->surface->flags & QEMU_ALLOCATED_FLAG) &&

        pixman_image_get_width(s->surface->image) == width &&

        pixman_image_get_height(s->surface->image) == height) {

        return;

ui/gtk.c

+31 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
#define GDK_KEY_g GDK_g

#define GDK_KEY_q GDK_q

#define GDK_KEY_plus GDK_plus

#define GDK_KEY_equal GDK_equal

#define GDK_KEY_minus GDK_minus

#define GDK_KEY_Pause GDK_Pause

#define GDK_KEY_Delete GDK_Delete
@@ -1007,6 +1008,10 @@ static gboolean gd_button_event(GtkWidget *widget, GdkEventButton *button, 
        btn = INPUT_BUTTON_MIDDLE;

    } else if (button->button == 3) {

        btn = INPUT_BUTTON_RIGHT;

    } else if (button->button == 8) {

        btn = INPUT_BUTTON_SIDE;

    } else if (button->button == 9) {

        btn = INPUT_BUTTON_EXTRA;

    } else {

        return TRUE;

    }
@@ -1027,6 +1032,19 @@ static gboolean gd_scroll_event(GtkWidget *widget, GdkEventScroll *scroll, 
        btn = INPUT_BUTTON_WHEEL_UP;

    } else if (scroll->direction == GDK_SCROLL_DOWN) {

        btn = INPUT_BUTTON_WHEEL_DOWN;

#if GTK_CHECK_VERSION(3, 4, 0)

    } else if (scroll->direction == GDK_SCROLL_SMOOTH) {

        gdouble delta_x, delta_y;

        if (!gdk_event_get_scroll_deltas((GdkEvent *)scroll,

                                         &delta_x, &delta_y)) {

            return TRUE;

        }

        if (delta_y > 0) {

            btn = INPUT_BUTTON_WHEEL_DOWN;

        } else {

            btn = INPUT_BUTTON_WHEEL_UP;

        }

#endif

    } else {

        return TRUE;

    }
@@ -1325,6 +1343,12 @@ static void gd_menu_zoom_in(GtkMenuItem *item, void *opaque) 
    gd_update_windowsize(vc);

}



static void gd_accel_zoom_in(void *opaque)

{

    GtkDisplayState *s = opaque;

    gtk_menu_item_activate(GTK_MENU_ITEM(s->zoom_in_item));

}



static void gd_menu_zoom_out(GtkMenuItem *item, void *opaque)

{

    GtkDisplayState *s = opaque;
@@ -2092,6 +2116,8 @@ static GtkWidget *gd_create_menu_view(GtkDisplayState *s) 
                                 "<QEMU>/View/Zoom In");

    gtk_accel_map_add_entry("<QEMU>/View/Zoom In", GDK_KEY_plus,

                            HOTKEY_MODIFIERS);

    gtk_accel_group_connect(s->accel_group, GDK_KEY_equal, HOTKEY_MODIFIERS, 0,

            g_cclosure_new_swap(G_CALLBACK(gd_accel_zoom_in), s, NULL));

    gtk_menu_shell_append(GTK_MENU_SHELL(view_menu), s->zoom_in_item);



    s->zoom_out_item = gtk_menu_item_new_with_mnemonic(_("Zoom _Out"));
@@ -2232,8 +2258,12 @@ void gtk_display_init(DisplayState *ds, bool full_screen, bool grab_on_hover) 


    s->free_scale = FALSE;



    /* LC_MESSAGES only. See early_gtk_display_init() for details */

    /* Mostly LC_MESSAGES only. See early_gtk_display_init() for details. For

     * LC_CTYPE, we need to make sure that non-ASCII characters are considered

     * printable, but without changing any of the character classes to make

     * sure that we don't accidentally break implicit assumptions.  */

    setlocale(LC_MESSAGES, "");

    setlocale(LC_CTYPE, "C.UTF-8");

    bindtextdomain("qemu", CONFIG_QEMU_LOCALEDIR);

    textdomain("qemu");