python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-10 16:22:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 6ed5b2abdd into 329d6a6a62

Browse Source
This commit is contained in:
Yan-Ke Guo 2025-07-08 17:02:08 +00:00 committed by GitHub
commit 0813e681b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/ImageGrab.rst
View File

@ -42,9 +42,9 @@ or the clipboard to a PIL image memory.
.. versionadded:: 7.1.0 .. versionadded:: 7.1.0
:param window: :param window:
HWND, to capture a single window. Windows only. Capture a single window. On Windows, this is a HWND. On macOS, it uses windowid.
.. versionadded:: 11.2.1 .. versionadded:: 11.2.1 (Windows), 12.0.0 (macOS)
:return: An image :return: An image
.. py:function:: grabclipboard() .. py:function:: grabclipboard()

17
src/PIL/ImageGrab.py
View File

@ -43,7 +43,10 @@ def grab(
fh, filepath = tempfile.mkstemp(".png") fh, filepath = tempfile.mkstemp(".png")
os.close(fh) os.close(fh)
args = ["screencapture"] args = ["screencapture"]
if bbox: if window:
args += ["-l", str(window)]
# -R is not working with -l
if bbox and not window:
left, top, right, bottom = bbox left, top, right, bottom = bbox
args += ["-R", f"{left},{top},{right-left},{bottom-top}"] args += ["-R", f"{left},{top},{right-left},{bottom-top}"]
subprocess.call(args + ["-x", filepath]) subprocess.call(args + ["-x", filepath])
@ -51,9 +54,15 @@ def grab(
im.load() im.load()
os.unlink(filepath) os.unlink(filepath)
if bbox: if bbox:
im_resized = im.resize((right - left, bottom - top)) # manual crop for windowed mode
im.close() if window:
return im_resized im_cropped = im.crop(bbox)
im.close()
return im_cropped
else:
im_resized = im.resize((right - left, bottom - top))
im.close()
return im_resized
return im return im
elif sys.platform == "win32": elif sys.platform == "win32":
if window is not None: if window is not None: