Reworked all MSS._set_cfunctions()

Author: BoboTiG

mss/darwin.py

@@ -94,41 +94,36 @@ def _set_cfunctions(self):
         # type: () -> None
         """ Set all ctypes functions and attach them to attributes. """
 
-        def cfactory(func, argtypes, restype):
-            # type: (str, List[Any], Any) -> None
-            """ Factorize ctypes creations. """
-            self._cfactory(
-                attr=self.core, func=func, argtypes=argtypes, restype=restype
-            )
-
         uint32 = ctypes.c_uint32
         void = ctypes.c_void_p
         pointer = ctypes.POINTER
+        cfactory = self._cfactory
+        core = self.core
 
-        cfactory(
-            func="CGGetActiveDisplayList",
-            argtypes=[uint32, pointer(uint32), pointer(uint32)],
-            restype=ctypes.c_int32,
-        )
-        cfactory(func="CGDisplayBounds", argtypes=[uint32], restype=CGRect)
-        cfactory(func="CGRectStandardize", argtypes=[CGRect], restype=CGRect)
-        cfactory(func="CGRectUnion", argtypes=[CGRect, CGRect], restype=CGRect)
-        cfactory(func="CGDisplayRotation", argtypes=[uint32], restype=ctypes.c_float)
-        cfactory(
-            func="CGWindowListCreateImage",
-            argtypes=[CGRect, uint32, uint32, uint32],
-            restype=void,
-        )
-        cfactory(func="CGImageGetWidth", argtypes=[void], restype=int)
-        cfactory(func="CGImageGetHeight", argtypes=[void], restype=int)
-        cfactory(func="CGImageGetDataProvider", argtypes=[void], restype=void)
-        cfactory(func="CGDataProviderCopyData", argtypes=[void], restype=void)
-        cfactory(func="CFDataGetBytePtr", argtypes=[void], restype=void)
-        cfactory(func="CFDataGetLength", argtypes=[void], restype=ctypes.c_uint64)
-        cfactory(func="CGImageGetBytesPerRow", argtypes=[void], restype=int)
-        cfactory(func="CGImageGetBitsPerPixel", argtypes=[void], restype=int)
-        cfactory(func="CGDataProviderRelease", argtypes=[void], restype=void)
-        cfactory(func="CFRelease", argtypes=[void], restype=void)
+        # Note: keep it sorted
+        for func, argtypes, restype in (
+            ("CGDataProviderCopyData", [void], void),
+            ("CGDisplayBounds", [uint32], CGRect),
+            ("CGDisplayRotation", [uint32], ctypes.c_float),
+            ("CFDataGetBytePtr", [void], void),
+            ("CFDataGetLength", [void], ctypes.c_uint64),
+            ("CFRelease", [void], void),
+            ("CGDataProviderRelease", [void], void),
+            (
+                "CGGetActiveDisplayList",
+                [uint32, pointer(uint32), pointer(uint32)],
+                ctypes.c_int32,
+            ),
+            ("CGImageGetBitsPerPixel", [void], int),
+            ("CGImageGetBytesPerRow", [void], int),
+            ("CGImageGetDataProvider", [void], void),
+            ("CGImageGetHeight", [void], int),
+            ("CGImageGetWidth", [void], int),
+            ("CGRectStandardize", [CGRect], CGRect),
+            ("CGRectUnion", [CGRect, CGRect], CGRect),
+            ("CGWindowListCreateImage", [CGRect, uint32, uint32, uint32], void),
+        ):
+            cfactory(attr=core, func=func, argtypes=argtypes, restype=restype)  # type: ignore
 
     def _monitors_impl(self):
         # type: () -> None

mss/linux.py

@@ -277,88 +277,104 @@ def _set_cfunctions(self):
         See https://tronche.com/gui/x/xlib/function-index.html for details.
         """
 
-        def cfactory(func, argtypes, restype, attr=self.xlib):
-            # type: (str, List[Any], Any, Any) -> None
-            """ Factorize ctypes creations. """
-            self._cfactory(
-                attr=attr,
-                errcheck=validate,
-                func=func,
-                argtypes=argtypes,
-                restype=restype,
-            )
-
         void = ctypes.c_void_p
         c_int = ctypes.c_int
         uint = ctypes.c_uint
         ulong = ctypes.c_ulong
         c_long = ctypes.c_long
         char_p = ctypes.c_char_p
         pointer = ctypes.POINTER
+        cfactory = self._cfactory
+        xlib = self.xlib
+        xrandr = self.xrandr
 
-        cfactory("XSetErrorHandler", [void], c_int)
-        cfactory("XGetErrorText", [pointer(Display), c_int, char_p, c_int], void)
-        cfactory("XOpenDisplay", [char_p], pointer(Display))
-        cfactory("XDefaultRootWindow", [pointer(Display)], pointer(XWindowAttributes))
-        cfactory(
-            "XGetWindowAttributes",
-            [pointer(Display), pointer(XWindowAttributes), pointer(XWindowAttributes)],
-            c_int,
-        )
-        cfactory(
-            "XGetImage",
-            [
-                pointer(Display),
-                pointer(Display),
-                c_int,
+        # Note: keep it sorted
+        for attr, func, argtypes, restype in (
+            (
+                xlib,
+                "XDefaultRootWindow",
+                [pointer(Display)],
+                pointer(XWindowAttributes),
+            ),
+            (xlib, "XDestroyImage", [pointer(XImage)], void),
+            (xlib, "XGetErrorText", [pointer(Display), c_int, char_p, c_int], void),
+            (
+                xlib,
+                "XGetImage",
+                [
+                    pointer(Display),
+                    pointer(Display),
+                    c_int,
+                    c_int,
+                    uint,
+                    uint,
+                    ulong,
+                    c_int,
+                ],
+                pointer(XImage),
+            ),
+            (
+                xlib,
+                "XGetWindowAttributes",
+                [
+                    pointer(Display),
+                    pointer(XWindowAttributes),
+                    pointer(XWindowAttributes),
+                ],
                 c_int,
+            ),
+            (xlib, "XOpenDisplay", [char_p], pointer(Display)),
+            (
+                xlib,
+                "XQueryExtension",
+                [
+                    pointer(Display),
+                    char_p,
+                    pointer(c_int),
+                    pointer(c_int),
+                    pointer(c_int),
+                ],
                 uint,
-                uint,
-                ulong,
-                c_int,
-            ],
-            pointer(XImage),
-        )
-        cfactory("XDestroyImage", [pointer(XImage)], void)
-        cfactory(
-            "XQueryExtension",
-            [pointer(Display), char_p, pointer(c_int), pointer(c_int), pointer(c_int)],
-            uint,
-        )
+            ),
+            (xlib, "XSetErrorHandler", [void], c_int),
+            (xrandr, "XRRFreeCrtcInfo", [pointer(XRRCrtcInfo)], void),
+            (xrandr, "XRRFreeScreenResources", [pointer(XRRScreenResources)], void),
+            (
+                xrandr,
+                "XRRGetCrtcInfo",
+                [pointer(Display), pointer(XRRScreenResources), c_long],
+                pointer(XRRCrtcInfo),
+            ),
+        ):
+            cfactory(
+                attr=attr,
+                errcheck=validate,
+                func=func,
+                argtypes=argtypes,
+                restype=restype,
+            )  # type: ignore
 
         # A simple benchmark calling 10 times those 2 functions:
         # XRRGetScreenResources():        0.1755971429956844 s
         # XRRGetScreenResourcesCurrent(): 0.0039125580078689 s
         # The second is faster by a factor of 44! So try to use it first.
         try:
             cfactory(
-                "XRRGetScreenResourcesCurrent",
-                [pointer(Display), pointer(Display)],
-                pointer(XRRScreenResources),
-                attr=self.xrandr,
+                attr=xrandr,
+                func="XRRGetScreenResourcesCurrent",
+                errcheck=validate,
+                argtypes=[pointer(Display), pointer(Display)],
+                restype=pointer(XRRScreenResources),
             )
         except AttributeError:
             cfactory(
-                "XRRGetScreenResources",
-                [pointer(Display), pointer(Display)],
-                pointer(XRRScreenResources),
-                attr=self.xrandr,
+                attr=xrandr,
+                func="XRRGetScreenResources",
+                errcheck=validate,
+                argtypes=[pointer(Display), pointer(Display)],
+                restype=pointer(XRRScreenResources),
             )
-            self.xrandr.XRRGetScreenResourcesCurrent = self.xrandr.XRRGetScreenResources
-
-        cfactory(
-            "XRRGetCrtcInfo",
-            [pointer(Display), pointer(XRRScreenResources), c_long],
-            pointer(XRRCrtcInfo),
-            attr=self.xrandr,
-        )
-        cfactory(
-            "XRRFreeScreenResources",
-            [pointer(XRRScreenResources)],
-            void,
-            attr=self.xrandr,
-        )
-        cfactory("XRRFreeCrtcInfo", [pointer(XRRCrtcInfo)], void, attr=self.xrandr)
+            xrandr.XRRGetScreenResourcesCurrent = xrandr.XRRGetScreenResources
 
     def get_error_details(self):
         # type: () -> Optional[Dict[str, Any]]

mss/windows.py

@@ -114,53 +114,34 @@ def _set_cfunctions(self):
 
         void = ctypes.c_void_p
         pointer = ctypes.POINTER
+        cfactory = self._cfactory
+        gdi32 = self.gdi32
+        user32 = self.user32
 
-        self._cfactory(
-            attr=self.user32, func="GetSystemMetrics", argtypes=[INT], restype=INT
-        )
-        self._cfactory(
-            attr=self.user32,
-            func="EnumDisplayMonitors",
-            argtypes=[HDC, void, self.monitorenumproc, LPARAM],
-            restype=BOOL,
-        )
-        self._cfactory(
-            attr=self.user32, func="GetWindowDC", argtypes=[HWND], restype=HDC
-        )
-
-        self._cfactory(
-            attr=self.gdi32, func="GetDeviceCaps", argtypes=[HWND, INT], restype=INT
-        )
-        self._cfactory(
-            attr=self.gdi32, func="CreateCompatibleDC", argtypes=[HDC], restype=HDC
-        )
-        self._cfactory(
-            attr=self.gdi32,
-            func="CreateCompatibleBitmap",
-            argtypes=[HDC, INT, INT],
-            restype=HBITMAP,
-        )
-        self._cfactory(
-            attr=self.gdi32,
-            func="SelectObject",
-            argtypes=[HDC, HGDIOBJ],
-            restype=HGDIOBJ,
-        )
-        self._cfactory(
-            attr=self.gdi32,
-            func="BitBlt",
-            argtypes=[HDC, INT, INT, INT, INT, HDC, INT, INT, DWORD],
-            restype=BOOL,
-        )
-        self._cfactory(
-            attr=self.gdi32, func="DeleteObject", argtypes=[HGDIOBJ], restype=INT
-        )
-        self._cfactory(
-            attr=self.gdi32,
-            func="GetDIBits",
-            argtypes=[HDC, HBITMAP, UINT, UINT, void, pointer(BITMAPINFO), UINT],
-            restype=BOOL,
-        )
+        # Note: keep it sorted
+        for attr, func, argtypes, restype in (
+            (gdi32, "BitBlt", [HDC, INT, INT, INT, INT, HDC, INT, INT, DWORD], BOOL),
+            (gdi32, "CreateCompatibleBitmap", [HDC, INT, INT], HBITMAP),
+            (gdi32, "CreateCompatibleDC", [HDC], HDC),
+            (gdi32, "DeleteObject", [HGDIOBJ], INT),
+            (gdi32, "GetDeviceCaps", [HWND, INT], INT),
+            (
+                gdi32,
+                "GetDIBits",
+                [HDC, HBITMAP, UINT, UINT, void, pointer(BITMAPINFO), UINT],
+                BOOL,
+            ),
+            (gdi32, "SelectObject", [HDC, HGDIOBJ], HGDIOBJ),
+            (
+                user32,
+                "EnumDisplayMonitors",
+                [HDC, void, self.monitorenumproc, LPARAM],
+                BOOL,
+            ),
+            (user32, "GetSystemMetrics", [INT], INT),
+            (user32, "GetWindowDC", [HWND], HDC),
+        ):
+            cfactory(attr=attr, func=func, argtypes=argtypes, restype=restype)  # type: ignore
 
     def _set_dpi_awareness(self):
         """ Set DPI aware to capture full screen on Hi-DPI monitors. """