Cross-platform plumbing for resize-to-client

remoting/tools/me2me_virtual_host.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 150 matching lines @@
 class Desktop:
   """Manage a single virtual desktop"""
 
   def __init__(self, sizes):
     self.x_proc = None
     self.session_proc = None
     self.host_proc = None
     self.child_env = None
     self.sizes = sizes
     self.pulseaudio_pipe = None
+    self.server_supports_exact_resize = False
     g_desktops.append(self)
 
   @staticmethod
   def get_unused_display_number():
     """Return a candidate display number for which there is currently no
     X Server lock file"""
     display = FIRST_X_DISPLAY_NUMBER
     while os.path.exists(X_LOCK_FILE_TEMPLATE % display):
       display += 1
     return display
@@ skipping 65 matching lines @@
     display = self.get_unused_display_number()
     ret_code = subprocess.call("xauth add :%d . `mcookie`" % display,
                                shell=True)
     if ret_code != 0:
       raise Exception("xauth failed with code %d" % ret_code)
 
     max_width = max([width for width, height in self.sizes])
     max_height = max([height for width, height in self.sizes])
 
     try:
-      xvfb = locate_executable("Xvfb-randr")
+      # TODO(jamiewalch): This script expects to be installed alongside
+      # Xvfb-randr, but that's no longer the case. Fix this once we have
+      # a Xvfb-randr package that installs somewhere sensible.
+      xvfb = "/usr/bin/Xvfb-randr"
+      if not os.path.exists(xvfb):
+        xvfb = locate_executable("Xvfb-randr")
+      self.server_supports_exact_resize = True
     except Exception:
       xvfb = "Xvfb"
+      self.server_supports_exact_resize = False
 
     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,
                                     "-noreset",
                                     "-auth", X_AUTH_FILE,
                                     "-nolisten", "tcp",
                                     "-screen", "0", screen_option
                                     ] + extra_x_args)
     if not self.x_proc.pid:
@@ skipping 71 matching lines @@
     self._init_child_env()
     self._setup_pulseaudio()
     self._launch_x_server(x_args)
     self._launch_x_session()
 
   def launch_host(self, host_config):
     # Start remoting host
     args = [locate_executable(HOST_BINARY_NAME), "--host-config=/dev/stdin"]
     if self.pulseaudio_pipe:
       args.append("--audio-pipe-name=%s" % self.pulseaudio_pipe)
+    if self.server_supports_exact_resize:
+      args.append("--server-supports-exact-resize")
     self.host_proc = subprocess.Popen(args, env=self.child_env,
                                       stdin=subprocess.PIPE)
     logging.info(args)
     if not self.host_proc.pid:
       raise Exception("Could not start Chrome Remote Desktop host")
     self.host_proc.stdin.write(json.dumps(host_config.data))
     self.host_proc.stdin.close()
 
 
 class PidFile:
@@ skipping 234 matching lines @@
       # Exit cleanly so the atexit handler, cleanup(), gets called.
       raise SystemExit
 
 
 def relaunch_self():
   cleanup()
   os.execvp(sys.argv[0], sys.argv)
 
 
 def main():
-  DEFAULT_SIZE = "1280x800"
+  DEFAULT_SIZE = "2560x1600"
   EPILOG = """This script is not intended for use by end-users.  To configure
 Chrome Remote Desktop, please install the app from the Chrome
 Web Store: https://chrome.google.com/remotedesktop"""
   parser = optparse.OptionParser(
       usage="Usage: %prog [options] [ -- [ X server options ] ]",
       epilog=EPILOG)
   parser.add_option("-s", "--size", dest="size", action="append",
                     help="Dimensions of virtual desktop (default: %s). "
                     "This can be specified multiple times to make multiple "
                     "screen resolutions available (if the Xvfb server "
@@ skipping 232 matching lines @@
         return 0
       elif os.WEXITSTATUS(status) == 5:
         logging.info("Host domain is blocked by policy - exiting.")
         os.remove(host.config_file)
         return 0
       # Nothing to do for Mac-only status 6 (login screen unsupported)
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG)
   sys.exit(main())