authoravatarclover caruso<git@paperclover.net>2026-11-17 04:19:09-08:00
committeravatarclover caruso<git@paperclover.net>2026-11-22 00:44:02-08:00
logc39854bcb4d98462f03c79c2dcc64c894cf98aab
tree4b7e4c66686787f1c0e6366f8ed323950240934e
parent9993eea212ea925b52a7c41f44974a873a6f7e8a
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

Request a complete VM screen after framebuffer resize

A resize clears the cached pixels, so request a complete framebuffer and wait for it before presenting. Preserve ordinary incremental updates and cursor-only frames. Assisted-by: gpt-6.1-sol

2 files changed, 18 insertions(+), 1 deletions(-)

tools/vm-rfb.py+4-1
...@@ -105,6 +105,7 @@ class Desktop:...@@ -105,6 +105,7 @@ class Desktop:
105 if kind == 0:105 if kind == 0:
106 _, count = struct.unpack("!BH", await self.reader.readexactly(3))106 _, count = struct.unpack("!BH", await self.reader.readexactly(3))
107 dirty = False107 dirty = False
108 full = False
108 for _ in range(count):109 for _ in range(count):
109 x, y, width, height, encoding = struct.unpack("!HHHHi", await self.reader.readexactly(12))110 x, y, width, height, encoding = struct.unpack("!HHHHi", await self.reader.readexactly(12))
110 if encoding == -224:111 if encoding == -224:
...@@ -112,6 +113,8 @@ class Desktop:...@@ -112,6 +113,8 @@ class Desktop:
112 if encoding == -223:113 if encoding == -223:
113 self.resize(width, height)114 self.resize(width, height)
114 resized()115 resized()
116 dirty = False
117 full = True
115 continue118 continue
116 if encoding == -239:119 if encoding == -239:
117 if width * height > 256 * 256:120 if width * height > 256 * 256:
...@@ -146,7 +149,7 @@ class Desktop:...@@ -146,7 +149,7 @@ class Desktop:
146 dirty = dirty or bool(width and height)149 dirty = dirty or bool(width and height)
147 if dirty:150 if dirty:
148 present()151 present()
149 self.request()152 self.request(not full)
150 await self.writer.drain()153 await self.writer.drain()
151 elif kind == 2:154 elif kind == 2:
152 pass155 pass
tools/vm-screen-test.py+14
...@@ -117,6 +117,7 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase):...@@ -117,6 +117,7 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase):
117 async def test_resize_and_out_of_bounds(self):117 async def test_resize_and_out_of_bounds(self):
118 await self.update([struct.pack("!HHHHi", 0, 0, 2, 2, -223)])118 await self.update([struct.pack("!HHHHi", 0, 0, 2, 2, -223)])
119 self.assertEqual((self.desktop.width, self.desktop.height, self.resized), (2, 2, 1))119 self.assertEqual((self.desktop.width, self.desktop.height, self.resized), (2, 2, 1))
120 self.assertEqual(self.writer.data[-10:], struct.pack("!BBHHHH", 3, 0, 0, 0, 2, 2))
120 self.reader = asyncio.StreamReader()121 self.reader = asyncio.StreamReader()
121 self.desktop.reader = self.reader122 self.desktop.reader = self.reader
122 with self.assertRaisesRegex(ValueError, "outside"):123 with self.assertRaisesRegex(ValueError, "outside"):
...@@ -125,6 +126,19 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase):...@@ -125,6 +126,19 @@ class DesktopTests(unittest.IsolatedAsyncioTestCase):
125 with self.assertRaises(ValueError):126 with self.assertRaises(ValueError):
126 self.desktop.resize(width, height)127 self.desktop.resize(width, height)
127128
129 async def test_resize_after_pixels_waits_for_the_new_frame(self):
130 await self.update([
131 struct.pack("!HHHHi", 0, 0, 4, 2, 0) + b'a' * 32,
132 struct.pack("!HHHHi", 0, 0, 2, 2, -223),
133 ])
134 self.assertEqual(self.presented, 0)
135 self.assertEqual(self.desktop.pixels, bytes(16))
136 self.reader = asyncio.StreamReader()
137 self.desktop.reader = self.reader
138 await self.update([struct.pack("!HHHHi", 0, 0, 2, 2, 0) + b'b' * 16])
139 self.assertEqual(self.presented, 1)
140 self.assertEqual(self.desktop.pixels, b'b' * 16)
141
128 def test_input_validation_and_release(self):142 def test_input_validation_and_release(self):
129 self.desktop.input({"type": "key", "key": 65507, "down": True})143 self.desktop.input({"type": "key", "key": 65507, "down": True})
130 self.desktop.input({"type": "pointer", "x": -1, "y": 10, "buttons": 1})144 self.desktop.input({"type": "pointer", "x": -1, "y": 10, "buttons": 1})