reflexion 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee249febb85efea8890f5d4623feec5d9f191ad969e20d83af968cb243b2b116
-  data.tar.gz: 70b1950e21b7e6ddc89b967b72a1e4acdd42afda4952f59832aa84379b24e5fb
+  metadata.gz: 385852765cb2073b46cffebf4c22bcd1e432f4d17b911f7cde7d67864add658b
+  data.tar.gz: 8645ad9b05be24a1f69c241757b4dda8004a36411704932729872d6a0410ee79
 SHA512:
-  metadata.gz: 816a5bfe8901e16a894ecb7f47cc5d542d50d33c856b0bed1b6b70189169e76f0abb917b2bf539ca71f4b25b3a3e47a05e5e3ff19f738b5125cdf338c1de894e
-  data.tar.gz: b53a2064c5b99b16195d69a51d02af0ff7437fafe3dab282528bb449c98c5fcd5de9b0b3dbf080a279a9ff2507e357f5b797fdb778d0a3787f2748955b63f1a8
+  metadata.gz: 1577fd876c000d34cb1435732f83292fcb27a940493926f1d8209f77cac8bc58da08e9782e629894a683b7e0624dba9c1786a1c4526732c051d17d3d3d40c628
+  data.tar.gz: 121844b893ea518437ab0eb2cd255af14c9c804af32281624ecde6629358b633339294530944b209dac3cfe4fcf1b242363a208df747a5b181f9c269aa60340b

data/ChangeLog.md

@@ -1,6 +1,18 @@
 # reflex ChangeLog
 
 
+## [v0.4.2] - 2026-06-12
+
+- Share single offscreen GL context across windows
+- Apply GC-root rebind pattern to window lifecycle on Win32 and SDL
+- Lazy-initialize OpenGL context until first drawRect:
+- Fire on_close by the close button on SDL
+- Do not destroy the view tree in Window#close to survive closing on event handlers
+- Add multi_window sample to demonstrate cross-window texture sharing
+
+- Fix iterator invalidation in View::clear_children
+
+
 ## [v0.4.1] - 2026-05-20
 
 - Track actual key repeat count on macOS

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/reflex.gemspec

@@ -25,9 +25,9 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',   '~> 0.3.13'
-  s.add_dependency 'rucy',  '~> 0.3.13'
-  s.add_dependency 'rays',  '~> 0.3.14'
+  s.add_dependency 'xot',   '~> 0.3.14'
+  s.add_dependency 'rucy',  '~> 0.3.14'
+  s.add_dependency 'rays',  '~> 0.3.15'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/multi_window.rb

@@ -0,0 +1,80 @@
+%w[xot rays reflex]
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
+  .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
+
+require 'reflex'
+
+
+# Shared off-screen canvas. The same Rays::Image is rendered into by
+# SourceWindow and sampled as a texture by MirrorWindow. This only works
+# because all Reflex windows share a single GL context, so a texture
+# allocated in one window is visible to the others.
+SIZE   = 300
+CANVAS = Rays::Image.new SIZE, SIZE
+
+
+class SourceWindow < Reflex::Window
+
+  def initialize
+    super title: 'source', frame: [80, 80, SIZE + 20, SIZE + 40]
+    @t = 0.0
+  end
+
+  def on_draw (e)
+    @t += 0.04
+
+    CANVAS.paint do |p|
+      # fade the previous frame so dots leave fading trails
+      p.no_stroke
+      p.fill 0, 0, 0, 0.06
+      p.rect 0, 0, SIZE, SIZE
+
+      6.times do |i|
+        a = @t + i * Math::PI / 3
+        r = 110 + Math.sin(@t * 0.6 + i) * 25
+        x = SIZE / 2 + Math.cos(a) * r
+        y = SIZE / 2 + Math.sin(a) * r
+        p.fill (Math.sin(@t + i)       + 1) / 2,
+               (Math.sin(@t + i + 2.1) + 1) / 2,
+               (Math.sin(@t + i + 4.2) + 1) / 2
+        p.ellipse x, y, 16, 16
+      end
+    end
+
+    e.painter.background 0.1
+    e.painter.image CANVAS, 10, 10
+  end
+
+  def on_update (e) = redraw
+
+end# SourceWindow
+
+
+class MirrorWindow < Reflex::Window
+
+  TILE   = SIZE / 2
+  SCALES = [[1.0, 1.0], [1.0, 0.5], [0.5, 1.0], [0.5, 0.5]]
+
+  def initialize
+    super title: 'mirror', frame: [420, 80, TILE * 2 + 20, TILE * 2 + 40]
+  end
+
+  def on_draw (e)
+    p = e.painter
+    p.background 0
+    4.times do |i|
+      row, col = i / 2, i % 2
+      sx, sy   = SCALES[i]
+      p.image CANVAS, col * TILE, row * TILE, TILE * sx, TILE * sy
+    end
+  end
+
+  def on_update (e) = redraw
+
+end# MirrorWindow
+
+
+Reflex.start do
+  SourceWindow.new.show
+  MirrorWindow.new.show
+end

data/src/osx/native_window.mm

@@ -106,8 +106,8 @@ move_to_main_screen_origin (NativeWindow* window)
 		// ruby value references native window weakly.
 		data.native = self;
 
-		// Reflex::Window is not constructed completely,
-		// so can not call ClassWrapper::retain().
+		// Reflex::Window is not fully constructed yet,
+		// so cannot call ClassWrapper::retain().
 		window->Xot::template RefCountable<>::retain();
 
 		// defer calling ClassWrapper::retain() to rebind.

data/src/osx/opengl_view.mm

@@ -2,55 +2,20 @@
 #import "opengl_view.h"
 
 
-#include <vector>
 #import <Cocoa/Cocoa.h>
 #import <OpenGL/OpenGL.h>
+#include <rays/rays.h>
 #import "native_window.h"
 
 
 //#define TRANSPARENT_BACKGROUND
 
 
-static bool
-is_valid_antialias_nsample (int n)
-{
-	return n == 0 || n == 2 || n == 4 || n == 6 || n == 8 || n == 16 || n == 32;
-}
-
-static NSOpenGLPixelFormat*
-make_pixelformat (int antialias_nsample = 0)
-{
-	if (!is_valid_antialias_nsample(antialias_nsample))
-		return nil;
+@implementation OpenGLView
 
-	static const NSOpenGLPixelFormatAttribute DEFAULT[] =
-	{
-		//NSOpenGLPFAOpenGLProfile, NSOpenGLProfileVersion3_2Core,
-		NSOpenGLPFAAccelerated, NSOpenGLPFANoRecovery,
-		NSOpenGLPFADoubleBuffer,
-		NSOpenGLPFAColorSize, 32,
-		NSOpenGLPFADepthSize, 32,
-	};
-	static const NSOpenGLPixelFormatAttribute ANTIALIAS[] =
 	{
-		NSOpenGLPFAMultisample,
-		NSOpenGLPFASampleBuffers, 1,
-		NSOpenGLPFASamples, (NSOpenGLPixelFormatAttribute) antialias_nsample,
-	};
-	static const size_t DEFAULT_SIZE   = sizeof(DEFAULT)   / sizeof(DEFAULT[0]);
-	static const size_t ANTIALIAS_SIZE = sizeof(ANTIALIAS) / sizeof(ANTIALIAS[0]);
-
-	std::vector<NSOpenGLPixelFormatAttribute> attr(
-		DEFAULT, DEFAULT + DEFAULT_SIZE);
-	if (antialias_nsample > 0)
-		attr.insert(attr.end(), ANTIALIAS, ANTIALIAS + ANTIALIAS_SIZE);
-	attr.push_back(0);
-
-	return [[[NSOpenGLPixelFormat alloc] initWithAttributes: &attr[0]] autorelease];
-}
-
-
-@implementation OpenGLView
+		bool setup_context_done;
+	}
 
 	- (id) initWithFrame: (NSRect) frame
 	{
@@ -59,30 +24,42 @@ make_pixelformat (int antialias_nsample = 0)
 
 	- (id) initWithFrame: (NSRect) frame antiAlias: (int) nsample
 	{
-		self = [super initWithFrame: frame pixelFormat: make_pixelformat(nsample)];
+		NSOpenGLContext* context = (NSOpenGLContext*) Rays::get_offscreen_context();
+
+		self = [super initWithFrame: frame pixelFormat: context.pixelFormat];
 		if (!self) return nil;
 
+		setup_context_done = false;
+
+		return self;
+	}
+
+	- (void) setupContext
+	{
+		if (setup_context_done) return;
+		setup_context_done = true;
+
 		[self setWantsBestResolutionOpenGLSurface: YES];
-		[self activateContext];
+
+		NSOpenGLContext* context = (NSOpenGLContext*) Rays::get_offscreen_context();
+		[self setOpenGLContext: context];
 
 		GLint swapInterval = 1;
-		[[self openGLContext]
-			setValues: &swapInterval
-			forParameter: NSOpenGLCPSwapInterval];
+		[context setValues: &swapInterval forParameter: NSOpenGLCPSwapInterval];
 
 #ifdef TRANSPARENT_BACKGROUND
 		GLint opacity = 0;
-		[[self openGLContext]
-			setValues: &opacity
-			forParameter: NSOpenGLCPSurfaceOpacity];
+		[context setValues: &opacity forParameter: NSOpenGLCPSurfaceOpacity];
 #endif
-
-		return self;
 	}
 
 	- (void) activateContext
 	{
-		[[self openGLContext] makeCurrentContext];
+		[self setupContext];
+
+		NSOpenGLContext* context = self.openGLContext;
+		if (context.view != self) [context setView: self];
+		[context makeCurrentContext];
 	}
 
 	- (BOOL) acceptsFirstResponder

data/src/sdl/opengl.cpp

@@ -1,6 +1,7 @@
 #include "opengl.h"
 
 
+#include <rays/rays.h>
 #include "reflex/exception.h"
 
 
@@ -27,9 +28,14 @@ namespace Reflex
 			invalid_state_error(__FILE__, __LINE__);
 
 		window  = win;
-		context = SDL_GL_CreateContext(win);
-		if (!context)
-			reflex_error(__FILE__, __LINE__, SDL_GetError());
+		context = (SDL_GLContext) Rays::get_offscreen_context();
+		if (!context)// wasm build returns NULL
+		{
+			context = SDL_GL_CreateContext(win);
+			if (!context)
+				reflex_error(__FILE__, __LINE__, SDL_GetError());
+			owner   = true;
+		}
 
 		make_current();
 	}
@@ -37,15 +43,17 @@ namespace Reflex
 	void
 	OpenGLContext::fin ()
 	{
-		if (!*this) return;
-
-		if (context)
+		if (owner && context)
 		{
+			if (context == SDL_GL_GetCurrentContext())
+				SDL_GL_MakeCurrent(NULL, NULL);
+
 			SDL_GL_DeleteContext(context);
-			context = NULL;
 		}
 
-		window = NULL;
+		window  = NULL;
+		context = NULL;
+		owner   = false;
 	}
 
 	void
@@ -65,12 +73,6 @@ namespace Reflex
 		SDL_GL_SwapWindow(window);
 	}
 
-	bool
-	OpenGLContext::is_active () const
-	{
-		return *this && context == SDL_GL_GetCurrentContext();
-	}
-
 	OpenGLContext::operator bool () const
 	{
 		return window && context;

data/src/sdl/opengl.h

@@ -28,8 +28,6 @@ namespace Reflex
 
 			void swap_buffers ();
 
-			bool is_active () const;
-
 			operator bool () const;
 
 			bool operator ! () const;
@@ -40,6 +38,8 @@ namespace Reflex
 
 			SDL_GLContext context = NULL;
 
+			bool owner            = false;
+
 	};// OpenGLContext
 
 

data/src/sdl/window.cpp

@@ -22,6 +22,8 @@ namespace Reflex
 
 		SDL_Window* native = NULL;
 
+		bool need_rebind   = false;
+
 		OpenGLContext context;
 
 		mutable String title_tmp;
@@ -47,6 +49,21 @@ namespace Reflex
 
 			context.init(native);
 
+			// Reflex::Window is not fully constructed yet,
+			// so cannot call ClassWrapper::retain().
+			win->Xot::template RefCountable<>::retain();
+		}
+
+		void rebind (Window* win)
+		{
+			if (!need_rebind) return;
+
+			// deferred call of ClassWrapper::retain().
+			win->retain();
+
+			win->Xot::template RefCountable<>::release();
+			need_rebind = false;
+
 			Window_register(win);
 		}
 
@@ -54,15 +71,21 @@ namespace Reflex
 		{
 			if (!native) return;
 
-			context.fin();
-
 			Window* win = Window_from(native);
-			if (win) Window_unregister(win);
+			if (win)
+			{
+				rebind(win);
+				Window_unregister(win);
+			}
+
+			context.fin();
 
 			SDL_SetWindowData(native, WINDOW_DATA_KEY, NULL);
 			SDL_DestroyWindow(native);
 			native = NULL;
 
+			if (win) win->release();
+
 			if (Window_all().empty())
 				Reflex::app()->quit();
 		}
@@ -181,7 +204,11 @@ namespace Reflex
 	void
 	Window_initialize (Window* win)
 	{
-		get_data(win)->create(win);
+		WindowData* self = get_data(win);
+
+		self->create(win);
+
+		self->need_rebind = true;
 	}
 
 	void
@@ -322,6 +349,8 @@ namespace Reflex
 	{
 		WindowData* self = get_data(win);
 
+		self->rebind(win);
+
 		switch (event.type)
 		{
 			case SDL_WINDOWEVENT:
@@ -329,7 +358,7 @@ namespace Reflex
 				switch (event.window.event)
 				{
 					case SDL_WINDOWEVENT_CLOSE:
-						Window_close(win);
+						win->close();
 						break;
 
 					case SDL_WINDOWEVENT_EXPOSED:

data/src/view.cpp

@@ -1890,11 +1890,9 @@ namespace Reflex
 	void
 	View::clear_children ()
 	{
-		auto* children = self->children();
-		if (!children || children->empty()) return;
-
-		for (auto& child : *children)
-			remove_child(child);
+		const auto& children = self->pchildren;
+		while (children && !children->empty())
+			remove_child(children->back());
 	}
 
 	View::ChildList

data/src/win32/opengl.cpp

@@ -1,9 +1,18 @@
 #include "opengl.h"
 
 
+#include <rays/rays.h>
 #include "reflex/exception.h"
 
 
+namespace Rays
+{
+
+	const PIXELFORMATDESCRIPTOR* get_pixel_format_descriptor ();
+
+}// Rays
+
+
 namespace Reflex
 {
 
@@ -31,22 +40,15 @@ namespace Reflex
 		if (!hdc)
 			system_error(__FILE__, __LINE__);
 
-		static const PIXELFORMATDESCRIPTOR PFD =
-		{
-			sizeof(PIXELFORMATDESCRIPTOR), 1,
-			PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
-			PFD_TYPE_RGBA, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0,
-			PFD_MAIN_PLANE, 0, 0, 0, 0
-		};
-
-		int pf = ChoosePixelFormat(hdc, &PFD);
+		const auto* pfd = Rays::get_pixel_format_descriptor();
+		int pf          = ChoosePixelFormat(hdc, pfd);
 		if (pf == 0)
 			system_error(__FILE__, __LINE__);
 
-		if (!SetPixelFormat(hdc, pf, &PFD))
+		if (!SetPixelFormat(hdc, pf, pfd))
 			system_error(__FILE__, __LINE__);
 
-		hrc = wglCreateContext(hdc);
+		hrc = (HGLRC) Rays::get_offscreen_context();
 		if (!hrc)
 			system_error(__FILE__, __LINE__);
 
@@ -56,31 +58,12 @@ namespace Reflex
 	void
 	OpenGLContext::fin ()
 	{
-		if (!*this) return;
-
-		if (hrc)
-		{
-			if (hrc == wglGetCurrentContext())
-			{
-				if (!wglMakeCurrent(NULL, NULL))
-					system_error(__FILE__, __LINE__);
-			}
-
-			if (!wglDeleteContext(hrc))
-				system_error(__FILE__, __LINE__);
-
-			hrc = NULL;
-		}
-
-		if (hdc)
-		{
-			if (!ReleaseDC(hwnd, hdc))
-				system_error(__FILE__, __LINE__);
-
-			hdc = NULL;
-		}
+		if (hdc && !ReleaseDC(hwnd, hdc))
+			system_error(__FILE__, __LINE__);
 
 		hwnd = NULL;
+		hdc  = NULL;
+		hrc  = NULL;
 	}
 
 	void
@@ -101,12 +84,6 @@ namespace Reflex
 			system_error(__FILE__, __LINE__);
 	}
 
-	bool
-	OpenGLContext::is_active () const
-	{
-		return *this && hrc == wglGetCurrentContext();
-	}
-
 	OpenGLContext::operator bool () const
 	{
 		return hwnd && hdc && hrc;

data/src/win32/opengl.h

@@ -29,8 +29,6 @@ namespace Reflex
 
 			void swap_buffers ();
 
-			bool is_active () const;
-
 			operator bool () const;
 
 			bool operator ! () const;

data/src/win32/window.cpp

@@ -32,7 +32,9 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		HWND hwnd = NULL;
+		HWND hwnd        = NULL;
+
+		bool need_rebind = false;
 
 		OpenGLContext context;
 
@@ -118,7 +120,25 @@ namespace Reflex
 
 		self->hwnd = hwnd;
 		self->context.init(hwnd);
+
+		// Reflex::Window is not fully constructed yet,
+		// so cannot call ClassWrapper::retain().
+		win->Xot::template RefCountable<>::retain();
+	}
+
+	static inline void
+	rebind (Window* win)
+	{
+		WindowData* self = get_data(win);
+		if (!self->need_rebind) return;
+
+		// deferred call of ClassWrapper::retain().
 		win->retain();
+
+		win->Xot::template RefCountable<>::release();
+		self->need_rebind = false;
+
+		Window_register(win);
 	}
 
 	static void
@@ -127,6 +147,9 @@ namespace Reflex
 		if (!*win)
 			Xot::invalid_state_error(__FILE__, __LINE__);
 
+		rebind(win);
+		Window_unregister(win);
+
 		WindowData* self = get_data(win);
 
 		if (window_has_wndproc(self->hwnd))
@@ -142,12 +165,13 @@ namespace Reflex
 				system_error(__FILE__, __LINE__);
 		}
 
-		if (self->context.is_active())
-			Rays::activate_offscreen_context();
-
 		self->context.fin();
 		self->hwnd = NULL;
+
 		win->release();
+
+		if (Window_all().empty())
+			Reflex::app()->quit();
 	}
 
 	void
@@ -456,25 +480,16 @@ namespace Reflex
 			CREATESTRUCT* cs = (CREATESTRUCT*) lp;
 			win = (Window*) cs->lpCreateParams;
 			setup_window(win, hwnd);
-
-			Window_register(win);
 		}
 
-		if (!win)
-			win = get_window_from_hwnd(hwnd);
+		if (!win) win = get_window_from_hwnd(hwnd);
+		if  (win) rebind(win);
 
 		LRESULT ret = window_proc(win, hwnd, msg, wp, lp);
 
 		if (msg == WM_NCDESTROY)
-		{
-			Window_unregister(win);
-
 			cleanup_window(win);
 
-			if (Window_all().empty())
-				Reflex::app()->quit();
-		}
-
 		return ret;
 	}
 
@@ -546,6 +561,8 @@ namespace Reflex
 	Window_initialize (Window* window)
 	{
 		create_window(window);
+
+		get_data(window)->need_rebind = true;
 	}
 
 	void

data/src/window.cpp

@@ -787,7 +787,6 @@ namespace Reflex
 		if (!force && e.is_blocked()) return;
 
 		View_set_window(self->root.get(), NULL);
-		self->root.reset();
 
 		Window_close(this);
 	}

data/test/test_midi_event.rb

@@ -86,8 +86,8 @@ class TestMIDIEvent < Test::Unit::TestCase
     assert_equal  5, event(0xC5, 1, 2, 3).channel
     assert_equal  6, event(0xD6, 1, 2, 3).channel
     assert_equal  7, event(0xE7, 1, 2, 3).channel
-    assert_equal -1, event(0xF8, 1, 2, 3).channel
-    assert_equal -1, event(0x00, 1, 2, 3).channel
+    assert_equal(-1, event(0xF8, 1, 2, 3).channel)
+    assert_equal(-1, event(0x00, 1, 2, 3).channel)
   end
 
 end# TestMIDIEvent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-20 00:00:00.000000000 Z
+date: 2026-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.13
+        version: 0.3.14
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.15
 description: This library helps you to develop interactive graphical user interface.
 email: xordog@gmail.com
 executables: []
@@ -305,6 +305,7 @@ files:
 - samples/key.rb
 - samples/layout.rb
 - samples/model.rb
+- samples/multi_window.rb
 - samples/osx/hello/hello.xcodeproj/project.pbxproj
 - samples/osx/hello/hello/Images.xcassets/AppIcon.appiconset/Contents.json
 - samples/osx/hello/hello/en.lproj/Credits.rtf