reflexion 0.1.23 → 0.1.24

data/ext/reflex/key_event.cpp

@@ -19,15 +19,16 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF5(initialize, type, chars, code, repeat, modifiers)
+RUCY_DEF5(initialize, action, chars, code, modifiers, repeat)
 {
 	CHECK;
 
-	THIS->type      = (Reflex::KeyEvent::Type) to<int>(type);
-	THIS->chars     = chars.c_str();
-	THIS->code      = to<int>(code);
-	THIS->repeat    = to<int>(repeat);
-	THIS->modifiers = to<uint>(modifiers);
+	*THIS = Reflex::KeyEvent(
+		(Reflex::KeyEvent::Action) to<uint>(action),
+		chars.c_str(),
+		to<int>(code),
+		to<uint>(modifiers),
+		to<int>(repeat));
 
 	return rb_call_super(0, NULL);
 }
@@ -37,16 +38,16 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::KeyEvent&>(obj);
+	*THIS = to<Reflex::KeyEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(get_type)
+RUCY_DEF0(get_action)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 RUCY_END
 
@@ -54,7 +55,7 @@ static
 RUCY_DEF0(get_key)
 {
 	CHECK;
-	switch (THIS->code)
+	switch (THIS->code())
 	{
 		#define CASE(key)         case Reflex::KEY_##key
 		#define SYMBOL1(name)     SYMBOL2(_##name, #name)
@@ -252,7 +253,7 @@ static
 RUCY_DEF0(get_chars)
 {
 	CHECK;
-	return value(THIS->chars.c_str());
+	return value(THIS->chars());
 }
 RUCY_END
 
@@ -260,7 +261,7 @@ static
 RUCY_DEF0(get_code)
 {
 	CHECK;
-	return value(THIS->code);
+	return value(THIS->code());
 }
 RUCY_END
 
@@ -268,7 +269,7 @@ static
 RUCY_DEF0(get_modifiers)
 {
 	CHECK;
-	return value(THIS->modifiers);
+	return value(THIS->modifiers());
 }
 RUCY_END
 
@@ -276,7 +277,7 @@ static
 RUCY_DEF0(get_repeat)
 {
 	CHECK;
-	return value(THIS->repeat);
+	return value(THIS->repeat());
 }
 RUCY_END
 
@@ -284,7 +285,7 @@ static
 RUCY_DEF0(is_captured)
 {
 	CHECK;
-	return value(THIS->captured);
+	return value(THIS->is_captured());
 }
 RUCY_END
 
@@ -300,16 +301,16 @@ Init_key_event ()
 	cKeyEvent.define_alloc_func(alloc);
 	cKeyEvent.define_private_method("initialize",      initialize);
 	cKeyEvent.define_private_method("initialize_copy", initialize_copy);
-	cKeyEvent.define_method("type",      get_type);
+	cKeyEvent.define_method("action",    get_action);
 	cKeyEvent.define_method("key",       get_key);
 	cKeyEvent.define_method("chars",     get_chars);
 	cKeyEvent.define_method("code",      get_code);
 	cKeyEvent.define_method("modifiers", get_modifiers);
 	cKeyEvent.define_method("repeat",    get_repeat);
 	cKeyEvent.define_method("captured?", is_captured);
-	cKeyEvent.define_const("TYPE_NONE", Reflex::KeyEvent::NONE);
-	cKeyEvent.define_const("TYPE_DOWN", Reflex::KeyEvent::DOWN);
-	cKeyEvent.define_const("TYPE_UP",   Reflex::KeyEvent::UP);
+	cKeyEvent.define_const("ACTION_NONE", Reflex::KeyEvent::ACTION_NONE);
+	cKeyEvent.define_const("DOWN",        Reflex::KeyEvent::DOWN);
+	cKeyEvent.define_const("UP",          Reflex::KeyEvent::UP);
 }
 
 

data/ext/reflex/pointer_event.cpp

@@ -43,7 +43,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::PointerEvent&>(obj);
+	*THIS = to<Reflex::PointerEvent&>(obj).dup();
 	return self;
 }
 RUCY_END

data/ext/reflex/scroll_event.cpp

@@ -24,12 +24,9 @@ RUCY_DEF6(initialize, x, y, z, dx, dy, dz)
 {
 	CHECK;
 
-	THIS->x  = to<coord>(x);
-	THIS->y  = to<coord>(y);
-	THIS->z  = to<coord>(z);
-	THIS->dx = to<coord>(dx);
-	THIS->dy = to<coord>(dy);
-	THIS->dz = to<coord>(dz);
+	*THIS = Reflex::ScrollEvent(
+		to<coord>( x), to<coord>( y), to<coord>( z),
+		to<coord>(dx), to<coord>(dy), to<coord>(dz));
 
 	return rb_call_super(0, NULL);
 }
@@ -39,7 +36,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::ScrollEvent&>(obj);
+	*THIS = to<Reflex::ScrollEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -48,7 +45,7 @@ static
 RUCY_DEF0(x)
 {
 	CHECK;
-	return value(THIS->x);
+	return value(THIS->scroll().x);
 }
 RUCY_END
 
@@ -56,7 +53,7 @@ static
 RUCY_DEF0(y)
 {
 	CHECK;
-	return value(THIS->y);
+	return value(THIS->scroll().y);
 }
 RUCY_END
 
@@ -64,7 +61,7 @@ static
 RUCY_DEF0(z)
 {
 	CHECK;
-	return value(THIS->z);
+	return value(THIS->scroll().z);
 }
 RUCY_END
 
@@ -72,7 +69,7 @@ static
 RUCY_DEF0(dx)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->dscroll().x);
 }
 RUCY_END
 
@@ -80,7 +77,7 @@ static
 RUCY_DEF0(dy)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->dscroll().y);
 }
 RUCY_END
 
@@ -88,7 +85,7 @@ static
 RUCY_DEF0(dz)
 {
 	CHECK;
-	return value(THIS->dz);
+	return value(THIS->dscroll().z);
 }
 RUCY_END
 
@@ -96,15 +93,15 @@ static
 RUCY_DEF0(scroll)
 {
 	CHECK;
-	return value(Rays::Point(THIS->x, THIS->y, THIS->z));
+	return value(THIS->scroll());
 }
 RUCY_END
 
 static
-RUCY_DEF0(delta)
+RUCY_DEF0(dscroll)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy, THIS->dz));
+	return value(THIS->dscroll());
 }
 RUCY_END
 
@@ -126,8 +123,8 @@ Init_scroll_event ()
 	cScrollEvent.define_method("dx", dx);
 	cScrollEvent.define_method("dy", dy);
 	cScrollEvent.define_method("dz", dz);
-	cScrollEvent.define_method("scroll", scroll);
-	cScrollEvent.define_method("delta", delta);
+	cScrollEvent.define_method( "scroll",  scroll);
+	cScrollEvent.define_method("dscroll", dscroll);
 }
 
 

data/ext/reflex/timer.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/timer.h"
 
 
+#include "reflex/exception.h"
 #include "reflex/ruby/view.h"
 #include "reflex/ruby/selector.h"
 #include "defs.h"
@@ -16,6 +17,13 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(Reflex::Timer)
 #define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
 
+static
+RUCY_DEF_ALLOC(alloc, klass)
+{
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Timer class.");
+}
+RUCY_END
+
 static
 RUCY_DEF0(stop)
 {
@@ -82,13 +90,14 @@ Init_timer ()
 	Module mReflex = define_module("Reflex");
 
 	cTimer = mReflex.define_class("Timer");
+	cTimer.define_alloc_func(alloc);
 	cTimer.define_method("stop", stop);
-	cTimer.define_method("owner", get_owner);
-	cTimer.define_method("id", get_id);
-	cTimer.define_method("interval", get_interval);
-	cTimer.define_method("count=", set_count);
-	cTimer.define_method("count",  get_count);
-	cTimer.define_method("finish?", is_finished);
+	cTimer.define_method("owner",     get_owner);
+	cTimer.define_method("id",        get_id);
+	cTimer.define_method("interval",  get_interval);
+	cTimer.define_method("count=",    set_count);
+	cTimer.define_method("count",     get_count);
+	cTimer.define_method("finished?", is_finished);
 
 	define_selector_methods<Reflex::Timer>(cTimer);
 }

data/ext/reflex/timer_event.cpp

@@ -25,7 +25,7 @@ RUCY_DEF1(initialize, timer)
 {
 	CHECK;
 
-	THIS->timer = to<Reflex::Timer*>(timer);
+	*THIS = Reflex::TimerEvent(to<Reflex::Timer*>(timer));
 
 	return rb_call_super(0, NULL);
 }
@@ -35,7 +35,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::TimerEvent&>(obj);
+	*THIS = to<Reflex::TimerEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -44,7 +44,7 @@ static
 RUCY_DEF0(timer)
 {
 	CHECK;
-	return value(THIS->timer);
+	return value(THIS->timer());
 }
 RUCY_END
 
@@ -72,15 +72,6 @@ RUCY_DEF0(interval)
 }
 RUCY_END
 
-static
-RUCY_DEF1(set_count, count)
-{
-	CHECK;
-	THIS->set_count(to<int>(count));
-	return count;
-}
-RUCY_END
-
 static
 RUCY_DEF0(count)
 {
@@ -109,13 +100,12 @@ Init_timer_event ()
 	cTimerEvent.define_alloc_func(alloc);
 	cTimerEvent.define_private_method("initialize",      initialize);
 	cTimerEvent.define_private_method("initialize_copy", initialize_copy);
-	cTimerEvent.define_method("timer", timer);
-	cTimerEvent.define_method("owner", owner);
-	cTimerEvent.define_method("id", id);
-	cTimerEvent.define_method("interval", interval);
-	cTimerEvent.define_method("count=", set_count);
-	cTimerEvent.define_method("count",      count);
-	cTimerEvent.define_method("finish?", is_finished);
+	cTimerEvent.define_method("timer",     timer);
+	cTimerEvent.define_method("owner",     owner);
+	cTimerEvent.define_method("id",        id);
+	cTimerEvent.define_method("interval",  interval);
+	cTimerEvent.define_method("count",     count);
+	cTimerEvent.define_method("finished?", is_finished);
 }
 
 

data/ext/reflex/update_event.cpp

@@ -23,8 +23,9 @@ RUCY_DEF2(initialize, now, dt)
 {
 	CHECK;
 
-	THIS->now = to<double>(now);
-	THIS->dt  = to<float>(dt);
+	*THIS = Reflex::UpdateEvent(
+		to<double>(now),
+		to<float>(dt));
 
 	return rb_call_super(0, NULL);
 }
@@ -34,7 +35,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::UpdateEvent&>(obj);
+	*THIS = to<Reflex::UpdateEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -43,7 +44,7 @@ static
 RUCY_DEF0(now)
 {
 	CHECK;
-	return value(THIS->now);
+	return value(THIS->now());
 }
 RUCY_END
 
@@ -51,7 +52,7 @@ static
 RUCY_DEF0(dt)
 {
 	CHECK;
-	return value(THIS->dt);
+	return value(THIS->dt());
 }
 RUCY_END
 

data/ext/reflex/wheel_event.cpp

@@ -20,13 +20,14 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF3(initialize, dx, dy, dz)
+RUCY_DEF7(initialize, x, y, z, dx, dy, dz, modifiers)
 {
 	CHECK;
 
-	THIS->dx = to<coord>(dx);
-	THIS->dy = to<coord>(dy);
-	THIS->dz = to<coord>(dz);
+	*THIS = Reflex::WheelEvent(
+		to<coord>( x), to<coord>( y), to<coord>( z),
+		to<coord>(dx), to<coord>(dy), to<coord>(dz),
+		to<uint>(modifiers));
 
 	return rb_call_super(0, NULL);
 }
@@ -36,56 +37,72 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::WheelEvent&>(obj);
+	*THIS = to<Reflex::WheelEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(dx)
+RUCY_DEF0(x)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->position().x);
 }
 RUCY_END
 
 static
-RUCY_DEF0(dy)
+RUCY_DEF0(y)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->position().y);
 }
 RUCY_END
 
 static
-RUCY_DEF0(dz)
+RUCY_DEF0(z)
 {
 	CHECK;
-	return value(THIS->dz);
+	return value(THIS->position().z);
 }
 RUCY_END
 
 static
-RUCY_DEF0(x)
+RUCY_DEF0(dx)
 {
 	CHECK;
-	return value(THIS->x);
+	return value(THIS->dposition().x);
 }
 RUCY_END
 
 static
-RUCY_DEF0(y)
+RUCY_DEF0(dy)
 {
 	CHECK;
-	return value(THIS->y);
+	return value(THIS->dposition().y);
 }
 RUCY_END
 
 static
-RUCY_DEF0(z)
+RUCY_DEF0(dz)
+{
+	CHECK;
+	return value(THIS->dposition().z);
+}
+RUCY_END
+
+static
+RUCY_DEF0(position)
 {
 	CHECK;
-	return value(THIS->z);
+	return value(THIS->position());
+}
+RUCY_END
+
+static
+RUCY_DEF0(dposition)
+{
+	CHECK;
+	return value(THIS->dposition());
 }
 RUCY_END
 
@@ -93,7 +110,7 @@ static
 RUCY_DEF0(modifiers)
 {
 	CHECK;
-	return value(THIS->modifiers);
+	return value(THIS->modifiers());
 }
 RUCY_END
 
@@ -109,12 +126,14 @@ Init_wheel_event ()
 	cWheelEvent.define_alloc_func(alloc);
 	cWheelEvent.define_private_method("initialize",      initialize);
 	cWheelEvent.define_private_method("initialize_copy", initialize_copy);
-	cWheelEvent.define_method("dx", dx);
-	cWheelEvent.define_method("dy", dy);
-	cWheelEvent.define_method("dz", dz);
 	cWheelEvent.define_method("x", x);
 	cWheelEvent.define_method("y", y);
 	cWheelEvent.define_method("z", z);
+	cWheelEvent.define_method("dx", dx);
+	cWheelEvent.define_method("dy", dy);
+	cWheelEvent.define_method("dz", dz);
+	cWheelEvent.define_method( "position",  position);
+	cWheelEvent.define_method("dposition", dposition);
 	cWheelEvent.define_method("modifiers", modifiers);
 }