diff options
author | lambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:40:27 +0000 |
---|---|---|
committer | lambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 21:40:27 +0000 |
commit | c1cfd8e2c81f68b0e8deb997ab289f1d28b387f6 (patch) | |
tree | cdb41c6044f1b21d824c40d40bf5f73739d7301d /remoting/tools | |
parent | 8d0d01057db8015aff643a141ebfb68ecaf295ce (diff) | |
download | chromium_src-c1cfd8e2c81f68b0e8deb997ab289f1d28b387f6.zip chromium_src-c1cfd8e2c81f68b0e8deb997ab289f1d28b387f6.tar.gz chromium_src-c1cfd8e2c81f68b0e8deb997ab289f1d28b387f6.tar.bz2 |
Run a RANDR-patched version of Xvfb for Virtual Me2Me if available.
BUG=131245
TEST=Manual
Review URL: https://chromiumcodereview.appspot.com/10800061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
-rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index e2b1849..2b537b6 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -281,9 +281,14 @@ class Desktop: max_width = max([width for width, height in self.sizes]) max_height = max([height for width, height in self.sizes]) - logging.info("Starting Xvfb on display :%d" % display); + try: + xvfb = locate_executable("Xvfb-randr") + except Exception: + xvfb = "Xvfb" + + logging.info("Starting %s on display :%d" % (xvfb, display)); screen_option = "%dx%dx24" % (max_width, max_height) - self.x_proc = subprocess.Popen(["Xvfb", ":%d" % display, + self.x_proc = subprocess.Popen([xvfb, ":%d" % display, "-noreset", "-auth", X_AUTH_FILE, "-nolisten", "tcp", |