ui: bugfixes for sdl and gtk
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJbIigtAAoJEEy22O7T6HE4Y94QAKgXLVAZj53zdIdsX72nlni4 XFgtMfYtybBS7uM12Oz552OPgmwd4wofp/+yuARh2DZiW2vXBdOuH5bNqgoSgBej BO1XemUckQWYXZf+OQDhSZgKUkpOKjCCcP7FwGO0kDCUTkRpfblrHUYT+yTxFDj8 A6lkuzIjAEBQGEM2dKK7VL95hIb+VWnORjOhEEFz5YSS+BtCLUa90+KXN62s/WCN jvMmFleE/zH2TzNhk6/mL2n7Oc7FNuJhrt6s+olUGrSEkzXZGzXBW/wwoEPnrGJb 9DJiz7iMSfXbUCLphtlB3EKWaqlprMN5pBIK+9buJixdJts9r3ku9VEMQnP5VFys +Q+dQvgYYYweMBrNznnUup3x5dG/YyiGp9pgzv2YXTCDMsOG/C7okGd+Fr1L8MMN lUWjp55zdZOYm9V+c12uStPv/hT7Mo0rPJzH2UiK/CeUN0+u52gqegXcnUobMLfl zNQPXAktKL+CR0gpmf28rOHbWj1g5uAnGvQSfVBkZ6ne4l1CckDsWchWdwMzztS1 xw7ZzNG+OEmBFoKkhvVimWsd0kbVMK+PEQbTcTO0kJFSDI2VUjQx48F3bJXBqZkJ Fq16kEVd/JNVTCI3mTEJR1N0CA5EbJ+Pe6IHRU9ZprLxXEEHGADpuSUPULkCsOzl j+EOmgrwCXpYPD2zBvFx =Fshe -----END PGP SIGNATURE----- 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) <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:
commit
409c241f88
1
Makefile
1
Makefile
@ -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)
|
||||||
|
@ -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 */
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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);
|
||||||
|
Loading…
Reference in New Issue
Block a user