aboutsummaryrefslogtreecommitdiff
path: root/qapi
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-01-24 15:38:47 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-01-24 15:38:47 +0000
commit341b7186e7bf0ed94fbf9b7303dfe2fdf3b71ea6 (patch)
tree08080cabee051f1f3e9785144c9633f93a0e4804 /qapi
parent8b7a3e1e5434b55d7710071b00af97c7086cab7a (diff)
parent2657846fb2e47e8ba847b5ef6fe742466414c745 (diff)
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190124-pull-request' into staging
input-linux: customizable grab toggle keys # gpg: Signature made Thu 24 Jan 2019 10:35:29 GMT # 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-20190124-pull-request: input-linux: customizable grab toggle keys Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qapi')
-rw-r--r--qapi/ui.json10
1 files changed, 10 insertions, 0 deletions
diff --git a/qapi/ui.json b/qapi/ui.json
index 5ad13248d5..7d9c4bddaf 100644
--- a/qapi/ui.json
+++ b/qapi/ui.json
@@ -1016,6 +1016,16 @@
'*head' : 'int',
'events' : [ 'InputEvent' ] } }
+##
+# @GrabToggleKeys:
+#
+# Keys to toggle input-linux between host and guest.
+#
+# Since: 4.0
+#
+##
+{ 'enum': 'GrabToggleKeys',
+ 'data': [ 'ctrl-ctrl', 'alt-alt', 'meta-meta', 'scrolllock', 'ctrl-scrolllock' ] }
##
# @DisplayGTK: