Ticket #1321: osx-shadow-scrolling-v2.patch

xpra/platform/darwin/shadow_server.py

@@ -80 +80 @@
             raise InitExit(1, "cannot grab pixels from the screen, make sure this command is launched from a GUI session")
         patch_picture_encode()
         self.refresh_count = 0
+        self.move_count = 0
+        self.move_rectangle_count = 0
+        self.move_registered = False
         self.refresh_rectangle_count = 0
         self.refresh_registered = False
         GTKShadowServerBase.__init__(self)
@@ -98 +101 @@
         return GTKStatusIconTray(self, 0, self.tray, "Xpra Shadow Server", None, None,
                                  self.tray_click_callback, mouseover_cb=None, exit_cb=self.tray_exit_callback)
 
-
     def setup_capture(self):
         return OSXRootCapture()
 
-    def screen_refresh_callback(self, count, rects, info):
-        log("screen_refresh_callback%s mapped=%s", (count, rects, info), self.mapped)
-        self.refresh_count += 1
+    def _cgrects_to_list(self, count, rects):
         rlist = []
-        for r in rects:
+        for i in range(count):
+            r = rects[i]
             if not isinstance(r, CG.CGRect):
-                log.error("Error: invalid rectangle in refresh list: %s", r)
+                log.error("Error: invalid rectangle in refresh list: %s (%s)", r, type(r))
                 continue
             self.refresh_rectangle_count += 1
             rlist.append((int(r.origin.x), int(r.origin.y), int(r.size.width), int(r.size.height)))
+        return rlist
+
+    def screen_move_callback(self, delta, count, rects, info):
+        log.info("screen_move_callback%s mapped=%s", (delta, count, rects, info), self.mapped)
+        self.move_count += 1
+        rlist = self._cgrects_to_list(count, rects)
+        self.move_rectangle_count += len(rlist)
+        self.idle_add(self.do_screen_move, delta, rlist)
+
+    def do_screen_move(self, delta, rlist):
+        log.info("do_screen_move%s", (delta, rlist))
+
+    def screen_refresh_callback(self, count, rects, info):
+        log("screen_refresh_callback%s mapped=%s", (count, rects, info), self.mapped)
+        self.refresh_count += 1
+        rlist = self._cgrects_to_list(count, rects)
         #return quickly, and process the list copy via idle add:
         self.idle_add(self.do_screen_refresh, rlist)
 
@@ -139 +156 @@
         if not USE_TIMER:
             err = CG.CGRegisterScreenRefreshCallback(self.screen_refresh_callback, None)
             log("CGRegisterScreenRefreshCallback(%s)=%s", self.screen_refresh_callback, err)
-            if err==0:
-                self.refresh_registered = True
+            self.refresh_registered = err==0
+            if self.refresh_registered:
+                #now try to register move callback (optional):
+                try:
+                    err = CG.CGScreenRegisterMoveCallback(self.screen_move_callback, None)
+                    log("CGScreenRegisterMoveCallback(%s)=%s", self.screen_move_callback, err)
+                except Exception as e:
+                    err = str(e)
+                self.move_registered = err==0
+                if not self.move_registered:
+                    log.warn("Warning: CGScreenRegisterMoveCallback failed with error %i", err)
+                    log.warn(" no scrolling detection")
                 return
             log.warn("Warning: CGRegisterScreenRefreshCallback failed with error %i", err)
             log.warn(" using fallback timer method")
@@ -150 +177 @@
         log("stop_refresh(%i) mapped=%s, timer=%s", wid, self.mapped, self.refresh_timer)
         #may stop the timer fallback:
         super().stop_refresh(wid)
-        if self.refresh_registered and not self.mapped:
+        if self.mapped:
+            return
+        if self.refresh_registered:
             try:
                 err = CG.CGUnregisterScreenRefreshCallback(self.screen_refresh_callback, None)
                 log("CGUnregisterScreenRefreshCallback(%s)=%s", self.screen_refresh_callback, err)
@@ -160 +189 @@
                 log.warn("Error unregistering screen refresh callback:")
                 log.warn(" %s", e)
             self.refresh_registered = False
+        if self.move_registered:
+            try:
+                err = CG.CGScreenUnregisterMoveCallback(self.screen_move_callback, None)
+                log("CGScreenUnregisterMoveCallback(%s)=%s", self.screen_move_callback, err)
+                if err:
+                    log.warn(" unregistering the move callback returned %s", err)
+            except ValueError as e:
+                log.warn("Error unregistering screen refresh callback:")
+                log.warn(" %s", e)
+            self.move_registered = False
 
-
-    def do_process_mouse_common(self, proto, wid, pointer, *args):
+    def do_process_mouse_common(self, proto, wid, pointer, *_args):
         assert proto in self._server_sources
         assert wid in self._id_to_window
         CG.CGWarpMouseCursorPosition(pointer[:2])
@@ -223 +261 @@
                                               "notifications"   : self.refresh_registered,
                                               "count"           : self.refresh_count,
                                               "rectangles"      : self.refresh_rectangle_count,
+                                              "move"            : self.move_count,
+                                              "move-rectangles" : self.move_rectangle_count,
                                               })
         return info