pyglet 2.1.13__py3-none-any.whl → 3.0.dev1__py3-none-any.whl

pyglet/{gl → libs/win32}/lib_wgl.py

@@ -5,12 +5,12 @@ from ctypes import CFUNCTYPE, POINTER, c_char_p, c_int, cast
 from typing import Any, Callable, Sequence
 
 import pyglet
-from pyglet.gl.lib import decorate_function, missing_function
+from pyglet.graphics.api.gl.lib import decorate_function, missing_function
 from pyglet.util import asbytes
 
-__all__ = ['link_GL', 'link_WGL']
+__all__ = ['link_GL', 'link_GL_proxy', 'link_WGL', 'link_WGL_proxy']
 
-_debug_trace = pyglet.options['debug_trace']
+_debug_trace = pyglet.options.debug_trace
 
 gl_lib = ctypes.windll.opengl32
 wgl_lib = gl_lib
@@ -22,7 +22,7 @@ if _debug_trace:
     wgl_lib = _TraceLibrary(wgl_lib)
 
 try:
-    wglGetProcAddress = wgl_lib.wglGetProcAddress  # noqa: N816
+    wglGetProcAddress = wgl_lib.wglGetProcAddress
     wglGetProcAddress.restype = CFUNCTYPE(POINTER(c_int))
     wglGetProcAddress.argtypes = [c_char_p]
     _have_get_proc_address = True
@@ -53,8 +53,7 @@ class WGLFunctionProxy:
         self.func = None
 
     def __call__(self, *args: Any, **kwargs: Any) -> Callable:
-        from pyglet.gl import current_context
-        if not current_context:
+        if not pyglet.graphics.api.core:
             msg = f'Call to function "{self.name}" before GL context created'
             raise Exception(msg)
         address = wglGetProcAddress(asbytes(self.name))
@@ -70,8 +69,15 @@ class WGLFunctionProxy:
         return self.func(*args, **kwargs)
 
 
-def link_GL(name: str, restype: Any, argtypes: Any, requires: str | None = None,  # noqa: N802, D103
+def link_GL_proxy(name: str, restype: Any, argtypes: Any, requires: str | None = None,  # noqa: N802
             suggestions: Sequence[str] | None = None) -> Callable[..., Any]:
+    """Link a GL function using a proxy address.
+
+    Most functions are not exposed in opengl32.dll, so the majority will be created via wglGetProcAddress.
+
+    If a context is not created, a proxy function will be created in its place. Through this implementation,
+    OpenGL functions can be imported globally.
+    """
     try:
         func = getattr(gl_lib, name)
         func.restype = restype
@@ -79,26 +85,46 @@ def link_GL(name: str, restype: Any, argtypes: Any, requires: str | None = None,
         decorate_function(func, name)
         return func
     except AttributeError:
-        # Not in opengl32.dll. Try and get a pointer from WGL.
-        try:
-            fargs = (restype,) + tuple(argtypes)
-            ftype = ctypes.WINFUNCTYPE(*fargs)
-            if _have_get_proc_address:
-                from pyglet.gl import gl_info
-                if gl_info.have_context():
-                    address = wglGetProcAddress(name)
-                    if address:
-                        func = cast(address, ftype)
-                        decorate_function(func, name)
-                        return func
-                else:
-                    # Insert proxy until we have a context
-                    return WGLFunctionProxy(name, ftype, requires, suggestions)
-        except:  # noqa: E722, S110
-            # TODO: Figure out what exception this can cause instead of catching all.
-            pass
+        fargs = (restype, *tuple(argtypes))
+        ftype = ctypes.WINFUNCTYPE(*fargs)
+        if _have_get_proc_address:
+            from pyglet.graphics.api import core
+            if core and core.have_context:
+                address = wglGetProcAddress(asbytes(name))
+                if cast(address, POINTER(c_int)):  # check cast because address is func
+                    func = cast(address, ftype)
+                    decorate_function(func, name)
+                    return func
+            else:
+                # Insert proxy until we have a context
+                return WGLFunctionProxy(name, ftype, requires, suggestions)
 
         return missing_function(name, requires, suggestions)
 
+def link_GL(name: str, restype: Any, argtypes: Any, requires: str | None = None,  # noqa: N802
+            suggestions: Sequence[str] | None = None) -> Callable[..., Any]:
+    """Link a GL function using a proxy address.
+
+    Requires an OpenGL context to be created and current.
+    """
+    try:
+        func = getattr(gl_lib, name)
+        func.restype = restype
+        func.argtypes = argtypes
+        decorate_function(func, name)
+        return func
+    except AttributeError:
+        # Not in opengl32.dll. Try and get a pointer from WGL.
+        fargs = (restype, *tuple(argtypes))
+        ftype = ctypes.WINFUNCTYPE(*fargs)
+        if _have_get_proc_address:
+            address = wglGetProcAddress(asbytes(name))
+            if cast(address, POINTER(c_int)):  # check cast because address is func
+                func = cast(address, ftype)
+                decorate_function(func, name)
+                return func
+
+        return missing_function(name, requires, suggestions)
 
-link_WGL = link_GL  # noqa: N816
+link_WGL = link_GL
+link_WGL_proxy = link_GL_proxy

pyglet/libs/win32/types.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import ctypes
 import sys
 from ctypes import (
@@ -47,6 +48,7 @@ from ctypes.wintypes import (
     LPARAM,
     LPCWSTR,
     LPOLESTR,
+    LPVOID,
     LPWSTR,
     MSG,
     POINT,
@@ -92,8 +94,7 @@ def POINTER_(obj):
         def from_param(cls, x):
             if x is None:
                 return cls()
-            else:
-                return x
+            return x
 
         p.from_param = classmethod(from_param)
 
@@ -159,6 +160,8 @@ MONITOR_DEFAULTTONEAREST = 0
 MONITOR_DEFAULTTONULL = 1
 MONITOR_DEFAULTTOPRIMARY = 2
 
+REGSAM = DWORD
+
 def MAKEINTRESOURCE(i):
     return cast(ctypes.c_void_p(i & 0xFFFF), c_wchar_p)
 
@@ -174,7 +177,7 @@ class WNDCLASS(Structure):
         ('hCursor', HCURSOR),
         ('hbrBackground', HBRUSH),
         ('lpszMenuName', c_char_p),
-        ('lpszClassName', c_wchar_p)
+        ('lpszClassName', c_wchar_p),
     ]
 
 
@@ -182,7 +185,7 @@ class SECURITY_ATTRIBUTES(Structure):
     _fields_ = [
         ("nLength", DWORD),
         ("lpSecurityDescriptor", c_void_p),
-        ("bInheritHandle", BOOL)
+        ("bInheritHandle", BOOL),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -214,7 +217,7 @@ class PIXELFORMATDESCRIPTOR(Structure):
         ('bReserved', BYTE),
         ('dwLayerMask', DWORD),
         ('dwVisibleMask', DWORD),
-        ('dwDamageMask', DWORD)
+        ('dwDamageMask', DWORD),
     ]
 
 
@@ -294,7 +297,7 @@ class BITMAPV5HEADER(Structure):
 class BITMAPINFO(Structure):
     _fields_ = [
         ('bmiHeader', BITMAPINFOHEADER),
-        ('bmiColors', RGBQUAD * 1)
+        ('bmiColors', RGBQUAD * 1),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -314,7 +317,7 @@ class LOGFONT(Structure):
         ('lfClipPrecision', BYTE),
         ('lfQuality', BYTE),
         ('lfPitchAndFamily', BYTE),
-        ('lfFaceName', (c_char * LF_FACESIZE))  # Use ASCII
+        ('lfFaceName', (c_char * LF_FACESIZE)),  # Use ASCII
     ]
 
 
@@ -334,7 +337,7 @@ class LOGFONTW(Structure):
         ('lfClipPrecision', BYTE),
         ('lfQuality', BYTE),
         ('lfPitchAndFamily', BYTE),
-        ('lfFaceName', (WCHAR * LF_FACESIZE))
+        ('lfFaceName', (WCHAR * LF_FACESIZE)),
     ]
 
 
@@ -343,7 +346,7 @@ class TRACKMOUSEEVENT(Structure):
         ('cbSize', DWORD),
         ('dwFlags', DWORD),
         ('hwndTrack', HWND),
-        ('dwHoverTime', DWORD)
+        ('dwHoverTime', DWORD),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -354,7 +357,7 @@ class MINMAXINFO(Structure):
         ('ptMaxSize', POINT),
         ('ptMaxPosition', POINT),
         ('ptMinTrackSize', POINT),
-        ('ptMaxTrackSize', POINT)
+        ('ptMaxTrackSize', POINT),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -363,7 +366,7 @@ class ABC(Structure):
     _fields_ = [
         ('abcA', c_int),
         ('abcB', c_uint),
-        ('abcC', c_int)
+        ('abcC', c_int),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -389,7 +392,7 @@ class TEXTMETRIC(Structure):
         ('tmUnderlined', c_byte),
         ('tmStruckOut', c_byte),
         ('tmPitchAndFamily', c_byte),
-        ('tmCharSet', c_byte)
+        ('tmCharSet', c_byte),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -400,7 +403,7 @@ class MONITORINFOEX(Structure):
         ('rcMonitor', RECT),
         ('rcWork', RECT),
         ('dwFlags', DWORD),
-        ('szDevice', WCHAR * CCHDEVICENAME)
+        ('szDevice', WCHAR * CCHDEVICENAME),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -422,7 +425,7 @@ class _DUMMYSTRUCTNAME2(Structure):
     _fields_ = [
         ('dmPosition', POINTL),
         ('dmDisplayOrientation', DWORD),
-        ('dmDisplayFixedOutput', DWORD)
+        ('dmDisplayFixedOutput', DWORD),
     ]
 
 
@@ -475,7 +478,7 @@ class ICONINFO(Structure):
         ('xHotspot', DWORD),
         ('yHotspot', DWORD),
         ('hbmMask', HBITMAP),
-        ('hbmColor', HBITMAP)
+        ('hbmColor', HBITMAP),
     ]
     __slots__ = [f[0] for f in _fields_]
 
@@ -485,7 +488,7 @@ class RAWINPUTDEVICE(Structure):
         ('usUsagePage', USHORT),
         ('usUsage', USHORT),
         ('dwFlags', DWORD),
-        ('hwndTarget', HWND)
+        ('hwndTarget', HWND),
     ]
 
 
@@ -568,7 +571,7 @@ class _VarTable(Union):
     """Must be in an anonymous union or values will not work across various VT's."""
     _fields_ = [
         ('llVal', ctypes.c_longlong),
-        ('pwszVal', LPWSTR)
+        ('pwszVal', LPWSTR),
     ]
 
 
@@ -580,14 +583,14 @@ class PROPVARIANT(Structure):
         ('wReserved1', ctypes.c_ubyte),
         ('wReserved2', ctypes.c_ubyte),
         ('wReserved3', ctypes.c_ulong),
-        ('union', _VarTable)
+        ('union', _VarTable),
     ]
 
 
 class _VarTableVariant(Union):
     """Must be in an anonymous union or values will not work across various VT's."""
     _fields_ = [
-        ('bstrVal', LPCWSTR)
+        ('bstrVal', LPCWSTR),
     ]
 
 
@@ -599,7 +602,7 @@ class VARIANT(Structure):
         ('wReserved1', WORD),
         ('wReserved2', WORD),
         ('wReserved3', WORD),
-        ('union', _VarTableVariant)
+        ('union', _VarTableVariant),
     ]
 
 
@@ -674,7 +677,7 @@ class DEV_BROADCAST_DEVICEINTERFACE(Structure):
         ('dbcc_devicetype', DWORD),
         ('dbcc_reserved', DWORD),
         ('dbcc_classguid', com.GUID),
-        ('dbcc_name', ctypes.c_wchar * 256)
+        ('dbcc_name', ctypes.c_wchar * 256),
     )
 
 
@@ -751,14 +754,14 @@ class DISPLAYCONFIG_DEVICE_INFO_HEADER(ctypes.Structure):
     _fields_ = [('type', UINT32),
                 ('size', UINT32),
                 ('adapterId', LUID),
-                ('id', UINT32)
+                ('id', UINT32),
                 ]
 
 
 class DISPLAYCONFIG_SOURCE_DEVICE_NAME(ctypes.Structure):
     _fields_ = [
         ('header', DISPLAYCONFIG_DEVICE_INFO_HEADER),
-        ('viewGdiDeviceName', WCHAR * 32)
+        ('viewGdiDeviceName', WCHAR * 32),
     ]
 
 
@@ -773,3 +776,35 @@ class DISPLAYCONFIG_TARGET_DEVICE_NAME(ctypes.Structure):
         ('monitorFriendlyDeviceName', WCHAR * 64),
         ('monitorDevicePath', WCHAR * 128),
     ]
+
+
+LPOFNHOOKPROC = ctypes.WINFUNCTYPE(UINT, HWND,  UINT,WPARAM, LPARAM)
+
+LPEDITMENU = ctypes.c_void_p
+
+class OPENFILENAMEW(Structure):
+    _fields_ = [
+        ("lStructSize", DWORD),
+        ("hwndOwner", HWND),
+        ("hInstance", HINSTANCE),
+        ("lpstrFilter", LPCWSTR),
+        ("lpstrCustomFilter", LPWSTR),
+        ("nMaxCustFilter", DWORD),
+        ("nFilterIndex", DWORD),
+        ("lpstrFile", LPWSTR),
+        ("nMaxFile", DWORD),
+        ("lpstrFileTitle", LPWSTR),
+        ("nMaxFileTitle", DWORD),
+        ("lpstrInitialDir", LPCWSTR),
+        ("lpstrTitle", LPCWSTR),
+        ("Flags", DWORD),
+        ("nFileOffset", WORD),
+        ("nFileExtension", WORD),
+        ("lpstrDefExt", LPCWSTR),
+        ("lCustData", LPARAM),
+        ("lpfnHook", LPOFNHOOKPROC),
+        ("lpTemplateName", LPCWSTR),
+        ("pvReserved", LPVOID),
+        ("dwReserved", DWORD),
+        ("FlagsEx", DWORD),
+    ]

pyglet/{gl → libs/win32}/wgl.py

@@ -2,11 +2,13 @@
 
 Generated by tools/gengl.py.
 """
+from __future__ import annotations
 
 from ctypes import CFUNCTYPE, POINTER, Structure, c_int
 from ctypes.wintypes import DWORD, BOOL, FLOAT, LONG, UINT, HDC, WORD, HANDLE, LPCSTR
 
-from pyglet.gl.lib import link_WGL as _link_function
+from pyglet.graphics.api.gl.lib import link_WGL as _link_function
+from pyglet.libs.win32.wglext_arb import WGLFunctionsARB
 from pyglet.libs.win32.types import BYTE
 
 if not _link_function:
@@ -33,7 +35,6 @@ wglMakeCurrent = _link_function('wglMakeCurrent', BOOL, [HDC, HGLRC], None)
 wglShareLists = _link_function('wglShareLists', BOOL, [HGLRC, HGLRC], None)
 wglUseFontBitmapsA = _link_function('wglUseFontBitmapsA', BOOL, [HDC, DWORD, DWORD, DWORD], None)
 wglUseFontBitmapsW = _link_function('wglUseFontBitmapsW', BOOL, [HDC, DWORD, DWORD, DWORD], None)
-SwapBuffers = _link_function('SwapBuffers', BOOL, [HDC], None)
 
 
 class struct__POINTFLOAT(Structure):
@@ -56,9 +57,9 @@ class struct__GLYPHMETRICSFLOAT(Structure):
     __slots__ = [
         'gmfBlackBoxX',
         'gmfBlackBoxY',
-        'gmfptGlyphOrigin',
         'gmfCellIncX',
         'gmfCellIncY',
+        'gmfptGlyphOrigin',
     ]
 
 
@@ -80,32 +81,38 @@ wglUseFontOutlinesA = _link_function('wglUseFontOutlinesA', BOOL, [HDC, DWORD, D
 wglUseFontOutlinesW = _link_function('wglUseFontOutlinesW', BOOL, [HDC, DWORD, DWORD, DWORD, FLOAT, FLOAT, c_int, LPGLYPHMETRICSFLOAT], None)
 
 
+
+class WGLFunctions(WGLFunctionsARB):
+    def __init__(self):
+        super().__init__()
+
+
 class struct_tagLAYERPLANEDESCRIPTOR(Structure):
     __slots__ = [
-        'nSize',
-        'nVersion',
-        'dwFlags',
-        'iPixelType',
-        'cColorBits',
-        'cRedBits',
-        'cRedShift',
-        'cGreenBits',
-        'cGreenShift',
-        'cBlueBits',
-        'cBlueShift',
-        'cAlphaBits',
-        'cAlphaShift',
+        'bReserved',
+        'cAccumAlphaBits',
         'cAccumBits',
-        'cAccumRedBits',
-        'cAccumGreenBits',
         'cAccumBlueBits',
-        'cAccumAlphaBits',
+        'cAccumGreenBits',
+        'cAccumRedBits',
+        'cAlphaBits',
+        'cAlphaShift',
+        'cAuxBuffers',
+        'cBlueBits',
+        'cBlueShift',
+        'cColorBits',
         'cDepthBits',
+        'cGreenBits',
+        'cGreenShift',
+        'cRedBits',
+        'cRedShift',
         'cStencilBits',
-        'cAuxBuffers',
-        'iLayerPlane',
-        'bReserved',
         'crTransparent',
+        'dwFlags',
+        'iLayerPlane',
+        'iPixelType',
+        'nSize',
+        'nVersion',
     ]
 
 
@@ -212,10 +219,10 @@ wglSwapMultipleBuffers = _link_function('wglSwapMultipleBuffers', DWORD, [UINT,
 
 class struct_tagRECT(Structure):
     __slots__ = [
+        'bottom',
         'left',
-        'top',
         'right',
-        'bottom',
+        'top',
     ]
 
 
@@ -298,7 +305,7 @@ __all__ = [
     'WGL_SWAP_UNDERLAY13',
     'WGL_SWAP_UNDERLAY14',
     'WGL_SWAP_UNDERLAY15',
-    'SwapBuffers',
+    'WGLFunctions',
     'wglCopyContext',
     'wglCreateContext',
     'wglCreateLayerContext',