pyglet 1.5.27__zip → 1.5.29__zip

pyglet-1.5.29/.github/workflows/unittests.yml

@@ -0,0 +1,80 @@
+name: PyTest
+
+on: [push, pull_request]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [ '3.8', '3.9', '3.10' ]
+    name: Python ${{ matrix.python-version }} ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+          sudo apt-get install xvfb libglu1-mesa
+      - name: Run tests
+        run: |
+          xvfb-run pytest tests/unit
+
+  osx:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        python-version: [ '3.8', '3.9', '3.10' ]
+    name: Python ${{ matrix.python-version }} OSX
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          pip install pytest
+      - name: Run tests
+        run: |
+          pytest tests/unit
+
+  windows:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: [ '3.8', '3.9', '3.10' ]
+    name: Python ${{ matrix.python-version }} Windows
+    steps:
+      - uses: actions/checkout@v3
+      - name: Setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          release: false
+          install: mingw-w64-x86_64-mesa
+      - name: Install dependencies
+        run: |
+          pip install pytest
+      - name: Run tests
+        shell: pwsh
+        run: |
+          
+          $env:PYGLET_DEBUG_LIB = "True"
+          $env:PYGLET_DEBUG_GL_TRACE = "True"
+
+          mkdir D:\a\pyglet\pyglet\lib
+          copy C:\msys64\mingw64\bin\opengl32.dll D:\a\pyglet\pyglet\lib\
+
+          mkdir D:\a\pyglet\lib
+          copy C:\msys64\mingw64\bin\opengl32.dll D:\a\pyglet\lib\
+
+          # pytest tests/unit
+          python -m pyglet.info

{pyglet-1.5.27 → pyglet-1.5.29}/LICENSE

@@ -1,5 +1,5 @@
 Copyright (c) 2006-2008 Alex Holkner
-Copyright (c) 2008-2021 pyglet contributors
+Copyright (c) 2008-2023 pyglet contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

{pyglet-1.5.27 → pyglet-1.5.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyglet
-Version: 1.5.27
+Version: 1.5.29
 Summary: Cross-platform windowing and multimedia library
 Home-page: http://pyglet.readthedocs.org/en/latest/
 Download-URL: http://pypi.python.org/pypi/pyglet

{pyglet-1.5.27 → pyglet-1.5.29}/RELEASE_NOTES

@@ -1,3 +1,40 @@
+pyglet 1.5.29
+
+Bugfixes
+--------
+- image: Fix name error on Windows when using WIC decoder (#1106)
+- media: Backport thread join exception catch from 2.0 (9db3971) (#1105)
+
+
+pyglet 1.5.28
+
+Features
+--------
+- Add support for FFmpeg 6.0
+- Add support for mouse buttons 4 & 5 on Windows and Linux
+- Windows: set higher timer precision when starting PlatformEventLoop.
+- font.DirectWrite: improve font name parser (set 'dw_legacy_naming' pyglet option for old behavior)
+- Extend keyboard F-key support (F16-24 on Windows, F21-24 on Linux. Mac limited to F20. (#773)
+- Avoid audio stutter by initializing the AudioDriver when the media module is first used.
+- macOS: add support for "on_file_drop" Window events
+- macOS: add CoreAudio decoder for supporting compressed audio formats out of the box (mp3, etc.)
+- macOS: add filename support for QuartzFont
+- macOS: New optional alternate event loop, to prevent M1 issues (set 'osx_alt_loop' pyglet option) (#794)
+
+Bugfixes
+--------
+- Backport of numerous media and font bugfixes from the master branch.
+- Fix BYTE windows type for Python 3.12
+- Skip calling CGDisplaySetDisplayMode if the current screen mode is the same (#891)
+- font.DirectWrite: Enable color font only for supported OS's
+- Fix get_default_screen() to get the primary monitor, not just the first in the list (#717)
+- Fix debug_win32 - LoadLibrary implementation (#748)
+- font.Directwrite: Fix 32 bit crashes (#771)
+- macOS: Fix memory leak with NSDate object returns.
+- Fix FFmpeg 4.0 not being found on MacOS
+- Varios XAudio2 fixes and cleanups (#877)
+
+
 pyglet 1.5.27
 
 Bugfixes

{pyglet-1.5.27 → pyglet-1.5.29}/pyglet/__init__.py

@@ -1,41 +1,6 @@
-# ----------------------------------------------------------------------------
-# pyglet
-# Copyright (c) 2006-2008 Alex Holkner
-# Copyright (c) 2008-2022 pyglet contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#  * Neither the name of pyglet nor the names of its
-#    contributors may be used to endorse or promote products
-#    derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# ----------------------------------------------------------------------------
-
 """pyglet is a cross-platform games and multimedia package.
 
-Detailed documentation is available at http://www.pyglet.org
+More information is available at http://www.pyglet.org
 """
 
 import os
@@ -53,7 +18,7 @@ _is_pyglet_doc_run = hasattr(sys, "is_pyglet_doc_run") and sys.is_pyglet_doc_run
 #:
 #: Valid only if pyglet was installed from a source or binary distribution
 #: (i.e. not cloned from Git).
-version = '1.5.27'
+version = '1.5.29'
 
 
 if sys.version_info < (3, 6):
@@ -160,12 +125,14 @@ options = {
     'vsync': None,
     'xsync': True,
     'xlib_fullscreen_override_redirect': False,
-    'darwin_cocoa': True,
     'search_local_libs': True,
     'advanced_font_features': False,
     'headless': False,
     'headless_device': 0,
     'win32_disable_shaping': False,
+    'dw_legacy_naming': False,
+    'com_mta': False,
+    'osx_alt_loop': False
 }
 
 _option_types = {
@@ -189,30 +156,32 @@ _option_types = {
     'vsync': bool,
     'xsync': bool,
     'xlib_fullscreen_override_redirect': bool,
+    'search_local_libs': bool,
     'advanced_font_features': bool,
     'headless': bool,
     'headless_device': int,
-    'win32_disable_shaping': bool
+    'win32_disable_shaping': bool,
+    'dw_legacy_naming': bool,
+    'com_mta': bool,
+    'osx_alt_loop': bool,
 }
 
 
-def _read_environment():
+for key in options:
     """Read defaults for options from environment"""
-    for key in options:
-        env = 'PYGLET_%s' % key.upper()
-        try:
-            value = os.environ[env]
-            if _option_types[key] is tuple:
-                options[key] = value.split(',')
-            elif _option_types[key] is bool:
-                options[key] = value in ('true', 'TRUE', 'True', '1')
-            elif _option_types[key] is int:
-                options[key] = int(value)
-        except KeyError:
-            pass
-
+    assert key in _option_types, f"Option '{key}' must have a type set in _option_types."
+    env = f'PYGLET_{key.upper()}'
+    try:
+        value = os.environ[env]
+        if _option_types[key] is tuple:
+            options[key] = value.split(',')
+        elif _option_types[key] is bool:
+            options[key] = value in ('true', 'TRUE', 'True', '1')
+        elif _option_types[key] is int:
+            options[key] = int(value)
+    except KeyError:
+        pass
 
-_read_environment()
 
 if compat_platform == 'cygwin':
     # This hack pretends that the posix-like ctypes provides windows
@@ -268,21 +237,21 @@ def _trace_frame(thread, frame, indent):
                 filename = os.path.join('...', filename)
             _trace_filename_abbreviations[path] = filename
 
-        location = '(%s:%d)' % (filename, line)
+        location = f'({filename}:{line})'
 
     if indent:
-        name = 'Called from %s' % name
-    print('[%d] %s%s %s' % (thread, indent, name, location))
+        name = f'Called from {name}'
+    print(f'[{thread}] {indent}{name} {location}')
 
     if _trace_args:
         if is_ctypes:
             args = [_trace_repr(arg) for arg in frame.f_locals['args']]
-            print('  %sargs=(%s)' % (indent, ', '.join(args)))
+            print(f'  {indent}args=({", ".join(args)})')
         else:
             for argname in code.co_varnames[:code.co_argcount]:
                 try:
                     argvalue = _trace_repr(frame.f_locals[argname])
-                    print('  %s%s=%s' % (indent, argname, argvalue))
+                    print(f'  {indent}{argname}={argvalue}')
                 except:
                     pass
 
@@ -338,7 +307,7 @@ class _ModuleProxy:
             if self._module is not None:
                 raise
 
-            import_name = 'pyglet.%s' % self._module_name
+            import_name = f'pyglet.{self._module_name}'
             __import__(import_name)
             module = sys.modules[import_name]
             object.__setattr__(self, '_module', module)
@@ -352,7 +321,7 @@ class _ModuleProxy:
             if self._module is not None:
                 raise
 
-            import_name = 'pyglet.%s' % self._module_name
+            import_name = f'pyglet.{self._module_name}'
             __import__(import_name)
             module = sys.modules[import_name]
             object.__setattr__(self, '_module', module)
@@ -366,7 +335,6 @@ if TYPE_CHECKING:
     from . import app
     from . import canvas
     from . import clock
-    from . import com
     from . import event
     from . import font
     from . import gl
@@ -387,7 +355,6 @@ else:
     app = _ModuleProxy('app')
     canvas = _ModuleProxy('canvas')
     clock = _ModuleProxy('clock')
-    com = _ModuleProxy('com')
     event = _ModuleProxy('event')
     font = _ModuleProxy('font')
     gl = _ModuleProxy('gl')

{pyglet-1.5.27 → pyglet-1.5.29}/pyglet/app/__init__.py

@@ -1,38 +1,3 @@
-# ----------------------------------------------------------------------------
-# pyglet
-# Copyright (c) 2006-2008 Alex Holkner
-# Copyright (c) 2008-2022 pyglet contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#  * Neither the name of pyglet nor the names of its
-#    contributors may be used to endorse or promote products
-#    derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# ----------------------------------------------------------------------------
-
 """Application-wide functionality.
 
 Applications
@@ -64,20 +29,24 @@ default policy is to wait until all windows are closed)::
 .. versionadded:: 1.1
 """
 
+import platform
 import sys
 import weakref
 
-from pyglet.app.base import EventLoop
+import pyglet
 from pyglet import compat_platform
+from pyglet.app.base import EventLoop
 
 _is_pyglet_doc_run = hasattr(sys, "is_pyglet_doc_run") and sys.is_pyglet_doc_run
 
-
 if _is_pyglet_doc_run:
     from pyglet.app.base import PlatformEventLoop
 else:
     if compat_platform == 'darwin':
-        from pyglet.app.cocoa import CocoaEventLoop as PlatformEventLoop
+        from pyglet.app.cocoa import CocoaPlatformEventLoop as PlatformEventLoop
+
+        if platform.machine() == 'arm64' or pyglet.options["osx_alt_loop"]:
+            from pyglet.app.cocoa import CocoaAlternateEventLoop as EventLoop
     elif compat_platform in ('win32', 'cygwin'):
         from pyglet.app.win32 import Win32EventLoop as PlatformEventLoop
     else:
@@ -127,7 +96,6 @@ def exit():
 #: :meth:`EventLoop.run`.
 event_loop = EventLoop()
 
-#: The platform-dependent event loop.
-#: Applications must not subclass or replace this :class:`PlatformEventLoop`
-#: object.
+#: The platform-dependent event loop. Applications must not subclass
+# or replace this :class:`PlatformEventLoop` object.
 platform_event_loop = PlatformEventLoop()

{pyglet-1.5.27 → pyglet-1.5.29}/pyglet/app/base.py

@@ -1,7 +1,7 @@
 # ----------------------------------------------------------------------------
 # pyglet
 # Copyright (c) 2006-2008 Alex Holkner
-# Copyright (c) 2008-2022 pyglet contributors
+# Copyright (c) 2008-2023 pyglet contributors
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -55,7 +55,6 @@ class PlatformEventLoop:
     def __init__(self):
         self._event_queue = queue.Queue()
         self._is_running = threading.Event()
-        self._is_running.clear()
 
     def is_running(self):
         """Return True if the event loop is currently processing, or False

{pyglet-1.5.27 → pyglet-1.5.29}/pyglet/app/cocoa.py

@@ -1,59 +1,18 @@
-# ----------------------------------------------------------------------------
-# pyglet
-# Copyright (c) 2006-2008 Alex Holkner
-# Copyright (c) 2008-2022 pyglet contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#  * Neither the name of pyglet nor the names of its
-#    contributors may be used to endorse or promote products
-#    derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-# ----------------------------------------------------------------------------
-
-from pyglet.app.base import PlatformEventLoop
-from pyglet.libs.darwin import cocoapy
+import signal
+from pyglet import app
+from pyglet.app.base import PlatformEventLoop, EventLoop
+from pyglet.libs.darwin import cocoapy, AutoReleasePool, ObjCSubclass, PyObjectEncoding, ObjCInstance, send_super, \
+    ObjCClass, get_selector
 
 NSApplication = cocoapy.ObjCClass('NSApplication')
 NSMenu = cocoapy.ObjCClass('NSMenu')
 NSMenuItem = cocoapy.ObjCClass('NSMenuItem')
-NSAutoreleasePool = cocoapy.ObjCClass('NSAutoreleasePool')
 NSDate = cocoapy.ObjCClass('NSDate')
 NSEvent = cocoapy.ObjCClass('NSEvent')
 NSUserDefaults = cocoapy.ObjCClass('NSUserDefaults')
+NSTimer = cocoapy.ObjCClass('NSTimer')
 
 
-class AutoReleasePool:
-    def __enter__(self):
-        self.pool = NSAutoreleasePool.alloc().init()
-        return self.pool
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.pool.drain()
-        del self.pool
-
 
 def add_menu_item(menu, title, action, key):
     with AutoReleasePool():
@@ -65,8 +24,6 @@ def add_menu_item(menu, title, action, key):
         menu.addItem_(menuItem)
 
         # cleanup
-        title.release()
-        key.release()
         menuItem.release()
 
 
@@ -92,10 +49,72 @@ def create_menu():
         appMenuItem.release()
 
 
-class CocoaEventLoop(PlatformEventLoop):
+class _AppDelegate_Implementation:
+    _AppDelegate = ObjCSubclass('NSObject', '_AppDelegate')
+
+    @_AppDelegate.method(b'@' + PyObjectEncoding)
+    def init(self, pyglet_loop):
+        objc = ObjCInstance(send_super(self, 'init'))
+        self._pyglet_loop = pyglet_loop
+        return objc  # objc is self
+
+    @_AppDelegate.method('v')
+    def updatePyglet_(self):
+        self._pyglet_loop.nsapp_step()
+
+    @_AppDelegate.method('v@')
+    def applicationWillTerminate_(self, notification):
+        self._pyglet_loop.is_running = False
+        self._pyglet_loop.has_exit = True
+
+    @_AppDelegate.method('v@')
+    def applicationDidFinishLaunching_(self, notification):
+        self._pyglet_loop._finished_launching = True
+
+_AppDelegate = ObjCClass('_AppDelegate')  # the actual class
+
+class CocoaAlternateEventLoop(EventLoop):
+    """This is an alternate loop developed mainly for ARM64 variants of macOS.
+    nextEventMatchingMask_untilDate_inMode_dequeue_ is very broken with ctypes calls. Events eventually stop
+    working properly after X returns. This event loop differs in that it uses the built-in NSApplication event
+    loop. We tie our schedule into it via timer.
+    """
+    def run(self, interval=1.0/60.0):
+        self.has_exit = False
+
+        from pyglet.window import Window
+        Window._enable_event_queue = False
+
+        # Dispatch pending events
+        for window in app.windows:
+            window.switch_to()
+            window.dispatch_pending_events()
+
+        self.platform_event_loop = app.platform_event_loop
+
+        self.dispatch_event('on_enter')
+        self.is_running = True
+        self.platform_event_loop.nsapp_start(interval)
+
+    def exit(self):
+        """Safely exit the event loop at the end of the current iteration.
+
+        This method is a thread-safe equivalent for setting
+        :py:attr:`has_exit` to ``True``.  All waiting threads will be
+        interrupted (see :py:meth:`sleep`).
+        """
+        self.has_exit = True
+        self.platform_event_loop.notify()
+
+        self.is_running = False
+        self.dispatch_event('on_exit')
+
+        self.platform_event_loop.nsapp_stop()
+
+class CocoaPlatformEventLoop(PlatformEventLoop):
 
     def __init__(self):
-        super(CocoaEventLoop, self).__init__()
+        super(CocoaPlatformEventLoop, self).__init__()
         with AutoReleasePool():
             # Prepare the default application.
             self.NSApp = NSApplication.sharedApplication()
@@ -112,6 +131,11 @@ class CocoaEventLoop(PlatformEventLoop):
             ignoreState = cocoapy.CFSTR("ApplePersistenceIgnoreState")
             if not defaults.objectForKey_(ignoreState):
                 defaults.setBool_forKey_(True, ignoreState)
+
+            holdEnabled = cocoapy.CFSTR("ApplePressAndHoldEnabled")
+            if not defaults.objectForKey_(holdEnabled):
+                defaults.setBool_forKey_(False, holdEnabled)
+
             self._finished_launching = False
 
     def start(self):
@@ -123,6 +147,44 @@ class CocoaEventLoop(PlatformEventLoop):
                 self.NSApp.activateIgnoringOtherApps_(True)
                 self._finished_launching = True
 
+    def nsapp_start(self, interval):
+        """Used only for CocoaAlternateEventLoop"""
+        from pyglet.app import event_loop
+        self._event_loop = event_loop
+
+        def term_received(*args):
+            if self.timer:
+                self.timer.invalidate()
+                self.timer = 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.NSApp.run()
+
+    def nsapp_step(self):
+        """Used only for CocoaAlternateEventLoop"""
+        self._event_loop.idle()
+        self.dispatch_posted_events()
+
+    def nsapp_stop(self):
+        """Used only for CocoaAlternateEventLoop"""
+        self.NSApp.terminate_(None)
+
     def step(self, timeout=None):
         with AutoReleasePool():
             self.dispatch_posted_events()
@@ -132,6 +194,8 @@ class CocoaEventLoop(PlatformEventLoop):
                 # Using distantFuture as untilDate means that nextEventMatchingMask
                 # will wait until the next event comes along.
                 timeout_date = NSDate.distantFuture()
+            elif timeout == 0.0:
+                timeout_date = NSDate.distantPast()
             else:
                 timeout_date = NSDate.dateWithTimeIntervalSinceNow_(timeout)
 
@@ -146,25 +210,8 @@ class CocoaEventLoop(PlatformEventLoop):
             if event is not None:
                 event_type = event.type()
                 if event_type != cocoapy.NSApplicationDefined:
-                    # Send out event as normal.  Responders will still receive
-                    # keyUp:, keyDown:, and flagsChanged: events.
                     self.NSApp.sendEvent_(event)
 
-                    # Resend key events as special pyglet-specific messages
-                    # which supplant the keyDown:, keyUp:, and flagsChanged: messages
-                    # because NSApplication translates multiple key presses into key
-                    # equivalents before sending them on, which means that some keyUp:
-                    # messages are never sent for individual keys.   Our pyglet-specific
-                    # replacements ensure that we see all the raw key presses & releases.
-                    # We also filter out key-down repeats since pyglet only sends one
-                    # on_key_press event per key press.
-                    if event_type == cocoapy.NSKeyDown and not event.isARepeat():
-                        self.NSApp.sendAction_to_from_(cocoapy.get_selector("pygletKeyDown:"), None, event)
-                    elif event_type == cocoapy.NSKeyUp:
-                        self.NSApp.sendAction_to_from_(cocoapy.get_selector("pygletKeyUp:"), None, event)
-                    elif event_type == cocoapy.NSFlagsChanged:
-                        self.NSApp.sendAction_to_from_(cocoapy.get_selector("pygletFlagsChanged:"), None, event)
-
                 self.NSApp.updateWindows()
                 did_time_out = False
             else: