reflexion 0.1.28 → 0.1.30

data/ext/reflex/key_event.cpp

@@ -293,7 +293,7 @@ RUCY_END
 static Class cKeyEvent;
 
 void
-Init_key_event ()
+Init_reflex_key_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/line_shape.cpp

@@ -77,7 +77,7 @@ RUCY_END
 static Class cLineShape;
 
 void
-Init_line_shape ()
+Init_reflex_line_shape ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/motion_event.cpp

@@ -51,7 +51,7 @@ RUCY_END
 static Class cMotionEvent;
 
 void
-Init_motion_event ()
+Init_reflex_motion_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/native.cpp

@@ -2,39 +2,40 @@
 
 
 void Init_reflex ();
-
-void Init_selector ();
-void Init_style ();
-void Init_style_length ();
-void Init_timer ();
-void Init_filter ();
-
-void Init_event ();
-void Init_motion_event ();
-void Init_update_event ();
-void Init_draw_event ();
-void Init_frame_event ();
-void Init_scroll_event ();
-void Init_focus_event ();
-void Init_key_event ();
-void Init_pointer ();
-void Init_pointer_event ();
-void Init_wheel_event ();
-void Init_capture_event ();
-void Init_timer_event ();
-void Init_contact_event ();
-
-void Init_shape ();
-void Init_polygon_shape ();
-void Init_line_shape ();
-void Init_rect_shape ();
-void Init_ellipse_shape ();
-
-void Init_application ();
-void Init_window ();
-void Init_view ();
-
-void Init_image_view ();
+void Init_reflex_exception ();
+
+void Init_reflex_selector ();
+void Init_reflex_style ();
+void Init_reflex_style_length ();
+void Init_reflex_timer ();
+void Init_reflex_filter ();
+
+void Init_reflex_event ();
+void Init_reflex_motion_event ();
+void Init_reflex_update_event ();
+void Init_reflex_draw_event ();
+void Init_reflex_frame_event ();
+void Init_reflex_scroll_event ();
+void Init_reflex_focus_event ();
+void Init_reflex_key_event ();
+void Init_reflex_pointer ();
+void Init_reflex_pointer_event ();
+void Init_reflex_wheel_event ();
+void Init_reflex_capture_event ();
+void Init_reflex_timer_event ();
+void Init_reflex_contact_event ();
+
+void Init_reflex_shape ();
+void Init_reflex_polygon_shape ();
+void Init_reflex_line_shape ();
+void Init_reflex_rect_shape ();
+void Init_reflex_ellipse_shape ();
+
+void Init_reflex_application ();
+void Init_reflex_window ();
+void Init_reflex_view ();
+
+void Init_reflex_image_view ();
 
 
 extern "C" void
@@ -49,39 +50,40 @@ extern "C" void
 	Rucy::init();
 
 	Init_reflex();
-
-	Init_selector();
-	Init_style();
-	Init_style_length();
-	Init_timer();
-	Init_filter();
-
-	Init_event();
-	Init_motion_event();
-	Init_update_event();
-	Init_draw_event();
-	Init_frame_event();
-	Init_scroll_event();
-	Init_focus_event();
-	Init_key_event();
-	Init_pointer();
-	Init_pointer_event();
-	Init_wheel_event();
-	Init_capture_event();
-	Init_timer_event();
-	Init_contact_event();
-
-	Init_shape();
-	Init_polygon_shape();
-	Init_line_shape();
-	Init_rect_shape();
-	Init_ellipse_shape();
-
-	Init_application();
-	Init_window();
-	Init_view();
-
-	Init_image_view();
+	Init_reflex_exception();
+
+	Init_reflex_selector();
+	Init_reflex_style();
+	Init_reflex_style_length();
+	Init_reflex_timer();
+	Init_reflex_filter();
+
+	Init_reflex_event();
+	Init_reflex_motion_event();
+	Init_reflex_update_event();
+	Init_reflex_draw_event();
+	Init_reflex_frame_event();
+	Init_reflex_scroll_event();
+	Init_reflex_focus_event();
+	Init_reflex_key_event();
+	Init_reflex_pointer();
+	Init_reflex_pointer_event();
+	Init_reflex_wheel_event();
+	Init_reflex_capture_event();
+	Init_reflex_timer_event();
+	Init_reflex_contact_event();
+
+	Init_reflex_shape();
+	Init_reflex_polygon_shape();
+	Init_reflex_line_shape();
+	Init_reflex_rect_shape();
+	Init_reflex_ellipse_shape();
+
+	Init_reflex_application();
+	Init_reflex_window();
+	Init_reflex_view();
+
+	Init_reflex_image_view();
 
 	RUCY_CATCH
 }

data/ext/reflex/pointer.cpp

@@ -123,7 +123,7 @@ RUCY_END
 static Class cPointer;
 
 void
-Init_pointer ()
+Init_reflex_pointer ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/pointer_event.cpp

@@ -102,7 +102,7 @@ RUCY_END
 static Class cPointerEvent;
 
 void
-Init_pointer_event ()
+Init_reflex_pointer_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/polygon_shape.cpp

@@ -43,7 +43,7 @@ RUCY_END
 static Class cPolygonShape;
 
 void
-Init_polygon_shape ()
+Init_reflex_polygon_shape ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/rect_shape.cpp

@@ -140,7 +140,7 @@ RUCY_END
 static Class cRectShape;
 
 void
-Init_rect_shape ()
+Init_reflex_rect_shape ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/scroll_event.cpp

@@ -109,7 +109,7 @@ RUCY_END
 static Class cScrollEvent;
 
 void
-Init_scroll_event ()
+Init_reflex_scroll_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/selector.cpp

@@ -118,7 +118,7 @@ RUCY_END
 static Class cSelector;
 
 void
-Init_selector ()
+Init_reflex_selector ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/shape.cpp

@@ -187,7 +187,7 @@ RUCY_END
 static Class cShape;
 
 void
-Init_shape ()
+Init_reflex_shape ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/style.cpp

@@ -748,7 +748,7 @@ RUCY_END
 static Class cStyle;
 
 void
-Init_style ()
+Init_reflex_style ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/style_length.cpp

@@ -195,7 +195,7 @@ RUCY_END
 static Class cStyleLength;
 
 void
-Init_style_length ()
+Init_reflex_style_length ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/timer.cpp

@@ -85,7 +85,7 @@ RUCY_END
 static Class cTimer;
 
 void
-Init_timer ()
+Init_reflex_timer ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/timer_event.cpp

@@ -92,7 +92,7 @@ RUCY_END
 static Class cTimerEvent;
 
 void
-Init_timer_event ()
+Init_reflex_timer_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/update_event.cpp

@@ -60,7 +60,7 @@ RUCY_END
 static Class cUpdateEvent;
 
 void
-Init_update_event ()
+Init_reflex_update_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/view.cpp

@@ -1142,7 +1142,7 @@ RUCY_END
 static Class cView;
 
 void
-Init_view ()
+Init_reflex_view ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/wheel_event.cpp

@@ -118,7 +118,7 @@ RUCY_END
 static Class cWheelEvent;
 
 void
-Init_wheel_event ()
+Init_reflex_wheel_event ()
 {
 	Module mReflex = define_module("Reflex");
 

data/ext/reflex/window.cpp

@@ -294,7 +294,7 @@ RUCY_END
 static Class cWindow;
 
 void
-Init_window ()
+Init_reflex_window ()
 {
 	Module mReflex = define_module("Reflex");
 

data/include/reflex/ruby/application.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_APPLICATION_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/application.h>

data/include/reflex/ruby/defs.h

@@ -0,0 +1,33 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_DEFS_H__
+#define __REFLEX_RUBY_DEFS_H__
+
+
+#include <rucy/extension.h>
+#include <rays/ruby/defs.h>
+#include <reflex/ruby/exception.h>
+
+
+#define REFLEX_CATCH \
+	} \
+	catch (const Reflex::PhysicsError& e) \
+	{ \
+		RUCY_RAISE(Reflex::physics_error_class(), e.what()); \
+	} \
+	catch (const Reflex::LayoutError& e) \
+	{ \
+		RUCY_RAISE(Reflex::layout_error_class(), e.what()); \
+	} \
+	catch (const Reflex::ReflexError& e) \
+	{ \
+		RUCY_RAISE(Reflex::reflex_error_class(), e.what());
+
+#undef  RUCY_END
+#define RUCY_END \
+	REFLEX_CATCH \
+	RAYS_CATCH \
+	RUCY_DEF_END
+
+
+#endif//EOH

data/include/reflex/ruby/event.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_EVENT_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/event.h>

data/include/reflex/ruby/exception.h

@@ -0,0 +1,28 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_EXCEPTION_H__
+#define __REFLEX_RUBY_EXCEPTION_H__
+
+
+#include <rucy/class.h>
+#include <reflex/exception.h>
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class reflex_error_class ();
+	// class Reflex::ReflexError
+
+	Rucy::Class layout_error_class ();
+	// class Reflex::LayoutError
+
+	Rucy::Class physics_error_class ();
+	// class Reflex::PhysicsError
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/ruby/filter.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_FILTER_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <rays/ruby/image.h>

data/include/reflex/ruby/pointer.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_POINTER_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/pointer.h>

data/include/reflex/ruby/reflex.h

@@ -5,6 +5,7 @@
 
 
 #include <rucy/module.h>
+#include <rucy/extension.h>
 #include <reflex/reflex.h>
 
 

data/include/reflex/ruby/selector.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_SELECTOR_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/selector.h>

data/include/reflex/ruby/shape.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_SHAPE_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/shape.h>

data/include/reflex/ruby/style.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_STYLE_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/style.h>

data/include/reflex/ruby/timer.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_TIMER_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/timer.h>

data/include/reflex/ruby/view.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_VIEW_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/view.h>

data/include/reflex/ruby/window.h

@@ -4,7 +4,6 @@
 #define __REFLEX_RUBY_WINDOW_H__
 
 
-#include <rucy/rucy.h>
 #include <rucy/class.h>
 #include <rucy/extension.h>
 #include <reflex/window.h>

data/include/reflex/ruby.h

@@ -5,6 +5,8 @@
 
 
 #include <reflex/ruby/reflex.h>
+#include <reflex/ruby/defs.h>
+#include <reflex/ruby/exception.h>
 
 #include <reflex/ruby/selector.h>
 #include <reflex/ruby/event.h>

data/lib/reflex/button.rb

@@ -44,7 +44,7 @@ module Reflex
     end
 
     def on_pointer(e)
-      case e.type
+      case e.action
       when :down
         self.capture += [:pointer]
         redraw

data/reflex.gemspec

@@ -1,7 +1,7 @@
 # -*- mode: ruby; coding: utf-8 -*-
 
 
-File.expand_path('../lib', __FILE__)
+File.expand_path('lib', __dir__)
   .tap {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex/module'
@@ -28,10 +28,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 2.6.0'
 
-  s.add_runtime_dependency 'xot',   '~> 0.1.28'
-  s.add_runtime_dependency 'rucy',  '~> 0.1.28'
-  s.add_runtime_dependency 'beeps', '~> 0.1.28'
-  s.add_runtime_dependency 'rays',  '~> 0.1.28'
+  s.add_runtime_dependency 'xot',   '~> 0.1.30'
+  s.add_runtime_dependency 'rucy',  '~> 0.1.30'
+  s.add_runtime_dependency 'beeps', '~> 0.1.30'
+  s.add_runtime_dependency 'rays',  '~> 0.1.30'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/samples/app.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/bats.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'
@@ -62,7 +62,7 @@ win = Reflex::Window.new do
   end
 
   on :pointer do |e|
-    case e.type
+    case e.action
     when :down
       spawn e.x, e.y
       @spawning = true

data/samples/camera.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/checker.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/fans.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/fps.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/grid.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/hello.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/image.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/key.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'

data/samples/layout.rb

@@ -2,7 +2,7 @@
 
 
 %w[xot rays reflex]
-  .map  {|s| File.expand_path "../../../#{s}/lib", __FILE__}
+  .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}
 
 require 'reflex'