python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-26 18:06:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7143 from nulano/imagegrab-prefer-xcb

Browse Source 
Prefer screenshots using XCB over gnome-screenshot
This commit is contained in:
Hugo van Kemenade 2023-05-14 19:55:16 +03:00 committed by GitHub
commit 34ff170d8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/reference/ImageGrab.rst
View File

@ -15,8 +15,9 @@ or the clipboard to a PIL image memory.
returned as an "RGBA" on macOS, or an "RGB" image otherwise. returned as an "RGBA" on macOS, or an "RGB" image otherwise.
If the bounding box is omitted, the entire screen is copied. If the bounding box is omitted, the entire screen is copied.
On Linux, if ``xdisplay`` is ``None`` then ``gnome-screenshot`` will be used if it On Linux, if ``xdisplay`` is ``None`` and the default X11 display does not return
is installed. To capture the default X11 display instead, pass ``xdisplay=""``. a snapshot of the screen, ``gnome-screenshot`` will be used as fallback if it is
installed. To disable this behaviour, pass ``xdisplay=""`` instead.
.. versionadded:: 1.1.3 (Windows), 3.0.0 (macOS), 7.1.0 (Linux) .. versionadded:: 1.1.3 (Windows), 3.0.0 (macOS), 7.1.0 (Linux)

28
src/PIL/ImageGrab.py
View File

@ -61,7 +61,17 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
left, top, right, bottom = bbox left, top, right, bottom = bbox
im = im.crop((left - x0, top - y0, right - x0, bottom - y0)) im = im.crop((left - x0, top - y0, right - x0, bottom - y0))
return im return im
elif shutil.which("gnome-screenshot"): try:
if not Image.core.HAVE_XCB:
msg = "Pillow was built without XCB support"
raise OSError(msg)
size, data = Image.core.grabscreen_x11(xdisplay)
except OSError:
if (
xdisplay is None
and sys.platform not in ("darwin", "win32")
and shutil.which("gnome-screenshot")
):
fh, filepath = tempfile.mkstemp(".png") fh, filepath = tempfile.mkstemp(".png")
os.close(fh) os.close(fh)
subprocess.call(["gnome-screenshot", "-f", filepath]) subprocess.call(["gnome-screenshot", "-f", filepath])
@ -73,15 +83,13 @@ def grab(bbox=None, include_layered_windows=False, all_screens=False, xdisplay=N
im.close() im.close()
return im_cropped return im_cropped
return im return im
# use xdisplay=None for default display on non-win32/macOS systems else:
if not Image.core.HAVE_XCB: raise
msg = "Pillow was built without XCB support" else:
raise OSError(msg) im = Image.frombytes("RGB", size, data, "raw", "BGRX", size[0] * 4, 1)
size, data = Image.core.grabscreen_x11(xdisplay) if bbox:
im = Image.frombytes("RGB", size, data, "raw", "BGRX", size[0] * 4, 1) im = im.crop(bbox)
if bbox: return im
im = im.crop(bbox)
return im
def grabclipboard(): def grabclipboard():