when we get a decoding error, schedule a full window refresh (remove the need for the window in cancel_damage: we don't need to access the UI object here or check that it is even "sendable"

git-svn-id: https://xpra.org/svn/Xpra/trunk@8248 3bb7dfac-3a0b-4e04-842a-767bc560f471

Author: totaam

src/xpra/server/server_base.py

@@ -1680,17 +1680,22 @@ def _process_damage_sequence(self, proto, packet):
             ss = self._server_sources.get(proto)
             if ss:
                 ss.client_ack_damage(packet_sequence, wid, width, height, decode_time)
+            if decode_time<0:
+                #an error occurred, try to refresh:
+                ss.cancel_damage(wid)
+                def refresh():
+                    win = self._id_to_window.get(wid)
+                    ss = self._server_sources.get(proto)
+                    if ss and win:
+                        ss.refresh(wid, win, {})
+                self.idle_add(refresh)
 
 
     def _damage(self, window, x, y, width, height, options=None):
         wid = self._window_to_id[window]
         for ss in self._server_sources.values():
             ss.damage(wid, window, x, y, width, height, options)
 
-    def _cancel_damage(self, wid, window):
-        for ss in self._server_sources.values():
-            ss.cancel_damage(wid, window)
-
 
     def _process_buffer_refresh(self, proto, packet):
         """ can be used for requesting a refresh, or tuning batch config, or both """

src/xpra/server/source.py

@@ -1383,13 +1383,11 @@ def move_resize_window(self, wid, window, x, y, ww, wh, resize_counter):
             return
         self.send("window-move-resize", wid, x, y, ww, wh, resize_counter)
 
-    def cancel_damage(self, wid, window):
+    def cancel_damage(self, wid):
         """
         Use this method to cancel all currently pending and ongoing
         damage requests for a window.
         """
-        if not self.can_send_window(window):
-            return
         ws = self.window_sources.get(wid)
         if ws:
             ws.cancel_damage()
@@ -1432,7 +1430,7 @@ def set_speed(self, speed):
     def refresh(self, wid, window, opts):
         if not self.can_send_window(window):
             return
-        self.cancel_damage(wid, window)
+        self.cancel_damage(wid)
         w, h = window.get_dimensions()
         self.damage(wid, window, 0, 0, w, h, opts)