reflexion 0.1.39 → 0.1.41

data/include/reflex/window.h

@@ -11,6 +11,7 @@
 #include <rays/painter.h>
 #include <reflex/defs.h>
 #include <reflex/event.h>
+#include <reflex/screen.h>
 
 
 namespace Reflex
@@ -29,12 +30,27 @@ namespace Reflex
 
 			typedef Xot::Ref<This> Ref;
 
+			enum Flag
+			{
+
+				FLAG_CLOSABLE    = Xot::bit(0),
+
+				FLAG_MINIMIZABLE = Xot::bit(1),
+
+				FLAG_RESIZABLE   = Xot::bit(2),
+
+				FLAG_LAST        = FLAG_RESIZABLE
+
+			};// Flag
+
 			Window ();
 
 			virtual void show ();
 
 			virtual void hide ();
 
+			virtual bool hidden () const;
+
 			virtual void close (bool force = false);
 
 			virtual void redraw ();
@@ -53,11 +69,13 @@ namespace Reflex
 
 			virtual Bounds   frame () const;
 
-			virtual void set_resizable (bool state = true);
+			virtual void    add_flag (uint flags);
 
-			virtual bool  is_resizable () const;
+			virtual void remove_flag (uint flags);
 
-			virtual bool hidden () const;
+			virtual bool    has_flag (uint flags) const;
+
+			virtual Screen screen () const;
 
 			virtual       View* root ();
 

data/lib/reflex/contact_event.rb

@@ -24,7 +24,7 @@ module Reflex
     end
 
     def inspect()
-      "#<Reflex::ContactEvent type:#{type} shape:#{shape} view:#{view}>"
+      "#<Reflex::ContactEvent #{action} shape:#{shape} view:#{view}>"
     end
 
   end# ContactEvent

data/lib/reflex/screen.rb

@@ -0,0 +1,21 @@
+require 'forwardable'
+
+
+module Reflex
+
+
+  class Screen
+
+    extend Forwardable
+
+    def_delegators :frame,
+      :x, :y, :z, :w, :h, :d, :width, :height, :depth,
+      :left, :top, :back, :right, :bottom, :front,
+      :left_top, :right_top, :left_bottom, :right_bottom,
+      :lt, :lr, :lb, :rb,
+      :position, :pos, :size, :center
+
+  end# Screen
+
+
+end# Reflex

data/lib/reflex/view.rb

@@ -120,14 +120,15 @@ module Reflex
       cache:         {reader: :cache?},
       resize_to_fit: {reader: :resize_to_fit?},
       scroll_to_fit: {reader: :scroll_to_fit?},
+      fix_angle:     {reader: :fix_angle?},
       static:        {reader: :static?},
       dynamic:       {reader: :dynamic?},
       sensor:        {reader: :sensor?},
       debug:         {reader: :debug?}
 
-    alias add    add_child
+    alias add       add_child
     alias remove remove_child
-    alias find   find_child
+    alias find     find_child
 
     alias apply_impulse apply_linear_impulse
     alias velocity=     linear_velocity=

data/lib/reflex/window.rb

@@ -62,7 +62,9 @@ module Reflex
       :restitution=, :restitution
 
     universal_accessor :title, :frame,
-      resizable: {reader: :resizable?}
+      closable:    {reader: :closable?},
+      minimizable: {reader: :minimizable?},
+      resizable:   {reader: :resizable?}
 
     def initialize(options = nil, &block)
       super()

data/lib/reflex.rb

@@ -47,6 +47,7 @@ require 'reflex/model'
 require 'reflex/model_owner'
 
 require 'reflex/application'
+require 'reflex/screen'
 require 'reflex/window'
 require 'reflex/view'
 

data/reflex.gemspec

@@ -1,10 +1,7 @@
 # -*- mode: ruby -*-
 
 
-File.expand_path('lib', __dir__)
-  .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
-
-require 'reflex/extension'
+require_relative 'lib/reflex/extension'
 
 
 Gem::Specification.new do |s|
@@ -17,21 +14,21 @@ Gem::Specification.new do |s|
   rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
 
   s.name        = "#{name}ion"
+  s.version     = ext.version
+  s.license     = 'MIT'
   s.summary     = 'A Graphical User Interface Tool Kit.'
   s.description = 'This library helps you to develop interactive graphical user interface.'
-  s.version     = ext.version
-
-  s.authors  = %w[xordog]
-  s.email    = 'xordog@gmail.com'
-  s.homepage = "https://github.com/xord/reflex"
+  s.authors     = %w[xordog]
+  s.email       = 'xordog@gmail.com'
+  s.homepage    = "https://github.com/xord/reflex"
 
   s.platform              = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.0.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.36'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.36'
-  s.add_runtime_dependency 'beeps', '~> 0.1.37'
-  s.add_runtime_dependency 'rays',  '~> 0.1.37'
+  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_development_dependency 'rake'
   s.add_development_dependency 'test-unit'

data/src/body.cpp

@@ -247,6 +247,20 @@ namespace Reflex
 		return Xot::rad2deg(self->b2body->GetAngularVelocity());
 	}
 
+	void
+	Body::fix_rotation (bool state)
+	{
+		validate(this);
+
+		self->b2body->SetFixedRotation(state);
+	}
+
+	bool
+	Body::is_rotation_fixed () const
+	{
+		return self->b2body->IsFixedRotation();
+	}
+
 	void
 	Body::set_gravity_scale (float scale)
 	{

data/src/body.h

@@ -67,6 +67,10 @@ namespace Reflex
 
 			float    angular_velocity () const;
 
+			void fix_rotation (bool state = true);
+
+			bool  is_rotation_fixed () const;
+
 			void set_gravity_scale (float scale);
 
 			float    gravity_scale () const;

data/src/osx/native_window.mm

@@ -12,13 +12,13 @@
 #import "opengl_view.h"
 
 
-static const NSUInteger WINDOW_STYLE_MASK =
-	NSTitledWindowMask |
-	NSClosableWindowMask |
-	NSMiniaturizableWindowMask |
-	NSResizableWindowMask |
-	0;//NSTexturedBackgroundWindowMask
-
+static NSWindowStyleMask
+default_style_mask ()
+{
+	return Window_make_style_mask(
+		Reflex::Window::Data::FLAG_DEFAULT,
+		NSTitledWindowMask | NSTexturedBackgroundWindowMask);
+}
 
 static int
 count_mouse_buttons (const Reflex::PointerEvent& e)
@@ -67,7 +67,7 @@ update_pixel_density (Reflex::Window* window)
 	{
 		self = [super
 			initWithContentRect: NSMakeRect(0, 0, 0, 0)
-			styleMask: WINDOW_STYLE_MASK
+			styleMask: default_style_mask()
 			backing: NSBackingStoreBuffered
 			defer: NO];
 		if (!self) return nil;
@@ -368,7 +368,7 @@ update_pixel_density (Reflex::Window* window)
 		if (clicking_count == 0)
 			++pointer_id;
 		else if (clicking_count < 0)
-			Reflex::invalid_state_error(__FILE__, __LINE__);
+			return;//Reflex::invalid_state_error(__FILE__, __LINE__);
 
 		Window_call_pointer_event(win, &e);
 	}
@@ -420,7 +420,7 @@ update_pixel_density (Reflex::Window* window)
 	{
 		return [NSWindow
 			frameRectForContentRect: contentRect
-			styleMask: WINDOW_STYLE_MASK];
+			styleMask: default_style_mask()];
 	}
 
 @end// NativeWindow

data/src/osx/screen.h

@@ -0,0 +1,21 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_SRC_OSX_SCREEN_H__
+#define __REFLEX_SRC_OSX_SCREEN_H__
+
+
+#import <AppKit/NSScreen.h>
+#include "reflex/screen.h"
+
+
+namespace Reflex
+{
+
+
+	void Screen_initialize (Screen* pthis, NSScreen* screen);
+
+
+}// Reflex
+
+
+#endif//EOH

data/src/osx/screen.mm

@@ -0,0 +1,58 @@
+// -*- mode: objc -*-
+#include "screen.h"
+
+
+namespace Reflex
+{
+
+
+	struct Screen::Data
+	{
+
+		NSScreen* screen = nil;
+
+		~Data ()
+		{
+			if (screen) [screen release];
+		}
+
+	};// Screen::Data
+
+
+	void
+	Screen_initialize (Screen* pthis, NSScreen* screen)
+	{
+		pthis->self->screen = [screen retain];
+	}
+
+
+	Screen::Screen ()
+	{
+	}
+
+	Screen::~Screen ()
+	{
+	}
+
+	Bounds
+	Screen::frame () const
+	{
+		NSRect frame = self->screen.frame;
+		return Bounds(
+			frame.origin.x,   frame.origin.y,
+			frame.size.width, frame.size.height);
+	}
+
+	Screen::operator bool () const
+	{
+		return self->screen;
+	}
+
+	bool
+	Screen::operator ! () const
+	{
+		return !operator bool();
+	}
+
+
+}// Reflex

data/src/osx/window.h

@@ -4,6 +4,7 @@
 #define __REFLEX_SRC_OSX_WINDOW_H__
 
 
+#import <AppKit/NSWindow.h>
 #include "../window.h"
 
 
@@ -35,6 +36,9 @@ namespace Reflex
 
 	const WindowData& Window_get_data (const Window* window);
 
+	NSWindowStyleMask Window_make_style_mask (
+		uint flags, NSWindowStyleMask styleMask = 0);
+
 
 }// Reflex
 

data/src/osx/window.mm

@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 #include "reflex/exception.h"
+#include "screen.h"
 #import "native_window.h"
 
 
@@ -31,6 +32,27 @@ namespace Reflex
 		return Window_get_data(const_cast<Window*>(window));
 	}
 
+	NSWindowStyleMask
+	Window_make_style_mask (uint flags, NSWindowStyleMask styleMask)
+	{
+		if (Xot::has_flag(flags, Window::FLAG_CLOSABLE))
+			styleMask |=  NSWindowStyleMaskClosable;
+		else
+			styleMask &= ~NSWindowStyleMaskClosable;
+
+		if (Xot::has_flag(flags, Window::FLAG_MINIMIZABLE))
+			styleMask |=  NSWindowStyleMaskMiniaturizable;
+		else
+			styleMask &= ~NSWindowStyleMaskMiniaturizable;
+
+		if (Xot::has_flag(flags, Window::FLAG_RESIZABLE))
+			styleMask |=  NSWindowStyleMaskResizable;
+		else
+			styleMask &= ~NSWindowStyleMaskResizable;
+
+		return styleMask;
+	}
+
 	static NativeWindow*
 	get_native (const Window* window)
 	{
@@ -113,19 +135,23 @@ namespace Reflex
 	}
 
 	void
-	Window_set_resizable (Window* window, bool state)
+	Window_set_flags (Window* window, uint flags)
 	{
-		NativeWindow* native = get_native(window);
-		if (state)
-			native.styleMask |= NSResizableWindowMask;
-		else
-			native.styleMask &= ~NSResizableWindowMask;
+		NativeWindow* native        = get_native(window);
+		NSWindowStyleMask styleMask =
+			Window_make_style_mask(window->self->flags, native.styleMask);
+
+		if (styleMask != native.styleMask)
+			native.styleMask = styleMask;
 	}
 
-	bool
-	Window_is_resizable (const Window& window)
+	Screen
+	Window_get_screen (const Window& window)
 	{
-		return get_native(&window).styleMask & NSResizableWindowMask;
+		Screen s;
+		NativeWindow* native = get_native(&window);
+		if (native && native.screen) Screen_initialize(&s, native.screen);
+		return s;
 	}
 
 	float

data/src/view.cpp

@@ -216,6 +216,7 @@ namespace Reflex
 
 				pbody.reset(b);
 				update_body_frame();
+				update_body_states();
 			}
 			return *pbody;
 		}
@@ -235,6 +236,12 @@ namespace Reflex
 				pbody->set_transform(frame.x, frame.y, angle);
 		}
 
+		void update_body_states ()
+		{
+			if (pbody && pbody->is_rotation_fixed() != has_flag(View::FLAG_FIX_ANGLE))
+				pbody->fix_rotation(has_flag(View::FLAG_FIX_ANGLE));
+		}
+
 		void
 		get_view2body_matrix (Matrix* m)
 		{
@@ -261,7 +268,7 @@ namespace Reflex
 				.translate(-pivot);
 		}
 
-		void update_body_and_shapes ()
+		void setup_body_and_shapes ()
 		{
 			std::unique_ptr<Body> old_body;
 			if (pbody)
@@ -718,7 +725,7 @@ namespace Reflex
 		}
 
 		view->self->window = window;
-		view->self->update_body_and_shapes();
+		view->self->setup_body_and_shapes();
 
 		View::ChildList* children = view->self->children();
 		if (children)
@@ -2364,12 +2371,16 @@ namespace Reflex
 	View::add_flag (uint flags)
 	{
 		self->add_flag(flags);
+
+		self->update_body_states();
 	}
 
 	void
 	View::remove_flag (uint flags)
 	{
 		self->remove_flag(flags);
+
+		self->update_body_states();
 	}
 
 	bool

data/src/window.cpp

@@ -450,6 +450,12 @@ namespace Reflex
 		self->hide_count = new_count;
 	}
 
+	bool
+	Window::hidden () const
+	{
+		return self->hide_count > 0;
+	}
+
 	void
 	Window::close (bool force)
 	{
@@ -512,21 +518,31 @@ namespace Reflex
 	}
 
 	void
-	Window::set_resizable (bool state)
+	Window::add_flag (uint flags)
 	{
-		Window_set_resizable(this, state);
+		Xot::add_flag(&self->flags, flags);
+
+		Window_set_flags(this, self->flags);
 	}
 
-	bool
-	Window::is_resizable () const
+	void
+	Window::remove_flag (uint flags)
 	{
-		return Window_is_resizable(*this);
+		Xot::remove_flag(&self->flags, flags);
+
+		Window_set_flags(this, self->flags);
 	}
 
 	bool
-	Window::hidden () const
+	Window::has_flag (uint flags) const
 	{
-		return self->hide_count > 0;
+		return Xot::has_flag(self->flags, flags);
+	}
+
+	Screen
+	Window::screen () const
+	{
+		return Window_get_screen(*this);
 	}
 
 	View*

data/src/window.h

@@ -37,6 +37,8 @@ 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;
@@ -51,6 +53,8 @@ namespace Reflex
 
 		CaptureMap captures;
 
+		uint flags = FLAG_DEFAULT;
+
 		Data ()
 		{
 			prev_time_update = prev_time_draw = Xot::time();
@@ -94,9 +98,9 @@ namespace Reflex
 
 	Bounds Window_get_frame (const Window& window);
 
-	void Window_set_resizable (Window* window, bool state);
+	Screen Window_get_screen (const Window& window);
 
-	bool Window_is_resizable (const Window& window);
+	void Window_set_flags (Window* window, uint flags);
 
 	void Window_set_focus (Window* window, View* view);
 

data/test/test_event.rb

@@ -7,6 +7,10 @@ class TestEvent < Test::Unit::TestCase
     Reflex::UpdateEvent.new 0, 0
   end
 
+  def test_initialize()
+    assert_raise(Reflex::ReflexError) {Reflex::Event.new}
+  end
+
   def test_dup()
     e1 = event
     e2 = e1.dup

data/test/test_screen.rb

@@ -0,0 +1,18 @@
+require_relative 'helper'
+
+
+class TestScreen < Test::Unit::TestCase
+
+  def screen()
+    Reflex::Window.new.screen
+  end
+
+  def test_initialize()
+    assert_raise(Reflex::ReflexError) {Reflex::Screen.new}
+  end
+
+  def test_frame()
+    assert_raise(Rucy::InvalidObjectError) {screen.frame}
+  end
+
+end# TestScreen

data/test/test_view.rb

@@ -28,21 +28,21 @@ class TestView < Test::Unit::TestCase
 
   def test_show_hide_hidden()
     v = view
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal true, v.hidden?
+    assert_true  v.hidden?
     v.show
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
   end
 
   def test_hidden_count()
     v = view
     v.show
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal false, v.hidden?
+    assert_false v.hidden?
     v.hide
-    assert_equal true, v.hidden?
+    assert_true v.hidden?
   end
 
   def test_coord_conversion()
@@ -275,6 +275,20 @@ class TestView < Test::Unit::TestCase
     assert_equal 361,  v.angle
   end
 
+  def test_fix_angle()
+    v = view
+    assert_false v.fix_angle?
+    assert_false v.fix_angle
+
+    v.fix_angle = true
+    assert_true v.fix_angle?
+    assert_true v.fix_angle
+
+    v.fix_angle false
+    assert_false v.fix_angle?
+    assert_false v.fix_angle
+  end
+
   def test_pivot()
     v = view
     assert_each_in_epsilon [0, 0, 0],          v.pivot.to_a(3)