reflexion 0.1.34 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a4e06dbe75f97139a975134d48605a0b0fbdcd9fc5b9198ad8b9383c1eb0a49
-  data.tar.gz: 421779117f618c4fd0b9f196c5ad6b5348179a44d6ea8687afa723df4cad5e18
+  metadata.gz: 54f32e8f80f2156f47dca7b252f81acf4bf0dc45aab45d7af8d3fb2418141a6c
+  data.tar.gz: 538889ab97d5fec6fc47a3a8a99bec4856d9a3e763ffcd2c438d81f1ca92422d
 SHA512:
-  metadata.gz: eed1fbdfe875d01fe1ce577d986ca148e910147acb4de5206b0933b2100c1c85a35871b294c634e09d3c2b9582091fb46b145cf651c39cd4f0b4549c7ea2dc39
-  data.tar.gz: af03b8b695a62fdeca0332c6c32fd5b049987cb276ff11a6ffe88472478eb1c543f634c48fb3d40696f7a55667745666019e6bf5a925ebe6239b1325bd39b5c7
+  metadata.gz: 7ad6c799423f7c91fd99ca2eb9821d817e78eda67a1de868cedf632d9c888abfb9a46ea46a2c78f532a47ff28a8cd008344c230cd7c8560e8ac796ba3cf2d415
+  data.tar.gz: caa79e8872fb1c7a6633c57d4316318ed6a3754a792c07179c3493c6b8767e7c740cf6261f87885cde24b63f4c066db36d69ed57a559769b9c6f7a44185d918c

data/.doc/ext/reflex/frame_event.cpp

@@ -20,7 +20,7 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight, VALUE angle, VALUE dangle)
+VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight, VALUE zoom, VALUE dzoom, VALUE angle, VALUE dangle)
 {
 	CHECK;
 
@@ -28,6 +28,7 @@ VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALU
 		to<Rays::Bounds>(frame),
 		to<coord>(dx),     to<coord>(dy),
 		to<coord>(dwidth), to<coord>(dheight),
+		to<float>(zoom),   to<float>(dzoom),
 		to<float>(angle),  to<float>(dangle));
 
 	return rb_call_super(0, NULL);
@@ -90,6 +91,20 @@ VALUE dsize(VALUE self)
 	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
 }
 
+static
+VALUE zoom(VALUE self)
+{
+	CHECK;
+	return value(THIS->zoom());
+}
+
+static
+VALUE dzoom(VALUE self)
+{
+	CHECK;
+	return value(THIS->dzoom());
+}
+
 static
 VALUE angle(VALUE self)
 {
@@ -118,6 +133,13 @@ VALUE is_resize(VALUE self)
 	return value(THIS->is_resize());
 }
 
+static
+VALUE is_zoom(VALUE self)
+{
+	CHECK;
+	return value(THIS->is_zoom());
+}
+
 static
 VALUE is_rotate(VALUE self)
 {
@@ -135,7 +157,7 @@ Init_reflex_frame_event ()
 
 	cFrameEvent = mReflex.define_class("FrameEvent", Reflex::event_class());
 	rb_define_alloc_func(cFrameEvent, alloc);
-	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 7);
+	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 9);
 	rb_define_private_method(cFrameEvent, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cFrameEvent, "frame", RUBY_METHOD_FUNC(frame), 0);
 	rb_define_method(cFrameEvent, "dx", RUBY_METHOD_FUNC(dx), 0);
@@ -144,10 +166,13 @@ Init_reflex_frame_event ()
 	rb_define_method(cFrameEvent, "dheight", RUBY_METHOD_FUNC(dheight), 0);
 	rb_define_method(cFrameEvent, "dposition", RUBY_METHOD_FUNC(dposition), 0);
 	rb_define_method(cFrameEvent, "dsize", RUBY_METHOD_FUNC(dsize), 0);
+	rb_define_method(cFrameEvent, "zoom", RUBY_METHOD_FUNC(zoom), 0);
+	rb_define_method(cFrameEvent, "dzoom", RUBY_METHOD_FUNC(dzoom), 0);
 	rb_define_method(cFrameEvent, "angle", RUBY_METHOD_FUNC(angle), 0);
 	rb_define_method(cFrameEvent, "dangle", RUBY_METHOD_FUNC(dangle), 0);
 	cFrameEvent.define_method("move?",   is_move);
 	cFrameEvent.define_method("resize?", is_resize);
+	cFrameEvent.define_method("zoom?",   is_zoom);
 	cFrameEvent.define_method("rotate?", is_rotate);
 }
 

data/.doc/ext/reflex/view.cpp

@@ -404,6 +404,21 @@ VALUE get_angle(VALUE self)
 	return value(THIS->angle());
 }
 
+static
+VALUE set_pivot(VALUE self, VALUE x, VALUE y, VALUE z)
+{
+	CHECK;
+	THIS->set_pivot(to<float>(x), to<float>(y), to<float>(z));
+	return value(THIS->pivot());
+}
+
+static
+VALUE get_pivot(VALUE self)
+{
+	CHECK;
+	return value(THIS->pivot());
+}
+
 static
 VALUE scroll_to(VALUE self)
 {
@@ -871,6 +886,13 @@ VALUE on_resize(VALUE self, VALUE event)
 	CALL(on_resize(to<Reflex::FrameEvent*>(event)));
 }
 
+static
+VALUE on_zoom(VALUE self, VALUE event)
+{
+	CHECK;
+	CALL(on_zoom(to<Reflex::FrameEvent*>(event)));
+}
+
 static
 VALUE on_rotate(VALUE self, VALUE event)
 {
@@ -1053,6 +1075,8 @@ Init_reflex_view ()
 	rb_define_method(cView, "fit_to_content", RUBY_METHOD_FUNC(fit_to_content), 0);
 	rb_define_method(cView, "angle=", RUBY_METHOD_FUNC(set_angle), 1);
 	rb_define_method(cView, "angle", RUBY_METHOD_FUNC(get_angle), 0);
+	cView.define_private_method("set_pivot!", set_pivot);
+	rb_define_method(cView, "pivot", RUBY_METHOD_FUNC(get_pivot), 0);
 	rb_define_method(cView, "scroll_to", RUBY_METHOD_FUNC(scroll_to), -1);
 	rb_define_method(cView, "scroll_by", RUBY_METHOD_FUNC(scroll_by), -1);
 	rb_define_method(cView, "scroll", RUBY_METHOD_FUNC(get_scroll), 0);
@@ -1112,6 +1136,7 @@ Init_reflex_view ()
 	rb_define_method(cView, "on_draw", RUBY_METHOD_FUNC(on_draw), 1);
 	rb_define_method(cView, "on_move", RUBY_METHOD_FUNC(on_move), 1);
 	rb_define_method(cView, "on_resize", RUBY_METHOD_FUNC(on_resize), 1);
+	rb_define_method(cView, "on_zoom", RUBY_METHOD_FUNC(on_zoom), 1);
 	rb_define_method(cView, "on_rotate", RUBY_METHOD_FUNC(on_rotate), 1);
 	rb_define_method(cView, "on_scroll", RUBY_METHOD_FUNC(on_scroll), 1);
 	rb_define_method(cView, "on_focus", RUBY_METHOD_FUNC(on_focus), 1);

data/.github/workflows/utils.rb

@@ -20,8 +20,9 @@ def setup_dependencies(build: true, only: nil)
 
   exts.each do |ext|
     gem   = RENAMES[ext.to_sym].then {|s| s || ext}
-    clone = "git clone --depth 1 https://github.com/xord/#{ext}.git ../#{ext}"
     ver   = gemspec[/add_runtime_dependency.*['"]#{gem}['"].*['"]\s*~>\s*([\d\.]+)\s*['"]/, 1]
+    opts  = '-c advice.detachedHead=false --depth 1'
+    clone = "git clone #{opts} https://github.com/xord/#{ext}.git ../#{ext}"
 
     # 'rake subtree:push' pushes all subrepos, so cloning by new tag
     # often fails before tagging each new tag

data/ChangeLog.md

@@ -1,6 +1,21 @@
 # reflex ChangeLog
 
 
+## [v0.1.36] - 2023-05-08
+
+- Add inspect()
+- Add View#pivot accessor
+- Awake view body on every pointer event
+- Disable blocking event escalation
+- Check is view valid before calling event handlers
+- Fix pointer position for rotated view
+
+
+## [v0.1.35] - 2023-04-30
+
+- Add View#on_zoom(e)
+
+
 ## [v0.1.34] - 2023-04-25
 
 - Update beeps to v0.1.34

data/Rakefile

@@ -1,4 +1,4 @@
-# -*- mode: ruby; coding: utf-8 -*-
+# -*- mode: ruby -*-
 
 
 %w[../xot ../rucy ../rays .]

data/VERSION

@@ -1 +1 @@
-0.1.34
+0.1.36

data/ext/reflex/extconf.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 %w[../xot ../rucy ../rays .]
   .map  {|s| File.expand_path "../../#{s}/lib", __dir__}
   .each {|s| $:.unshift s if !$:.include?(s) && File.directory?(s)}

data/ext/reflex/frame_event.cpp

@@ -21,7 +21,7 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF7(initialize, frame, dx, dy, dwidth, dheight, angle, dangle)
+RUCY_DEF9(initialize, frame, dx, dy, dwidth, dheight, zoom, dzoom, angle, dangle)
 {
 	CHECK;
 
@@ -29,6 +29,7 @@ RUCY_DEF7(initialize, frame, dx, dy, dwidth, dheight, angle, dangle)
 		to<Rays::Bounds>(frame),
 		to<coord>(dx),     to<coord>(dy),
 		to<coord>(dwidth), to<coord>(dheight),
+		to<float>(zoom),   to<float>(dzoom),
 		to<float>(angle),  to<float>(dangle));
 
 	return rb_call_super(0, NULL);
@@ -100,6 +101,22 @@ RUCY_DEF0(dsize)
 }
 RUCY_END
 
+static
+RUCY_DEF0(zoom)
+{
+	CHECK;
+	return value(THIS->zoom());
+}
+RUCY_END
+
+static
+RUCY_DEF0(dzoom)
+{
+	CHECK;
+	return value(THIS->dzoom());
+}
+RUCY_END
+
 static
 RUCY_DEF0(angle)
 {
@@ -132,6 +149,14 @@ RUCY_DEF0(is_resize)
 }
 RUCY_END
 
+static
+RUCY_DEF0(is_zoom)
+{
+	CHECK;
+	return value(THIS->is_zoom());
+}
+RUCY_END
+
 static
 RUCY_DEF0(is_rotate)
 {
@@ -153,16 +178,19 @@ Init_reflex_frame_event ()
 	cFrameEvent.define_private_method("initialize",      initialize);
 	cFrameEvent.define_private_method("initialize_copy", initialize_copy);
 	cFrameEvent.define_method("frame", frame);
-	cFrameEvent.define_method("dx", dx);
-	cFrameEvent.define_method("dy", dy);
-	cFrameEvent.define_method("dwidth",  dwidth);
-	cFrameEvent.define_method("dheight", dheight);
+	cFrameEvent.define_method("dx",        dx);
+	cFrameEvent.define_method("dy",        dy);
+	cFrameEvent.define_method("dwidth",    dwidth);
+	cFrameEvent.define_method("dheight",   dheight);
 	cFrameEvent.define_method("dposition", dposition);
 	cFrameEvent.define_method("dsize",     dsize);
+	cFrameEvent.define_method( "zoom",   zoom);
+	cFrameEvent.define_method("dzoom",  dzoom);
 	cFrameEvent.define_method( "angle",  angle);
 	cFrameEvent.define_method("dangle", dangle);
 	cFrameEvent.define_method("move?",   is_move);
 	cFrameEvent.define_method("resize?", is_resize);
+	cFrameEvent.define_method("zoom?",   is_zoom);
 	cFrameEvent.define_method("rotate?", is_rotate);
 }
 

data/ext/reflex/view.cpp

@@ -445,6 +445,23 @@ RUCY_DEF0(get_angle)
 }
 RUCY_END
 
+static
+RUCY_DEF3(set_pivot, x, y, z)
+{
+	CHECK;
+	THIS->set_pivot(to<float>(x), to<float>(y), to<float>(z));
+	return value(THIS->pivot());
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_pivot)
+{
+	CHECK;
+	return value(THIS->pivot());
+}
+RUCY_END
+
 static
 RUCY_DEFN(scroll_to)
 {
@@ -968,6 +985,14 @@ RUCY_DEF1(on_resize, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_zoom, event)
+{
+	CHECK;
+	CALL(on_zoom(to<Reflex::FrameEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_rotate, event)
 {
@@ -1168,6 +1193,8 @@ Init_reflex_view ()
 	cView.define_method("fit_to_content", fit_to_content);
 	cView.define_method("angle=", set_angle);
 	cView.define_method("angle",  get_angle);
+	cView.define_private_method("set_pivot!", set_pivot);
+	cView.define_method(            "pivot",  get_pivot);
 	cView.define_method("scroll_to", scroll_to);
 	cView.define_method("scroll_by", scroll_by);
 	cView.define_method("scroll", get_scroll);
@@ -1227,6 +1254,7 @@ Init_reflex_view ()
 	cView.define_method("on_draw",   on_draw);
 	cView.define_method("on_move",   on_move);
 	cView.define_method("on_resize", on_resize);
+	cView.define_method("on_zoom",   on_zoom);
 	cView.define_method("on_rotate", on_rotate);
 	cView.define_method("on_scroll", on_scroll);
 	cView.define_method("on_focus",  on_focus);

data/include/reflex/event.h

@@ -30,7 +30,7 @@ namespace Reflex
 
 			~Event ();
 
-			void block ();
+			void block (bool parent = false);
 
 			bool is_blocked () const;
 
@@ -116,10 +116,12 @@ namespace Reflex
 				const Bounds& frame,
 				coord dx,     coord dy,
 				coord dwidth, coord dheight,
-				float angle,  float dangle);
+				float zoom  = 1,  float dzoom  = 0,
+				float angle = 0,  float dangle = 0);
 
 			FrameEvent (
 				const Bounds& frame, const Bounds& prev_frame,
+				float zoom,  float prev_zoom,
 				float angle, float prev_angle);
 
 			FrameEvent dup () const;
@@ -134,6 +136,10 @@ namespace Reflex
 
 			coord dheight () const;
 
+			float zoom () const;
+
+			float dzoom () const;
+
 			float angle () const;
 
 			float dangle () const;
@@ -142,6 +148,8 @@ namespace Reflex
 
 			bool is_resize () const;
 
+			bool is_zoom () const;
+
 			bool is_rotate () const;
 
 			struct Data;

data/include/reflex/ruby/view.h

@@ -113,6 +113,15 @@ namespace Reflex
 					Super::on_resize(e);
 			}
 
+			virtual void on_zoom (FrameEvent* e)
+			{
+				RUCY_SYM(on_zoom);
+				if (this->is_overridable())
+					this->value.call(on_zoom, Rucy::value(e));
+				else
+					Super::on_zoom(e);
+			}
+
 			virtual void on_rotate (FrameEvent* e)
 			{
 				RUCY_SYM(on_rotate);

data/include/reflex/view.h

@@ -209,10 +209,20 @@ namespace Reflex
 
 			virtual void fit_to_content ();
 
+			virtual void set_zoom (float zoom);
+
+			virtual float    zoom () const;
+
 			virtual void set_angle (float degree);
 
 			virtual float    angle () const;
 
+			virtual void     set_pivot (float x, float y, float z = 0);
+
+			virtual void     set_pivot (const Point& pivot);
+
+			virtual const Point& pivot () const;
+
 			virtual void         scroll_to (coord x, coord y, coord z = 0);
 
 			virtual void         scroll_to (const Point& scroll);
@@ -223,10 +233,6 @@ namespace Reflex
 
 			virtual const Point& scroll () const;
 
-			virtual void set_zoom (float zoom);
-
-			virtual float    zoom () const;
-
 			virtual void set_capture (uint types);
 
 			virtual uint     capture () const;
@@ -344,6 +350,8 @@ namespace Reflex
 
 			virtual void on_resize (FrameEvent* e);
 
+			virtual void on_zoom   (FrameEvent* e);
+
 			virtual void on_rotate (FrameEvent* e);
 
 			virtual void on_scroll (ScrollEvent* e);

data/lib/reflex/application.rb

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/setter'
 require 'xot/universal_accessor'
 require 'xot/block_util'
+require 'xot/inspectable'
 require 'reflex/ext'
 require 'reflex/helper'
 
@@ -14,6 +12,7 @@ module Reflex
   class Application
 
     include Xot::Setter
+    include Xot::Inspectable
     include Hookable
 
     universal_accessor :name

data/lib/reflex/autoinit.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/autoinit'
 require 'reflex/ext'
 

data/lib/reflex/bitmap.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/bitmap'
 
 

data/lib/reflex/bounds.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/bounds'
 
 

data/lib/reflex/button.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/view'
 
 

data/lib/reflex/camera.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/camera'
 
 

data/lib/reflex/capture_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/ext'
 require 'reflex/view'
 

data/lib/reflex/color.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/color'
 
 

data/lib/reflex/color_space.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/color_space'
 
 

data/lib/reflex/contact_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 

data/lib/reflex/draw_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/block_util'
 require 'reflex/ext'
 

data/lib/reflex/ellipse_shape.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/universal_accessor'
 require 'reflex/shape'
 

data/lib/reflex/ext.rb

@@ -1,5 +1,2 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/ext'
 require 'reflex/native'

data/lib/reflex/extension.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 module Reflex
 
 

data/lib/reflex/filter.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/universal_accessor'
 require 'reflex/ext'
 

data/lib/reflex/fixture.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/setter'
 require 'xot/universal_accessor'
 

data/lib/reflex/focus_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 

data/lib/reflex/font.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/font'
 
 

data/lib/reflex/frame_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/ext'
 
 
@@ -33,7 +30,8 @@ module Reflex
     alias h height
 
     def inspect()
-      "#<Reflex::FrameEvent x:#{x} y:#{y} w:#{w} h:#{h} dx:#{dx} dy:#{dy} dw:#{dw} dh:#{dh}>"
+      "#<Reflex::FrameEvent x:%g(%g) y:%g(%g) w:%g(%g) h:%g(%g) zoom:%g(%g) angle:%g(%g)>" %
+        [x, dx, y, dy, w, dw, h, dh, zoom, dzoom, angle, dangle]
     end
 
   end# FrameEvent

data/lib/reflex/helper.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/hookable'
 require 'xot/universal_accessor'
 require 'reflex/point'

data/lib/reflex/image.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/image'
 
 

data/lib/reflex/image_view.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/view'
 
 

data/lib/reflex/key_event.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/const_symbol_accessor'
 require 'reflex/ext'
 

data/lib/reflex/line_shape.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/universal_accessor'
 require 'reflex/shape'
 

data/lib/reflex/list_view.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/view'
 
 

data/lib/reflex/matrix.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'rays/matrix'
 
 

data/lib/reflex/model.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'xot/invoker'
 require 'xot/setter'
 require 'xot/block_util'

data/lib/reflex/model_owner.rb

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 require 'reflex/model'