mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-13 05:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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) <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-20180614-pull-request:
  sdl2: restore window dimensions by resize
  ui: darwin: gtk: Add missing input keymap

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
2018-06-14 14:04:14 +01:00
parent 666b0e732f 64bf97e56f
commit 409c241f88
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -322,6 +322,7 @@ KEYCODEMAP_FILES = \
ui/input-keymap-xorgkbd-to-qcode.c \ ui/input-keymap-xorgkbd-to-qcode.c \
ui/input-keymap-xorgxquartz-to-qcode.c \ ui/input-keymap-xorgxquartz-to-qcode.c \
ui/input-keymap-xorgxwin-to-qcode.c \ ui/input-keymap-xorgxwin-to-qcode.c \
ui/input-keymap-osx-to-qcode.c \
$(NULL) $(NULL)
GENERATED_FILES += $(KEYCODEMAP_FILES) GENERATED_FILES += $(KEYCODEMAP_FILES)

3
include/ui/input.h
View File

@@ -116,4 +116,7 @@ extern const guint16 qemu_input_map_xorgxquartz_to_qcode[];
extern const guint qemu_input_map_xorgxwin_to_qcode_len; extern const guint qemu_input_map_xorgxwin_to_qcode_len;
extern const guint16 qemu_input_map_xorgxwin_to_qcode[]; extern const guint16 qemu_input_map_xorgxwin_to_qcode[];
extern const guint qemu_input_map_osx_to_qcode_len;
extern const guint16 qemu_input_map_osx_to_qcode[];
#endif /* INPUT_H */ #endif /* INPUT_H */

1
ui/input-keymap.c
View File

@@ -21,6 +21,7 @@
#include "ui/input-keymap-xorgkbd-to-qcode.c" #include "ui/input-keymap-xorgkbd-to-qcode.c"
#include "ui/input-keymap-xorgxquartz-to-qcode.c" #include "ui/input-keymap-xorgxquartz-to-qcode.c"
#include "ui/input-keymap-xorgxwin-to-qcode.c" #include "ui/input-keymap-xorgxwin-to-qcode.c"
#include "ui/input-keymap-osx-to-qcode.c"
int qemu_input_linux_to_qcode(unsigned int lnx) int qemu_input_linux_to_qcode(unsigned int lnx)
{ {

3
ui/sdl2.c
View File

@@ -371,8 +371,7 @@ static void handle_keydown(SDL_Event *ev)
} }
break; break;
case SDL_SCANCODE_U: case SDL_SCANCODE_U:
sdl2_window_destroy(scon); sdl2_window_resize(scon);
sdl2_window_create(scon);
if (!scon->opengl) { if (!scon->opengl) {
/* re-create scon->texture */ /* re-create scon->texture */
sdl2_2d_switch(&scon->dcl, scon->surface); sdl2_2d_switch(&scon->dcl, scon->surface);