Changeset 127 in xpra

Timestamp:

08/14/11 21:01:07 (22 months ago)

Author:

antoine

Message:

detect changes to the client keymap and apply them immediately (new protocol message - will be ignored by older clients)

Location:

trunk/src/xpra

Files:

• client.py (modified) (5 diffs)
• scripts/main.py (modified) (1 diff)
• server.py (modified) (2 diffs)

trunk/src/xpra/client.py

@@ -326 +326 @@
 
     def __init__(self, conn, compression_level, jpegquality, title, password_file,
-                 pulseaudio, clipboard, refresh_delay, max_bandwidth, opts, xkbmap_print, xkbmap_query):
+                 pulseaudio, clipboard, refresh_delay, max_bandwidth, opts):
         gobject.GObject.__init__(self)
         self._window_to_id = {}
@@ -336 +336 @@
         self.refresh_delay = refresh_delay
         self.max_bandwidth = max_bandwidth
-        self.xkbmap_print = xkbmap_print
-        self.xkbmap_query = xkbmap_query
         if self.max_bandwidth>0.0 and self.jpegquality==0:
             """ jpegquality was not set, use a better start value """
@@ -348 +346 @@
         self._keymap = gtk.gdk.keymap_get_default()
         self._keymap.connect("keys-changed", self._keys_changed)
-        self._keys_changed()
+        self._do_keys_changed()
 
         self._xsettings_watcher = None
@@ -387 +385 @@
         gtk.main()
 
+    def query_xkbmap(self):
+        def get_xkbmap_data(arg):
+            # Find the client's current keymap so we can send it to the server:
+            try:
+                import subprocess
+                cmd = ["setxkbmap", arg]
+                process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
+                (out,_) = process.communicate(None)
+                if process.returncode==0:
+                    return out
+                else:
+                    log.error("'setxkbmap %s' failed with exit code %s\n" % (arg, process.returncode))
+            except Exception, e:
+                log.error("error running 'setxkbmap %s': %s\n" % (arg, e))
+                return None
+        self.xkbmap_print = get_xkbmap_data("-print")
+        self.xkbmap_query = get_xkbmap_data("-query")
+
     def _keys_changed(self, *args):
+        self._do_keys_changed(True)
+
+    def _do_keys_changed(self, sendkeymap=False):
         self._modifier_map = grok_modifier_map(gtk.gdk.display_get_default())
+        if sendkeymap:
+            #old clients won't know what to do with it, but that's ok
+            self.query_xkbmap()
+            log.info("keys_changed")
+            self.send(["keymap-changed", self.xkbmap_print, self.xkbmap_query])
 
     def update_focus(self, id, gotit):
@@ -418 +442 @@
         if self.jpegquality:
             capabilities_request["jpeg"] = self.jpegquality
+        self.query_xkbmap()
         if self.xkbmap_print:
             capabilities_request["keymap"] = self.xkbmap_print

trunk/src/xpra/scripts/main.py

@@ -289 +289 @@
         title = "@title@ %s" % opts.title_suffix
 
-    def get_xkbmap_data(arg):
-    # Find the client's current keymap so we can send it to the server:
-        try:
-            import subprocess
-            cmd = ["setxkbmap", arg]
-            process = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=False)
-            (out,_) = process.communicate(None)
-            if process.returncode==0:
-                return out
-            else:
-                sys.stdout.write("'setxkbmap %s' failed with exit code %s\n" % (arg, process.returncode))
-        except Exception, e:
-            sys.stdout.write("error running 'setxkbmap %s': %s\n" % (arg, e))
-            return None
-    xkbmap_print = get_xkbmap_data("-print")
-    xkbmap_query = get_xkbmap_data("-query")
     app = XpraClient(conn, opts.compression_level, opts.jpegquality, title, opts.password_file,
                      opts.pulseaudio, opts.clipboard,
-                     opts.auto_refresh_delay, opts.max_bandwidth, opts, xkbmap_print, xkbmap_query)
+                     opts.auto_refresh_delay, opts.max_bandwidth, opts)
     app.connect("handshake-complete", handshake_complete_msg)
     app.connect("received-gibberish", got_gibberish_msg)

trunk/src/xpra/server.py

@@ -846 +846 @@
         (_, id) = packet
         self._focus(id)
+    
+    def _process_keymap(self, proto, packet):
+        (_, keymap, xkbmap_query) = packet
+        self.set_keymap(keymap, xkbmap_query)
 
     def _process_key_action(self, proto, packet):
@@ -929 +933 @@
         "focus": _process_focus,
         "key-action": _process_key_action,
+        "keymap-changed": _process_keymap,
         "button-action": _process_button_action,
         "pointer-position": _process_pointer_position,