[Qemu-commits] [qemu/qemu] 656282: ui: darwin: gtk: Add missing input keymap

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 656282d245b49b84d4a1a47d7b7ede482d541776
      
https://github.com/qemu/qemu/commit/656282d245b49b84d4a1a47d7b7ede482d541776
  Author: Keno Fischer <address@hidden>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M Makefile
    M include/ui/input.h
    M ui/input-keymap.c

  Log Message:
  -----------
  ui: darwin: gtk: Add missing input keymap

In appears the input keymap for osx was forgotten in the commit that
converted the gtk frontend to keycodemapdb. Add it.

Fixes: 2ec78706 ("ui: convert GTK and SDL1 frontends to keycodemapdb")
CC: Daniel P. Berrange <address@hidden>
Signed-off-by: Keno Fischer <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 64bf97e56f3ab44d587c92c40503d646273a24df
      
https://github.com/qemu/qemu/commit/64bf97e56f3ab44d587c92c40503d646273a24df
  Author: Amadeusz Sławiński <address@hidden>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M ui/sdl2.c

  Log Message:
  -----------
  sdl2: restore window dimensions by resize

instead of destroying and recreating window, fixes segfault caused by
handle_keyup trying to access no more existing window when using
Ctrl-Alt-U to restore window "un-scaled" dimensions

 Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
 [Switching to Thread 0x7ffff7f92b80 (LWP 3711)]
 handle_keyup (ev=0x7fffffffd010) at ui/sdl2.c:416
 416         scon->ignore_hotkeys = false;
 (gdb) bt
 #0  handle_keyup (ev=0x7fffffffd010) at ui/sdl2.c:416
 #1  sdl2_poll_events (scon=0x100fee5a8) at ui/sdl2.c:608
 #2  0x0000000100585bf2 in dpy_refresh (s=0x101ad3e00) at ui/console.c:1658
 #3  gui_update (opaque=0x101ad3e00) at ui/console.c:205
 #4  0x0000000100690f2c in timerlist_run_timers (timer_list=0x100ede130) at 
util/qemu-timer.c:536
 #5  0x0000000100691177 in qemu_clock_run_timers (type=QEMU_CLOCK_REALTIME) at 
util/qemu-timer.c:547
 #6  qemu_clock_run_all_timers () at util/qemu-timer.c:674
 #7  0x0000000100691651 in main_loop_wait (nonblocking=<optimized out>) at 
util/main-loop.c:503
 #8  0x00000001003d650f in main_loop () at vl.c:1848
 #9  0x0000000100289681 in main (argc=<optimized out>, argv=<optimized out>, 
envp=<optimized out>) at vl.c:4605

Signed-off-by: Amadeusz Sławiński <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 409c241f887a38bb7a2ac12e34d3a8d73922a9a5
      
https://github.com/qemu/qemu/commit/409c241f887a38bb7a2ac12e34d3a8d73922a9a5
  Author: Peter Maydell <address@hidden>
  Date:   2018-06-14 (Thu, 14 Jun 2018)

  Changed paths:
    M Makefile
    M include/ui/input.h
    M ui/input-keymap.c
    M ui/sdl2.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' 
into staging

ui: bugfixes for sdl and gtk

# gpg: Signature made Thu 14 Jun 2018 09:32:45 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/ui-20180614-pull-request:
  sdl2: restore window dimensions by resize
  ui: darwin: gtk: Add missing input keymap

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/666b0e732f69...409c241f887a
      **NOTE:** This service been marked for deprecation: 
https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.