Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support GNOME Wayland sessions #75

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 44 additions & 18 deletions pyscreeze/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,28 @@
else:
raise

isWaylandSession = False
if sys.platform == 'linux':
try:
# ref: https://unix.stackexchange.com/questions/202891/how-to-know-whether-wayland-or-x11-is-being-used#comment1133584_371164
session_string = subprocess.check_output("loginctl show-session $(loginctl show-user $(whoami) -p Display --value) -p Type --value", shell=True, stderr=subprocess.STDOUT).decode().strip()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might want to leave a comment mentioning that this relies on the host being systemd based.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair point; that probably belongs in the commit message. How would you revise the commit message to reflect that nuance?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something along the lines of "This currently relies on processing information from loginctl provided by systemd in order to validate whether we are inside of a wayland session, which should work in most setups today."

isWaylandSession = session_string == 'wayland'
except subprocess.CalledProcessError:
pass # assume no Wayland if execution fails

gnomescreenshotExists = False
if sys.platform == 'linux':
try:
whichProc = subprocess.Popen(
['which', 'gnome-screenshot'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
gnomescreenshotExists = whichProc.wait() == 0
except OSError as ex:
if ex.errno == errno.ENOENT:
# if there is no "which" program to find gnome-screenshot, then assume there
# is no gnome-screenshot.
pass
else:
raise

if sys.platform == 'win32':
from ctypes import windll
Expand Down Expand Up @@ -495,32 +517,36 @@ def _screenshot_linux(imageFilename=None, region=None):
"""
TODO
"""
if not scrotExists:
raise NotImplementedError('"scrot" must be installed to use screenshot functions in Linux. Run: sudo apt-get install scrot')
if imageFilename is None:
tmpFilename = '.screenshot%s.png' % (datetime.datetime.now().strftime('%Y-%m%d_%H-%M-%S-%f'))
else:
tmpFilename = imageFilename
if scrotExists:
subprocess.call(['scrot', '-z', tmpFilename])
im = Image.open(tmpFilename)

if region is not None:
assert len(region) == 4, 'region argument must be a tuple of four ints'
region = [int(x) for x in region]
im = im.crop((region[0], region[1], region[2] + region[0], region[3] + region[1]))
os.unlink(tmpFilename) # delete image of entire screen to save cropped version
im.save(tmpFilename)

if isWaylandSession:
if gnomescreenshotExists:
# scrot generates a blank black screen for Wayland sessions, but we can use gnome-screenshot if it's available
subprocess.call(['gnome-screenshot', '-f', tmpFilename])
else:
# force loading before unlinking, Image.open() is lazy
im.load()
raise Exception("pyscreeze only supports Wayland session when gnome-screenshot is available")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it would be better to treat this failure here way above right when checking whether gnome-screenshot is available or not

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seemed appropriate to minimize this patch by mimicking flow of logic used for scrot. Handling the error condition inside a function also generates a more readable stack trace and affords us more flexibility when adding support for environments other than Gnome.

That said, I'm fine with throwing an exception earlier if @asweigart prefers that approach.

elif scrotExists:
subprocess.call(['scrot', '-z', tmpFilename])
else:
raise Exception('The scrot program must be installed to take a screenshot in X sessions on Linux. Run: sudo apt-get install scrot')

if imageFilename is None:
os.unlink(tmpFilename)
return im
im = Image.open(tmpFilename)
if region is not None:
assert len(region) == 4, 'region argument must be a tuple of four ints'
region = [int(x) for x in region]
im = im.crop((region[0], region[1], region[2] + region[0], region[3] + region[1]))
os.unlink(tmpFilename) # delete image of entire screen to save cropped version
im.save(tmpFilename)
else:
raise Exception('The scrot program must be installed to take a screenshot with PyScreeze on Linux. Run: sudo apt-get install scrot')
# force loading before unlinking, Image.open() is lazy
im.load()

if imageFilename is None:
os.unlink(tmpFilename)
return im


def _kmp(needle, haystack, _dummy): # Knuth-Morris-Pratt search algorithm implementation (to be used by screen capture)
Expand Down