simple-rdp 0.8.3__cp314-cp314-win_amd64.whl → 0.8.5__cp314-cp314-win_amd64.whl

simple_rdp/client.py

@@ -409,7 +409,7 @@ class RDPClient:
         """
         return await self._display.screenshot()
 
-    async def pointer_area_screenshot(self) -> tuple[Image.Image, tuple[int, int]]:
+    async def pointer_area_screenshot(self) -> tuple[Image.Image, tuple[int, int], tuple[int, int]]:
         """
         Capture a cropped area around the pointer position.
 
@@ -418,12 +418,26 @@ class RDPClient:
         near edges, the crop is clamped to stay within display bounds.
 
         Returns:
-            Tuple of (cropped_image, (top_x, top_y)) where:
+            Tuple of (cropped_image, (top_x, top_y), (bottom_x, bottom_y)) where:
             - cropped_image: Cropped region with pointer composited
             - (top_x, top_y): Top-left corner position of crop relative to display
+            - (bottom_x, bottom_y): Bottom-right corner position of crop relative to display
         """
         return await self._display.pointer_area_screenshot()
 
+    async def screenshot_with_crop(self, top_left: tuple[int, int], bottom_right: tuple[int, int]) -> Image.Image:
+        """
+        Capture a cropped area of the screen.
+
+        Args:
+            top_left: (x, y) coordinates of the top-left corner of the crop area.
+            bottom_right: (x, y) coordinates of the bottom-right corner of the crop area.
+
+        Returns:
+            Cropped PIL Image of the specified region with pointer composited.
+        """
+        return await self._display.screenshot_with_crop(top_left, bottom_right)
+
     async def save_screenshot(self, path: str) -> None:
         """
         Save a screenshot to a file.

simple_rdp/display.py

@@ -528,7 +528,43 @@ class Display:
         img.save(path)
         logger.info(f"Screenshot saved to {path}")
 
-    async def pointer_area_screenshot(self) -> tuple[Image.Image, tuple[int, int]]:
+    async def screenshot_with_crop(self, top_left: tuple[int, int], bottom_right: tuple[int, int]) -> Image.Image:
+        """
+        Capture a cropped area of the screen.
+
+        Args:
+            top_left: (x, y) coordinates of the top-left corner of the crop area.
+            bottom_right: (x, y) coordinates of the bottom-right corner of the crop area.
+
+        Returns:
+            Cropped PIL Image of the specified region with pointer composited.
+        """
+        async with self._screen_lock:
+            if self._raw_display_image is None:
+                crop_w = bottom_right[0] - top_left[0]
+                crop_h = bottom_right[1] - top_left[1]
+                return Image.new("RGB", (max(1, crop_w), max(1, crop_h)), (0, 0, 0))
+
+            # Update final display image if dirty
+            if self._final_display_image_dirty or self._final_display_image is None:
+                self._update_final_display_image()
+
+            assert self._final_display_image is not None
+
+            # Clamp coordinates to display bounds
+            x1 = max(0, min(top_left[0], self._width))
+            y1 = max(0, min(top_left[1], self._height))
+            x2 = max(0, min(bottom_right[0], self._width))
+            y2 = max(0, min(bottom_right[1], self._height))
+
+            # Ensure valid crop dimensions
+            if x2 <= x1 or y2 <= y1:
+                return Image.new("RGB", (1, 1), (0, 0, 0))
+
+            cropped = self._final_display_image.crop((x1, y1, x2, y2))
+            return cropped.copy()
+
+    async def pointer_area_screenshot(self) -> tuple[Image.Image, tuple[int, int], tuple[int, int]]:
         """
         Capture a cropped area around the pointer position.
 
@@ -537,15 +573,16 @@ class Display:
         near edges, the crop is clamped to stay within display bounds.
 
         Returns:
-            Tuple of (cropped_image, (top_x, top_y)) where:
+            Tuple of (cropped_image, (top_x, top_y), (bottom_x, bottom_y)) where:
             - cropped_image: Cropped region with pointer composited
             - (top_x, top_y): Top-left corner position of crop relative to display
+            - (bottom_x, bottom_y): Bottom-right corner position of crop relative to display
         """
         async with self._screen_lock:
             if self._raw_display_image is None:
                 crop_w = self._width // 3
                 crop_h = self._height // 3
-                return (Image.new("RGB", (crop_w, crop_h), (0, 0, 0)), (0, 0))
+                return (Image.new("RGB", (crop_w, crop_h), (0, 0, 0)), (0, 0), (crop_w, crop_h))
 
             # Update final display image if dirty
             if self._final_display_image_dirty or self._final_display_image is None:
@@ -565,10 +602,14 @@ class Display:
             top_x = max(0, min(top_x, self._width - crop_w))
             top_y = max(0, min(top_y, self._height - crop_h))
 
+            # Calculate bottom-right corner
+            bottom_x = top_x + crop_w
+            bottom_y = top_y + crop_h
+
             # Crop the image
-            cropped = self._final_display_image.crop((top_x, top_y, top_x + crop_w, top_y + crop_h))
+            cropped = self._final_display_image.crop((top_x, top_y, bottom_x, bottom_y))
 
-            return (cropped.copy(), (top_x, top_y))
+            return (cropped.copy(), (top_x, top_y), (bottom_x, bottom_y))
 
     async def apply_bitmap(
         self,

{simple_rdp-0.8.3.dist-info → simple_rdp-0.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-rdp
-Version: 0.8.3
+Version: 0.8.5
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

simple_rdp-0.8.5.dist-info/RECORD

@@ -0,0 +1,14 @@
+simple_rdp\__init__.py,sha256=zJw8lC4mIERiJQJb1ziRaS5pUNGNcE1z8xuGymxwwB8,717
+simple_rdp\_rle.cp314-win_amd64.pyd,sha256=hHMHZcWqYCFXQox5pkXUohDq7hvtym81Wx55iGc_uh8,195072
+simple_rdp\capabilities.py,sha256=jAP3SYjPORIDLV0p2tKD21jq3ulthd6NgpYVJ2uv1vg,17797
+simple_rdp\client.py,sha256=6J6actlIuYrxO-qyD8gMg5SU_77k4V4ibFQStp2RXcw,73122
+simple_rdp\credssp.py,sha256=nf75WpBvL8X7i4nT5o27tmfPCwkLhAfamBzMlXnd5CE,16370
+simple_rdp\display.py,sha256=uMIrQeUfjvy6VfBNpE9p5X0g8HRkHsJQBGZn9sYemmQ,41609
+simple_rdp\input.py,sha256=nnSEac9t4j72ZdCvhhDMcXGu9KwoqRCdzpyZxnUg_AE,938
+simple_rdp\mcs.py,sha256=egSTKViZVXd0uaUBPorc9ia79xa0XwUgnTm3u5G2eXw,26462
+simple_rdp\pdu.py,sha256=GRat4fJ56zhSvy0QtP5tBqpClDNTCH6CPp9FELrXTxw,18713
+simple_rdp-0.8.5.dist-info\METADATA,sha256=SvSlgmpGhU6-cRSVKjCHYPMS_Sn85KKn7cO3bwsDKjE,11619
+simple_rdp-0.8.5.dist-info\WHEEL,sha256=TASrtxyeL-Pi7odwPBMCgR1YebCHdBFZvgqiADG_4b0,97
+simple_rdp-0.8.5.dist-info\entry_points.txt,sha256=CPwBu2L4Vh3MZwYYlTAotNUElilT43OKdi3UnHTTKQ4,66
+simple_rdp-0.8.5.dist-info\licenses\LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+simple_rdp-0.8.5.dist-info\RECORD,,

simple_rdp-0.8.3.dist-info/RECORD

@@ -1,14 +0,0 @@
-simple_rdp\__init__.py,sha256=zJw8lC4mIERiJQJb1ziRaS5pUNGNcE1z8xuGymxwwB8,717
-simple_rdp\_rle.cp314-win_amd64.pyd,sha256=lH0x7U3KgPc4o64v6AR-zQr1c7_zZ9wEcOzDFKOMl30,195072
-simple_rdp\capabilities.py,sha256=jAP3SYjPORIDLV0p2tKD21jq3ulthd6NgpYVJ2uv1vg,17797
-simple_rdp\client.py,sha256=4mhXFbcMMls-jSKdkXg_zniNFxsoQBD1xL5MBHLAybU,72426
-simple_rdp\credssp.py,sha256=nf75WpBvL8X7i4nT5o27tmfPCwkLhAfamBzMlXnd5CE,16370
-simple_rdp\display.py,sha256=cf31w5xPWh--vl3p6rnM3vNJrXr_ATx7gcE9JCOnQQ8,39764
-simple_rdp\input.py,sha256=nnSEac9t4j72ZdCvhhDMcXGu9KwoqRCdzpyZxnUg_AE,938
-simple_rdp\mcs.py,sha256=egSTKViZVXd0uaUBPorc9ia79xa0XwUgnTm3u5G2eXw,26462
-simple_rdp\pdu.py,sha256=GRat4fJ56zhSvy0QtP5tBqpClDNTCH6CPp9FELrXTxw,18713
-simple_rdp-0.8.3.dist-info\METADATA,sha256=N6LDHByeGL4X9V67HAsUE_eBLyvDDCLHuXep3_RTYrs,11619
-simple_rdp-0.8.3.dist-info\WHEEL,sha256=TASrtxyeL-Pi7odwPBMCgR1YebCHdBFZvgqiADG_4b0,97
-simple_rdp-0.8.3.dist-info\entry_points.txt,sha256=CPwBu2L4Vh3MZwYYlTAotNUElilT43OKdi3UnHTTKQ4,66
-simple_rdp-0.8.3.dist-info\licenses\LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-simple_rdp-0.8.3.dist-info\RECORD,,