Ticket #2757: replay-scrolls.patch

xpra/client/gtk_base/cairo_backing_base.py

@@ -11 +11 @@
 from xpra.client.window_backing_base import WindowBackingBase, fire_paint_callbacks, SCROLL_ENCODING
 from xpra.client.gtk_base.cairo_paint_common import setup_cairo_context, cairo_paint_pointer_overlay
 from xpra.os_util import memoryview_to_bytes
-from xpra.util import envbool
+from xpra.util import envbool, csv
 from xpra.log import Logger
 
 log = Logger("paint", "cairo")
@@ -145 +145 @@
         if not gc:
             fire_paint_callbacks(callbacks, False, message="no context")
             return
+        count = getattr(self, "scroll_counter", 0)
+        old_backing.write_to_png("scroll-%iA.png" % count)
+        log.error("scrolls %i:", count)
+        with open("scroll-%i.txt" % count, "wb") as f:
+            for scroll in scrolls:
+                log.error(csv(scroll))
+                f.write(("%s\n" % csv(scroll)).encode())
         gc.set_operator(cairo.OPERATOR_SOURCE)
         for sx,sy,sw,sh,xdelta,ydelta in scrolls:
             gc.set_source_surface(old_backing, xdelta, ydelta)
@@ -156 +163 @@
                 self.cairo_paint_box(gc, "scroll", x, y, sw, sh)
         del gc
         self._backing.flush()
+        self._backing.write_to_png("scroll-%iB.png" % count)
+        self.scroll_counter = count+1
         fire_paint_callbacks(callbacks)
 
 

tests/xpra/clients/cairo_replayscroll.py

@@ +1 @@
+#!/usr/bin/env python
+# This file is part of Xpra.
+# Copyright (C) 2020 Antoine Martin <antoine@xpra.org>
+# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
+# later version. See the file COPYING for details.
+
+import sys
+import cairo
+from time import sleep
+
+import gi
+gi.require_version("Gtk", "3.0")
+gi.require_version("Gdk", "3.0")
+from gi.repository import Gtk, Gdk, GLib
+
+
+class ReplayScroll(Gtk.Window):
+
+    def __init__(self):
+        super().__init__()
+
+        self.last = None
+        self.image = None
+        self.scrolls = []
+
+        self.darea = Gtk.DrawingArea()
+        self.darea.connect("draw", self.on_draw)
+        self.darea.set_size_request(1024, 1024)
+        self.add(self.darea)
+
+        self.set_title("Replay Scroll ")
+        self.set_position(Gtk.WindowPosition.CENTER)
+        self.connect("delete-event", Gtk.main_quit)
+        self.show_all()
+
+    def load_image(self, filename):
+        self.last = self.image
+        self.image = cairo.ImageSurface.create_from_png(filename)
+        self.resize(self.image.get_width(), self.image.get_height())
+        self.darea.queue_draw()
+
+    def step(self, message):
+        print(message)
+        self.darea.queue_draw()
+
+    def apply_scroll(self, filename):
+        with open(filename, "rb") as f:
+            data = f.read()
+        self.scrolls = []
+        for line in data.decode().splitlines():
+            scroll = [int(x.strip()) for x in line.split(",")]
+            self.scrolls.append(scroll)
+        self.clear()
+
+    def clear(self):
+        self.last = self.image
+        w, h = self.image.get_width(), self.image.get_height()
+        self.image = cairo.ImageSurface(cairo.FORMAT_ARGB32, w, h)
+        cr = cairo.Context(self.image)
+        cr.set_operator(cairo.OPERATOR_CLEAR)
+        cr.set_source_rgba(1, 1, 1, 1)
+        cr.rectangle(0, 0, w, h)
+        cr.fill()
+        self.image.flush()
+        self.step("clear")
+        GLib.timeout_add(1000, self.copy)
+
+    def copy(self):
+        cr = cairo.Context(self.image)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.set_source_surface(self.last, 0, 0)
+        cr.paint()
+        self.image.flush()
+        self.step("copy")
+        GLib.timeout_add(1000, self.paint_scroll)
+
+    def paint_scroll(self):
+        if not self.scrolls:
+            return False
+        scroll = self.scrolls[0]
+        sx,sy,sw,sh,xdelta,ydelta = scroll
+        self.scrolls = self.scrolls[1:]
+        self.step("scroll: %s" % (scroll))
+
+        cr = cairo.Context(self.image)
+        cr.set_operator(cairo.OPERATOR_SOURCE)
+        cr.set_source_surface(self.last, xdelta, ydelta)
+        x = sx+xdelta
+        y = sy+ydelta
+        cr.rectangle(x, y, sw, sh)
+        cr.fill()
+        if True:
+            color = 0, 0, 0, 0.6
+            cr.set_line_width(1)
+            cr.set_source_rgba(*color)
+            cr.rectangle(x, y, sw, sh)
+            cr.stroke()
+        del cr
+        self.image.flush()
+        return bool(self.scrolls)
+
+
+    def on_draw(self, wid, cr):
+        if self.image:
+            cr.set_source_surface(self.image, 0, 0)
+            cr.paint()
+
+def main():
+    app = ReplayScroll()
+    def update_image():
+        for x in sys.argv[1:]:
+            if x.endswith(".png"):
+                app.load_image(x)
+            else:
+                app.apply_scroll(x)
+    GLib.timeout_add(1000, update_image)
+    Gtk.main()
+
+if __name__ == "__main__":    
+    main()