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.

Sign up for GitHub

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

Jump to bottom

Added session type check for Linux in ImageGrab.grabclipboard() #7332

Merged
merged 8 commits into from
Aug 22, 2023
Merged

Added session type check for Linux in ImageGrab.grabclipboard() #7332

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc658e1
Add session type check in grabclipboard for Linux
TheNooB2706 Aug 11, 2023
164ea2d
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 11, 2023
a8b3fea
Apply suggestions from code review
TheNooB2706 Aug 11, 2023
7b157b0
Use os.getlogin() instead of whoami command for getting username
TheNooB2706 Aug 11, 2023
0b6ab79
Check session type using environment variable instead of loginctl
TheNooB2706 Aug 12, 2023
e06edcb
Reformat variable name following PEP8
TheNooB2706 Aug 12, 2023
8b14a67
Merge branch 'main' into grabclipboard-linux
radarhere Aug 21, 2023
9c3bc70
Use tuples
radarhere Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/PIL/ImageGrab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,14 @@ def grabclipboard():
return BmpImagePlugin.DibImageFile(data)
return None
else:
if shutil.which("wl-paste"):
if os.getenv("WAYLAND_DISPLAY"):
session_type = "wayland"
elif os.getenv("DISPLAY"):
session_type = "x11"
else: # Session type check failed
session_type = None

if shutil.which("wl-paste") and session_type in ("wayland", None):
output = subprocess.check_output(["wl-paste", "-l"]).decode()
mimetypes = output.splitlines()
if "image/png" in mimetypes:
Expand All @@ -153,11 +160,12 @@ def grabclipboard():
args = ["wl-paste"]
if mimetype:
args.extend(["-t", mimetype])
elif shutil.which("xclip"):
elif shutil.which("xclip") and session_type in ("x11", None):
args = ["xclip", "-selection", "clipboard", "-t", "image/png", "-o"]
else:
msg = "wl-paste or xclip is required for ImageGrab.grabclipboard() on Linux"
raise NotImplementedError(msg)

p = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
err = p.stderr
if err:
Expand Down