From b473b4f17cd65115fc4fadd8a71d30fef5066cb5 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Wed, 28 Feb 2007 12:24:47 +0000
Subject: Pass the X dpi to Xephyr. Default to a minimum of 96, some distros appear to be broken.

---
(limited to 'sugar/emulator.py')

diff --git a/sugar/emulator.py b/sugar/emulator.py
index 6cc4f52..8491dbf 100644
--- a/sugar/emulator.py
+++ b/sugar/emulator.py
@@ -78,7 +78,7 @@ class MatchboxProcess(Process):
         return 'Matchbox'
 
 class XephyrProcess(Process):
-    def __init__(self, width, height, fullscreen):
+    def __init__(self, width, height, fullscreen, dpi):
         self._display = get_display_number()
         cmd = 'Xephyr :%d -ac ' % (self._display)
 
@@ -88,6 +88,9 @@ class XephyrProcess(Process):
         if width > 0 and height > 0:
             cmd += ' -screen %dx%d' % (width, height)
 
+        if dpi > 0:
+            cmd += ' -dpi %d' % (dpi)
+
         Process.__init__(self, cmd)
         
     def get_name(self):
@@ -100,15 +103,16 @@ class XephyrProcess(Process):
 
 class Emulator(object):
     """The OLPC emulator"""
-    def __init__(self, width, height, fullscreen):
+    def __init__(self, width, height, fullscreen, dpi):
         self._fullscreen = fullscreen
         self._width = width
         self._height = height
+        self._dpi = dpi
 
     def start(self):
         try:
             process = XephyrProcess(self._width, self._height,
-                                    self._fullscreen)
+                                    self._fullscreen, self._dpi)
             process.start()
         except:
             print 'Cannot run the emulator. You need to install Xephyr'
--
cgit v0.9.1