reflexion 0.1.38 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd000da9cadc8587ea27cf2ef0d55c617aedd61e00e0fa84f0575215d81060f
-  data.tar.gz: 66a9040b3b5d9233afe96b8869c981449403ddff9dd62a9a590d37f99ff14530
+  metadata.gz: 2a2bf359950c676836ffec40bf02fda296c2111f09cf585ad546b0ecc8edc296
+  data.tar.gz: 2366d63f0d4512bf3f71cf1a16e355f4b98123f7473bdfa5f8d95bdbf87536aa
 SHA512:
-  metadata.gz: e2d19b6fd82f8f0d81bb6a774d6a829bf84a92e61cb5c5305c9815d76b39118a22f513f7b776f3fd039d65c41a1bf8b3dafc4a094db64adb7cbc42e7dd517503
-  data.tar.gz: 51c91ee902178f44c5b1f100d511179e47bc023f46411255ac4e72da03db07b0db3346e9283ff0ba2e0651d0fc9348fb93d7cf6bc761e29f311d1d3cf29d3bc8
+  metadata.gz: 33e83a7603fa2749030b58d321d5ee9a808283095d43dc7c5772a6890d1758abe2993d7392f7f820c83eeb9b2fecea690ded0e4dc8689c8815b4397870429229
+  data.tar.gz: 7d604628381cf76bed34cae3126739d5658d007c6924ef3d6ce0e7459476a4513099b7f61932f6aa82110a1458ee73c508b59719d6049f37e97dcffb710caf9f

data/.doc/ext/reflex/capture_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 

data/.doc/ext/reflex/event.cpp

@@ -22,7 +22,12 @@ static
 VALUE block(VALUE self)
 {
 	CHECK;
-	THIS->block();
+	check_arg_count(__FILE__, __LINE__, "Event#block", argc, 0, 1);
+
+	if (argc >= 1)
+		THIS->block((bool) argv[0]);
+	else
+		THIS->block();
 }
 
 static
@@ -49,7 +54,7 @@ Init_reflex_event ()
 
 	cEvent = rb_define_class_under(mReflex, "Event", rb_cObject);
 	rb_define_alloc_func(cEvent, alloc);
-	rb_define_method(cEvent, "block", RUBY_METHOD_FUNC(block), 0);
+	rb_define_method(cEvent, "block", RUBY_METHOD_FUNC(block), -1);
 	cEvent.define_method("blocked?", is_blocked);
 	rb_define_method(cEvent, "time", RUBY_METHOD_FUNC(get_time), 0);
 }

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

@@ -1,8 +1,8 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
-#include "rays/ruby/bounds.h"
+#include <rays/ruby/point.h>
+#include <rays/ruby/bounds.h>
 #include "defs.h"
 
 
@@ -20,14 +20,15 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self, VALUE frame, VALUE dx, VALUE dy, VALUE dwidth, VALUE dheight, VALUE zoom, VALUE dzoom, VALUE angle, VALUE dangle)
+VALUE initialize(VALUE self, VALUE
+	frame, VALUE dx, VALUE dy, VALUE dz, VALUE dwidth, VALUE dheight, VALUE ddepth, VALUE zoom, VALUE dzoom, VALUE angle, VALUE dangle)
 {
 	CHECK;
 
 	*THIS = Reflex::FrameEvent(
 		to<Rays::Bounds>(frame),
-		to<coord>(dx),     to<coord>(dy),
-		to<coord>(dwidth), to<coord>(dheight),
+		to<coord>(dx),     to<coord>(dy),      to<coord>(dz),
+		to<coord>(dwidth), to<coord>(dheight), to<coord>(ddepth),
 		to<float>(zoom),   to<float>(dzoom),
 		to<float>(angle),  to<float>(dangle));
 
@@ -63,6 +64,13 @@ VALUE dy(VALUE self)
 	return value(THIS->dy());
 }
 
+static
+VALUE dz(VALUE self)
+{
+	CHECK;
+	return value(THIS->dz());
+}
+
 static
 VALUE dwidth(VALUE self)
 {
@@ -77,18 +85,25 @@ VALUE dheight(VALUE self)
 	return value(THIS->dheight());
 }
 
+static
+VALUE ddepth(VALUE self)
+{
+	CHECK;
+	return value(THIS->ddepth());
+}
+
 static
 VALUE dposition(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx(), THIS->dy()));
+	return value(Rays::Point(THIS->dx(), THIS->dy(), THIS->dz()));
 }
 
 static
 VALUE dsize(VALUE self)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
+	return value(Rays::Point(THIS->dwidth(), THIS->dheight(), THIS->ddepth()));
 }
 
 static
@@ -157,13 +172,15 @@ 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), 9);
+	rb_define_private_method(cFrameEvent, "initialize", RUBY_METHOD_FUNC(initialize), 11);
 	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);
 	rb_define_method(cFrameEvent, "dy", RUBY_METHOD_FUNC(dy), 0);
+	rb_define_method(cFrameEvent, "dz", RUBY_METHOD_FUNC(dz), 0);
 	rb_define_method(cFrameEvent, "dwidth", RUBY_METHOD_FUNC(dwidth), 0);
 	rb_define_method(cFrameEvent, "dheight", RUBY_METHOD_FUNC(dheight), 0);
+	rb_define_method(cFrameEvent, "ddepth", RUBY_METHOD_FUNC(ddepth), 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);

data/.doc/ext/reflex/motion_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 
@@ -23,7 +23,7 @@ VALUE initialize(VALUE self, VALUE gravity)
 {
 	CHECK;
 
-	THIS->gravity = to<Rays::Point>(gravity);
+	*THIS = Reflex::MotionEvent(to<Rays::Point>(gravity));
 
 	return rb_call_super(0, NULL);
 }
@@ -32,7 +32,7 @@ static
 VALUE initialize_copy(VALUE self, VALUE obj)
 {
 	CHECK;
-	*THIS = to<Reflex::MotionEvent&>(obj);
+	*THIS = to<Reflex::MotionEvent&>(obj).dup();
 	return self;
 }
 
@@ -40,7 +40,7 @@ static
 VALUE gravity(VALUE self)
 {
 	CHECK;
-	return value(THIS->gravity);
+	return value(THIS->gravity());
 }
 
 

data/.doc/ext/reflex/pointer.cpp

@@ -20,7 +20,7 @@ VALUE alloc(VALUE klass)
 
 static
 VALUE initialize(VALUE self, VALUE
-	id, VALUE type, VALUE action, VALUE position, VALUE modifiers, VALUE click_count, VALUE drag, VALUE time)
+	id, VALUE type, VALUE action, VALUE position, VALUE modifiers, VALUE drag, VALUE click_count, VALUE view_index, VALUE time)
 {
 	CHECK;
 
@@ -30,8 +30,9 @@ VALUE initialize(VALUE self, VALUE
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
-		to<uint>(click_count),
 		to<bool>(drag),
+		to<uint>(click_count),
+		to<uint>(view_index),
 		to<double>(time));
 	return self;
 }
@@ -79,6 +80,13 @@ VALUE get_modifiers(VALUE self)
 	return value(THIS->modifiers());
 }
 
+static
+VALUE is_drag(VALUE self)
+{
+	CHECK;
+	return value(THIS->is_drag());
+}
+
 static
 VALUE get_click_count(VALUE self)
 {
@@ -87,10 +95,10 @@ VALUE get_click_count(VALUE self)
 }
 
 static
-VALUE is_drag(VALUE self)
+VALUE get_view_index(VALUE self)
 {
 	CHECK;
-	return value(THIS->is_drag());
+	return value(THIS->view_index());
 }
 
 static
@@ -117,15 +125,16 @@ Init_reflex_pointer ()
 
 	cPointer = rb_define_class_under(mReflex, "Pointer", rb_cObject);
 	rb_define_alloc_func(cPointer, alloc);
-	rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 8);
+	rb_define_private_method(cPointer, "initialize", RUBY_METHOD_FUNC(initialize), 9);
 	rb_define_private_method(cPointer, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cPointer, "id", RUBY_METHOD_FUNC(get_id), 0);
 	rb_define_private_method(cPointer, "get_type", RUBY_METHOD_FUNC(get_type), 0);
 	rb_define_private_method(cPointer, "get_action", RUBY_METHOD_FUNC(get_action), 0);
 	rb_define_method(cPointer, "position", RUBY_METHOD_FUNC(get_position), 0);
 	rb_define_method(cPointer, "modifiers", RUBY_METHOD_FUNC(get_modifiers), 0);
-	rb_define_method(cPointer, "click_count", RUBY_METHOD_FUNC(get_click_count), 0);
 	cPointer.define_method("drag?",              is_drag);
+	rb_define_method(cPointer, "click_count", RUBY_METHOD_FUNC(get_click_count), 0);
+	rb_define_method(cPointer, "view_index", RUBY_METHOD_FUNC(get_view_index), 0);
 	rb_define_method(cPointer, "time", RUBY_METHOD_FUNC(get_time), 0);
 	rb_define_method(cPointer, "prev", RUBY_METHOD_FUNC(get_prev), 0);
 	cPointer.define_const("TYPE_NONE",    Reflex::Pointer::TYPE_NONE);

data/.doc/ext/reflex/pointer_event.cpp

@@ -33,7 +33,6 @@ VALUE initialize(VALUE self)
 		pointers.emplace_back(to<Reflex::Pointer&>(argv[i]));
 
 	*THIS = Reflex::PointerEvent(&pointers[0], pointers.size());
-
 	return rb_call_super(0, NULL);
 }
 

data/.doc/ext/reflex/polygon_shape.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/shape.h"
 
 
-#include "rays/ruby/polygon.h"
+#include <rays/ruby/polygon.h>
 #include "defs.h"
 
 

data/.doc/ext/reflex/scroll_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 

data/.doc/ext/reflex/style.cpp

@@ -1,8 +1,8 @@
 #include "reflex/ruby/style.h"
 
 
-#include "rays/ruby/color.h"
-#include "rays/ruby/image.h"
+#include <rays/ruby/color.h>
+#include <rays/ruby/image.h>
 #include "reflex/ruby/selector.h"
 #include "defs.h"
 #include "selector.h"

data/.doc/ext/reflex/wheel_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 

data/ChangeLog.md

@@ -1,6 +1,14 @@
 # reflex ChangeLog
 
 
+## [v0.1.39] - 2023-05-18
+
+- Event#block has a bool parameter, which defaults to true
+- Add z and depth value to FrameEvent class
+- Sort child views by z position
+- Add Pointer#view_index
+
+
 ## [v0.1.38] - 2023-05-13
 
 - View: Reimplemented from_parent(), to_parent(), from_window(), to_window(), from_screen(), and to_screen() to account for rotation, zoom, and scrolling during coordinate transformation
@@ -40,17 +48,17 @@
 
 ## [v0.1.32] - 2023-03-01
 
-- fix bugs
+- Fix bugs
 
 
 ## [v0.1.31] - 2023-02-27
 
-- add ChangeLog.md file
-- add test.yml, tag.yaml, and release.yml
-- requires ruby 2.7.0 or later
+- Add ChangeLog.md file
+- Add test.yml, tag.yaml, and release.yml
+- Requires ruby 2.7.0 or later
 
 
 ## [v0.1.30] - 2023-02-09
 
-- fix conflicting reflex's Init_exception() and others Init_exception()
-- refactoring
+- Fix conflicting reflex's Init_exception() and others Init_exception()
+- Refactoring

data/VERSION

@@ -1 +1 @@
-0.1.38
+0.1.39

data/ext/reflex/capture_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 

data/ext/reflex/defs.h

@@ -5,8 +5,8 @@
 
 
 #include <rucy.h>
-#include <reflex/defs.h>
-#include <reflex/ruby/defs.h>
+#include "reflex/defs.h"
+#include "reflex/ruby/defs.h"
 
 
 using namespace Rucy;

data/ext/reflex/event.cpp

@@ -20,10 +20,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF0(block)
+RUCY_DEFN(block)
 {
 	CHECK;
-	THIS->block();
+	check_arg_count(__FILE__, __LINE__, "Event#block", argc, 0, 1);
+
+	if (argc >= 1)
+		THIS->block((bool) argv[0]);
+	else
+		THIS->block();
 }
 RUCY_END
 

data/ext/reflex/frame_event.cpp

@@ -1,8 +1,8 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
-#include "rays/ruby/bounds.h"
+#include <rays/ruby/point.h>
+#include <rays/ruby/bounds.h>
 #include "defs.h"
 
 
@@ -21,14 +21,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF9(initialize, frame, dx, dy, dwidth, dheight, zoom, dzoom, angle, dangle)
+RUCY_DEF11(initialize,
+	frame, dx, dy, dz, dwidth, dheight, ddepth, zoom, dzoom, angle, dangle)
 {
 	CHECK;
 
 	*THIS = Reflex::FrameEvent(
 		to<Rays::Bounds>(frame),
-		to<coord>(dx),     to<coord>(dy),
-		to<coord>(dwidth), to<coord>(dheight),
+		to<coord>(dx),     to<coord>(dy),      to<coord>(dz),
+		to<coord>(dwidth), to<coord>(dheight), to<coord>(ddepth),
 		to<float>(zoom),   to<float>(dzoom),
 		to<float>(angle),  to<float>(dangle));
 
@@ -69,6 +70,14 @@ RUCY_DEF0(dy)
 }
 RUCY_END
 
+static
+RUCY_DEF0(dz)
+{
+	CHECK;
+	return value(THIS->dz());
+}
+RUCY_END
+
 static
 RUCY_DEF0(dwidth)
 {
@@ -85,11 +94,19 @@ RUCY_DEF0(dheight)
 }
 RUCY_END
 
+static
+RUCY_DEF0(ddepth)
+{
+	CHECK;
+	return value(THIS->ddepth());
+}
+RUCY_END
+
 static
 RUCY_DEF0(dposition)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx(), THIS->dy()));
+	return value(Rays::Point(THIS->dx(), THIS->dy(), THIS->dz()));
 }
 RUCY_END
 
@@ -97,7 +114,7 @@ static
 RUCY_DEF0(dsize)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
+	return value(Rays::Point(THIS->dwidth(), THIS->dheight(), THIS->ddepth()));
 }
 RUCY_END
 
@@ -180,8 +197,10 @@ Init_reflex_frame_event ()
 	cFrameEvent.define_method("frame", frame);
 	cFrameEvent.define_method("dx",        dx);
 	cFrameEvent.define_method("dy",        dy);
+	cFrameEvent.define_method("dz",        dz);
 	cFrameEvent.define_method("dwidth",    dwidth);
 	cFrameEvent.define_method("dheight",   dheight);
+	cFrameEvent.define_method("ddepth",    ddepth);
 	cFrameEvent.define_method("dposition", dposition);
 	cFrameEvent.define_method("dsize",     dsize);
 	cFrameEvent.define_method( "zoom",   zoom);

data/ext/reflex/motion_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 
@@ -24,7 +24,7 @@ RUCY_DEF1(initialize, gravity)
 {
 	CHECK;
 
-	THIS->gravity = to<Rays::Point>(gravity);
+	*THIS = Reflex::MotionEvent(to<Rays::Point>(gravity));
 
 	return rb_call_super(0, NULL);
 }
@@ -34,7 +34,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::MotionEvent&>(obj);
+	*THIS = to<Reflex::MotionEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -43,7 +43,7 @@ static
 RUCY_DEF0(gravity)
 {
 	CHECK;
-	return value(THIS->gravity);
+	return value(THIS->gravity());
 }
 RUCY_END
 

data/ext/reflex/pointer.cpp

@@ -20,8 +20,8 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF8(initialize,
-	id, type, action, position, modifiers, click_count, drag, time)
+RUCY_DEF9(initialize,
+	id, type, action, position, modifiers, drag, click_count, view_index, time)
 {
 	CHECK;
 
@@ -31,8 +31,9 @@ RUCY_DEF8(initialize,
 		(Reflex::Pointer::Action) to<int>(action),
 		to<Rays::Point>(position),
 		to<uint>(modifiers),
-		to<uint>(click_count),
 		to<bool>(drag),
+		to<uint>(click_count),
+		to<uint>(view_index),
 		to<double>(time));
 	return self;
 }
@@ -87,6 +88,14 @@ RUCY_DEF0(get_modifiers)
 }
 RUCY_END
 
+static
+RUCY_DEF0(is_drag)
+{
+	CHECK;
+	return value(THIS->is_drag());
+}
+RUCY_END
+
 static
 RUCY_DEF0(get_click_count)
 {
@@ -96,10 +105,10 @@ RUCY_DEF0(get_click_count)
 RUCY_END
 
 static
-RUCY_DEF0(is_drag)
+RUCY_DEF0(get_view_index)
 {
 	CHECK;
-	return value(THIS->is_drag());
+	return value(THIS->view_index());
 }
 RUCY_END
 
@@ -136,8 +145,9 @@ Init_reflex_pointer ()
 	cPointer.define_private_method("get_action", get_action);
 	cPointer.define_method("position",           get_position);
 	cPointer.define_method("modifiers",          get_modifiers);
-	cPointer.define_method("click_count",        get_click_count);
 	cPointer.define_method("drag?",              is_drag);
+	cPointer.define_method("click_count",        get_click_count);
+	cPointer.define_method("view_index",         get_view_index);
 	cPointer.define_method("time",               get_time);
 	cPointer.define_method("prev",               get_prev);
 	cPointer.define_const("TYPE_NONE",    Reflex::Pointer::TYPE_NONE);

data/ext/reflex/pointer_event.cpp

@@ -34,7 +34,6 @@ RUCY_DEFN(initialize)
 		pointers.emplace_back(to<Reflex::Pointer&>(argv[i]));
 
 	*THIS = Reflex::PointerEvent(&pointers[0], pointers.size());
-
 	return rb_call_super(0, NULL);
 }
 RUCY_END

data/ext/reflex/polygon_shape.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/shape.h"
 
 
-#include "rays/ruby/polygon.h"
+#include <rays/ruby/polygon.h>
 #include "defs.h"
 
 

data/ext/reflex/scroll_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"
 
 

data/ext/reflex/selector.h

@@ -4,7 +4,7 @@
 #define __REFLEX_EXT_SELECTOR_H__
 
 
-#include <reflex/ruby/selector.h>
+#include "reflex/ruby/selector.h"
 
 
 template <typename T>

data/ext/reflex/style.cpp

@@ -1,8 +1,8 @@
 #include "reflex/ruby/style.h"
 
 
-#include "rays/ruby/color.h"
-#include "rays/ruby/image.h"
+#include <rays/ruby/color.h>
+#include <rays/ruby/image.h>
 #include "reflex/ruby/selector.h"
 #include "defs.h"
 #include "selector.h"

data/ext/reflex/wheel_event.cpp

@@ -1,7 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
-#include "rays/ruby/point.h"
+#include <rays/ruby/point.h>
 #include "defs.h"