diff --git a/tools/vm-rfb.py b/tools/vm-rfb.py index c7d0e5003b3d68e53bae01e2eed1c764159a5589..5f94523bbd2c0805ac914a6643c6befd2b68a923 100644 --- a/tools/vm-rfb.py +++ b/tools/vm-rfb.py @@ -105,6 +105,7 @@ class Desktop: if kind == 0: _, count = struct.unpack("!BH", await self.reader.readexactly(3)) dirty = False + full = False for _ in range(count): x, y, width, height, encoding = struct.unpack("!HHHHi", await self.reader.readexactly(12)) if encoding == -224: @@ -112,6 +113,8 @@ class Desktop: if encoding == -223: self.resize(width, height) resized() + dirty = False + full = True continue if encoding == -239: if width * height > 256 * 256: @@ -146,7 +149,7 @@ class Desktop: dirty = dirty or bool(width and height) if dirty: present() - self.request() + self.request(not full) await self.writer.drain() elif kind == 2: pass diff --git a/tools/vm-screen-test.py b/tools/vm-screen-test.py index 65c4c40ff9aecf55c13398270d5685b2ffafaf9f..6cf21ab69d95bd79f9f0e4fbdc8f548d8bf96b12 100644 --- a/tools/vm-screen-test.py +++ b/tools/vm-screen-test.py @@ -117,6 +117,7 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase): async def test_resize_and_out_of_bounds(self): await self.update([struct.pack("!HHHHi", 0, 0, 2, 2, -223)]) self.assertEqual((self.desktop.width, self.desktop.height, self.resized), (2, 2, 1)) + self.assertEqual(self.writer.data[-10:], struct.pack("!BBHHHH", 3, 0, 0, 0, 2, 2)) self.reader = asyncio.StreamReader() self.desktop.reader = self.reader with self.assertRaisesRegex(ValueError, "outside"): @@ -125,6 +126,19 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase): with self.assertRaises(ValueError): self.desktop.resize(width, height) + async def test_resize_after_pixels_waits_for_the_new_frame(self): + await self.update([ + struct.pack("!HHHHi", 0, 0, 4, 2, 0) + b'a' * 32, + struct.pack("!HHHHi", 0, 0, 2, 2, -223), + ]) + self.assertEqual(self.presented, 0) + self.assertEqual(self.desktop.pixels, bytes(16)) + self.reader = asyncio.StreamReader() + self.desktop.reader = self.reader + await self.update([struct.pack("!HHHHi", 0, 0, 2, 2, 0) + b'b' * 16]) + self.assertEqual(self.presented, 1) + self.assertEqual(self.desktop.pixels, b'b' * 16) + def test_input_validation_and_release(self): self.desktop.input({"type": "key", "key": 65507, "down": True}) self.desktop.input({"type": "pointer", "x": -1, "y": 10, "buttons": 1})