reflexion 0.1.41 → 0.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b412c2e913baaeacdd4afff628c339c01a6ce7359572901d6193fc97d772a426
-  data.tar.gz: f8cba434ac873919a9bd75ea5c5e08d0436eb672313e60541d5634b210b81b76
+  metadata.gz: c10c73adab35ef74f8426582c0343a84873fbe71b116fd669e656b42edfee613
+  data.tar.gz: ffcf1e0fb5a0b26d3bd0dbc3a5e1627bc25ae7addbbd5dd213332f21b661e5d6
 SHA512:
-  metadata.gz: 7b6f7fd46e08e459010a98facf5c8e800c326f93d0482b0649c4f20a6bc54537947e5e3316285db7e759870c7739c68ab5284fba8f4640fb88e5dc02c106b598
-  data.tar.gz: a30e5f7bde2f8f9b09ff0e76847d2bbbfefe9187e3888224409ebfe04a72c05e36387ab4a976f0dd385f1ead5aa749d1ba8478182030e73058879792b0ca051e
+  metadata.gz: 7761664e1ba50fa8b10ef92c14dbeac9bfca2e4820bbe67d7f01cd44f6b7b235d06657796d567d9d3ff55bdf7e33eb911ab7dd2ea9f83dc77488c3f12771bada
+  data.tar.gz: 50ec935dcb2f5b692cab1ae3549aea533a8a2b7b4c4f89944ee92b39ca849feb7ac8f799dcf82cd8a4f066bdd2986d21489c56761f3e38acbda079e930fe677d

data/.doc/ext/reflex/window.cpp

@@ -194,6 +194,20 @@ VALUE get_painter(VALUE self)
 	return value(THIS->painter());
 }
 
+static
+VALUE on_activate(VALUE self, VALUE event)
+{
+	CHECK;
+	CALL(on_activate(to<Reflex::Event*>(event)));
+}
+
+static
+VALUE on_deactivate(VALUE self, VALUE event)
+{
+	CHECK;
+	CALL(on_deactivate(to<Reflex::Event*>(event)));
+}
+
 static
 VALUE on_show(VALUE self, VALUE event)
 {
@@ -341,6 +355,8 @@ Init_reflex_window ()
 	rb_define_method(cWindow, "root", RUBY_METHOD_FUNC(get_root), 0);
 	rb_define_method(cWindow, "focus", RUBY_METHOD_FUNC(get_focus), 0);
 	rb_define_method(cWindow, "painter", RUBY_METHOD_FUNC(get_painter), 0);
+	rb_define_method(cWindow, "on_activate", RUBY_METHOD_FUNC(on_activate), 1);
+	rb_define_method(cWindow, "on_deactivate", RUBY_METHOD_FUNC(on_deactivate), 1);
 	rb_define_method(cWindow, "on_show", RUBY_METHOD_FUNC(on_show), 1);
 	rb_define_method(cWindow, "on_hide", RUBY_METHOD_FUNC(on_hide), 1);
 	rb_define_method(cWindow, "on_close", RUBY_METHOD_FUNC(on_close), 1);

data/ChangeLog.md

@@ -1,6 +1,19 @@
 # reflex ChangeLog
 
 
+## [v0.1.43] - 2023-06-07
+
+- Add on_activate() and on_deactivate() to Window class
+
+
+## [v0.1.42] - 2023-06-02
+
+- Implement the Screen class for iOS
+- Implement Window_get_screen() for iOS
+- Implement window flags for iOS
+- Update reflexView's size on viewDidLayoutSubviews
+
+
 ## [v0.1.41] - 2023-05-29
 
 - Add Reflex::Screen class

data/VERSION

@@ -1 +1 @@
-0.1.41
+0.1.43

data/ext/reflex/window.cpp

@@ -216,6 +216,22 @@ RUCY_DEF0(get_painter)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_activate, event)
+{
+	CHECK;
+	CALL(on_activate(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_deactivate, event)
+{
+	CHECK;
+	CALL(on_deactivate(to<Reflex::Event*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_show, event)
 {
@@ -379,6 +395,8 @@ Init_reflex_window ()
 	cWindow.define_method("root",    get_root);
 	cWindow.define_method("focus",   get_focus);
 	cWindow.define_method("painter", get_painter);
+	cWindow.define_method("on_activate",   on_activate);
+	cWindow.define_method("on_deactivate", on_deactivate);
 	cWindow.define_method("on_show",  on_show);
 	cWindow.define_method("on_hide",  on_hide);
 	cWindow.define_method("on_close", on_close);

data/include/reflex/ruby/window.h

@@ -29,6 +29,24 @@ namespace Reflex
 
 		public:
 
+			virtual void on_activate (Event* e)
+			{
+				RUCY_SYM(on_activate);
+				if (this->is_overridable())
+					this->value.call(on_activate, Rucy::value(e));
+				else
+					return Super::on_activate(e);
+			}
+
+			virtual void on_deactivate (Event* e)
+			{
+				RUCY_SYM(on_deactivate);
+				if (this->is_overridable())
+					this->value.call(on_deactivate, Rucy::value(e));
+				else
+					return Super::on_deactivate(e);
+			}
+
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);

data/include/reflex/window.h

@@ -89,6 +89,10 @@ namespace Reflex
 
 			virtual const Painter* painter () const;
 
+			virtual void on_activate   (Event* e);
+
+			virtual void on_deactivate (Event* e);
+
 			virtual void on_show (Event* e);
 
 			virtual void on_hide (Event* e);

data/reflex.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'xot',   '~> 0.1.38'
   s.add_runtime_dependency 'rucy',  '~> 0.1.38'
   s.add_runtime_dependency 'beeps', '~> 0.1.39'
-  s.add_runtime_dependency 'rays',  '~> 0.1.39'
+  s.add_runtime_dependency 'rays',  '~> 0.1.40'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/ios/screen.h

@@ -0,0 +1,20 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_IOS_SCREEN_H__
+#define __REFLEX_SRC_IOS_SCREEN_H__
+
+
+#include "reflex/screen.h"
+
+
+namespace Reflex
+{
+
+
+	void Screen_initialize (Screen* pthis, UIScreen* screen);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/ios/screen.mm

@@ -0,0 +1,62 @@
+// -*- mode: objc -*-
+#include "screen.h"
+
+
+#include "reflex/exception.h"
+
+
+namespace Reflex
+{
+
+
+	struct Screen::Data
+	{
+
+		UIScreen* screen = nil;
+
+		~Data ()
+		{
+			if (screen) [screen release];
+		}
+
+	};// Screen::Data
+
+
+	void
+	Screen_initialize (Screen* pthis, UIScreen* screen)
+	{
+		pthis->self->screen = [screen retain];
+	}
+
+
+	Screen::Screen ()
+	{
+	}
+
+	Screen::~Screen ()
+	{
+	}
+
+	Bounds
+	Screen::frame () const
+	{
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		CGRect b = self->screen.bounds;
+		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
+	}
+
+	Screen::operator bool () const
+	{
+		return self->screen;
+	}
+
+	bool
+	Screen::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/ios/view_controller.h

@@ -17,6 +17,8 @@
 
 	- (void) stopTimer;
 
+	- (void) update;
+
 	- (void) viewDidResize;
 
 	- (void) titleDidChange;

data/src/ios/view_controller.mm

@@ -285,14 +285,54 @@ ReflexViewController_get_show_fun ()
 	{
 		[super viewDidAppear: animated];
 		[self startTimer];
+
+		Window_call_activate_event(self.window);
+
+		[NSNotificationCenter.defaultCenter
+			addObserver: self
+			selector: @selector(didBecomeActive)
+			name: UIApplicationDidBecomeActiveNotification
+			object: nil];
+		[NSNotificationCenter.defaultCenter
+			addObserver: self
+			selector: @selector(willResignActive)
+			name: UIApplicationWillResignActiveNotification
+			object: nil];
 	}
 
 	- (void) viewDidDisappear: (BOOL) animated
 	{
+		[NSNotificationCenter.defaultCenter
+			removeObserver: self
+			name: UIApplicationDidBecomeActiveNotification
+			object: nil];
+		[NSNotificationCenter.defaultCenter
+			removeObserver: self
+			name: UIApplicationWillResignActiveNotification
+			object: nil];
+
+		Window_ca__deactivate_event(self.window);
+
 		[self stopTimer];
 		[super viewDidDisappear: animated];
 	}
 
+	- (void) didBecomeActive
+	{
+		Window_call_activate_event(self.window);
+	}
+
+	- (void) willResignActive
+	{
+		Window_call_deactivate_event(self.window);
+	}
+
+	- (void)viewDidLayoutSubviews
+	{
+		[super viewDidLayoutSubviews];
+		self.reflexView.frame = self.view.bounds;
+	}
+
 	- (void) startTimer
 	{
 		[self startTimer: 60];

data/src/ios/window.h

@@ -17,9 +17,7 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		ReflexViewController* view_controller;
-
-		WindowData ();
+		ReflexViewController* view_controller = nil;
 
 		bool is_valid () const
 		{

data/src/ios/window.mm

@@ -3,6 +3,7 @@
 
 
 #include "reflex/exception.h"
+#include "screen.h"
 #import "view_controller.h"
 
 
@@ -48,6 +49,12 @@ namespace Reflex
 		return new WindowData();
 	}
 
+	uint
+	Window_default_flags ()
+	{
+		return 0;
+	}
+
 	void
 	Window_initialize (Window* window)
 	{
@@ -127,24 +134,44 @@ namespace Reflex
 	Bounds
 	Window_get_frame (const Window& window)
 	{
-		CGRect rect = get_vc(&window).reflexView.bounds;
-		return Bounds(
-			rect.origin.x,
-			rect.origin.y,
-			rect.size.width,
-			rect.size.height);
+		CGRect b = get_vc(&window).reflexView.bounds;
+		return Bounds(b.origin.x, b.origin.y, b.size.width, b.size.height);
 	}
 
 	void
-	Window_set_resizable (Window* window, bool state)
+	Window_set_flags (Window* window, uint flags)
 	{
-		//not_implemented_error(__FILE__, __LINE__);
+		if (Xot::has_flag(flags, Window::FLAG_CLOSABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_CLOSABLE is not supported");
+
+		if (Xot::has_flag(flags, Window::FLAG_MINIMIZABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_MINIMIZABLE is not supported");
+
+		if (Xot::has_flag(flags, Window::FLAG_RESIZABLE))
+			argument_error(__FILE__, __LINE__, "FLAG_RESIZABLE is not supported");
+	}
+
+	static UIScreen*
+	get_screen (const Window& window)
+	{
+		UIWindow* w = get_vc(&window).view.window;
+		if (@available(iOS 13.0, *))
+		{
+			return w.windowScene.screen;
+		}
+		else
+		{
+			return w.screen;
+		}
 	}
 
-	bool
-	Window_is_resizable (const Window& window)
+	Screen
+	Window_get_screen (const Window& window)
 	{
-		return false;
+		Screen s;
+		UIScreen* screen = get_screen(window);
+		Screen_initialize(&s, screen ? screen : UIScreen.mainScreen);
+		return s;
 	}
 
 	float
@@ -154,10 +181,4 @@ namespace Reflex
 	}
 
 
-	WindowData::WindowData ()
-	{
-		view_controller = nil;
-	}
-
-
 }// Reflex

data/src/osx/native_window.mm

@@ -15,8 +15,8 @@
 static NSWindowStyleMask
 default_style_mask ()
 {
-	return Window_make_style_mask(
-		Reflex::Window::Data::FLAG_DEFAULT,
+	return Reflex::Window_make_style_mask(
+		Reflex::Window_default_flags(),
 		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
 }
 
@@ -242,6 +242,9 @@ update_pixel_density (Reflex::Window* window)
 
 	- (void) windowWillClose: (NSNotification*) notification
 	{
+		if (self.isKeyWindow)
+			Window_call_deactivate_event(self.window);
+
 		[self stopTimer];
 		[self unbind];
 		[self setDelegate: nil];
@@ -306,6 +309,16 @@ update_pixel_density (Reflex::Window* window)
 		}
 	}
 
+	- (void) windowDidBecomeKey: (NSNotification*) notification
+	{
+		Window_call_activate_event(self.window);
+	}
+
+	- (void) windowDidResignKey: (NSNotification*) notification
+	{
+		Window_call_deactivate_event(self.window);
+	}
+
 	- (void) keyDown: (NSEvent*) event
 	{
 		Reflex::Window* win = self.window;

data/src/osx/screen.mm

@@ -2,6 +2,9 @@
 #include "screen.h"
 
 
+#include "reflex/exception.h"
+
+
 namespace Reflex
 {
 
@@ -37,10 +40,11 @@ namespace Reflex
 	Bounds
 	Screen::frame () const
 	{
-		NSRect frame = self->screen.frame;
-		return Bounds(
-			frame.origin.x,   frame.origin.y,
-			frame.size.width, frame.size.height);
+		if (!*this)
+			invalid_state_error(__FILE__, __LINE__);
+
+		NSRect f = self->screen.frame;
+		return Bounds(f.origin.x, f.origin.y, f.size.width, f.size.height);
 	}
 
 	Screen::operator bool () const

data/src/osx/window.h

@@ -18,12 +18,10 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		NativeWindow* native;
+		NativeWindow* native = nil;
 
 		mutable String title_tmp;
 
-		WindowData ();
-
 		bool is_valid () const
 		{
 			return native;

data/src/osx/window.mm

@@ -70,6 +70,15 @@ namespace Reflex
 		return new WindowData();
 	}
 
+	uint
+	Window_default_flags ()
+	{
+		return
+			Window::FLAG_CLOSABLE    |
+			Window::FLAG_MINIMIZABLE |
+			Window::FLAG_RESIZABLE;
+	}
+
 	void
 	Window_initialize (Window* window)
 	{
@@ -126,12 +135,8 @@ namespace Reflex
 	Window_get_frame (const Window& window)
 	{
 		NativeWindow* native = get_native(&window);
-		NSRect rect = [native contentRectForFrameRect: [native frame]];
-		return Bounds(
-			rect.origin.x,
-			rect.origin.y,
-			rect.size.width,
-			rect.size.height);
+		NSRect r = [native contentRectForFrameRect: [native frame]];
+		return Bounds(r.origin.x, r.origin.y, r.size.width, r.size.height);
 	}
 
 	void
@@ -149,8 +154,8 @@ namespace Reflex
 	Window_get_screen (const Window& window)
 	{
 		Screen s;
-		NativeWindow* native = get_native(&window);
-		if (native && native.screen) Screen_initialize(&s, native.screen);
+		NSScreen* screen = get_native(&window).screen;
+		if (screen) Screen_initialize(&s, screen);
 		return s;
 	}
 
@@ -161,10 +166,4 @@ namespace Reflex
 	}
 
 
-	WindowData::WindowData ()
-	{
-		native = nil;
-	}
-
-
 }// Reflex

data/src/window.cpp

@@ -22,6 +22,17 @@ namespace Reflex
 	using TargetPointerMap      = Window::Data::TargetPointerMap;
 
 
+	Window::Data::Data ()
+	:	flags(Window_default_flags())
+	{
+		prev_time_update = prev_time_draw = Xot::time();
+	}
+
+	Window::Data::~Data ()
+	{
+	}
+
+
 	Window::Data::PointerData::PointerData (uint view_index)
 	:	view_index(view_index)
 	{
@@ -123,6 +134,24 @@ namespace Reflex
 		}
 	}
 
+	void
+	Window_call_activate_event (Reflex::Window* window)
+	{
+		if (!window) return;
+
+		Reflex::Event e;
+		window->on_activate(&e);
+	}
+
+	void
+	Window_call_deactivate_event (Reflex::Window* window)
+	{
+		if (!window) return;
+
+		Reflex::Event e;
+		window->on_deactivate(&e);
+	}
+
 	void
 	Window_call_draw_event (Window* window, DrawEvent* event)
 	{
@@ -520,17 +549,23 @@ namespace Reflex
 	void
 	Window::add_flag (uint flags)
 	{
-		Xot::add_flag(&self->flags, flags);
+		uint value = self->flags;
+		Xot::add_flag(&value, flags);
+
+		Window_set_flags(this, value);
 
-		Window_set_flags(this, self->flags);
+		self->flags = value;
 	}
 
 	void
 	Window::remove_flag (uint flags)
 	{
-		Xot::remove_flag(&self->flags, flags);
+		uint value = self->flags;
+		Xot::remove_flag(&value, flags);
 
-		Window_set_flags(this, self->flags);
+		Window_set_flags(this, value);
+
+		self->flags = value;
 	}
 
 	bool
@@ -581,6 +616,16 @@ namespace Reflex
 		return const_cast<Window*>(this)->painter();
 	}
 
+	void
+	Window::on_activate (Event* e)
+	{
+	}
+
+	void
+	Window::on_deactivate (Event* e)
+	{
+	}
+
 	void
 	Window::on_show (Event* e)
 	{

data/src/window.h

@@ -37,8 +37,6 @@ namespace Reflex
 
 		typedef std::map<View::Ref, TargetPointerMap> CaptureMap;
 
-		enum {FLAG_DEFAULT = FLAG_CLOSABLE | FLAG_MINIMIZABLE | FLAG_RESIZABLE};
-
 		int hide_count = 1;
 
 		bool redraw = true;
@@ -53,16 +51,11 @@ namespace Reflex
 
 		CaptureMap captures;
 
-		uint flags = FLAG_DEFAULT;
+		uint flags;
 
-		Data ()
-		{
-			prev_time_update = prev_time_draw = Xot::time();
-		}
+		Data ();
 
-		virtual ~Data ()
-		{
-		}
+		virtual ~Data ();
 
 		virtual bool is_valid () const = 0;
 
@@ -81,6 +74,8 @@ namespace Reflex
 
 	Window::Data* Window_create_data ();
 
+	uint Window_default_flags ();
+
 	void Window_initialize (Window* window);
 
 	void Window_show (Window* window);
@@ -110,13 +105,17 @@ namespace Reflex
 	void Window_unregister_capture (
 		Window* window, View* view, Pointer::ID target);
 
-	void Window_call_draw_event    (Window* window, DrawEvent*    event);
+	void Window_call_activate_event   (Window* window);
+
+	void Window_call_deactivate_event (Window* window);
+
+	void Window_call_draw_event       (Window* window, DrawEvent*    event);
 
-	void Window_call_key_event     (Window* window, KeyEvent*     event);
+	void Window_call_key_event        (Window* window, KeyEvent*     event);
 
-	void Window_call_pointer_event (Window* window, PointerEvent* event);
+	void Window_call_pointer_event    (Window* window, PointerEvent* event);
 
-	void Window_call_wheel_event   (Window* window, WheelEvent*   event);
+	void Window_call_wheel_event      (Window* window, WheelEvent*   event);
 
 	float Window_get_pixel_density (const Window& window);
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reflexion
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.43
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.39
+        version: 0.1.40
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +355,8 @@ files:
 - src/ios/event.h
 - src/ios/event.mm
 - src/ios/reflex.mm
+- src/ios/screen.h
+- src/ios/screen.mm
 - src/ios/view_controller.h
 - src/ios/view_controller.mm
 - src/ios/window.h