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

Restructure to not execute code on speculative import

Browse Source 
Add logging messages at "info" level to provide feedback
while launching in order to make debugging unsuccessful
launches easier.
This commit is contained in:
Mike C. Fletcher 2007-04-21 23:01:56 -04:00
parent 60c9e0ecb8
commit a0ee487a40
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
sugar-emulator
View File

@ -19,6 +19,10 @@
import os import os
import sys import sys
import socket import socket
import logging
log = logging.getLogger( 'sugar-emulator' )
log.setLevel( logging.DEBUG )
import pygtk import pygtk
pygtk.require('2.0') pygtk.require('2.0')
@ -27,6 +31,7 @@ import gobject
def _get_display_number(): def _get_display_number():
"""Find a free display number trying to connect to 6000+ ports""" """Find a free display number trying to connect to 6000+ ports"""
log.info( "Attempting to find free port for X11 (Xephyr)" )
retries = 20 retries = 20
display_number = 1 display_number = 1
display_is_free = False display_is_free = False
@ -43,6 +48,10 @@ def _get_display_number():
display_is_free = True display_is_free = True
if display_is_free: if display_is_free:
log.info(
' Found free port: #%s (%s)',
display_number, display_number+6000
)
return display_number return display_number
else: else:
logging.error('Cannot find a free display.') logging.error('Cannot find a free display.')
@ -50,6 +59,7 @@ def _get_display_number():
def _start_xephyr(): def _start_xephyr():
display = _get_display_number() display = _get_display_number()
log.info( 'Starting the Xephyr nested X display on display %s', display )
cmd = [ 'Xephyr' ] cmd = [ 'Xephyr' ]
cmd.append(':%d' % display) cmd.append(':%d' % display)
@ -66,6 +76,7 @@ def _start_xephyr():
cmd.append('-dpi') cmd.append('-dpi')
cmd.append('%d' % int(dpi/1024)) cmd.append('%d' % int(dpi/1024))
log.debug( 'Xephyr command: %s', " ".join( cmd ) )
result = gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH) result = gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
pid = result[0] pid = result[0]
@ -73,11 +84,13 @@ def _start_xephyr():
os.environ['SUGAR_EMULATOR_PID'] = str(pid) os.environ['SUGAR_EMULATOR_PID'] = str(pid)
def _start_matchbox(): def _start_matchbox():
log.info( 'Starting the matchbox window manager' )
cmd = ['matchbox-window-manager'] cmd = ['matchbox-window-manager']
cmd.extend(['-use_titlebar', 'no']) cmd.extend(['-use_titlebar', 'no'])
cmd.extend(['-theme', 'olpc']) cmd.extend(['-theme', 'olpc'])
log.debug( 'Matchbox command: %s', " ".join( cmd) )
gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH) gobject.spawn_async(cmd, flags=gobject.SPAWN_SEARCH_PATH)
def _setup_env(): def _setup_env():
@ -89,23 +102,32 @@ def _setup_env():
if os.environ.has_key('PYTHONPATH'): if os.environ.has_key('PYTHONPATH'):
path = os.environ['PYTHONPATH'] path = os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = source_dir + ':' + path os.environ['PYTHONPATH'] = source_dir + ':' + path
log.info( 'Set PYTHONPATH=%s', os.environ['PYTHONPATH'] )
_setup_env() def main():
_start_xephyr() """Script-level operations"""
logging.basicConfig()
_setup_env()
_start_xephyr()
from sugar import env
if env.is_emulator():
gtkrc_filename = 'sugar.gtkrc'
else:
gtkrc_filename = 'sugar-xo.gtkrc'
os.environ['GTK2_RC_FILES'] = env.get_data_path(gtkrc_filename)
if len(sys.argv) == 1:
program = 'sugar-shell'
else:
_start_matchbox()
program = sys.argv[1]
command = ['dbus-launch', 'dbus-launch', '--exit-with-session', program]
log.info( "Attempting to launch sugar to replace this process: %s", " ".join(command) )
os.execlp( *command )
from sugar import env if __name__ == "__main__":
main()
if env.is_emulator():
gtkrc_filename = 'sugar.gtkrc'
else:
gtkrc_filename = 'sugar-xo.gtkrc'
os.environ['GTK2_RC_FILES'] = env.get_data_path(gtkrc_filename)
if len(sys.argv) == 1:
program = 'sugar-shell'
else:
_start_matchbox()
program = sys.argv[1]
os.execlp('dbus-launch', 'dbus-launch', '--exit-with-session', program)