Changeset 158 in xpra

Timestamp:

09/07/11 10:32:12 (22 months ago)

Author:

antoine

Message:

clear keys when client disconnects and ignore any packets that come after that so we don't end up re-setting some modifiers or keys. Unfortunately requires a new public flag on Protocol class.

Location:

trunk/src/xpra

Files:

• protocol.py (modified) (1 diff)
• server.py (modified) (4 diffs)

trunk/src/xpra/protocol.py

@@ -83 +83 @@
         self._source_has_more = False
         self._recv_counter = 0
+        self.closing = False
         self._closed = False
         self._read_decoder = IncrBDecode()

trunk/src/xpra/server.py

@@ -617 +617 @@
                     break
 
+    def _clear_keys_pressed(self):
+        if len(self.keys_pressed)>0:
+            log.debug("clearing keys pressed: %s" % str(self.keys_pressed))
+            for keycode in self.keys_pressed.keys():
+                xtest_fake_key(gtk.gdk.display_get_default(), keycode, False)
+            self.keys_pressed = {}
+
     def _focus(self, id, modifiers):
         log.debug("_focus(%s,%s)" % (id, modifiers))
         if self._has_focus != id:
             if id == 0:
-                #clear any keys that were pressed:
-                if len(self.keys_pressed)>0:
-                    log.debug("focus event: clearing keys pressed: %s" % str(self.keys_pressed))
-                    for keycode in self.keys_pressed.keys():
-                        xtest_fake_key(gtk.gdk.display_get_default(), keycode, False)
-                    self.keys_pressed = {}
+                self._clear_keys_pressed()
                 # FIXME: kind of a hack:
                 self._wm.get_property("toplevel").reset_x_focus()
@@ -790 +792 @@
         if self._protocol is not None:
             log.info("Disconnecting existing client")
+            #ensure that from now on we ignore any incoming packets coming
+            #from this connection as these could potentially set some keys pressed, etc
+            self._protocol.closing = True
+            self._clear_keys_pressed()
             # send message asking for disconnection politely:
             self._protocol.source.send_packet_now(["disconnect", "new valid connection received"])
@@ -984 +990 @@
         if proto is self._protocol:
             log.info("xpra client disconnected.")
+            self._clear_keys_pressed()
             self._protocol = None
         sys.stdout.flush()
@@ -1014 +1021 @@
     def process_packet(self, proto, packet):
         packet_type = packet[0]
+        if self._protocol and self._protocol.closing:
+            log.debug("ignoring %s packet on socket which is closing" % packet_type)
+            return
         if (isinstance(packet_type, str)
             and packet_type.startswith("clipboard-")):