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

Use gnome-screenshot on Linux if available #6361

Merged
merged 3 commits into from Jun 21, 2022
Merged

Use gnome-screenshot on Linux if available #6361

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a48d950
Use gnome-screenshot on Linux if available
radarhere Jun 12, 2022
b1ba090
Prefer gnome-screenshot if xdisplay is None
radarhere Jun 12, 2022
463d181
Document use of gnome-screenshot
radarhere Jun 13, 2022
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
21 changes: 16 additions & 5 deletions src/PIL/ImageGrab.py
View file
Open in desktop
Expand Up @@ -15,15 +15,14 @@
# See the README file for information on usage and redistribution.
#

import os
import shutil
import subprocess
import sys
import tempfile

from . import Image

if sys.platform == "darwin":
import os
import subprocess
import tempfile


def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=None):
if xdisplay is None:
Expand Down Expand Up @@ -62,6 +61,18 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
left, top, right, bottom = bbox
im = im.crop((left - x0, top - y0, right - x0, bottom - y0))
return im
elif not Image.core.HAVE_XCB and shutil.which("gnome-screenshot"):
radarhere marked this conversation as resolved.
Show resolved Hide resolved
fh, filepath = tempfile.mkstemp(".png")
os.close(fh)
subprocess.call(["gnome-screenshot", "-f", filepath])
im = Image.open(filepath)
im.load()
os.unlink(filepath)
if bbox:
im_cropped = im.crop(bbox)
im.close()
return im_cropped
return im
# use xdisplay=None for default display on non-win32/macOS systems
if not Image.core.HAVE_XCB:
raise OSError("Pillow was built without XCB support")
Expand Down