reflexion 0.1.21 → 0.1.25

data/ext/reflex/view.cpp

@@ -130,6 +130,54 @@ RUCY_DEF0(update_layout)
 }
 RUCY_END
 
+static
+RUCY_DEF1(from_parent, point)
+{
+	CHECK;
+	return value(THIS->from_parent(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(to_parent, point)
+{
+	CHECK;
+	return value(THIS->to_parent(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(from_window, point)
+{
+	CHECK;
+	return value(THIS->from_window(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(to_window, point)
+{
+	CHECK;
+	return value(THIS->to_window(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(from_screen, point)
+{
+	CHECK;
+	return value(THIS->from_screen(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(to_screen, point)
+{
+	CHECK;
+	return value(THIS->to_screen(to<Rays::Point>(point)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(add_child, child)
 {
@@ -1034,6 +1082,14 @@ RUCY_DEF1(on_pointer_move, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_pointer_cancel, event)
+{
+	CHECK;
+	CALL(on_pointer_cancel(to<Reflex::PointerEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_wheel, event)
 {
@@ -1102,6 +1158,13 @@ Init_view ()
 	cView.define_private_method("start_timer", start_timer);
 	cView.define_method("update_layout", update_layout);
 
+	cView.define_method("from_parent", from_parent);
+	cView.define_method(  "to_parent",   to_parent);
+	cView.define_method("from_window", from_window);
+	cView.define_method(  "to_window",   to_window);
+	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);
@@ -1201,9 +1264,10 @@ Init_view ()
 	cView.define_method("on_key_down", on_key_down);
 	cView.define_method("on_key_up",   on_key_up);
 	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_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_wheel", on_wheel);
 	cView.define_method("on_capture", on_capture);
 	cView.define_method("on_timer", on_timer);

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);
 }
 

data/ext/reflex/window.cpp

@@ -59,6 +59,22 @@ RUCY_DEF0(redraw)
 }
 RUCY_END
 
+static
+RUCY_DEF1(from_screen, point)
+{
+	CHECK;
+	return value(THIS->from_screen(to<Rays::Point>(point)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(to_screen, point)
+{
+	CHECK;
+	return value(THIS->to_screen(to<Rays::Point>(point)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_title, title)
 {
@@ -258,6 +274,14 @@ RUCY_DEF1(on_pointer_move, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_pointer_cancel, event)
+{
+	CHECK;
+	CALL(on_pointer_cancel(to<Reflex::PointerEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_wheel, event)
 {
@@ -280,6 +304,8 @@ Init_window ()
 	cWindow.define_method("hide", hide);
 	cWindow.define_method("close", close);
 	cWindow.define_method("redraw", redraw);
+	cWindow.define_method("from_screen", from_screen);
+	cWindow.define_method(  "to_screen",   to_screen);
 	cWindow.define_method("title=", set_title);
 	cWindow.define_method("title", get_title);
 	cWindow.define_method("frame=", set_frame);
@@ -301,9 +327,10 @@ Init_window ()
 	cWindow.define_method("on_key_down", on_key_down);
 	cWindow.define_method("on_key_up",   on_key_up);
 	cWindow.define_method("on_pointer",      on_pointer);
-	cWindow.define_method("on_pointer_down", on_pointer_down);
-	cWindow.define_method("on_pointer_up",   on_pointer_up);
-	cWindow.define_method("on_pointer_move", on_pointer_move);
+	cWindow.define_method("on_pointer_down",   on_pointer_down);
+	cWindow.define_method("on_pointer_up",     on_pointer_up);
+	cWindow.define_method("on_pointer_move",   on_pointer_move);
+	cWindow.define_method("on_pointer_cancel", on_pointer_cancel);
 	cWindow.define_method("on_wheel", on_wheel);
 }
 

data/include/reflex/defs.h

@@ -68,98 +68,89 @@ namespace Reflex
 
 		KEY_NONE = 0,
 
+		KEY_A,
+		KEY_B,
+		KEY_C,
+		KEY_D,
+		KEY_E,
+		KEY_F,
+		KEY_G,
+		KEY_H,
+		KEY_I,
+		KEY_J,
+		KEY_K,
+		KEY_L,
+		KEY_M,
+		KEY_N,
+		KEY_O,
+		KEY_P,
+		KEY_Q,
+		KEY_R,
+		KEY_S,
+		KEY_T,
+		KEY_U,
+		KEY_V,
+		KEY_W,
+		KEY_X,
+		KEY_Y,
+		KEY_Z,
+
+		KEY_0,
+		KEY_1,
+		KEY_2,
+		KEY_3,
+		KEY_4,
+		KEY_5,
+		KEY_6,
+		KEY_7,
+		KEY_8,
+		KEY_9,
+
+		KEY_MINUS,
+		KEY_EQUAL,
+		KEY_COMMA,
+		KEY_PERIOD,
+		KEY_SEMICOLON,
+		KEY_QUOTE,
+		KEY_SLASH,
+		KEY_BACKSLASH,
+		KEY_UNDERSCORE,
+		KEY_GRAVE,
+		KEY_YEN,
+		KEY_LBRACKET,
+		KEY_RBRACKET,
+
+		KEY_ENTER,
 		KEY_RETURN,
-		KEY_ENTER = KEY_RETURN,
-		KEY_ESCAPE,
 		KEY_SPACE,
-		KEY_BACKSPACE,
 		KEY_TAB,
+		KEY_DELETE,
+		KEY_BACKSPACE,
+		//KEY_INSERT,
+		KEY_ESCAPE,
 
 		KEY_LEFT,
-		KEY_UP,
 		KEY_RIGHT,
+		KEY_UP,
 		KEY_DOWN,
-
-		KEY_INSERT,
-		KEY_DELETE,
 		KEY_HOME,
 		KEY_END,
 		KEY_PAGEUP,
 		KEY_PAGEDOWN,
 
-		KEY_SHIFT,
 		KEY_LSHIFT,
 		KEY_RSHIFT,
-
-		KEY_CONTROL,
 		KEY_LCONTROL,
 		KEY_RCONTROL,
-
-		KEY_ALT,
-		KEY_LALT,
-		KEY_RALT,
-
-		KEY_WIN,
-		KEY_LWIN,
-		KEY_RWIN,
-
-		KEY_OPTION  = KEY_ALT,
-		KEY_LOPTION = KEY_LALT,
-		KEY_ROPTION = KEY_RALT,
-
-		KEY_COMMAND  = KEY_WIN,
-		KEY_LCOMMAND = KEY_LWIN,
-		KEY_RCOMMAND = KEY_RWIN,
-
-		KEY_CAPSLOCK,
-		KEY_NUMLOCK,
-		KEY_SCROLLLOCK,
-
-		KEY_PRINTSCREEN,
-		KEY_PAUSE,
-		KEY_BREAK,
-
-		KEY_SLEEP,
-		KEY_EXEC,//UTE,
-		KEY_HELP,
-		KEY_PRINT,
-		KEY_APPS,
-		KEY_SELECT,
-		KEY_CLEAR,
-		KEY_PLAY,
-		KEY_ZOOM,
-
-		KEY_IME_KANA,
-		KEY_IME_KANJI,
-		KEY_IME_JUNJA,
-		KEY_IME_PROCESS,
-		KEY_IME_ACCEPT,
-		KEY_IME_FINAL,
-		KEY_IME_CONVERT,
-		KEY_IME_NONCONVERT,
-		KEY_IME_MODECHANGE,
-
-		KEY_BROWSER_BACK,
-		KEY_BROWSER_FORWARD,
-		KEY_BROWSER_REFRESH,
-		KEY_BROWSER_STOP,
-		KEY_BROWSER_SEARCH,
-		KEY_BROWSER_FAVORITES,
-		KEY_BROWSER_HOME,
-
-		KEY_VOLUME_MUTE,
-		KEY_VOLUME_DOWN,
-		KEY_VOLUME_UP,
-
-		KEY_MEDIA_NEXT_TRACK,
-		KEY_MEDIA_PREV_TRACK,
-		KEY_MEDIA_STOP,
-		KEY_MEDIA_PLAY_PAUSE,
-
-		KEY_LAUNCH_MAIL,
-		KEY_LAUNCH_MEDIA_SELECT,
-		KEY_LAUNCH_APP1,
-		KEY_LAUNCH_APP2,
+		//KEY_LALT,
+		//KEY_RALT,
+		//KEY_LWIN,
+		//KEY_RWIN,
+		KEY_LCOMMAND,
+		KEY_RCOMMAND,
+		KEY_LOPTION,
+		KEY_ROPTION,
+		KEY_FUNCTION,
 
 		KEY_F1,
 		KEY_F2,
@@ -181,41 +172,84 @@ namespace Reflex
 		KEY_F18,
 		KEY_F19,
 		KEY_F20,
-		KEY_F21,
-		KEY_F22,
-		KEY_F23,
-		KEY_F24,
-		KEY_F25,
-		KEY_F26,
-		KEY_F27,
-		KEY_F28,
-		KEY_F29,
-		KEY_F30,
-		KEY_F31,
-		KEY_F32,
-		KEY_F33,
-		KEY_F34,
-		KEY_F35,
-
-	};// KeyCode
+		//KEY_F21,
+		//KEY_F22,
+		//KEY_F23,
+		//KEY_F24,
+
+		KEY_NUM_0,
+		KEY_NUM_1,
+		KEY_NUM_2,
+		KEY_NUM_3,
+		KEY_NUM_4,
+		KEY_NUM_5,
+		KEY_NUM_6,
+		KEY_NUM_7,
+		KEY_NUM_8,
+		KEY_NUM_9,
+
+		KEY_NUM_PLUS,
+		KEY_NUM_MINUS,
+		KEY_NUM_MULTIPLY,
+		KEY_NUM_DIVIDE,
+		KEY_NUM_EQUAL,
+		KEY_NUM_COMMA,
+		KEY_NUM_DECIMAL,
+		KEY_NUM_CLEAR,
 
+		KEY_CAPSLOCK,
+		//KEY_NUMLOCK,
+		//KEY_SCROLLLOCK,
 
-	enum PointerType
-	{
-
-		POINTER_NONE         = 0,
-
-		POINTER_MOUSE_LEFT   = 0x1 << 0,
-
-		POINTER_MOUSE_RIGHT  = 0x1 << 1,
-
-		POINTER_MOUSE_MIDDLE = 0x1 << 2,
+		//KEY_PRINTSCREEN,
+		//KEY_PAUSE,
+		//KEY_BREAK,
+		KEY_SECTION,
+		KEY_HELP,
 
-		POINTER_TOUCH        = 0x1 << 3,
+		KEY_IME_EISU,
+		KEY_IME_KANA,
+		//KEY_IME_KANJI,
+		//KEY_IME_JUNJA,
+		//KEY_IME_PROCESS,
+		//KEY_IME_ACCEPT,
+		//KEY_IME_FINAL,
+		//KEY_IME_CONVERT,
+		//KEY_IME_NONCONVERT,
+		//KEY_IME_MODECHANGE,
 
-		POINTER_PEN          = 0x1 << 4,
+		KEY_VOLUME_UP,
+		KEY_VOLUME_DOWN,
+		KEY_MUTE,
+
+		//KEY_SLEEP,
+		//KEY_EXEC,
+		//KEY_PRINT,
+		//KEY_APPS,
+		//KEY_SELECT,
+		//KEY_CLEAR,
+		//KEY_PLAY,
+		//KEY_ZOOM,
+
+		//KEY_BROWSER_BACK,
+		//KEY_BROWSER_FORWARD,
+		//KEY_BROWSER_REFRESH,
+		//KEY_BROWSER_STOP,
+		//KEY_BROWSER_SEARCH,
+		//KEY_BROWSER_FAVORITES,
+		//KEY_BROWSER_HOME,
+
+		//KEY_MEDIA_NEXT_TRACK,
+		//KEY_MEDIA_PREV_TRACK,
+		//KEY_MEDIA_STOP,
+		//KEY_MEDIA_PLAY_PAUSE,
+
+		//KEY_LAUNCH_MAIL,
+		//KEY_LAUNCH_MEDIA_SELECT,
+		//KEY_LAUNCH_APP1,
+		//KEY_LAUNCH_APP2,
 
-	};// PointType
+	};// KeyCode
 
 
 	enum Modifier