Merge pull request scrapinghub#725 from deademo/xvbf_screen_size_para…

…meter

Added --xvbf_screen_size parameter.

splash/server.py

@@ -43,6 +43,8 @@ def parse_opts(jupyter=False, argv=sys.argv):
         help="comma-separated list of allowed URI schemes (defaut: %default)")
     op.add_option("--filters-path",
         help="path to a folder with network request filters")
+    op.add_option('--xvfb-screen-size',
+        help="screen size for xvfb (default: %default)", default=defaults.VIEWPORT_SIZE)
     op.add_option("--disable-private-mode", action="store_true", default=not defaults.PRIVATE_MODE,
         help="disable private mode (WARNING: data may leak between requests)" + _bool_default[not defaults.PRIVATE_MODE])
     op.add_option("--disable-xvfb", action="store_true", default=False,
@@ -355,7 +357,7 @@ def main(jupyter=False, argv=sys.argv, server_factory=splash_server):
     log_splash_version()
     bump_nofile_limit()
 
-    with xvfb.autostart(opts.disable_xvfb) as x:
+    with xvfb.autostart(opts.disable_xvfb, opts.xvfb_screen_size) as x:
         xvfb.log_options(x)
 
         install_qtreactor(opts.verbosity >= 5)

splash/xvfb.py

@@ -9,10 +9,10 @@
 from twisted.python import log
 
 
-def autostart(disable=False):
+def autostart(disable=False, screen_size=None):
     if disable:
         return _dummy()
-    return _get_xvfb() or _dummy()
+    return _get_xvfb(screen_size=screen_size) or _dummy()
 
 
 def log_options(xvfb):
@@ -27,13 +27,14 @@ def _dummy():
     yield
 
 
-def _get_xvfb():
+def _get_xvfb(screen_size=None):
     if not sys.platform.startswith('linux'):
         return None
 
     try:
         from xvfbwrapper import Xvfb
-        width, height = map(int, defaults.VIEWPORT_SIZE.split("x"))
+        screen_size = screen_size or defaults.VIEWPORT_SIZE
+        width, height = map(int, screen_size.split("x"))
         return Xvfb(width, height, nolisten="tcp")
     except ImportError:
         return None