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): |
71 | 71 | sys.stderr.write('Error executing server: %s\n' % (exc, )) |
72 | 72 | return None |
73 | 73 | |
74 | | os.environ['DISPLAY'] = ":%d" % (display) |
75 | | os.environ['SUGAR_EMULATOR_PID'] = str(pipe.pid) |
76 | 74 | return pipe |
77 | 75 | |
78 | 76 | |
… |
… |
def _start_xephyr(dpi, dimensions, fullscreen): |
98 | 96 | if not _check_server(display): |
99 | 97 | pipe = _run_xephyr(display, dpi, dimensions, fullscreen) |
100 | 98 | if not pipe: |
101 | | return None |
| 99 | return None, None |
102 | 100 | |
103 | 101 | for i_ in range(10): |
104 | 102 | if _check_server(display): |
105 | | return pipe |
| 103 | return pipe, display |
106 | 104 | |
107 | 105 | time.sleep(0.1) |
108 | 106 | |
109 | 107 | _kill_pipe(pipe) |
110 | 108 | |
111 | | return None |
| 109 | return None, None |
112 | 110 | |
113 | 111 | |
114 | 112 | def _start_window_manager(): |
… |
… |
def main(): |
152 | 150 | |
153 | 151 | _setup_env() |
154 | 152 | |
155 | | server = _start_xephyr(options.dpi, options.dimensions, options.fullscreen) |
| 153 | server, display = _start_xephyr(options.dpi, options.dimensions, options.fullscreen) |
156 | 154 | if not server: |
157 | 155 | sys.stderr.write('Failed to start server.\n') |
158 | 156 | return ERROR_NO_SERVER |
159 | 157 | |
| 158 | os.environ['DISPLAY'] = ":%d" % (display) |
| 159 | os.environ['SUGAR_EMULATOR_PID'] = str(server.pid) |
| 160 | |
160 | 161 | if options.scaling: |
161 | 162 | os.environ['SUGAR_SCALING'] = options.scaling |
162 | 163 | |