Commit d2bc6e1f authored by Peter Maydell's avatar Peter Maydell
Browse files

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



ui: convert to keycodedb, fix sign extension
sdl: cleanups, deprecate sdl 1.2

# gpg: Signature made Thu 25 Jan 2018 14:31:47 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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-20180125-pull-request:
  sdl: reorganize -no-frame support
  sdl: use ctrl-alt-g as grab hotkey
  ui: deprecate use of SDL 1.2 in favour of 2.0 series
  ui: ignore hardware keycode 255 on win32
  ui: add fix for GTK Pause key handling on Win32
  ui: convert GTK and SDL1 frontends to keycodemapdb
  ui: convert the SDL2 frontend to keycodemapdb
  ui: avoid sign extension using client width/height

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2077fef9 04ff1a39

Makefile

+8 −0
Original line number Diff line number Diff line
@@ -232,10 +232,18 @@ KEYCODEMAP_GEN = $(SRC_PATH)/ui/keycodemapdb/tools/keymap-gen 
KEYCODEMAP_CSV = $(SRC_PATH)/ui/keycodemapdb/data/keymaps.csv



KEYCODEMAP_FILES = \

		 ui/input-keymap-atset1-to-qcode.c \

		 ui/input-keymap-linux-to-qcode.c \

		 ui/input-keymap-qcode-to-qnum.c \

		 ui/input-keymap-qnum-to-qcode.c \

		 ui/input-keymap-qcode-to-linux.c \

		 ui/input-keymap-usb-to-qcode.c \

		 ui/input-keymap-win32-to-qcode.c \

		 ui/input-keymap-x11-to-qcode.c \

		 ui/input-keymap-xorgevdev-to-qcode.c \

		 ui/input-keymap-xorgkbd-to-qcode.c \

		 ui/input-keymap-xorgxquartz-to-qcode.c \

		 ui/input-keymap-xorgxwin-to-qcode.c \

		 $(NULL)



GENERATED_FILES += $(KEYCODEMAP_FILES)

configure

+6 −0
Original line number Diff line number Diff line
@@ -5668,6 +5668,12 @@ if test "$gtkabi" = "2.0"; then 
    echo "WARNING: future releases. Please switch to using GTK 3.0"

fi



if test "$sdlabi" = "1.2"; then

    echo

    echo "WARNING: Use of SDL 1.2 is deprecated and will be removed in"

    echo "WARNING: future releases. Please switch to using SDL 2.0"

fi



if test "$supported_cpu" = "no"; then

    echo

    echo "WARNING: SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!"

include/sysemu/sysemu.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ extern const char *keyboard_layout; 
extern int win2k_install_hack;

extern int alt_grab;

extern int ctrl_grab;

extern int no_frame;

extern int smp_cpus;

extern unsigned int max_cpus;

extern int cursor_hide;

include/ui/console.h

+2 −3
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ void surface_gl_setup_viewport(QemuGLShader *gls, 
/* sdl.c */

#ifdef CONFIG_SDL

void sdl_display_early_init(int opengl);

void sdl_display_init(DisplayState *ds, int full_screen, int no_frame);

void sdl_display_init(DisplayState *ds, int full_screen);

#else

static inline void sdl_display_early_init(int opengl)

{
@@ -444,8 +444,7 @@ static inline void sdl_display_early_init(int opengl) 
    error_report("SDL support is disabled");

    abort();

}

static inline void sdl_display_init(DisplayState *ds, int full_screen,

                                    int no_frame)

static inline void sdl_display_init(DisplayState *ds, int full_screen)

{

    /* This must never be called if CONFIG_SDL is disabled */

    error_report("SDL support is disabled");

include/ui/input.h

+24 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ void qemu_input_check_mode_change(void); 
void qemu_add_mouse_mode_change_notifier(Notifier *notify);

void qemu_remove_mouse_mode_change_notifier(Notifier *notify);



extern const guint qemu_input_map_atset1_to_qcode_len;

extern const guint16 qemu_input_map_atset1_to_qcode[];



extern const guint qemu_input_map_linux_to_qcode_len;

extern const guint16 qemu_input_map_linux_to_qcode[];
@@ -80,4 +83,25 @@ extern const guint16 qemu_input_map_qnum_to_qcode[]; 
extern const guint qemu_input_map_qcode_to_linux_len;

extern const guint16 qemu_input_map_qcode_to_linux[];



extern const guint qemu_input_map_usb_to_qcode_len;

extern const guint16 qemu_input_map_usb_to_qcode[];



extern const guint qemu_input_map_win32_to_qcode_len;

extern const guint16 qemu_input_map_win32_to_qcode[];



extern const guint qemu_input_map_x11_to_qcode_len;

extern const guint16 qemu_input_map_x11_to_qcode[];



extern const guint qemu_input_map_xorgevdev_to_qcode_len;

extern const guint16 qemu_input_map_xorgevdev_to_qcode[];



extern const guint qemu_input_map_xorgkbd_to_qcode_len;

extern const guint16 qemu_input_map_xorgkbd_to_qcode[];



extern const guint qemu_input_map_xorgxquartz_to_qcode_len;

extern const guint16 qemu_input_map_xorgxquartz_to_qcode[];



extern const guint qemu_input_map_xorgxwin_to_qcode_len;

extern const guint16 qemu_input_map_xorgxwin_to_qcode[];



#endif /* INPUT_H */