teek-sdl2 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c87f625007ce2918dbb774860499c02b600109523ca6b546fe797697ca7ccd1
-  data.tar.gz: 9e3846f955461b2c479647bd05f2fcd4ce92be719ca408f1b12d4a11dffe534e
+  metadata.gz: de03bda40a94468e6956aba1a61fbfda2ae7caed7dd8d4f54632816c5c72db80
+  data.tar.gz: a53e78b3469245cfd47bc3b72dc9b9acffc0b035abad24647b4e824d5ec5e40a
 SHA512:
-  metadata.gz: 2a39f2f511c186759cd197a30ea9b08f77354a3ab361586d8390518061f1f40c90a37e2e050698a863e5b586caf9f55d2e674a0c6beace0ab0aa842f432778c7
-  data.tar.gz: f429de357646467b93478ea0094ada7e815dadd019f69dd7cabdc43f896601b4d1f27a87e36a24e8bdf70395522eff510fee1854460d0ebb6b92e1afda3fe336
+  metadata.gz: 4bc926660c4760d6f3fc6f54ab6f7c982e3f5164dd66b80531e54f729e0ffde515843ded5438824d6a0616529d362c1b15d033e8bbb91b09773546cd46586723
+  data.tar.gz: d3393755c68d9b4bf95fbf9fcab193cf155fd5996773bc0018a572d4e39837b4a5e333e207df14c66361c920f0e3c4d4627067af0ec080561982d27274f7b937

data/ext/teek_sdl2/extconf.rb

@@ -130,4 +130,13 @@ end
 
 $srcs = ['teek_sdl2.c', 'sdl2surface.c', 'sdl2bridge.c', 'sdl2text.c', 'sdl2pixels.c', 'sdl2image.c', 'sdl2mixer.c', 'sdl2audio.c', 'sdl2gamepad.c']
 
+# macOS: ObjC file to clean up SDL2 Metal subview left on foreign windows.
+# Non-macOS: C stub with no-op implementation.
+if RUBY_PLATFORM =~ /darwin/
+  $srcs << 'sdl2_macos.m'
+  $LDFLAGS << ' -framework Cocoa -framework QuartzCore'
+else
+  $srcs << 'sdl2_macos_stub.c'
+end
+
 create_makefile('teek_sdl2')

data/ext/teek_sdl2/sdl2_macos.m

@@ -0,0 +1,47 @@
+#include "teek_sdl2.h"
+
+#ifdef __APPLE__
+#import <Cocoa/Cocoa.h>
+#include <SDL2/SDL_syswm.h>
+
+/*
+ * Remove any non-Tk subviews from the NSWindow's contentView and mark
+ * it for redisplay.  Called from renderer_destroy() after
+ * SDL_DestroyRenderer — SDL2's Metal backend fails to remove its
+ * SDL_cocoametalview on foreign (Tk-owned) windows.
+ *
+ * Must be called BEFORE SDL_DestroyWindow (which NULLs the window
+ * pointer in SDL_WindowData, making SDL_GetWindowWMInfo fail).
+ */
+void
+sdl2_macos_cleanup_metal_view(SDL_Window *window)
+{
+    if (!window) return;
+
+    SDL_SysWMinfo wminfo;
+    SDL_VERSION(&wminfo.version);
+
+    if (!SDL_GetWindowWMInfo(window, &wminfo)) return;
+    if (wminfo.subsystem != SDL_SYSWM_COCOA) return;
+
+    NSWindow *nswindow = wminfo.info.cocoa.window;
+    NSView *contentView = [nswindow contentView];
+
+    /* Remove any subviews that aren't part of Tk's view hierarchy.
+     * Tk's own views are TKContentView (the contentView itself) and
+     * occasionally internal Tk_ prefixed views.  The Metal subview is
+     * SDL_cocoametalview.  Rather than matching class names, just
+     * remove everything — Tk draws into the contentView directly, it
+     * doesn't use subviews. */
+    NSArray *subviews = [contentView.subviews copy];
+    for (NSView *subview in subviews) {
+        [subview removeFromSuperview];
+    }
+
+    [contentView setNeedsDisplay:YES];
+}
+
+#else
+/* No-op on non-macOS */
+void sdl2_macos_cleanup_metal_view(SDL_Window *window) { (void)window; }
+#endif

data/ext/teek_sdl2/sdl2_macos_stub.c

@@ -0,0 +1,9 @@
+#include "teek_sdl2.h"
+
+/* No-op stub for non-macOS platforms. The real implementation
+ * lives in sdl2_macos.m (ObjC) and is only compiled on Darwin. */
+void
+sdl2_macos_cleanup_metal_view(SDL_Window *window)
+{
+    (void)window;
+}

data/ext/teek_sdl2/sdl2surface.c

@@ -48,8 +48,11 @@ renderer_free(void *ptr)
             SDL_DestroyRenderer(r->renderer);
             r->renderer = NULL;
         }
-        if (r->window && r->owned_window) {
-            SDL_DestroyWindow(r->window);
+        if (r->window) {
+            sdl2_macos_cleanup_metal_view(r->window);
+            if (r->owned_window) {
+                SDL_DestroyWindow(r->window);
+            }
             r->window = NULL;
         }
         r->destroyed = 1;
@@ -388,8 +391,14 @@ renderer_destroy(VALUE self)
             SDL_DestroyRenderer(r->renderer);
             r->renderer = NULL;
         }
-        if (r->window && r->owned_window) {
-            SDL_DestroyWindow(r->window);
+        if (r->window) {
+            /* On macOS, SDL2's Metal backend leaves an SDL_cocoametalview
+             * subview on foreign (Tk-owned) windows after SDL_DestroyRenderer.
+             * Remove it before destroying the SDL_Window. */
+            sdl2_macos_cleanup_metal_view(r->window);
+            if (r->owned_window) {
+                SDL_DestroyWindow(r->window);
+            }
             r->window = NULL;
         }
         r->destroyed = 1;

data/ext/teek_sdl2/teek_sdl2.h

@@ -63,4 +63,7 @@ void Init_sdl2mixer(VALUE mTeekSDL2);
 void Init_sdl2audio(VALUE mTeekSDL2);
 void Init_sdl2gamepad(VALUE mTeekSDL2);
 
+/* macOS Metal view cleanup (sdl2_macos.m) — no-op on other platforms */
+void sdl2_macos_cleanup_metal_view(SDL_Window *window);
+
 #endif /* TEEK_SDL2_H */

data/lib/teek/sdl2/version.rb

@@ -2,6 +2,6 @@
 
 module Teek
   module SDL2
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: teek-sdl2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Cook
@@ -74,6 +74,8 @@ extensions:
 extra_rdoc_files: []
 files:
 - ext/teek_sdl2/extconf.rb
+- ext/teek_sdl2/sdl2_macos.m
+- ext/teek_sdl2/sdl2_macos_stub.c
 - ext/teek_sdl2/sdl2audio.c
 - ext/teek_sdl2/sdl2bridge.c
 - ext/teek_sdl2/sdl2gamepad.c