[Qemu-commits] [qemu/qemu] 0095cc: qapi: add support for mice with extra/side buttons

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 0095cc62b6803d5e2cb8cb27e5b14657d9dc0c95
      
https://github.com/qemu/qemu/commit/0095cc62b6803d5e2cb8cb27e5b14657d9dc0c95
  Author: Fabian Lesniak <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  qapi: add support for mice with extra/side buttons

Adds "side" and "extra" values to enum InputButton. The naming was borrowed
from evdev since it is more descriptive than "button4" and "button5".

Signed-off-by: Fabian Lesniak <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8b0caab07bf0056f44b52eb335faa45f07b7e1a6
      
https://github.com/qemu/qemu/commit/8b0caab07bf0056f44b52eb335faa45f07b7e1a6
  Author: Fabian Lesniak <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M hw/input/ps2.c
    M include/hw/input/ps2.h

  Log Message:
  -----------
  ps2: add support for mice with extra/side buttons

This enables the ps2 controller to process mouse events for buttons 4 and 5.
Additionally, distinct definitions for the ps2 mouse button state are
introduced. The legacy definitions from console.h are not used anymore.

Signed-off-by: Fabian Lesniak <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 1266b68c6e3af7f7bd53edcba1ee12cec07cdefe
      
https://github.com/qemu/qemu/commit/1266b68c6e3af7f7bd53edcba1ee12cec07cdefe
  Author: Fabian Lesniak <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/gtk.c
    M ui/input-linux.c

  Log Message:
  -----------
  ui: add support for mice with extra/side buttons

Adds input event generation for BTN_SIDE and BTN_EXTRA events to gtk and
input-linux methods.

Signed-off-by: Fabian Lesniak <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: a54f0d2ba3094ca43e85a465c7c4ae58c589efc4
      
https://github.com/qemu/qemu/commit/a54f0d2ba3094ca43e85a465c7c4ae58c589efc4
  Author: Pierre Ossman <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  vnc: track LED state separately

Piggy-backing on the modifier state array made it difficult to send
out updates at the proper times.

Signed-off-by: Pierre Ossman <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: e229d1efd7323504f90127bbf52e63f4773dc382
      
https://github.com/qemu/qemu/commit/e229d1efd7323504f90127bbf52e63f4773dc382
  Author: OGAWA Hirofumi <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk: Fix mouse wheel on 3.4.0 or later

On 3.4.0 or later, send GDK_SCROLL_SMOOTH event, instead of
GDK_SCROLL_UP/DOWN.

This fixes it by converting any smooth scroll to up/down.
(I.e. without smooth support)

Signed-off-by: OGAWA Hirofumi <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 6b557d7c933442377de59b71d0d82c3ccba68b2e
      
https://github.com/qemu/qemu/commit/6b557d7c933442377de59b71d0d82c3ccba68b2e
  Author: Rami Rosen <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  ui: fix format specfier in vnc to avoid break in build.

When building qemu after setting _VNC_DEBUG to 1 (see ui/vnc.h),
we get the following error and the build breaks:
...
ui/vnc.c: In function ‘vnc_client_io_error’:
ui/vnc.c:1262:13: error: format ‘%d’ expects argument of type ‘int’, but
       VNC_DEBUG("Closing down client sock: ret %d (%s)\n",
       ^
cc1: all warnings being treated as errors
make: *** [ui/vnc.o] Error 1
...

This patch solves this issue by fixing the print format specifier
in vnc_client_io_error() to be %zd, which corresponds to the type
of the "ret" variable.

Signed-off-by: Rami Rosen <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 66f6b82bf26cc15e33a39390844035d017102902
      
https://github.com/qemu/qemu/commit/66f6b82bf26cc15e33a39390844035d017102902
  Author: Ziyue Yang <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  ui/gtk.c: add ctrl-alt-= support for zoom in acceleration

Solving wishlist item at
https://bugs.launchpad.net/qemu/+bug/1656710
by accepting Ctrl-Alt-= as an additional zoom-in acceleration.

Using gtk_accel_group_connect to support multiple accelerations
triggering a single menu item since that gtk_accel_map_add_entry
seems to support only one acceleration. A wrapper function
gd_accel_zoom_in is added to support gtk_accel_group_connect's
callback activities.

Signed-off-by: Ziyue Yang <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 51e0b654539d587f09fc23074d1ae2a9c7747b06
      
https://github.com/qemu/qemu/commit/51e0b654539d587f09fc23074d1ae2a9c7747b06
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/spice-display.c

  Log Message:
  -----------
  spice: wakeup QXL worker to pick up mouse changes

Without it, server-mode mouse is "slow" to update position: QXL will
wait until new display commands come. This is very visible with
virtio-gpu.

Signed-off-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: eebe0b7905642a986cbce7406d6ab7bf78f3e210
      
https://github.com/qemu/qemu/commit/eebe0b7905642a986cbce7406d6ab7bf78f3e210
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/vnc.c

  Log Message:
  -----------
  vnc: fix overflow in vnc_update_stats

Commit "bea60dd ui/vnc: fix potential memory corruption issues" is
incomplete.  vnc_update_stats must calculate width and height the same
way vnc_refresh_server_surface does it, to make sure we don't use width
and height values larger than the qemu vnc server can handle.

Commit "e22492d ui/vnc: disable adaptive update calculations if not
needed" masks the issue in the default configuration.  It triggers only
in case the "lossy" option is set to "on" (default is "off").

Cc: Marc-André Lureau <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden


  Commit: 27b224a61f97faabbd20bdf72c0c1a3dbe400cd1
      
https://github.com/qemu/qemu/commit/27b224a61f97faabbd20bdf72c0c1a3dbe400cd1
  Author: Kevin Wolf <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/gtk.c

  Log Message:
  -----------
  gtk: Hardcode LC_CTYPE as C.utf-8

Commit 2cb5d2a4 removed setlocale() for everything except LC_MESSAGES in
order to avoid unwanted side effects such as using the wrong decimal
separator in generated JSON objects. However, the problem that unsetting
LC_CTYPE caused is that non-ASCII characters are considered
non-printable now and therefore the GTK menus display question marks for
accented letters, Chinese characters etc.

A first attempt to fix this [1] was rejected because even just setting
LC_CTYPE to the user's locale (and thereby modifying the semantics of
the ctype.h functions) could have unwanted effects that we're not aware
of yet.

Recently, however, glibc introduced a new locale "C.utf-8" that just
uses UTF-8 as its charset, but otherwise leaves the semantics alone.
Just setting the right character set is enough for our use case, so we
can just hardcode this one without having to be afraid of nasty side
effects.

Older systems that don't have the new locale will continue displaying
question marks, but this should fix the problem for most users.

[1] https://lists.gnu.org/archive/html/qemu-devel/2015-12/msg03591.html
    ('Re: gtk: use setlocale() for LC_MESSAGES only')

Signed-off-by: Kevin Wolf <address@hidden>
Message-id: address@hidden

[ kraxel: change C.utf-8 to C.UTF-8 ]

Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 3ef0c573d37b117867352a8bd8c567d3b774fe37
      
https://github.com/qemu/qemu/commit/3ef0c573d37b117867352a8bd8c567d3b774fe37
  Author: Gerd Hoffmann <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M ui/console.c

  Log Message:
  -----------
  console: fix console resize

Only skip surface reallocation in case the old surface was created using
qemu_alloc_display (via qemu_create_displaysurface) too, otherwise we
might end up with a DisplaySurface with the wrong backing storage.

Cc: address@hidden
Fixes: cd958edb1fae85d0c7d1e1acbff82d22724e8d64
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Tested-by: Laszlo Ersek <address@hidden>
Message-id: address@hidden


  Commit: 6fe791b5e3aca8a6de8a322e85e76d2f13338a7e
      
https://github.com/qemu/qemu/commit/6fe791b5e3aca8a6de8a322e85e76d2f13338a7e
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-31 (Tue, 31 Jan 2017)

  Changed paths:
    M hw/input/ps2.c
    M include/hw/input/ps2.h
    M qapi-schema.json
    M ui/console.c
    M ui/gtk.c
    M ui/input-linux.c
    M ui/spice-display.c
    M ui/vnc.c
    M ui/vnc.h

  Log Message:
  -----------
  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) <address@hidden>"
# gpg:                 aka "Gerd Hoffmann <address@hidden>"
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>"
# 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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/a0def594286d...6fe791b5e3ac