Increase default maximum desktop size and make it configurable.

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 17 matching lines @@
 # By default this script will try to determine the most appropriate X session
 # command for the system.  To use a specific session instead, set this variable
 # to the executable filename, or a list containing the executable and any
 # arguments, for example:
 # XSESSION_COMMAND = "/usr/bin/gnome-session-fallback"
 # XSESSION_COMMAND = ["/usr/bin/gnome-session", "--session=ubuntu-2d"]
 XSESSION_COMMAND = None
 
 LOG_FILE_ENV_VAR = "CHROME_REMOTE_DESKTOP_LOG_FILE"
 
+# This script has a sensible default for the initial and maximum desktop size,
+# which can be overridden either on the command-line, or via a comma-separated
+# list of sizes in this environment variable.
+DEFAULT_SIZES_ENV_VAR = "CHROME_REMOTE_DESKTOP_DEFAULT_DESKTOP_SIZES"
+
+# By default, provide a relatively small size to handle the case where resize-
+# to-client is disabled, and a much larger size to support clients with large
+# or mulitple monitors. These defaults can be overridden in ~/.profile.
+DEFAULT_SIZES = "1600x1200,3840x1600"
+
 SCRIPT_PATH = sys.path[0]
 
 DEFAULT_INSTALL_PATH = "/opt/google/chrome-remote-desktop"
 if SCRIPT_PATH == DEFAULT_INSTALL_PATH:
   HOST_BINARY_NAME = "chrome-remote-desktop-host"
 else:
   HOST_BINARY_NAME = "remoting_me2me_host"
 
 CHROME_REMOTING_GROUP_NAME = "chrome-remote-desktop"
 
@@ skipping 693 matching lines @@
           raise
         elif deadline > now:
           time.sleep(deadline - now)
         return (0, 0)
       else:
         # Anything else is an unexpected error.
         raise
 
 
 def main():
-  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 "
-                    "supports this)" % DEFAULT_SIZE)
+                    help="Dimensions of virtual desktop. This can be specified "
+                    "multiple times to make multiple screen resolutions "
+                    "available (if the Xvfb server supports this).")
   parser.add_option("-f", "--foreground", dest="foreground", default=False,
                     action="store_true",
                     help="Don't run as a background daemon.")
   parser.add_option("", "--start", dest="start", default=False,
                     action="store_true",
                     help="Start the host.")
   parser.add_option("-k", "--stop", dest="stop", default=False,
                     action="store_true",
                     help="Stop the daemon currently running.")
   parser.add_option("", "--check-running", dest="check_running", default=False,
@@ skipping 53 matching lines @@
     # TODO(sergeyu): Also check RPM package version once we add RPM package.
     return os.system(locate_executable(HOST_BINARY_NAME) + " --version") >> 8
 
   if not options.start:
     # If no modal command-line options specified, print an error and exit.
     print >> sys.stderr, EPILOG
     return 1
 
   # Collate the list of sizes that XRANDR should support.
   if not options.size:
-    options.size = [DEFAULT_SIZE]
+    default_sizes = DEFAULT_SIZES
+    if os.environ.has_key(DEFAULT_SIZES_ENV_VAR):
+      default_sizes = os.environ[DEFAULT_SIZES_ENV_VAR]
+    options.size = default_sizes.split(",");
 
   sizes = []
   for size in options.size:
     size_components = size.split("x")
     if len(size_components) != 2:
       parser.error("Incorrect size format '%s', should be WIDTHxHEIGHT" % size)
 
     try:
       width = int(size_components[0])
       height = int(size_components[1])
@@ skipping 190 matching lines @@
         host_config.clear_auth()
         host_config.clear_host_info()
         host_config.save()
         return 0
 
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG,
                       format="%(asctime)s:%(levelname)s:%(message)s")
   sys.exit(main())