sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop Xnest support. Start fullscreen if widht <= 900.

Browse Source
This commit is contained in:
Marco Pesenti Gritti 2007-01-27 14:31:13 +01:00
parent 37c6c1e9fa
commit 204aac8658
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sugar-emulator
View File

@ -78,7 +78,7 @@ if len(sys.argv) == 1:
else:
program = sys.argv[1]
fullscreen = (gtk.gdk.screen_width() <= 1200 and
fullscreen = (gtk.gdk.screen_width() <= 1200 or
gtk.gdk.screen_height() <= 900)
emulator = Emulator(fullscreen)

23
sugar/emulator.py
View File

@ -95,20 +95,6 @@ class XephyrProcess(Process):
os.environ['DISPLAY'] = ":%d" % (self._display)
os.environ['SUGAR_XEPHYR_PID'] = '%d' % self.pid
class XnestProcess(Process):
def __init__(self):
self._display = get_display_number()
cmd = 'Xnest :%d -ac -geometry 800x600' % (self._display)
Process.__init__(self, cmd)
def get_name(self):
return 'Xnest'
def start(self, standard_output=False):
Process.start(self)
os.environ['DISPLAY'] = ":%d" % (self._display)
class Emulator(object):
"""The OLPC emulator"""
def __init__(self, fullscreen):
@ -119,13 +105,8 @@ class Emulator(object):
process = XephyrProcess(self._fullscreen)
process.start()
except:
try:
process = XnestProcess()
process.start()
except:
print 'Cannot run the emulator. You need to install \
Xephyr or Xnest.'
sys.exit(0)
print 'Cannot run the emulator. You need to install Xephyr'
sys.exit(0)
process = MatchboxProcess()
process.start()