Ticket #13: release-keys-on-focus1.diff

src/xpra/client.py

@@ -73 +73 @@
         self._failed_pixbuf_index = 0
         self._refresh_timer = None
         self._refresh_requested = 0
+        self._heldKeys = {}
 
         self.update_metadata(metadata)
 
@@ -279 +280 @@
             """ for versions newer than 0.0.7.24, we send ALL the raw information we have """
             keycode = event.hardware_keycode
             log.debug("key_action(%s,%s) modifiers=%s, name=%s, state=%s, keyval=%s, string=%s, keycode=%s" % (event, depressed, modifiers, name, event.state, event.keyval, event.string, keycode))
-            self._client.send(["key-action", self._id, nn(name), depressed, modifiers, nn(event.keyval), nn(event.string), nn(keycode)])
+            keyEvent = ["key-action", self._id, nn(name), depressed, modifiers, nn(event.keyval), nn(event.string), nn(keycode)]
+            self._client.send(keyEvent)
+            if depressed:
+                assert(keyEvent[3])
+                self._heldKeys[nn(keycode)] = keyEvent[:]
+            else:
+                if nn(keycode) in self._heldKeys:
+                    del self._heldKeys[nn(keycode)]
         else:
             """ versions before 0.0.7.24 only accept 4 parameters (no keyval, keycode, ...) """
             if name is not None:
                 self._client.send(["key-action", self._id, nn(name), depressed, modifiers])
 
+    def release_keys(self):
+        for keyEvent in self._heldKeys.values():
+            assert(keyEvent[3])
+            keyEvent[3] = False
+            self._client.send(keyEvent)
+        self._heldKeys = {}
+
     def do_key_press_event(self, event):
         self._key_action(event, True)
 
@@ -435 +450 @@
         if gotit and self._focused is not id:
             self.send(["focus", id])
             self._focused = id
+            assert id > 0
+            self._id_to_window[id].release_keys()
         if not gotit and self._focused is id:
             self.send(["focus", 0])
             self._focused = None