reflexion 0.6.0 → 0.7.0

data/ext/reflex/view.cpp

@@ -22,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)
 
@@ -53,7 +53,7 @@ RUCY_DEF0(hide)
 RUCY_END
 
 static
-RUCY_DEF0(hidden)
+RUCY_DEF0(is_hidden)
 {
 	CHECK;
 	return value(THIS->hidden());
@@ -122,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)
 {
@@ -446,23 +471,6 @@ RUCY_DEF0(get_frame)
 }
 RUCY_END
 
-static
-RUCY_DEF0(content_bounds)
-{
-	CHECK;
-	return value(CALL(content_bounds()));
-}
-RUCY_END
-
-static
-RUCY_DEF0(fit_to_content)
-{
-	CHECK;
-	THIS->fit_to_content();
-	return self;
-}
-RUCY_END
-
 static
 RUCY_DEF1(set_angle, degree)
 {
@@ -645,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
 
@@ -732,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)
 {
@@ -1162,6 +1192,30 @@ RUCY_DEF1(on_key_up, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_text, event)
+{
+	CHECK;
+	CALL(on_text(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_text_preedit, event)
+{
+	CHECK;
+	CALL(on_text_preedit(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_text_commit, event)
+{
+	CHECK;
+	CALL(on_text_commit(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_pointer, event)
 {
@@ -1227,90 +1281,90 @@ RUCY_DEF1(on_wheel, event)
 RUCY_END
 
 static
-RUCY_DEF1(on_midi, event)
+RUCY_DEF1(on_capture, event)
 {
 	CHECK;
-	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
+	CALL(on_capture(to<Reflex::CaptureEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note, event)
+RUCY_DEF1(on_timer, event)
 {
 	CHECK;
-	CALL(on_note(to<Reflex::NoteEvent*>(event)));
+	CALL(on_timer(to<Reflex::TimerEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note_on, event)
+RUCY_DEF1(will_contact, view)
 {
 	CHECK;
-	CALL(on_note_on(to<Reflex::NoteEvent*>(event)));
+	return value(CALL(will_contact(to<Reflex::View*>(view))));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_note_off, event)
+RUCY_DEF1(on_contact, event)
 {
 	CHECK;
-	CALL(on_note_off(to<Reflex::NoteEvent*>(event)));
+	CALL(on_contact(to<Reflex::ContactEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_control_change, event)
+RUCY_DEF1(on_contact_begin, event)
 {
 	CHECK;
-	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
+	CALL(on_contact_begin(to<Reflex::ContactEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_capture, event)
+RUCY_DEF1(on_contact_end, event)
 {
 	CHECK;
-	CALL(on_capture(to<Reflex::CaptureEvent*>(event)));
+	CALL(on_contact_end(to<Reflex::ContactEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_timer, event)
+RUCY_DEF1(on_midi, event)
 {
 	CHECK;
-	CALL(on_timer(to<Reflex::TimerEvent*>(event)));
+	CALL(on_midi(to<Reflex::MIDIEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(will_contact, view)
+RUCY_DEF1(on_note, event)
 {
 	CHECK;
-	return value(CALL(will_contact(to<Reflex::View*>(view))));
+	CALL(on_note(to<Reflex::NoteEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_contact, event)
+RUCY_DEF1(on_note_on, event)
 {
 	CHECK;
-	CALL(on_contact(to<Reflex::ContactEvent*>(event)));
+	CALL(on_note_on(to<Reflex::NoteEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_contact_begin, event)
+RUCY_DEF1(on_note_off, event)
 {
 	CHECK;
-	CALL(on_contact_begin(to<Reflex::ContactEvent*>(event)));
+	CALL(on_note_off(to<Reflex::NoteEvent*>(event)));
 }
 RUCY_END
 
 static
-RUCY_DEF1(on_contact_end, event)
+RUCY_DEF1(on_control_change, event)
 {
 	CHECK;
-	CALL(on_contact_end(to<Reflex::ContactEvent*>(event)));
+	CALL(on_control_change(to<Reflex::ControlChangeEvent*>(event)));
 }
 RUCY_END
 
@@ -1324,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_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);
@@ -1370,8 +1427,6 @@ Init_reflex_view ()
 
 	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);
@@ -1385,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);
 
@@ -1447,6 +1504,9 @@ 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);
@@ -1455,17 +1515,17 @@ Init_reflex_view ()
 	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);

data/ext/reflex/wheel_constraint.cpp

@@ -10,7 +10,7 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::WheelConstraint)
 
 #define THIS  to<Reflex::WheelConstraint*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Reflex::WheelConstraint, self)
+#define CHECK RUCY_CHECK_PTR(Reflex::WheelConstraint, self)
 
 
 static

data/ext/reflex/wheel_event.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::WheelEvent)
 
 #define THIS  to<Reflex::WheelEvent*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Reflex::WheelEvent, self)
+#define CHECK RUCY_CHECK_PTR(Reflex::WheelEvent, self)
 
 
 static