Attachment 869664 Details for Bug 1071611 – Add a gsettings preference for keyboard grabbing

[patch] Add a gsettings preference for keyboard grabbing

virt-manager-keyboard-grab-preference.patch (text/plain), 4.26 KB, created by Kjö Hansi Glaz on 2014-03-02 16:16:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kjö Hansi Glaz

Created: 2014-03-02 16:16:19 UTC

Size: 4.26 KB

patch

obsolete

>diff -Naur ../virt-manager-0.10.0+git20130205.69015c.orig/data/org.virt-manager.virt-manager.gschema.xml ./data/org.virt-manager.virt-manager.gschema.xml
>--- ../virt-manager-0.10.0+git20130205.69015c.orig/data/org.virt-manager.virt-manager.gschema.xml	2014-03-02 11:56:16.922783493 +0100
>+++ ./data/org.virt-manager.virt-manager.gschema.xml	2014-03-02 12:51:48.980188363 +0100
>@@ -184,6 +184,12 @@
>       <description>Grab keyboard sequence for the graphical console</description>
>     </key>
> 
>+    <key name="grab-keyboard" type="b">
>+      <default>true</default>
>+      <summary>Enable grab keyboard when active and focused</summary>
>+      <description>Enable grab keyboard when active and focused</description>
>+    </key>
>+
>     <key name="auto-redirect" type="b">
>       <default>true</default>
>       <summary>Enable SPICE Auto USB redirection in console window</summary>
>diff -Naur ../virt-manager-0.10.0+git20130205.69015c.orig/virtManager/config.py ./virtManager/config.py
>--- ../virt-manager-0.10.0+git20130205.69015c.orig/virtManager/config.py	2014-03-02 11:56:16.982782510 +0100
>+++ ./virtManager/config.py	2014-03-02 17:03:32.256724034 +0100
>@@ -285,6 +285,13 @@
>     def on_keys_combination_changed(self, cb):
>         return self.conf.notify_add("/console/grab-keys", cb)
> 
>+    def get_grab_keyboard(self):
>+        return self.conf.get("/console/grab-keyboard")
>+    def set_grab_keyboard(self, val):
>+        self.conf.set("/console/grab-keyboard", val)
>+    def on_grab_keyboard_changed(self, cb):
>+        return self.conf.notify_add("/console/grab-keyboard", cb)
>+
>     # Confirmation preferences
>     def get_confirm_forcepoweroff(self):
>         return self.conf.get("/confirm/forcepoweroff")
>diff -Naur ../virt-manager-0.10.0+git20130205.69015c.orig/virtManager/console.py ./virtManager/console.py
>--- ../virt-manager-0.10.0+git20130205.69015c.orig/virtManager/console.py	2014-03-02 11:56:16.982782510 +0100
>+++ ./virtManager/console.py	2014-03-02 17:12:34.475839876 +0100
>@@ -360,6 +360,9 @@
>     def send_keys(self, keys):
>         raise NotImplementedError()
> 
>+    def set_grab_keyboard(self):
>+        raise NotImplementedError()
>+
>     def open_host(self, ginfo):
>         raise NotImplementedError()
> 
>@@ -392,6 +395,7 @@
> 
>     def init_widget(self):
>         self.set_grab_keys()
>+        self.set_grab_keyboard()
> 
>         self.display.realize()
> 
>@@ -401,7 +405,6 @@
>         self.console.sync_scaling_with_display()
>         self.console.refresh_resizeguest_from_settings()
> 
>-        self.display.set_keyboard_grab(True)
>         self.display.set_pointer_grab(True)
> 
>         self.display.connect("size-allocate",
>@@ -459,6 +462,9 @@
>     def send_keys(self, keys):
>         return self.display.send_keys([Gdk.keyval_from_name(k) for k in keys])
> 
>+    def set_grab_keyboard(self):
>+        self.display.set_grab_keyboard(self.config.get_grab_keyboard())
>+
>     def _desktop_resize(self, src_ignore, w, h):
>         self.desktop_resolution = (w, h)
>         self.console.widget("console-gfx-scroll").queue_resize()
>@@ -569,6 +575,7 @@
> 
>     def _init_widget(self):
>         self.set_grab_keys()
>+        self.set_grab_keyboard()
>         self.console.sync_scaling_with_display()
>         self.console.refresh_resizeguest_from_settings()
> 
>@@ -615,6 +622,9 @@
>         return self.display.send_keys([Gdk.keyval_from_name(k) for k in keys],
>                                       SpiceClientGtk.DisplayKeyEvent.CLICK)
> 
>+    def set_grab_keyboard(self):
>+        self.display.set_property("grab-keyboard", self.config.get_grab_keyboard())
>+
>     def close(self):
>         if self.spice_session is not None:
>             self.spice_session.disconnect()
>@@ -868,6 +878,8 @@
>             self.config.on_console_accels_changed(self.set_enable_accel))
>         self.add_gconf_handle(
>             self.config.on_keys_combination_changed(self.grab_keys_changed))
>+        self.add_gconf_handle(
>+            self.config.on_grab_keyboard_changed(self.grab_keyboard_changed))
> 
>         self.page_changed()
> 
>@@ -1060,6 +1072,10 @@
>         if self.viewer:
>             self.viewer.set_grab_keys()
> 
>+    def grab_keyboard_changed(self):
>+        if self.viewer:
>+            self.viewer.set_grab_keyboard()
>+
>     def set_enable_accel(self):
>         # Make sure modifiers are up to date
>         self.viewer_focus_changed()

Actions: View | Diff

Attachments on bug 1071611: 869664 | 872807