reflexion 0.5.3 → 0.7.0

data/ext/reflex/view.cpp

@@ -10,6 +10,7 @@
 #include "reflex/ruby/timer.h"
 #include "reflex/ruby/style.h"
 #include "reflex/ruby/shape.h"
+#include "reflex/ruby/constraint.h"
 #include "reflex/ruby/filter.h"
 #include "reflex/ruby/window.h"
 #include "defs.h"
@@ -21,7 +22,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::View)
 #define   THIS    to<      Reflex::View*>(self)
 #define C_THIS    to<const Reflex::View*>(self)
 
-#define CHECK     RUCY_CHECK_OBJECT(Reflex::View, self)
+#define CHECK     RUCY_CHECK_OBJ(Reflex::View, self)
 
 #define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
@@ -52,7 +53,7 @@ RUCY_DEF0(hide)
 RUCY_END
 
 static
-RUCY_DEF0(hidden)
+RUCY_DEF0(is_hidden)
 {
 	CHECK;
 	return value(THIS->hidden());
@@ -102,7 +103,7 @@ static
 RUCY_DEFN(start_timer)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#start_timer", argc, 1, 2);
+	check_arg_count(__FILE__, __LINE__, "View#start_timer!", argc, 1, 2);
 
 	Reflex::Timer* timer = THIS->start_timer(
 		to<float>(argv[0]),
@@ -121,6 +122,31 @@ RUCY_DEF0(update_layout)
 }
 RUCY_END
 
+static
+RUCY_DEF0(fit_to_content)
+{
+	CHECK;
+	THIS->fit_to_content();
+	return self;
+}
+RUCY_END
+
+static
+RUCY_DEF0(content_bounds)
+{
+	CHECK;
+	return value(CALL(content_bounds()));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_text_input_bounds)
+{
+	CHECK;
+	return value(CALL(text_input_bounds()));
+}
+RUCY_END
+
 static
 RUCY_DEF1(from_parent, point)
 {
@@ -170,10 +196,10 @@ RUCY_DEF1(to_screen, point)
 RUCY_END
 
 static
-RUCY_DEF1(add_child, child)
+RUCY_DEF2(add_child, child, index)
 {
 	CHECK;
-	THIS->add_child(to<Reflex::View*>(child));
+	THIS->add_child(to<Reflex::View*>(child), index.is_nil() ? -1 : to<int>(index));
 	return child;
 }
 RUCY_END
@@ -216,9 +242,11 @@ RUCY_DEF0(each_child)
 {
 	CHECK;
 
+	Reflex::View::ChildList children(THIS->child_begin(), THIS->child_end());
+
 	Value ret;
-	for (auto it = THIS->child_begin(), end = THIS->child_end(); it != end; ++it)
-		ret = rb_yield(value(it->get()));
+	for (auto& child : children)
+		ret = yield(value(child.get()));
 	return ret;
 }
 RUCY_END
@@ -276,10 +304,11 @@ RUCY_DEF0(each_style)
 {
 	CHECK;
 
+	Reflex::View::StyleList styles(THIS->style_begin(), THIS->style_end());
+
 	Value ret;
-	Reflex::View::style_iterator end = THIS->style_end();
-	for (Reflex::View::style_iterator it = THIS->style_begin(); it != end; ++it)
-		ret = rb_yield(value(*it));
+	for (auto& style : styles)
+		ret = yield(value(style));
 	return ret;
 }
 RUCY_END
@@ -318,10 +347,10 @@ RUCY_DEF0(get_shape)
 RUCY_END
 
 static
-RUCY_DEF1(add_shape, shape)
+RUCY_DEF2(add_shape, shape, index)
 {
 	CHECK;
-	THIS->add_shape(to_shape(shape));
+	THIS->add_shape(to_shape(shape), index.is_nil() ? -1 : to<int>(index));
 	return shape;
 }
 RUCY_END
@@ -362,62 +391,83 @@ RUCY_DEF0(each_shape)
 {
 	CHECK;
 
+	Reflex::View::ShapeList shapes(THIS->shape_begin(), THIS->shape_end());
+
 	Value ret;
-	Reflex::View::shape_iterator end = THIS->shape_end();
-	for (Reflex::View::shape_iterator it = THIS->shape_begin(); it != end; ++it)
-		ret = rb_yield(value(it->get()));
+	for (auto& shape : shapes)
+		ret = yield(value(shape.get()));
 	return ret;
 }
 RUCY_END
 
 static
-RUCY_DEF1(set_filter, filter)
+RUCY_DEF0(clear_constraints)
 {
 	CHECK;
-	THIS->set_filter(filter ? to<Reflex::Filter*>(filter) : NULL);
-	return filter;
+	THIS->clear_constraints();
+	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_filter)
+RUCY_DEFN(find_constraints)
 {
 	CHECK;
-	return value(THIS->filter());
+	check_arg_count(__FILE__, __LINE__, "View#find_constraints", argc, 1);
+
+	auto constraints =
+		THIS->find_constraints(to<Reflex::Selector>(argv[0])) |
+		std::views::transform([](auto& ref) {return value(ref.get());});
+	return array(constraints.begin(), constraints.end());
 }
 RUCY_END
 
 static
-RUCY_DEFN(set_frame)
+RUCY_DEF0(each_constraint)
 {
 	CHECK;
-	THIS->set_frame(to<Rays::Bounds>(argc, argv));
-	return value(THIS->frame());
+
+	Reflex::View::ConstraintList constraints(
+		THIS->constraint_begin(), THIS->constraint_end());
+
+	Value ret;
+	for (auto& constraint : constraints)
+		ret = yield(value(constraint.get()));
+	return ret;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_frame)
+RUCY_DEF1(set_filter, filter)
 {
 	CHECK;
-	return value(THIS->frame());
+	THIS->set_filter(filter ? to<Reflex::Filter*>(filter) : NULL);
+	return filter;
 }
 RUCY_END
 
 static
-RUCY_DEF0(content_bounds)
+RUCY_DEF0(get_filter)
 {
 	CHECK;
-	return value(CALL(content_bounds()));
+	return value(THIS->filter());
 }
 RUCY_END
 
 static
-RUCY_DEF0(fit_to_content)
+RUCY_DEFN(set_frame)
 {
 	CHECK;
-	THIS->fit_to_content();
-	return self;
+	THIS->set_frame(to<Rays::Bounds>(argc, argv));
+	return value(THIS->frame());
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_frame)
+{
+	CHECK;
+	return value(THIS->frame());
 }
 RUCY_END
 
@@ -603,24 +653,24 @@ RUCY_DEF0(get_clip)
 RUCY_END
 
 static
-RUCY_DEF1(set_cache, cache)
+RUCY_DEF1(set_draw_cache, state)
 {
 	CHECK;
 
-	if (cache)
-		THIS->   add_flag(Reflex::View::FLAG_CACHE);
+	if (state)
+		THIS->   add_flag(Reflex::View::FLAG_DRAW_CACHE);
 	else
-		THIS->remove_flag(Reflex::View::FLAG_CACHE);
+		THIS->remove_flag(Reflex::View::FLAG_DRAW_CACHE);
 
-	return cache;
+	return state;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_cache)
+RUCY_DEF0(has_draw_cache)
 {
 	CHECK;
-	return value(THIS->has_flag(Reflex::View::FLAG_CACHE));
+	return value(THIS->has_flag(Reflex::View::FLAG_DRAW_CACHE));
 }
 RUCY_END
 
@@ -690,6 +740,28 @@ RUCY_DEF0(get_fix_angle)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_text_input, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::View::FLAG_TEXT_INPUT);
+	else
+		THIS->remove_flag(Reflex::View::FLAG_TEXT_INPUT);
+
+	return state;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_text_input)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::View::FLAG_TEXT_INPUT));
+}
+RUCY_END
+
 static
 RUCY_DEF0(parent)
 {
@@ -904,13 +976,11 @@ RUCY_DEF1(create_world, pixels_per_meter)
 RUCY_END
 
 static
-RUCY_DEFN(update_world)
+RUCY_DEF0(update_world)
 {
 	CHECK;
-	check_arg_count(__FILE__, __LINE__, "View#update_world", argc, 0, 1);
 
-	float duration = argc >= 1 ? to<float>(argv[0]) : 0;
-	THIS->update_world(duration);
+	THIS->update_world();
 	return self;
 }
 RUCY_END
@@ -1002,6 +1072,22 @@ RUCY_DEF1(on_detach, event)
 }
 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)
 {
@@ -1107,90 +1193,90 @@ RUCY_DEF1(on_key_up, event)
 RUCY_END
 
 static
-RUCY_DEF1(on_pointer, event)
+RUCY_DEF1(on_text, event)
 {
 	CHECK;
-	CALL(on_pointer(to<Reflex::PointerEvent*>(event)));
+	CALL(on_text(to<Reflex::TextEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_pointer_down, event)
+RUCY_DEF1(on_text_preedit, event)
 {
 	CHECK;
-	CALL(on_pointer_down(to<Reflex::PointerEvent*>(event)));
+	CALL(on_text_preedit(to<Reflex::TextEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_pointer_up, event)
+RUCY_DEF1(on_text_commit, event)
 {
 	CHECK;
-	CALL(on_pointer_up(to<Reflex::PointerEvent*>(event)));
+	CALL(on_text_commit(to<Reflex::TextEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_pointer_move, event)
+RUCY_DEF1(on_pointer, event)
 {
 	CHECK;
-	CALL(on_pointer_move(to<Reflex::PointerEvent*>(event)));
+	CALL(on_pointer(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_pointer_cancel, event)
+RUCY_DEF1(on_pointer_down, event)
 {
 	CHECK;
-	CALL(on_pointer_cancel(to<Reflex::PointerEvent*>(event)));
+	CALL(on_pointer_down(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_wheel, event)
+RUCY_DEF1(on_pointer_up, event)
 {
 	CHECK;
-	CALL(on_wheel(to<Reflex::WheelEvent*>(event)));
+	CALL(on_pointer_up(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_midi, event)
+RUCY_DEF1(on_pointer_move, event)
 {
 	CHECK;
-	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
+	CALL(on_pointer_move(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note, event)
+RUCY_DEF1(on_pointer_cancel, event)
 {
 	CHECK;
-	CALL(on_note(to<Reflex::NoteEvent*>(event)));
+	CALL(on_pointer_cancel(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note_on, event)
+RUCY_DEF1(on_pointer_enter, event)
 {
 	CHECK;
-	CALL(on_note_on(to<Reflex::NoteEvent*>(event)));
+	CALL(on_pointer_enter(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note_off, event)
+RUCY_DEF1(on_pointer_leave, event)
 {
 	CHECK;
-	CALL(on_note_off(to<Reflex::NoteEvent*>(event)));
+	CALL(on_pointer_leave(to<Reflex::PointerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_control_change, event)
+RUCY_DEF1(on_wheel, event)
 {
 	CHECK;
-	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
+	CALL(on_wheel(to<Reflex::WheelEvent*>(event)));
 }
 RUCY_END
 
@@ -1242,6 +1328,46 @@ RUCY_DEF1(on_contact_end, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_midi, event)
+{
+	CHECK;
+	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note, event)
+{
+	CHECK;
+	CALL(on_note(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note_on, event)
+{
+	CHECK;
+	CALL(on_note_on(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_note_off, event)
+{
+	CHECK;
+	CALL(on_note_off(to<Reflex::NoteEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_control_change, event)
+{
+	CHECK;
+	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
+}
+RUCY_END
+
 
 static Class cView;
 
@@ -1252,15 +1378,18 @@ Init_reflex_view ()
 
 	cView = mReflex.define_class("View");
 	cView.define_alloc_func(alloc);
-	cView.define_method("show",    show);
-	cView.define_method("hide",    hide);
-	cView.define_method("hidden?", hidden);
+	cView.define_method("show",       show);
+	cView.define_method("hide",       hide);
+	cView.define_method("hidden?", is_hidden);
 	cView.define_method("redraw",  redraw);
 	cView.define_method("focus",  focus);
 	cView.define_method("blur",   blur);
 	cView.define_method("focus?", has_focus);
-	cView.define_private_method("start_timer", start_timer);
+	cView.define_private_method("start_timer!", start_timer);
 	cView.define_method("update_layout", update_layout);
+	cView.define_method("fit_to_content",        fit_to_content);
+	cView.define_method(       "content_bounds",        content_bounds);
+	cView.define_method(    "text_input_bounds", get_text_input_bounds);
 
 	cView.define_method("from_parent", from_parent);
 	cView.define_method(  "to_parent",   to_parent);
@@ -1269,33 +1398,35 @@ Init_reflex_view ()
 	cView.define_method("from_screen", from_screen);
 	cView.define_method(  "to_screen",   to_screen);
 
-	cView.define_method(   "add_child",      add_child);
-	cView.define_method("remove_child",   remove_child);
-	cView.define_method( "clear_children", clear_children);
-	cView.define_method(  "find_children",  find_children);
-	cView.define_method(  "each_child",     each_child);
-
-	cView.define_method(   "add_style",    add_style);
-	cView.define_method("remove_style", remove_style);
-	cView.define_method(   "get_style",    get_style);
-	cView.define_method(  "find_styles",  find_styles);
-	cView.define_method(  "each_style",   each_style);
-
-	cView.define_method(       "shape=",   set_shape);
-	cView.define_method(       "shape",    get_shape);
-	cView.define_method(   "add_shape",    add_shape);
-	cView.define_method("remove_shape", remove_shape);
-	cView.define_method( "clear_shapes", clear_shapes);
-	cView.define_method(  "find_shapes",  find_shapes);
-	cView.define_method(  "each_shape",   each_shape);
+	cView.define_method(         "add_child!",     add_child);
+	cView.define_method(      "remove_child",   remove_child);
+	cView.define_method(       "clear_children", clear_children);
+	cView.define_method(        "find_children",  find_children);
+	cView.define_private_method("each_child!",    each_child);
+
+	cView.define_method(         "add_style",    add_style);
+	cView.define_method(      "remove_style", remove_style);
+	cView.define_method(         "get_style",    get_style);
+	cView.define_method(        "find_styles",  find_styles);
+	cView.define_private_method("each_style!",  each_style);
+
+	cView.define_method(             "shape=",   set_shape);
+	cView.define_method(             "shape",    get_shape);
+	cView.define_method(         "add_shape!",   add_shape);
+	cView.define_method(      "remove_shape", remove_shape);
+	cView.define_method(       "clear_shapes", clear_shapes);
+	cView.define_method(        "find_shapes",  find_shapes);
+	cView.define_private_method("each_shape!",  each_shape);
+
+	cView.define_method(       "clear_constraints", clear_constraints);
+	cView.define_method(        "find_constraints",  find_constraints);
+	cView.define_private_method("each_constraint!",  each_constraint);
 
 	cView.define_method("filter=", set_filter);
 	cView.define_method("filter",  get_filter);
 
 	cView.define_method("frame=", set_frame);
 	cView.define_method("frame",  get_frame);
-	cView.define_method("content_bounds", content_bounds);
-	cView.define_method("fit_to_content", fit_to_content);
 	cView.define_method("angle=", set_angle);
 	cView.define_method("angle",  get_angle);
 	cView.define_method("pivot=", set_pivot);
@@ -1309,14 +1440,16 @@ Init_reflex_view ()
 	cView.define_method("capture",  get_capture);
 	cView.define_method("clip=", set_clip);
 	cView.define_method("clip?", get_clip);
-	cView.define_method("cache=", set_cache);
-	cView.define_method("cache?", get_cache);
+	cView.define_method("draw_cache=", set_draw_cache);
+	cView.define_method("draw_cache?", has_draw_cache);
 	cView.define_method("resize_to_fit=", set_resize_to_fit);
 	cView.define_method("resize_to_fit?", get_resize_to_fit);
 	cView.define_method("scroll_to_fit=", set_scroll_to_fit);
 	cView.define_method("scroll_to_fit?", get_scroll_to_fit);
 	cView.define_method("fix_angle=", set_fix_angle);
 	cView.define_method("fix_angle?", get_fix_angle);
+	cView.define_private_method("set_text_input_flag!", set_text_input);
+	cView.define_private_method(    "text_input_flag!", get_text_input);
 	cView.define_method("parent", parent);
 	cView.define_method("window", window);
 
@@ -1356,6 +1489,8 @@ Init_reflex_view ()
 
 	cView.define_method("on_attach", on_attach);
 	cView.define_method("on_detach", on_detach);
+	cView.define_method("on_activate",   on_activate);
+	cView.define_method("on_deactivate", on_deactivate);
 	cView.define_method("on_show",   on_show);
 	cView.define_method("on_hide",   on_hide);
 	cView.define_method("on_update", on_update);
@@ -1369,23 +1504,28 @@ Init_reflex_view ()
 	cView.define_method("on_key",      on_key);
 	cView.define_method("on_key_down", on_key_down);
 	cView.define_method("on_key_up",   on_key_up);
+	cView.define_method("on_text",         on_text);
+	cView.define_method("on_text_preedit", on_text_preedit);
+	cView.define_method("on_text_commit",  on_text_commit);
 	cView.define_method("on_pointer",        on_pointer);
 	cView.define_method("on_pointer_down",   on_pointer_down);
 	cView.define_method("on_pointer_up",     on_pointer_up);
 	cView.define_method("on_pointer_move",   on_pointer_move);
 	cView.define_method("on_pointer_cancel", on_pointer_cancel);
+	cView.define_method("on_pointer_enter",  on_pointer_enter);
+	cView.define_method("on_pointer_leave",  on_pointer_leave);
 	cView.define_method("on_wheel",          on_wheel);
+	cView.define_method("on_capture",        on_capture);
+	cView.define_method("on_timer",          on_timer);
+	cView.define_method(        "will_contact?",     will_contact);
+	cView.define_private_method("call_contact!",       on_contact);
+	cView.define_private_method("call_contact_begin!", on_contact_begin);
+	cView.define_private_method("call_contact_end!",   on_contact_end);
 	cView.define_method("on_midi",           on_midi);
 	cView.define_method("on_note",           on_note);
 	cView.define_method("on_note_on",        on_note_on);
 	cView.define_method("on_note_off",       on_note_off);
 	cView.define_method("on_control_change", on_control_change);
-	cView.define_method("on_capture",  on_capture);
-	cView.define_method("on_timer",    on_timer);
-	cView.define_method(        "will_contact?",     will_contact);
-	cView.define_private_method("call_contact!",       on_contact);
-	cView.define_private_method("call_contact_begin!", on_contact_begin);
-	cView.define_private_method("call_contact_end!",   on_contact_end);
 
 	cView.define_const("CAPTURE_NONE",    Reflex::View::CAPTURE_NONE);
 	cView.define_const("CAPTURE_KEY",     Reflex::View::CAPTURE_KEY);