reflexion 0.1.20 → 0.1.24

data/ext/reflex/draw_event.cpp

@@ -21,11 +21,13 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF1(initialize, dt)
+RUCY_DEF2(initialize, dt, fps)
 {
 	CHECK;
 
-	THIS->dt = to<float>(dt);
+	*THIS = Reflex::DrawEvent(
+		to<float>(dt),
+		to<float>(fps));
 
 	return rb_call_super(0, NULL);
 }
@@ -35,7 +37,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::DrawEvent&>(obj);
+	*THIS = to<Reflex::DrawEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -44,7 +46,7 @@ static
 RUCY_DEF0(painter)
 {
 	CHECK;
-	return value(THIS->painter);
+	return value(THIS->painter());
 }
 RUCY_END
 
@@ -52,7 +54,7 @@ static
 RUCY_DEF0(bounds)
 {
 	CHECK;
-	return value(THIS->bounds);
+	return value(THIS->bounds());
 }
 RUCY_END
 
@@ -60,7 +62,7 @@ static
 RUCY_DEF0(dt)
 {
 	CHECK;
-	return value(THIS->dt);
+	return value(THIS->dt());
 }
 RUCY_END
 
@@ -68,7 +70,7 @@ static
 RUCY_DEF0(fps)
 {
 	CHECK;
-	return value(THIS->fps);
+	return value(THIS->fps());
 }
 RUCY_END
 

data/ext/reflex/event.cpp

@@ -1,6 +1,7 @@
 #include "reflex/ruby/event.h"
 
 
+#include "reflex/exception.h"
 #include "defs.h"
 
 
@@ -14,32 +15,31 @@ RUCY_DEFINE_VALUE_FROM_TO(Reflex::Event)
 static
 RUCY_DEF_ALLOC(alloc, klass)
 {
-	return new_type<Reflex::Event>(klass);
+	Reflex::reflex_error(__FILE__, __LINE__, "can not instantiate Event class.");
 }
 RUCY_END
 
 static
-RUCY_DEF1(initialize_copy, obj)
+RUCY_DEF0(block)
 {
 	CHECK;
-	*THIS = to<Reflex::Event&>(obj);
-	return self;
+	THIS->block();
 }
 RUCY_END
 
 static
-RUCY_DEF0(block)
+RUCY_DEF0(is_blocked)
 {
 	CHECK;
-	THIS->block();
+	return value(THIS->is_blocked());
 }
 RUCY_END
 
 static
-RUCY_DEF0(is_blocked)
+RUCY_DEF0(get_time)
 {
 	CHECK;
-	return value(THIS->is_blocked());
+	return value(THIS->time());
 }
 RUCY_END
 
@@ -53,9 +53,9 @@ Init_event ()
 
 	cEvent = mReflex.define_class("Event");
 	cEvent.define_alloc_func(alloc);
-	cEvent.define_private_method("initialize_copy", initialize_copy);
-	cEvent.define_method("block", block);
-	cEvent.define_method("block?", is_blocked);
+	cEvent.define_method("block",    block);
+	cEvent.define_method("blocked?", is_blocked);
+	cEvent.define_method("time",     get_time);
 }
 
 

data/ext/reflex/focus_event.cpp

@@ -20,13 +20,14 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF3(initialize, type, current, last)
+RUCY_DEF3(initialize, action, current, last)
 {
 	CHECK;
 
-	THIS->type    = (Reflex::FocusEvent::Type) to<uint>(type);
-	THIS->current = to<Reflex::View*>(current);
-	THIS->last    = to<Reflex::View*>(last);
+	*THIS = Reflex::FocusEvent(
+		(Reflex::FocusEvent::Action) to<uint>(action),
+		to<Reflex::View*>(current),
+		to<Reflex::View*>(last));
 
 	return rb_call_super(0, NULL);
 }
@@ -36,32 +37,32 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FocusEvent&>(obj);
+	*THIS = to<Reflex::FocusEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_action)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 RUCY_END
 
 static
-RUCY_DEF0(current)
+RUCY_DEF0(get_current)
 {
 	CHECK;
-	return THIS->current ? value(THIS->current) : nil();
+	return THIS->current() ? value(THIS->current()) : nil();
 }
 RUCY_END
 
 static
-RUCY_DEF0(last)
+RUCY_DEF0(get_last)
 {
 	CHECK;
-	return THIS->last ? value(THIS->last) : nil();
+	return THIS->last() ? value(THIS->last()) : nil();
 }
 RUCY_END
 
@@ -77,12 +78,12 @@ Init_focus_event ()
 	cFocusEvent.define_alloc_func(alloc);
 	cFocusEvent.define_private_method("initialize",      initialize);
 	cFocusEvent.define_private_method("initialize_copy", initialize_copy);
-	cFocusEvent.define_method("type", type);
-	cFocusEvent.define_method("current", current);
-	cFocusEvent.define_method("last", last);
-	cFocusEvent.define_const("TYPE_NONE",  Reflex::FocusEvent::NONE);
-	cFocusEvent.define_const("TYPE_FOCUS", Reflex::FocusEvent::FOCUS);
-	cFocusEvent.define_const("TYPE_BLUR",  Reflex::FocusEvent::BLUR);
+	cFocusEvent.define_method("action",  get_action);
+	cFocusEvent.define_method("current", get_current);
+	cFocusEvent.define_method("last",    get_last);
+	cFocusEvent.define_const("ACTION_NONE", Reflex::FocusEvent::ACTION_NONE);
+	cFocusEvent.define_const("FOCUS",       Reflex::FocusEvent::FOCUS);
+	cFocusEvent.define_const("BLUR",        Reflex::FocusEvent::BLUR);
 }
 
 

data/ext/reflex/frame_event.cpp

@@ -21,15 +21,15 @@ RUCY_DEF_ALLOC(alloc, klass)
 RUCY_END
 
 static
-RUCY_DEF5(initialize, frame, dx, dy, dwidth, dheight)
+RUCY_DEF7(initialize, frame, dx, dy, dwidth, dheight, angle, dangle)
 {
 	CHECK;
 
-	THIS->frame   = to<Rays::Bounds>(frame);
-	THIS->dx      = to<coord>(dx);
-	THIS->dy      = to<coord>(dy);
-	THIS->dwidth  = to<coord>(dwidth);
-	THIS->dheight = to<coord>(dheight);
+	*THIS = Reflex::FrameEvent(
+		to<Rays::Bounds>(frame),
+		to<coord>(dx),     to<coord>(dy),
+		to<coord>(dwidth), to<coord>(dheight),
+		to<float>(angle),  to<float>(dangle));
 
 	return rb_call_super(0, NULL);
 }
@@ -39,7 +39,7 @@ static
 RUCY_DEF1(initialize_copy, obj)
 {
 	CHECK;
-	*THIS = to<Reflex::FrameEvent&>(obj);
+	*THIS = to<Reflex::FrameEvent&>(obj).dup();
 	return self;
 }
 RUCY_END
@@ -48,7 +48,7 @@ static
 RUCY_DEF0(frame)
 {
 	CHECK;
-	return value(THIS->frame);
+	return value(THIS->frame());
 }
 RUCY_END
 
@@ -56,7 +56,7 @@ static
 RUCY_DEF0(dx)
 {
 	CHECK;
-	return value(THIS->dx);
+	return value(THIS->dx());
 }
 RUCY_END
 
@@ -64,7 +64,7 @@ static
 RUCY_DEF0(dy)
 {
 	CHECK;
-	return value(THIS->dy);
+	return value(THIS->dy());
 }
 RUCY_END
 
@@ -72,7 +72,7 @@ static
 RUCY_DEF0(dwidth)
 {
 	CHECK;
-	return value(THIS->dwidth);
+	return value(THIS->dwidth());
 }
 RUCY_END
 
@@ -80,7 +80,7 @@ static
 RUCY_DEF0(dheight)
 {
 	CHECK;
-	return value(THIS->dheight);
+	return value(THIS->dheight());
 }
 RUCY_END
 
@@ -88,7 +88,7 @@ static
 RUCY_DEF0(dposition)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dx, THIS->dy));
+	return value(Rays::Point(THIS->dx(), THIS->dy()));
 }
 RUCY_END
 
@@ -96,7 +96,7 @@ static
 RUCY_DEF0(dsize)
 {
 	CHECK;
-	return value(Rays::Point(THIS->dw, THIS->dh));
+	return value(Rays::Point(THIS->dwidth(), THIS->dheight()));
 }
 RUCY_END
 
@@ -104,7 +104,7 @@ static
 RUCY_DEF0(angle)
 {
 	CHECK;
-	return value(THIS->angle);
+	return value(THIS->angle());
 }
 RUCY_END
 
@@ -112,7 +112,7 @@ static
 RUCY_DEF0(dangle)
 {
 	CHECK;
-	return value(THIS->dangle);
+	return value(THIS->dangle());
 }
 RUCY_END
 

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,56 +38,254 @@ 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(type)
+RUCY_DEF0(get_action)
 {
 	CHECK;
-	return value(THIS->type);
+	return value(THIS->action());
 }
 RUCY_END
 
 static
-RUCY_DEF0(chars)
+RUCY_DEF0(get_key)
 {
 	CHECK;
-	return value(THIS->chars.c_str());
+	switch (THIS->code())
+	{
+		#define CASE(key)         case Reflex::KEY_##key
+		#define SYMBOL1(name)     SYMBOL2(_##name, #name)
+		#define SYMBOL2(var, sym) {RUCY_SYMBOL(var, sym); return var.value();}
+
+		CASE(A): SYMBOL1(a);
+		CASE(B): SYMBOL1(b);
+		CASE(C): SYMBOL1(c);
+		CASE(D): SYMBOL1(d);
+		CASE(E): SYMBOL1(e);
+		CASE(F): SYMBOL1(f);
+		CASE(G): SYMBOL1(g);
+		CASE(H): SYMBOL1(h);
+		CASE(I): SYMBOL1(i);
+		CASE(J): SYMBOL1(j);
+		CASE(K): SYMBOL1(k);
+		CASE(L): SYMBOL1(l);
+		CASE(M): SYMBOL1(m);
+		CASE(N): SYMBOL1(n);
+		CASE(O): SYMBOL1(o);
+		CASE(P): SYMBOL1(p);
+		CASE(Q): SYMBOL1(q);
+		CASE(R): SYMBOL1(r);
+		CASE(S): SYMBOL1(s);
+		CASE(T): SYMBOL1(t);
+		CASE(U): SYMBOL1(u);
+		CASE(V): SYMBOL1(v);
+		CASE(W): SYMBOL1(w);
+		CASE(X): SYMBOL1(x);
+		CASE(Y): SYMBOL1(y);
+		CASE(Z): SYMBOL1(z);
+
+		CASE(0):
+		CASE(NUM_0): SYMBOL1(0);
+		CASE(1):
+		CASE(NUM_1): SYMBOL1(1);
+		CASE(2):
+		CASE(NUM_2): SYMBOL1(2);
+		CASE(3):
+		CASE(NUM_3): SYMBOL1(3);
+		CASE(4):
+		CASE(NUM_4): SYMBOL1(4);
+		CASE(5):
+		CASE(NUM_5): SYMBOL1(5);
+		CASE(6):
+		CASE(NUM_6): SYMBOL1(6);
+		CASE(7):
+		CASE(NUM_7): SYMBOL1(7);
+		CASE(8):
+		CASE(NUM_8): SYMBOL1(8);
+		CASE(9):
+		CASE(NUM_9): SYMBOL1(9);
+
+		CASE(MINUS):      SYMBOL1(minus);
+		CASE(EQUAL):      SYMBOL1(equal);
+		CASE(COMMA):      SYMBOL1(comma);
+		CASE(PERIOD):     SYMBOL1(period);
+		CASE(SEMICOLON):  SYMBOL1(semicolon);
+		CASE(QUOTE):      SYMBOL1(quote);
+		CASE(SLASH):      SYMBOL1(slash);
+		CASE(BACKSLASH):  SYMBOL1(backslash);
+		CASE(UNDERSCORE): SYMBOL1(underscore);
+		CASE(GRAVE):      SYMBOL1(grave);
+		CASE(YEN):        SYMBOL1(yen);
+		CASE(LBRACKET):   SYMBOL1(lbracket);
+		CASE(RBRACKET):   SYMBOL1(rbracket);
+
+		CASE(ENTER):
+		CASE(RETURN):     SYMBOL1(enter);
+		CASE(SPACE):      SYMBOL1(space);
+		CASE(TAB):        SYMBOL1(tab);
+		CASE(DELETE):     SYMBOL2(_delete, "delete");
+		CASE(BACKSPACE):  SYMBOL1(backspace);
+		//CASE(INSERT):     SYMBOL1(insert);
+		CASE(ESCAPE):     SYMBOL1(escape);
+
+		CASE(LEFT):     SYMBOL1(left);
+		CASE(RIGHT):    SYMBOL1(right);
+		CASE(UP):       SYMBOL1(up);
+		CASE(DOWN):     SYMBOL1(down);
+		CASE(HOME):     SYMBOL1(home);
+		CASE(END):      SYMBOL1(end);
+		CASE(PAGEUP):   SYMBOL1(pageup);
+		CASE(PAGEDOWN): SYMBOL1(pagedown);
+
+		CASE(LSHIFT):
+		CASE(RSHIFT):   SYMBOL1(shift);
+		CASE(LCONTROL):
+		CASE(RCONTROL): SYMBOL1(control);
+		//CASE(LALT):
+		//CASE(RALT):     SYMBOL1(alt);
+		//CASE(LWIN):
+		//CASE(RWIN):     SYMBOL1(win);
+		CASE(LCOMMAND):
+		CASE(RCOMMAND): SYMBOL1(command);
+		CASE(LOPTION):
+		CASE(ROPTION):  SYMBOL1(option);
+		CASE(FUNCTION): SYMBOL1(function);
+
+		CASE(F1):  SYMBOL1(f1);
+		CASE(F2):  SYMBOL1(f2);
+		CASE(F3):  SYMBOL1(f3);
+		CASE(F4):  SYMBOL1(f4);
+		CASE(F5):  SYMBOL1(f5);
+		CASE(F6):  SYMBOL1(f6);
+		CASE(F7):  SYMBOL1(f7);
+		CASE(F8):  SYMBOL1(f8);
+		CASE(F9):  SYMBOL1(f9);
+		CASE(F10): SYMBOL1(f10);
+		CASE(F11): SYMBOL1(f11);
+		CASE(F12): SYMBOL1(f12);
+		CASE(F13): SYMBOL1(f13);
+		CASE(F14): SYMBOL1(f14);
+		CASE(F15): SYMBOL1(f15);
+		CASE(F16): SYMBOL1(f16);
+		CASE(F17): SYMBOL1(f17);
+		CASE(F18): SYMBOL1(f18);
+		CASE(F19): SYMBOL1(f19);
+		CASE(F20): SYMBOL1(f20);
+		//CASE(F21): SYMBOL1(f21);
+		//CASE(F22): SYMBOL1(f22);
+		//CASE(F23): SYMBOL1(f23);
+		//CASE(F24): SYMBOL1(f24);
+
+		CASE(NUM_PLUS):     SYMBOL1(plus);
+		CASE(NUM_MINUS):    SYMBOL1(minus);
+		CASE(NUM_MULTIPLY): SYMBOL1(multiply);
+		CASE(NUM_DIVIDE):   SYMBOL1(divide);
+		CASE(NUM_EQUAL):    SYMBOL1(equal);
+		CASE(NUM_COMMA):    SYMBOL1(comma);
+		CASE(NUM_DECIMAL):  SYMBOL1(decimal);
+		CASE(NUM_CLEAR):    SYMBOL1(clear);
+
+		CASE(CAPSLOCK):   SYMBOL1(capslock);
+		//CASE(NUMLOCK):    SYMBOL1(numlock);
+		//CASE(SCROLLLOCK): SYMBOL1(scrolllock);
+
+		//CASE(PRINTSCREEN): SYMBOL1(printscreen);
+		//CASE(PAUSE):       SYMBOL1(pause);
+		//CASE(BREAK):       SYMBOL2(_break, "break");
+		CASE(SECTION):     SYMBOL1(section);
+		CASE(HELP):        SYMBOL1(help);
+
+		CASE(IME_EISU):       SYMBOL1(eisu);
+		CASE(IME_KANA):       SYMBOL1(kana);
+		//CASE(IME_KANJI):      SYMBOL1(kanji);
+		//CASE(IME_JUNJA):      SYMBOL1(junja);
+		//CASE(IME_PROCESS):    SYMBOL1(process);
+		//CASE(IME_ACCEPT):     SYMBOL1(accept);
+		//CASE(IME_FINAL):      SYMBOL2(_final, "final");
+		//CASE(IME_CONVERT):    SYMBOL1(convert);
+		//CASE(IME_NONCONVERT): SYMBOL1(nonconvert);
+		//CASE(IME_MODECHANGE): SYMBOL1(mode_change);
+
+		CASE(VOLUME_UP):   SYMBOL1(volume_up);
+		CASE(VOLUME_DOWN): SYMBOL1(volume_down);
+		CASE(MUTE):        SYMBOL1(mute);
+
+		//CASE(SLEEP):  SYMBOL1(sleep);
+		//CASE(EXEC):   SYMBOL1(exec);
+		//CASE(PRINT):  SYMBOL1(print);
+		//CASE(APPS):   SYMBOL1(apps);
+		//CASE(SELECT): SYMBOL1(select);
+		//CASE(CLEAR):  SYMBOL1(clear);
+		//CASE(PLAY):   SYMBOL1(play);
+		//CASE(ZOOM):   SYMBOL1(zoom);
+
+		//CASE(BROWSER_BACK):      SYMBOL1(browser_back);
+		//CASE(BROWSER_FORWARD):   SYMBOL1(browser_forward);
+		//CASE(BROWSER_REFRESH):   SYMBOL1(browser_refresh);
+		//CASE(BROWSER_STOP):      SYMBOL1(browser_stop);
+		//CASE(BROWSER_SEARCH):    SYMBOL1(browser_search);
+		//CASE(BROWSER_FAVORITES): SYMBOL1(browser_favorites);
+		//CASE(BROWSER_HOME):      SYMBOL1(browser_home);
+
+		//CASE(MEDIA_NEXT_TRACK): SYMBOL1(media_next);
+		//CASE(MEDIA_PREV_TRACK): SYMBOL1(media_prev);
+		//CASE(MEDIA_STOP):       SYMBOL1(media_stop);
+		//CASE(MEDIA_PLAY_PAUSE): SYMBOL1(media_play_stop);
+
+		//CASE(LAUNCH_MAIL):         SYMBOL1(launch_mail);
+		//CASE(LAUNCH_MEDIA_SELECT): SYMBOL1(launch_media_select);
+		//CASE(LAUNCH_APP1):         SYMBOL1(launch_app1);
+		//CASE(LAUNCH_APP2):         SYMBOL1(launch_app2);
+
+		#undef CASE
+		#undef SYMBOL1
+		#undef SYMBOL2
+	}
+	return nil();
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_chars)
+{
+	CHECK;
+	return value(THIS->chars());
 }
 RUCY_END
 
 static
-RUCY_DEF0(code)
+RUCY_DEF0(get_code)
 {
 	CHECK;
-	return value(THIS->code);
+	return value(THIS->code());
 }
 RUCY_END
 
 static
-RUCY_DEF0(modifiers)
+RUCY_DEF0(get_modifiers)
 {
 	CHECK;
-	return value(THIS->modifiers);
+	return value(THIS->modifiers());
 }
 RUCY_END
 
 static
-RUCY_DEF0(repeat)
+RUCY_DEF0(get_repeat)
 {
 	CHECK;
-	return value(THIS->repeat);
+	return value(THIS->repeat());
 }
 RUCY_END
 
 static
-RUCY_DEF0(capture)
+RUCY_DEF0(is_captured)
 {
 	CHECK;
-	return value(THIS->capture);
+	return value(THIS->is_captured());
 }
 RUCY_END
 
@@ -102,15 +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", type);
-	cKeyEvent.define_method("chars", chars);
-	cKeyEvent.define_method("code", code);
-	cKeyEvent.define_method("modifiers", modifiers);
-	cKeyEvent.define_method("repeat", repeat);
-	cKeyEvent.define_method("capture?", capture);
-	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_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("ACTION_NONE", Reflex::KeyEvent::ACTION_NONE);
+	cKeyEvent.define_const("DOWN",        Reflex::KeyEvent::DOWN);
+	cKeyEvent.define_const("UP",          Reflex::KeyEvent::UP);
 }
 
 

data/ext/reflex/native.cpp

@@ -17,6 +17,7 @@ void Init_frame_event ();
 void Init_scroll_event ();
 void Init_focus_event ();
 void Init_key_event ();
+void Init_pointer ();
 void Init_pointer_event ();
 void Init_wheel_event ();
 void Init_capture_event ();
@@ -63,6 +64,7 @@ extern "C" void
 	Init_scroll_event();
 	Init_focus_event();
 	Init_key_event();
+	Init_pointer();
 	Init_pointer_event();
 	Init_wheel_event();
 	Init_capture_event();