This patch allows to boot a guest without the input-linux device being
grabbed immediately from the host. This is useful when the guest is
automatically started, but is supposed to stay in the background until
the user actively switches to it with a key combination.
In this usage example the host continues to own the keyboard until the
user explicitly toggles the grab state with both control keys:
-object input-linux,id=kbd1,evdev=/dev/input/eventX,grab-active=off
When grab-active is not given, input-linux will behave as before and
devices are being grabbed immediately on initialization.
Note that even if grab_all=on is set, other devices will initially be
grabbed according to their own grab-active option. The first toggle
operation on a grab_all=on device will sync state to the other devices.
Furthermore, this new option allows to toggle the grab state from QMP
with the qom-set command. By setting grab-active at runtime, the device
will be grabbed or released as indicated by the passed value.
$ ./scripts/qmp-shell /tmp/qmp.sock
(QEMU) qom-set path=/objects/kbd1 property=grab-active value=true
{"return": {}}
(QEMU) qom-get path=/objects/kbd1 property=grab-active
{"return": true}
For devices with grab_all=on, the action will propagate to other devices
as if the grab toggle hotkey was used.
Signed-off-by: Rainer Müller <rai...@codingfarm.de>
---
qapi/qom.json | 3 +++
ui/input-linux.c | 39 +++++++++++++++++++++++++++++++++++----
2 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/qapi/qom.json b/qapi/qom.json
index cd0e76d564..51704465ec 100644
--- a/qapi/qom.json
+++ b/qapi/qom.json
@@ -488,6 +488,8 @@
#
# @repeat: enables auto-repeat events (default: false)
#
+# @grab-active: if true, device is grabbed (default: true)
+#
# @grab-toggle: the key or key combination that toggles device grab
# (default: ctrl-ctrl)
#
@@ -497,6 +499,7 @@
'data': { 'evdev': 'str',
'*grab_all': 'bool',
'*repeat': 'bool',
+ '*grab-active': 'bool',
'*grab-toggle': 'GrabToggleKeys' } }
##
diff --git a/ui/input-linux.c b/ui/input-linux.c
index 47d489d738..64efb83e21 100644
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -399,10 +399,9 @@ static void input_linux_complete(UserCreatable *uc, Error
**errp)
}
qemu_set_fd_handler(il->fd, input_linux_event, NULL, il);
- if (il->keycount) {
- /* delay grab until all keys are released */
- il->grab_request = true;
- } else {
+ /* delay grab until all keys are released */
+ if (il->grab_request && !il->keycount) {
+ il->grab_request = false;
input_linux_toggle_grab(il);
}
QTAILQ_INSERT_TAIL(&inputs, il, next);
@@ -493,8 +492,37 @@ static void input_linux_set_grab_toggle(Object *obj, int
value,
il->grab_toggle = value;
}
+static bool input_linux_get_grab_active(Object *obj, Error **errp)
+{
+ InputLinux *il = INPUT_LINUX(obj);
+
+ return il->grab_active;
+}
+
+static void input_linux_set_grab_active(Object *obj, bool value,
+ Error **errp)
+{
+ InputLinux *il = INPUT_LINUX(obj);
+
+ if (!il->initialized) {
+ il->grab_request = value;
+ return;
+ }
+
+ if (il->grab_active != value) {
+ if (il->keycount) {
+ il->grab_request = true;
+ } else {
+ input_linux_toggle_grab(il);
+ }
+ }
+}
+
static void input_linux_instance_init(Object *obj)
{
+ InputLinux *il = INPUT_LINUX(obj);
+
+ il->grab_request = true;
}
static void input_linux_class_init(ObjectClass *oc, void *data)
@@ -512,6 +540,9 @@ static void input_linux_class_init(ObjectClass *oc, void
*data)
object_class_property_add_bool(oc, "repeat",
input_linux_get_repeat,
input_linux_set_repeat);
+ object_class_property_add_bool(oc, "grab-active",
+ input_linux_get_grab_active,
+ input_linux_set_grab_active);
object_class_property_add_enum(oc, "grab-toggle", "GrabToggleKeys",
&GrabToggleKeys_lookup,
input_linux_get_grab_toggle,
--
2.25.1
