reflexion 0.1.21 → 0.1.22

data/VERSION

@@ -1 +1 @@
-0.1.21
+0.1.22

data/ext/reflex/contact_event.cpp

@@ -42,7 +42,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -50,7 +50,7 @@ RUCY_DEF0(type)
 RUCY_END
 
 static
-RUCY_DEF0(shape)
+RUCY_DEF0(get_shape)
 {
 	CHECK;
 	return value(THIS->shape);
@@ -58,7 +58,7 @@ RUCY_DEF0(shape)
 RUCY_END
 
 static
-RUCY_DEF0(view)
+RUCY_DEF0(get_view)
 {
 	CHECK;
 	return value(THIS->view);
@@ -77,9 +77,9 @@ Init_contact_event ()
 	cContactEvent.define_alloc_func(alloc);
 	cContactEvent.define_private_method("initialize",      initialize);
 	cContactEvent.define_private_method("initialize_copy", initialize_copy);
-	cContactEvent.define_method("type",  type);
-	cContactEvent.define_method("shape", shape);
-	cContactEvent.define_method("view",  view);
+	cContactEvent.define_method("type",  get_type);
+	cContactEvent.define_method("shape", get_shape);
+	cContactEvent.define_method("view",  get_view);
 	cContactEvent.define_const("TYPE_NONE",  Reflex::ContactEvent::NONE);
 	cContactEvent.define_const("TYPE_BEGIN", Reflex::ContactEvent::BEGIN);
 	cContactEvent.define_const("TYPE_END",   Reflex::ContactEvent::END);

data/ext/reflex/focus_event.cpp

@@ -42,7 +42,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -50,7 +50,7 @@ RUCY_DEF0(type)
 RUCY_END
 
 static
-RUCY_DEF0(current)
+RUCY_DEF0(get_current)
 {
 	CHECK;
 	return THIS->current ? value(THIS->current) : nil();
@@ -58,7 +58,7 @@ RUCY_DEF0(current)
 RUCY_END
 
 static
-RUCY_DEF0(last)
+RUCY_DEF0(get_last)
 {
 	CHECK;
 	return THIS->last ? value(THIS->last) : nil();
@@ -77,9 +77,9 @@ 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_method("type",    get_type);
+	cFocusEvent.define_method("current", get_current);
+	cFocusEvent.define_method("last",    get_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);

data/ext/reflex/key_event.cpp

@@ -43,7 +43,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -51,7 +51,205 @@ RUCY_DEF0(type)
 RUCY_END
 
 static
-RUCY_DEF0(chars)
+RUCY_DEF0(get_key)
+{
+	CHECK;
+	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.c_str());
@@ -59,7 +257,7 @@ RUCY_DEF0(chars)
 RUCY_END
 
 static
-RUCY_DEF0(code)
+RUCY_DEF0(get_code)
 {
 	CHECK;
 	return value(THIS->code);
@@ -67,7 +265,7 @@ RUCY_DEF0(code)
 RUCY_END
 
 static
-RUCY_DEF0(modifiers)
+RUCY_DEF0(get_modifiers)
 {
 	CHECK;
 	return value(THIS->modifiers);
@@ -75,7 +273,7 @@ RUCY_DEF0(modifiers)
 RUCY_END
 
 static
-RUCY_DEF0(repeat)
+RUCY_DEF0(get_repeat)
 {
 	CHECK;
 	return value(THIS->repeat);
@@ -83,7 +281,7 @@ RUCY_DEF0(repeat)
 RUCY_END
 
 static
-RUCY_DEF0(capture)
+RUCY_DEF0(is_capture)
 {
 	CHECK;
 	return value(THIS->capture);
@@ -102,12 +300,13 @@ 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_method("type",      get_type);
+	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("capture?",  is_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);

data/ext/reflex/pointer_event.cpp

@@ -52,7 +52,7 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(type)
+RUCY_DEF0(get_type)
 {
 	CHECK;
 	return value(THIS->type);
@@ -60,7 +60,7 @@ RUCY_DEF0(type)
 RUCY_END
 
 static
-RUCY_DEF0(pointer_type)
+RUCY_DEF0(get_pointer_type)
 {
 	CHECK;
 	return value(THIS->pointer_type);
@@ -68,7 +68,7 @@ RUCY_DEF0(pointer_type)
 RUCY_END
 
 static
-RUCY_DEF0(size)
+RUCY_DEF0(get_size)
 {
 	CHECK;
 	return value(THIS->size);
@@ -76,7 +76,7 @@ RUCY_DEF0(size)
 RUCY_END
 
 static
-RUCY_DEF0(modifiers)
+RUCY_DEF0(get_modifiers)
 {
 	CHECK;
 	return value(THIS->modifiers);
@@ -84,7 +84,7 @@ RUCY_DEF0(modifiers)
 RUCY_END
 
 static
-RUCY_DEF0(count)
+RUCY_DEF0(get_count)
 {
 	CHECK;
 	return value(THIS->count);
@@ -92,7 +92,7 @@ RUCY_DEF0(count)
 RUCY_END
 
 static
-RUCY_DEF0(drag)
+RUCY_DEF0(is_drag)
 {
 	CHECK;
 	return value(THIS->drag);
@@ -100,7 +100,7 @@ RUCY_DEF0(drag)
 RUCY_END
 
 static
-RUCY_DEF0(capture)
+RUCY_DEF0(is_capture)
 {
 	CHECK;
 	return value(THIS->capture);
@@ -108,7 +108,7 @@ RUCY_DEF0(capture)
 RUCY_END
 
 static
-RUCY_DEF0(x)
+RUCY_DEF0(get_x)
 {
 	CHECK;
 	return value(THIS->x);
@@ -116,7 +116,7 @@ RUCY_DEF0(x)
 RUCY_END
 
 static
-RUCY_DEF0(y)
+RUCY_DEF0(get_y)
 {
 	CHECK;
 	return value(THIS->y);
@@ -124,7 +124,7 @@ RUCY_DEF0(y)
 RUCY_END
 
 static
-RUCY_DEFN(position)
+RUCY_DEFN(get_position)
 {
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "PointerEvent#position", argc, 0, 1);
@@ -159,17 +159,17 @@ Init_pointer_event ()
 	cPointerEvent.define_alloc_func(alloc);
 	cPointerEvent.define_private_method("initialize",      initialize);
 	cPointerEvent.define_private_method("initialize_copy", initialize_copy);
-	cPointerEvent.define_method("type", type);
-	cPointerEvent.define_method("pointer_type", pointer_type);
-	cPointerEvent.define_method("size", size);
-	cPointerEvent.define_method("modifiers", modifiers);
-	cPointerEvent.define_method("count", count);
-	cPointerEvent.define_method("drag?", drag);
-	cPointerEvent.define_method("capture?", capture);
-	cPointerEvent.define_method("x", x);
-	cPointerEvent.define_method("y", y);
-	cPointerEvent.define_method("position", position);
-	cPointerEvent.define_method("[]", get_at);
+	cPointerEvent.define_method("type",         get_type);
+	cPointerEvent.define_method("pointer_type", get_pointer_type);
+	cPointerEvent.define_method("size",         get_size);
+	cPointerEvent.define_method("modifiers",    get_modifiers);
+	cPointerEvent.define_method("count",        get_count);
+	cPointerEvent.define_method("drag?",        is_drag);
+	cPointerEvent.define_method("capture?",     is_capture);
+	cPointerEvent.define_method("x",            get_x);
+	cPointerEvent.define_method("y",            get_y);
+	cPointerEvent.define_method("position",     get_position);
+	cPointerEvent.define_method("[]",           get_at);
 	cPointerEvent.define_const("TYPE_NONE", Reflex::PointerEvent::NONE);
 	cPointerEvent.define_const("TYPE_DOWN", Reflex::PointerEvent::DOWN);
 	cPointerEvent.define_const("TYPE_UP",   Reflex::PointerEvent::UP);