mbox

[PULL,v2,00/11] ui patch queue

Message ID 1483967385-12891-1-git-send-email-kraxel@redhat.com
State New
Headers show

Pull-request

git://git.kraxel.org/qemu tags/pull-ui-20170109-1

Message

Gerd Hoffmann Jan. 9, 2017, 1:09 p.m. UTC
Hi,

Here comes the ui patch queue with a bunch of small changes and fixes
all over the place: gtk, vnc, curses, sdl, keyboard.

v2 changes:  Replace the ps2 fix (v3 instead of v2 of the patch).

please pull,
  Gerd

The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:

  Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)

are available in the git repository at:


  git://git.kraxel.org/qemu tags/pull-ui-20170109-1

for you to fetch changes up to f46c4259f489d2e7742890ddfaa862bde3731e3e:

  ps2: Fix lost scancodes by recent changes (2017-01-06 10:36:49 +0100)

----------------------------------------------------------------
gtk,vnc: misc bugfixes.
kbd: add jp keys, fix ps2 regressions.
sdl: export window id for baum, remove sdl hooks from baum.
egl: egl-helpers.c license change.

----------------------------------------------------------------
Daniel P. Berrange (1):
      ui: use evdev keymap when running under wayland

Frediano Ziglio (1):
      egl-helpers: Change file licensing to LGPLv2

Gerd Hoffmann (1):
      ui: drop unused MOUSE_EVENT_WHEEL{UP, DN} defines

Hervé Poussineau (1):
      ui/gtk: fix crash at startup when no console is available

Marc-André Lureau (1):
      gtk: avoid oob array access

OGAWA Hirofumi (1):
      ps2: Fix lost scancodes by recent changes

Samuel Thibault (3):
      console: add API to get underlying gui window ID
      console: move window ID code from baum to sdl
      sdl2: set window ID

Stefan Weil (1):
      curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT)

Thomas Huth (1):
      ui/vnc: Fix problem with sending too many bytes as server name

 backends/baum.c      | 31 ++++++++-----------------------
 hw/input/ps2.c       | 10 ++++++++++
 include/ui/console.h | 12 ++++++++----
 include/ui/gtk.h     |  4 ++++
 qapi-schema.json     |  6 +++++-
 ui/console.c         | 11 +++++++++++
 ui/curses.c          |  1 -
 ui/egl-helpers.c     | 16 ++++++++++++++++
 ui/gtk.c             | 18 +++++++++++++++++-
 ui/input-keymap.c    |  3 +++
 ui/sdl.c             | 25 +++++++++++++++++++++++++
 ui/sdl2.c            |  7 +++++++
 ui/vnc.c             |  8 ++++++--
 13 files changed, 120 insertions(+), 32 deletions(-)

Comments

Peter Maydell Jan. 9, 2017, 1:49 p.m. UTC | #1
On 9 January 2017 at 13:09, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
> Here comes the ui patch queue with a bunch of small changes and fixes
> all over the place: gtk, vnc, curses, sdl, keyboard.
>
> v2 changes:  Replace the ps2 fix (v3 instead of v2 of the patch).
>
> please pull,
>   Gerd
>
> The following changes since commit dbe2b65566e76d3c3a0c3358285c0336ac61e757:
>
>   Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.9-pull-request' into staging (2016-12-28 17:11:11 +0000)
>
> are available in the git repository at:
>
>
>   git://git.kraxel.org/qemu tags/pull-ui-20170109-1
>
> for you to fetch changes up to f46c4259f489d2e7742890ddfaa862bde3731e3e:
>
>   ps2: Fix lost scancodes by recent changes (2017-01-06 10:36:49 +0100)
>
> ----------------------------------------------------------------
> gtk,vnc: misc bugfixes.
> kbd: add jp keys, fix ps2 regressions.
> sdl: export window id for baum, remove sdl hooks from baum.
> egl: egl-helpers.c license change.

Hi. I'm afraid this fails to build on OSX:

/Users/pm215/src/qemu-for-merges/ui/cocoa.m:688:21: error: use of
undeclared identifier 'MOUSE_EVENT_WHEELUP'
                    MOUSE_EVENT_WHEELUP : MOUSE_EVENT_WHEELDN;
                    ^
/Users/pm215/src/qemu-for-merges/ui/cocoa.m:710:45: error: use of
undeclared identifier 'MOUSE_EVENT_WHEELUP'
                [INPUT_BUTTON_WHEEL_UP]   = MOUSE_EVENT_WHEELUP,
                                            ^
/Users/pm215/src/qemu-for-merges/ui/cocoa.m:711:45: error: use of
undeclared identifier 'MOUSE_EVENT_WHEELDN'
                [INPUT_BUTTON_WHEEL_DOWN] = MOUSE_EVENT_WHEELDN,
                                            ^

thanks
-- PMM
Gerd Hoffmann Jan. 10, 2017, 7:18 a.m. UTC | #2
Hi,

> >   git://git.kraxel.org/qemu tags/pull-ui-20170109-1

> Hi. I'm afraid this fails to build on OSX:
> 
> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:688:21: error: use of
> undeclared identifier 'MOUSE_EVENT_WHEELUP'
>                     MOUSE_EVENT_WHEELUP : MOUSE_EVENT_WHEELDN;
>                     ^
> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:710:45: error: use of
> undeclared identifier 'MOUSE_EVENT_WHEELUP'
>                 [INPUT_BUTTON_WHEEL_UP]   = MOUSE_EVENT_WHEELUP,
>                                             ^
> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:711:45: error: use of
> undeclared identifier 'MOUSE_EVENT_WHEELDN'
>                 [INPUT_BUTTON_WHEEL_DOWN] = MOUSE_EVENT_WHEELDN,

Pushed new tag:

  git://git.kraxel.org/qemu tags/pull-ui-20170110-1

Dropped offending patch (8/11), no other changes.

cheers,
  Gerd
Peter Maydell Jan. 10, 2017, 5:32 p.m. UTC | #3
On 10 January 2017 at 07:18, Gerd Hoffmann <kraxel@redhat.com> wrote:
>   Hi,
>
>> >   git://git.kraxel.org/qemu tags/pull-ui-20170109-1
>
>> Hi. I'm afraid this fails to build on OSX:
>>
>> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:688:21: error: use of
>> undeclared identifier 'MOUSE_EVENT_WHEELUP'
>>                     MOUSE_EVENT_WHEELUP : MOUSE_EVENT_WHEELDN;
>>                     ^
>> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:710:45: error: use of
>> undeclared identifier 'MOUSE_EVENT_WHEELUP'
>>                 [INPUT_BUTTON_WHEEL_UP]   = MOUSE_EVENT_WHEELUP,
>>                                             ^
>> /Users/pm215/src/qemu-for-merges/ui/cocoa.m:711:45: error: use of
>> undeclared identifier 'MOUSE_EVENT_WHEELDN'
>>                 [INPUT_BUTTON_WHEEL_DOWN] = MOUSE_EVENT_WHEELDN,
>
> Pushed new tag:
>
>   git://git.kraxel.org/qemu tags/pull-ui-20170110-1
>
> Dropped offending patch (8/11), no other changes.

Applied, thanks.

PS: to guarantee getting my attention on a respun pull request
you need to resend a proper cover email (but you don't need
to resend the rest of the emails). You got lucky this time :-)

thanks
-- PMM