Report XRandR display size for lodpi displays

fixes: QubesOS/qubes-issues#9578
alimirjamali · Nov 15, 2024 · 564879c · 564879c
1 parent 32e977b
commit 564879c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/qubesadmin/tests/tools/qvm_start_daemon.py b/qubesadmin/tests/tools/qvm_start_daemon.py
@@ -493,7 +493,7 @@ def test_050_get_monitor_layout1(self, proc_mock):
 VIRTUAL1 disconnected (normal left inverted right x axis y axis)
 '''.splitlines()
         self.assertEqual(qubesadmin.tools.qvm_start_daemon.get_monitor_layout(),
-                         ['1920 1200 0 0\n'])
+                         ['1920 1200 0 0 508 317\n'])
 
     @unittest.mock.patch('subprocess.Popen')
     def test_051_get_monitor_layout_multiple(self, proc_mock):

diff --git a/qubesadmin/tools/qvm_start_daemon.py b/qubesadmin/tools/qvm_start_daemon.py
@@ -402,7 +402,6 @@ def get_monitor_layout():
                     continue
                 output_params = match.groupdict()
                 if output_params['width']:
-                    phys_size = ""
                     if output_params['width_mm'] \
                             and int(output_params['width_mm']):
                         # don't provide real values for privacy reasons - see
@@ -416,14 +415,12 @@ def get_monitor_layout():
                         elif dpi > 150:
                             dpi = 150
                         else:
-                            # if lower, don't provide this info to the VM at all
-                            dpi = 0
-                        if dpi:
-                            # now calculate dimensions based on approximate DPI
-                            phys_size = " {} {}".format(
-                                int(output_params['width']) * 254 // dpi // 10,
-                                int(output_params['height']) * 254 // dpi // 10,
-                            )
+                            dpi = 96
+                        # now calculate dimensions based on approximate DPI
+                        phys_size = " {} {}".format(
+                            int(output_params['width']) * 254 // dpi // 10,
+                            int(output_params['height']) * 254 // dpi // 10,
+                        )
                     outputs.append("%s %s %s %s%s\n" % (
                         output_params['width'],
                         output_params['height'],