diff options
| author | Peter Maydell | 2018-04-09 13:02:19 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-09 13:02:19 +0200 |
| commit | b2c1742da0c79dd52080260edacaf0a7b6d309e5 (patch) | |
| tree | 94fc8886fa904d79c5c01bf31cd65f56c54cb668 /include | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into st... (diff) | |
| parent | sdl2: drop dead code (diff) | |
| download | qemu-b2c1742da0c79dd52080260edacaf0a7b6d309e5.tar.gz qemu-b2c1742da0c79dd52080260edacaf0a7b6d309e5.tar.xz qemu-b2c1742da0c79dd52080260edacaf0a7b6d309e5.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180409-pull-request' into staging
sdl2: fix kbd regression (compared to sdl1), cleanups.
# gpg: Signature made Mon 09 Apr 2018 10:40:21 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-20180409-pull-request:
sdl2: drop dead code
sdl2: drop QEMU_KEY_BACKSPACE special case
sdl2: enable ctrl modifier keys for text consoles
sdl2: track kbd modifier state unconditionally
ui: add ctrl modifier support to kbd_put_qcode_console()
sdl2: Remove unused epoxy include
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 6d2c052068..37a8d68d29 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -99,7 +99,7 @@ void hmp_mouse_set(Monitor *mon, const QDict *qdict); #define QEMU_KEY_CTRL_PAGEDOWN 0xe407 void kbd_put_keysym_console(QemuConsole *s, int keysym); -bool kbd_put_qcode_console(QemuConsole *s, int qcode); +bool kbd_put_qcode_console(QemuConsole *s, int qcode, bool ctrl); void kbd_put_string_console(QemuConsole *s, const char *str, int len); void kbd_put_keysym(int keysym); |