Commit f46cca9

committed

Fix PyAutoGUI targeting issue on Linux

1 parent 69f6ae8 commit f46cca9Copy full SHA for f46cca9

File tree

+37

-1

lines changed

+37

-1

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -580,13 +580,16 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):`
`580`	`580`	`headless = False`
`581`	`581`	`headed = None`
`582`	`582`	`xvfb = None`
	`583`	`+ xvfb_metrics = None`
`583`	`584`	`binary_location = None`
`584`	`585`	`if hasattr(sb_config, "headless"):`
`585`	`586`	`headless = sb_config.headless`
`586`	`587`	`if hasattr(sb_config, "headed"):`
`587`	`588`	`headed = sb_config.headed`
`588`	`589`	`if hasattr(sb_config, "xvfb"):`
`589`	`590`	`xvfb = sb_config.xvfb`
	`591`	`+ if hasattr(sb_config, "xvfb_metrics"):`
	`592`	`+ xvfb_metrics = sb_config.xvfb_metrics`
`590`	`593`	`if hasattr(sb_config, "binary_location"):`
`591`	`594`	`binary_location = sb_config.binary_location`
`592`	`595`
`@@ -599,6 +602,7 @@ def uc_open_with_cdp_mode(driver, url=None, **kwargs):`
`599`	`602`	`headless=headless,`
`600`	`603`	`headed=headed,`
`601`	`604`	`xvfb=xvfb,`
	`605`	`+ xvfb_metrics=xvfb_metrics,`
`602`	`606`	`browser_executable_path=binary_location,`
`603`	`607`	`)`
`604`	`608`	`)`
`@@ -963,6 +967,11 @@ def __install_pyautogui_if_missing():`
`963`	`967`	`backend="xvfb",`
`964`	`968`	`use_xauth=True,`
`965`	`969`	`)`
	`970`	`+ if "--debug-display" in sys.argv:`
	`971`	`+ print(`
	`972`	`+ "Starting VDisplay from browser_launcher: (%s, %s)"`
	`973`	`+ % (xvfb_width, xvfb_height)`
	`974`	`+ )`
`966`	`975`	`_xvfb_display.start()`
`967`	`976`	`sb_config._virtual_display = _xvfb_display`
`968`	`977`	`sb_config.headless_active = True`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1439,6 +1439,10 @@ def __install_pyautogui_if_missing(self):`
`1439`	`1439`	`shared_utils.is_linux()`
`1440`	`1440`	`and (not sb_config.headed or sb_config.xvfb)`
`1441`	`1441`	`and not driver.config.headless`
	`1442`	`+ and (`
	`1443`	`+ not hasattr(sb_config, "_virtual_display")`
	`1444`	`+ or not sb_config._virtual_display`
	`1445`	`+ )`
`1442`	`1446`	`):`
`1443`	`1447`	`from sbvirtualdisplay import Display`
`1444`	`1448`	`xvfb_width = 1366`
`@@ -1466,6 +1470,11 @@ def __install_pyautogui_if_missing(self):`
`1466`	`1470`	`backend="xvfb",`
`1467`	`1471`	`use_xauth=True,`
`1468`	`1472`	`)`
	`1473`	`+ if "--debug-display" in sys.argv:`
	`1474`	`+ print(`
	`1475`	`+ "Starting VDisplay from sb_cdp: (%s, %s)"`
	`1476`	`+ % (xvfb_width, xvfb_height)`
	`1477`	`+ )`
`1469`	`1478`	`xvfb_display.start()`
`1470`	`1479`
`1471`	`1480`	`def __get_configured_pyautogui(self, pyautogui_copy):`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14164,7 +14164,13 @@ def __activate_virtual_display(self):`
`14164`	`14164`	`backend="xvfb",`
`14165`	`14165`	`use_xauth=True,`
`14166`	`14166`	`)`
	`14167`	`+ if "--debug-display" in sys.argv:`
	`14168`	`+ print(`
	`14169`	`+ "Starting VDisplay from base_case: (%s, %s)"`
	`14170`	`+ % (self._xvfb_width, self._xvfb_height)`
	`14171`	`+ )`
`14167`	`14172`	`self._xvfb_display.start()`
	`14173`	`+ sb_config._virtual_display = self._xvfb_display`
`14168`	`14174`	`if "DISPLAY" not in os.environ.keys():`
`14169`	`14175`	`print(`
`14170`	`14176`	`"\nX11 display failed! Will use regular xvfb!"`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,14 @@ def __activate_virtual_display_as_needed(`
`51`	`51`	`headless, headed, xvfb, xvfb_metrics`
`52`	`52`	`):`
`53`	`53`	`"""This is only needed on Linux."""`
`54`		`- if IS_LINUX and (not headed or xvfb):`
	`54`	`+ if (`
	`55`	`+ IS_LINUX`
	`56`	`+ and (not headed or xvfb)`
	`57`	`+ and (`
	`58`	`+ not hasattr(sb_config, "_virtual_display")`
	`59`	`+ or not sb_config._virtual_display`
	`60`	`+ )`
	`61`	`+ ):`
`55`	`62`	`from sbvirtualdisplay import Display`
`56`	`63`	`pip_find_lock = fasteners.InterProcessLock(`
`57`	`64`	`constants.PipInstall.FINDLOCK`
`@@ -87,6 +94,11 @@ def __activate_virtual_display_as_needed(`
`87`	`94`	`backend="xvfb",`
`88`	`95`	`use_xauth=True,`
`89`	`96`	`)`
	`97`	`+ if "--debug-display" in sys.argv:`
	`98`	`+ print(`
	`99`	`+ "Starting VDisplay from cdp_util: (%s, %s)"`
	`100`	`+ % (_xvfb_width, _xvfb_height)`
	`101`	`+ )`
`90`	`102`	`_xvfb_display.start()`
`91`	`103`	`if "DISPLAY" not in os.environ.keys():`
`92`	`104`	`print(`

Comments

(0)