diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-01-25 18:06:25 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-01-25 18:06:25 +0000 |
| commit | d2bc6e1f62241085351005c88bed0b576b23da91 (patch) | |
| tree | 38af5ff2f0323b9a86ebfe01f3f682f411f7f81b /ui/input-keymap.c | |
| parent | 2077fef91d5eb8e3745a84fabd87a5ee7d2b535d (diff) | |
| parent | 04ff1a398a8d6e912eceaca9b62af0a09e927d63 (diff) | |
| download | qemu-d2bc6e1f62241085351005c88bed0b576b23da91.zip qemu-d2bc6e1f62241085351005c88bed0b576b23da91.tar.gz qemu-d2bc6e1f62241085351005c88bed0b576b23da91.tar.bz2 | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input-keymap.c')
| -rw-r--r-- | ui/input-keymap.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/input-keymap.c b/ui/input-keymap.c index 663986a..95b1e0c 100644 --- a/ui/input-keymap.c +++ b/ui/input-keymap.c @@ -5,10 +5,18 @@ #include "standard-headers/linux/input.h" +#include "ui/input-keymap-atset1-to-qcode.c" #include "ui/input-keymap-linux-to-qcode.c" #include "ui/input-keymap-qcode-to-qnum.c" #include "ui/input-keymap-qnum-to-qcode.c" #include "ui/input-keymap-qcode-to-linux.c" +#include "ui/input-keymap-usb-to-qcode.c" +#include "ui/input-keymap-win32-to-qcode.c" +#include "ui/input-keymap-x11-to-qcode.c" +#include "ui/input-keymap-xorgevdev-to-qcode.c" +#include "ui/input-keymap-xorgkbd-to-qcode.c" +#include "ui/input-keymap-xorgxquartz-to-qcode.c" +#include "ui/input-keymap-xorgxwin-to-qcode.c" int qemu_input_linux_to_qcode(unsigned int lnx) { |