pyglet 2.1.dev6__tar.gz → 2.1.dev7__tar.gz

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglet
-Version: 2.1.dev6
+Version: 2.1.dev7
 Summary: pyglet is a cross-platform games and multimedia package.
 Author-email: Alex Holkner & contributors <Alex.Holkner@gmail.com>
 Requires-Python: >=3.8

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/RELEASE_NOTES

@@ -1,3 +1,33 @@
+pyglet 2.0.18
+
+Changes and Improvements
+------------------------
+- shader: add support for OpenGL structures in UBO's (#1212)
+- win32.com: get libs/win32/com.py ready for incoming 3.13 changes #1199
+- docs: fix various typos, and example code to align with docs #1200, #1201
+- text.document: add new AbstractDocument.append_text method for more efficient end-of-text additions #1182
+- tests: fix issues with broken tests on macOS.
+- input.macos: add missing axis alias for modern controllers (Stadia, newer XBOX One)
+- gui.NinePatch: Add a new NinePatch.create_around_layout class method
+- typing: add py.typed file #1205
+
+Bugfixes
+--------
+- shader: fix matrix uniform assignment #1194
+- text: fix missing caret top level import
+- text.layout: fix updating anchor on the X axis #1213
+- text.layout: move get_line_count function into the base TextLayout class
+- window.macos: fix blinking cursor in bottom left of window #1204
+- examples: fix rectangle not appearing in text_input example
+- macos: fix missing dealloc for text view.
+- macos: fix some deallocation issues when creating multiple windows.
+- macos: fix event loop termination exiting the entire app.
+- macos: fix focus being stolen by other apps during launch. (#1211)
+- macos: fix error about pygletUpdate when closing a window. (#1219)
+- macos: fix function keys not registering. (#1220)
+- docs: move check for `sys.modules['sphinx']` into doc/conf.py to prevent conflicts with jupyter #1215
+
+
 pyglet 2.0.17
 
 Changes and Improvements

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/doc/conf.py

@@ -2,11 +2,12 @@
 # pyglet documentation build configuration file.
 #
 # This file is execfile()d with the current directory set to its containing dir.
-import datetime
 import os
 import sys
 import time
 import typing
+import datetime
+
 from typing import TypeVar
 
 import sphinx_autodoc_typehints
@@ -31,7 +32,7 @@ def parse_attributes_section(self, section):
             _type = self._lookup_annotation(_name)
             if _name in self._annotations:
                 _type = sphinx_autodoc_typehints.add_type_css_class(
-                   sphinx_autodoc_typehints.format_annotation(self._annotations[_name], self._app.config))
+                    sphinx_autodoc_typehints.format_annotation(self._annotations[_name], self._app.config))
 
         field = self._format_field(_name, _type, _desc)
         if multi:
@@ -48,12 +49,15 @@ def parse_attributes_section(self, section):
 
 GoogleDocstring._parse_attributes_section = parse_attributes_section
 
+
 # Unpatch... the patch.
 def _revert_patch():
     pass
 
+
 sphinx_autodoc_typehints.patches._patch_google_docstring_lookup_annotation = _revert_patch
 
+
 # Patch to fix our RST insertion issues.
 class _RstSnippetParser(RSTParser):
     @staticmethod
@@ -63,13 +67,14 @@ class _RstSnippetParser(RSTParser):
 
 sphinx_autodoc_typehints.parser.RSTParser = _RstSnippetParser
 
+
 def write_build(data, filename):
     with open(os.path.join("internal", filename), "w") as f:
         f.write(".. list-table::\n")
         f.write("   :widths: 50 50\n")
         f.write("\n")
         for var, val in data:
-            f.write("   * - "+var+"\n     - "+val+"\n")
+            f.write("   * - " + var + "\n     - " + val + "\n")
 
 
 sys.is_pyglet_doc_run = True
@@ -82,17 +87,14 @@ sys.path.insert(0, os.path.abspath("."))
 # import the pyglet package.
 sys.path.insert(0, os.path.abspath(".."))
 
-
 try:
     import pyglet
+
     print(f"Generating pyglet {pyglet.version} Documentation")
 except ImportError:
     print("ERROR: pyglet not found")
     sys.exit(1)
 
-
-
-
 # -- PYGLET DOCUMENTATION CONFIGURATION ----------------------------------------
 
 
@@ -150,7 +152,6 @@ skip_modules = {"pyglet": {
                         },
                 }
 
-
 now = datetime.datetime.fromtimestamp(time.time())
 build_data = (("Date", now.strftime("%Y/%m/%d %H:%M:%S")),
               ("pyglet version", pyglet.version))
@@ -227,19 +228,19 @@ release = pyglet.version
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 exclude_patterns = ["_build", "_templates", "api"]
 
 # The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
@@ -247,7 +248,7 @@ add_module_names = False
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = "sphinx"
@@ -255,7 +256,6 @@ pygments_style = "sphinx"
 # A list of ignored prefixes for module index sorting.
 modindex_common_prefix = ["pyglet."]
 
-
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -265,7 +265,7 @@ html_theme = "sphinx_rtd_theme"
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Force custom css to allow multiline inits.
 html_css_files = [
@@ -299,18 +299,18 @@ html_static_path = ["_static"]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
+# html_last_updated_fmt = '%b %d, %Y'
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
 html_domain_indices = True
@@ -325,62 +325,61 @@ html_split_index = True
 html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = "pygletdoc"
 
-
 # -- Options for LaTeX output --------------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    # 'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    # 'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ("index", "pyglet.tex", "pyglet Documentation",
-   "Alex Holkner", "manual"),
+    ("index", "pyglet.tex", "pyglet Documentation",
+     "Alex Holkner", "manual"),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output --------------------------------------------
@@ -393,7 +392,7 @@ man_pages = [
 ]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output ------------------------------------------------
@@ -402,24 +401,25 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ("index", "pyglet", "pyglet Documentation",
-   "Alex Holkner", "pyglet", "One line description of project.",
-   "Miscellaneous"),
+    ("index", "pyglet", "pyglet Documentation",
+     "Alex Holkner", "pyglet", "One line description of project.",
+     "Miscellaneous"),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 python_maximum_signature_line_length = 85
 
 nitpicky = True
 
+
 def custom_formatter(annotation, config):
     # Fixes TypeVar bounds, where the bound reference is forward referenced and class cannot be determined.
     # Defaults to a class style. Seems good enough for now since most bound things are classes.
@@ -447,4 +447,5 @@ def custom_formatter(annotation, config):
         return f":py:class:`TypeVar` {formatted_args}"
     return None
 
+
 typehints_formatter = custom_formatter

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/doc/programming_guide/events.rst

@@ -14,7 +14,7 @@ base class. Many of pyglet's built-in modules, such as :py:mod:`pyglet.window`,
 :py:mod:`pyglet.gui` and others make use of this pattern. You can also reuse this in
 your own classes easily.
 
-Even handlers are simply functions or methods that are written to accept the same
+Event handlers are simply functions or methods that are written to accept the same
 arguments as the dispatched event. Event handlers can be registered or unregistered
 during runtime. More than one handler can be registered to receive the same events,
 which is described in the following sections. Event dispatchers can *optionally* have
@@ -27,7 +27,7 @@ Setting event handlers
 
 For an example, lets look at the :py:class:`~pyglet.window.Window` class.
 :py:class:`~pyglet.window.Window` subclasses :py:class:`~pyglet.event.EventDispatcher`
-and, being an Window, has a variety of different events which it dispatches.
+and, being a Window, has a variety of different events which it dispatches.
 For instance, the :py:meth:`pyglet.window.Window.on_resize` event. Every time a
 resizeable Window is resized (and once when first created), this event is dispatched
 with two parameters: ``(width, height)``. Therefore, an event handler for this event

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/doc/programming_guide/examplegame.rst

@@ -119,9 +119,9 @@ Making the labels
 
 To make a text label in pyglet, just initialize a :class:`pyglet.text.Label` object::
 
-    score_label = pyglet.text.Label(text="Score: 0", x=10, y=460)
+    score_label = pyglet.text.Label(text="Score: 0", x=10, y=575)
     level_label = pyglet.text.Label(text="My Amazing Game",
-                                x=game_window.width//2, y=game_window.height//2, anchor_x='center')
+                                x=game_window.width//2, y=575, anchor_x='center')
 
 Notice that the second label is centered using the anchor_x attribute.
 

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/pyglet/__init__.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
     from typing import Any, Callable, ItemsView, Sized
 
 #: The release version
-version = '2.1.dev6'
+version = '2.1.dev7'
 __version__ = version
 
 MIN_PYTHON_VERSION = 3, 8
@@ -25,9 +25,6 @@ if sys.version_info < MIN_PYTHON_VERSION:
     msg = f"pyglet {version} requires Python {MIN_PYTHON_VERSION_STR} or newer."
     raise Exception(msg)
 
-if "sphinx" in sys.modules:
-    sys.is_pyglet_doc_run = True
-
 # pyglet platform treats *BSD systems as Linux
 compat_platform = sys.platform
 if "bsd" in compat_platform:

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/pyglet/app/__init__.py

@@ -68,7 +68,7 @@ the set when they are no longer referenced or are closed explicitly.
 """
 
 
-def run(interval: float | None = 1/60) -> None:
+def run(interval: float | None = 1 / 60) -> None:
     """Begin processing events, scheduled functions and window updates.
 
     This is a convenience function, equivalent to::

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/pyglet/app/cocoa.py

@@ -1,4 +1,6 @@
 import signal
+import time
+
 from pyglet import app
 from pyglet.app.base import PlatformEventLoop, EventLoop
 from pyglet.libs.darwin import cocoapy, AutoReleasePool, ObjCSubclass, PyObjectEncoding, ObjCInstance, send_super, \
@@ -11,7 +13,7 @@ NSDate = cocoapy.ObjCClass('NSDate')
 NSEvent = cocoapy.ObjCClass('NSEvent')
 NSUserDefaults = cocoapy.ObjCClass('NSUserDefaults')
 NSTimer = cocoapy.ObjCClass('NSTimer')
-
+NSRunningApplication = cocoapy.ObjCClass('NSRunningApplication')
 
 
 def add_menu_item(menu, title, action, key):
@@ -71,6 +73,30 @@ class _AppDelegate_Implementation:
     def applicationDidFinishLaunching_(self, notification):
         self._pyglet_loop._finished_launching = True
 
+        # Force App to activate to the foreground due to being an unbundled CLI program.
+        # This prevents an issue where if you move the mouse when launching the program, it's focus can be stolen
+        # by an app under/behind it leading to a weird state of input and the menu bar being greyed out until
+        # reactivating it.
+        NSApp = NSApplication.sharedApplication()
+
+        # Activate dock to ensure all other apps are deactivated.
+        dock_str = cocoapy.get_NSString("com.apple.dock")
+        running_apps = NSRunningApplication.runningApplicationsWithBundleIdentifier_(dock_str)
+        app_count = running_apps.count()
+        for i in range(app_count):
+            running_app = running_apps.objectAtIndex_(i)
+            running_app.activateWithOptions_(cocoapy.NSApplicationActivateIgnoringOtherApps)
+            break
+
+        # Doesn't seem to work unless we add a small sleep for some reason...
+        time.sleep(0.01)
+
+        NSApp.activateIgnoringOtherApps_(True)
+
+    @_AppDelegate.method('v@')
+    def applicationWillFinishLaunching_(self, notification):
+        pass
+
     @_AppDelegate.method('B')
     def applicationSupportsSecureRestorableState_(self):
         return True
@@ -129,7 +155,9 @@ class CocoaAlternateEventLoop(EventLoop):
 class CocoaPlatformEventLoop(PlatformEventLoop):
 
     def __init__(self):
-        super(CocoaPlatformEventLoop, self).__init__()
+        super().__init__()
+        self._timer = None
+
         with AutoReleasePool():
             # Prepare the default application.
             self.NSApp = NSApplication.sharedApplication()
@@ -151,8 +179,23 @@ class CocoaPlatformEventLoop(PlatformEventLoop):
             if not defaults.objectForKey_(holdEnabled):
                 defaults.setBool_forKey_(False, holdEnabled)
 
+            self.appdelegate = _AppDelegate.alloc().init(self)
+            self.NSApp.setDelegate_(self.appdelegate)
+
             self._finished_launching = False
 
+        def term_received(*args):
+            if self._timer:
+                self._timer.invalidate()
+                self._timer = None
+
+            if self.NSApp:
+                self.NSApp.terminate_(None)
+
+        # Force NSApp to close if Python receives sig events.
+        signal.signal(signal.SIGINT, term_received)
+        signal.signal(signal.SIGTERM, term_received)
+
     def start(self):
         with AutoReleasePool():
             if not self.NSApp.isRunning() and not self._finished_launching:
@@ -167,38 +210,31 @@ class CocoaPlatformEventLoop(PlatformEventLoop):
         from pyglet.app import event_loop
         self._event_loop = event_loop
 
-        def term_received(*args):
-            if self.timer:
-                self.timer.invalidate()
-                self.timer = None
+        assert self._timer is None
 
-            self.nsapp_stop()
-
-        # Force NSApp to close if Python receives sig events.
-        signal.signal(signal.SIGINT, term_received)
-        signal.signal(signal.SIGTERM, term_received)
-
-        self.appdelegate = _AppDelegate.alloc().init(self)
-        self.NSApp.setDelegate_(self.appdelegate)
-
-        self.timer = NSTimer.scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_(
-             interval,  # Clamped internally to 0.0001 (including 0)
-             self.appdelegate,
-             get_selector('updatePyglet:'),
-             False,
-             True
-         )
+        self._timer = NSTimer.scheduledTimerWithTimeInterval_target_selector_userInfo_repeats_(
+            interval,  # Clamped internally to 0.0001 (including 0)
+            self.appdelegate,
+            get_selector('updatePyglet:'),
+            False,
+            True
+        )
 
         self.NSApp.run()
 
     def nsapp_step(self):
         """Used only for CocoaAlternateEventLoop"""
         self._event_loop.idle()
-        self.dispatch_posted_events()
+        with AutoReleasePool():
+            self.dispatch_posted_events()
 
     def nsapp_stop(self):
         """Used only for CocoaAlternateEventLoop"""
-        self.NSApp.terminate_(None)
+        self.NSApp.stop_(None)
+
+        if self._timer:
+            self._timer.invalidate()
+            self._timer = None
 
     def step(self, timeout=None):
         with AutoReleasePool():
@@ -210,7 +246,7 @@ class CocoaPlatformEventLoop(PlatformEventLoop):
                 # will wait until the next event comes along.
                 timeout_date = NSDate.distantFuture()
             elif timeout == 0.0:
-                timeout_date = NSDate.distantPast()
+                timeout_date = None
             else:
                 timeout_date = NSDate.dateWithTimeIntervalSinceNow_(timeout)
 

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/pyglet/customtypes.py

@@ -14,7 +14,7 @@ else:
 HorizontalAlign = Literal["left", "center", "right"]
 AnchorX = Literal["left", "center", "right"]
 AnchorY = Literal["top", "bottom", "center", "baseline"]
-ContentVAlign = Literal["left", "center", "top"]
+ContentVAlign = Literal["bottom", "center", "top"]
 
 
 

{pyglet-2.1.dev6 → pyglet-2.1.dev7}/pyglet/gl/cocoa.py

@@ -239,6 +239,11 @@ class CocoaDisplayConfig(DisplayConfig):  # noqa: D101
             self._pixel_format,
             share_context)
 
+        # No longer needed after context creation.
+        if self._pixel_format:
+            self._pixel_format.release()
+            self._pixel_format = None
+
         return CocoaContext(self, nscontext, share)
 
     def compatible(self, canvas: CocoaCanvas) -> bool: