Changeset 139 in xpra

Timestamp:

08/25/11 16:09:44 (21 months ago)

Author:

antoine

Message:

batch keymap updates together: piping key mapping to xkbcomp can make it fire hundreds of times and we don't want to fire 100s of updates over the wire.

Also send the new modifiers when the keymap changes so we can clear it and then re-apply it after setting the new keymap.

Location:

trunk/src/xpra

Files:

• client.py (modified) (4 diffs)
• server.py (modified) (3 diffs)

trunk/src/xpra/client.py

@@ -354 +354 @@
         self._protocol = Protocol(conn, self.process_packet)
         ClientSource(self._protocol)
+
+        self._remote_version = None
+        self._keymap_changing = False
+        self._keymap = gtk.gdk.keymap_get_default()
+        self._do_keys_changed()
         self.send_hello()
 
-        self._remote_version = None
-        self._keymap = gtk.gdk.keymap_get_default()
         self._keymap.connect("keys-changed", self._keys_changed)
-        self._do_keys_changed()
-
         self._xsettings_watcher = None
         self._root_props_watcher = None
@@ -423 +424 @@
     def _keys_changed(self, *args):
         self._keymap = gtk.gdk.keymap_get_default()
-        self._do_keys_changed(True)
+        if not self._keymap_changing:
+            self._keymap_changing = True
+            gobject.timeout_add(500, self._do_keys_changed, True)
 
     def _do_keys_changed(self, sendkeymap=False):
+        self._keymap_changing = False
         self._modifier_map = grok_modifier_map(gtk.gdk.display_get_default())
         if sendkeymap:
@@ -431 +435 @@
             self.query_xkbmap()
             log.info("keys_changed")
-            self.send(["keymap-changed", self.xkbmap_print, self.xkbmap_query, self.xmodmap_data])
+            (_, _, current_mask) = gtk.gdk.get_default_root_window().get_pointer()
+            self.send(["keymap-changed", self.xkbmap_print, self.xkbmap_query, self.xmodmap_data, self.mask_to_names(current_mask)])
 
     def update_focus(self, id, gotit):
@@ -468 +473 @@
         if self.xmodmap_data:
             capabilities_request["xmodmap_data"] = self.xmodmap_data
+        (_, _, current_mask) = gtk.gdk.get_default_root_window().get_pointer()
+        modifiers = self.mask_to_names(current_mask)
+        log.debug("sending modifiers=%s" % str(modifiers))
+        capabilities_request["modifiers"] = modifiers
         root_w, root_h = gtk.gdk.get_default_root_window().get_size()
         capabilities_request["desktop_size"] = [root_w, root_h]

trunk/src/xpra/server.py

@@ -677 +677 @@
     def _calculate_capabilities(self, client_capabilities):
         capabilities = {}
-        for cap in ("deflate", "__prerelease_version", "challenge_response", "jpeg", "keymap", "xkbmap_query", "xmodmap_data"):
+        for cap in ("deflate", "__prerelease_version", "challenge_response", "jpeg", "keymap", "xkbmap_query", "xmodmap_data", "modifiers"):
             if cap in client_capabilities:
                 capabilities[cap] = client_capabilities[cap]
@@ -793 +793 @@
         if "jpeg" in capabilities:
             self._protocol.jpegquality = capabilities["jpeg"]
-        # clear the modifiers since this is a new client, if any are set they will be set on the next keypress
-        self._make_keymask_match([])
         if "keymap" in capabilities:
             self.xkbmap_print = capabilities["keymap"]
             self.xkbmap_query = capabilities.get("xkbmap_query", None)
             self.xmodmap_data = capabilities.get("xmodmap_data", None)
+            #always clear modifiers before setting a new keymap
+            self._make_keymask_match([])
             self.set_keymap()
+        # now we can set the modifiers to match the client
+        modifiers = capabilities.get("modifiers", [])
+        log.debug("setting modifiers to %s" % str(modifiers))
+        self._make_keymask_match(modifiers)
         # We send the new-window packets sorted by id because this sorts them
         # from oldest to newest -- and preserving window creation order means
@@ -873 +877 @@
         if len(packet)==3:
             (_, self.xkbmap_print, self.xkbmap_query) = packet
-        elif len(packet)==4:
-            (_, self.xkbmap_print, self.xkbmap_query, self.xmodmap_data) = packet
+        elif len(packet)==5:
+            (_, self.xkbmap_print, self.xkbmap_query, self.xmodmap_data, modifiers) = packet
+        self._make_keymask_match([])
         self.set_keymap()
+        self._make_keymask_match(modifiers)
 
     def _process_key_action(self, proto, packet):