Ticket #1860: 0001-Set-the-DISPLAY-env-var-once-Xephyr-has-been-launche.patch

File 0001-Set-the-DISPLAY-env-var-once-Xephyr-has-been-launche.patch, 1.8 KB (added by tomeu, 14 years ago)

  • src/jarabe/util/emulator.py 

    From e6ebef33620fc5a6928d85a429b3d60fcb342c30 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Tue, 23 Mar 2010 15:39:25 +0100
Subject: [PATCH] Set the DISPLAY env var once Xephyr has been launched

---
 src/jarabe/util/emulator.py |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/jarabe/util/emulator.py b/src/jarabe/util/emulator.py
index 3eb817f..4155985 100644
    a b def _run_xephyr(display, dpi, dimensions, fullscreen): 
    7171        sys.stderr.write('Error executing server: %s\n' % (exc, ))
    7272        return None
    7373
    74     os.environ['DISPLAY'] = ":%d" % (display)
    75     os.environ['SUGAR_EMULATOR_PID'] = str(pipe.pid)
    7674    return pipe
    7775
    7876
    … … def _start_xephyr(dpi, dimensions, fullscreen): 
    9896        if not _check_server(display):
    9997            pipe = _run_xephyr(display, dpi, dimensions, fullscreen)
    10098            if not pipe:
    101                 return None
     99                return None, None
    102100
    103101            for i_ in range(10):
    104102                if _check_server(display):
    105                     return pipe
     103                    return pipe, display
    106104
    107105                time.sleep(0.1)
    108106
    109107            _kill_pipe(pipe)
    110108
    111     return None
     109    return None, None
    112110
    113111
    114112def _start_window_manager():
    … … def main(): 
    152150
    153151    _setup_env()
    154152
    155     server = _start_xephyr(options.dpi, options.dimensions, options.fullscreen)
     153    server, display = _start_xephyr(options.dpi, options.dimensions, options.fullscreen)
    156154    if not server:
    157155        sys.stderr.write('Failed to start server.\n')
    158156        return ERROR_NO_SERVER
    159157
     158    os.environ['DISPLAY'] = ":%d" % (display)
     159    os.environ['SUGAR_EMULATOR_PID'] = str(server.pid)
     160
    160161    if options.scaling:
    161162        os.environ['SUGAR_SCALING'] = options.scaling
    162163