X11: fix multi-monitor setups after recent changes of X servers
Merge pull request #5256 from FernetMenta/X11

X11: fix multi-monitor setups after recent changes of X servers