summary refs log tree commit diff stats
path: root/ui/input.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-05-19 12:53:07 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-05-19 12:53:07 +0100
commit5bc8f026dd5eb76c89395933d38dc5b0cebf5763 (patch)
tree1457fdc19b5c79152c82e6a102a108045c6db4ca /ui/input.c
parent6a23082b4eca28df6a26efae8016d2f2f0921da5 (diff)
parent59e7a130054b55fe15cdfdebf284332b04d990ef (diff)
downloadfocaccia-qemu-5bc8f026dd5eb76c89395933d38dc5b0cebf5763.tar.gz
focaccia-qemu-5bc8f026dd5eb76c89395933d38dc5b0cebf5763.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-input-8' into staging
Input code update:
 - add keycode mapping helpers to core.
 - start switching devices to new input api.
 - misc bugfixes.

# gpg: Signature made Fri 16 May 2014 07:43:45 BST using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-input-8:
  input: sparc32 kbd: claim en-us layout
  input: sparc32 kbd: fix some key mappings
  input: remove sparc keymap hack
  input: switch sparc32 kbd to new input api
  input: switch ps/2 mouse to new input api
  input: switch ps/2 kbd to new input api
  input: use KeyValue directly in sendkey monitor command
  input: add qemu_input_handler_deactivate
  input: key mapping helpers
  ps2: set ps/2 output buffer size as the same as kernel

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/input.c')
-rw-r--r--ui/input.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/input.c b/ui/input.c
index 1ed0e783b1..fc91fba83c 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -39,6 +39,13 @@ void qemu_input_handler_activate(QemuInputHandlerState *s)
     qemu_input_check_mode_change();
 }
 
+void qemu_input_handler_deactivate(QemuInputHandlerState *s)
+{
+    QTAILQ_REMOVE(&handlers, s, node);
+    QTAILQ_INSERT_TAIL(&handlers, s, node);
+    qemu_input_check_mode_change();
+}
+
 void qemu_input_handler_unregister(QemuInputHandlerState *s)
 {
     QTAILQ_REMOVE(&handlers, s, node);