reflexion 0.1.19 → 0.1.23

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/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)
 {
@@ -93,6 +109,23 @@ RUCY_DEF0(get_frame)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_resizable, state)
+{
+	CHECK;
+	THIS->set_resizable(to<bool>(state));
+	return value(THIS->is_resizable());
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_resizable)
+{
+	CHECK;
+	return value(THIS->is_resizable());
+}
+RUCY_END
+
 static
 RUCY_DEF0(hidden)
 {
@@ -241,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)
 {
@@ -263,10 +304,14 @@ 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);
 	cWindow.define_method("frame",  get_frame);
+	cWindow.define_method("resizable=", set_resizable);
+	cWindow.define_method("resizable?",  is_resizable);
 	cWindow.define_method("hidden", hidden);
 	cWindow.define_method("root", root);
 	cWindow.define_method("focus", focus);
@@ -282,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

data/include/reflex/event.h

@@ -4,10 +4,12 @@
 #define __REFLEX_EVENT_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/point.h>
 #include <rays/bounds.h>
 #include <rays/painter.h>
 #include <reflex/defs.h>
+#include <reflex/pointer.h>
 #include <reflex/timer.h>
 
 
@@ -30,10 +32,14 @@ namespace Reflex
 
 			bool is_blocked () const;
 
+			double time () const;
+
 		private:
 
 			bool blocked;
 
+			double time_;
+
 	};// Event
 
 
@@ -161,7 +167,7 @@ namespace Reflex
 
 		int repeat;
 
-		bool capture;
+		bool captured;
 
 		KeyEvent ();
 
@@ -172,47 +178,40 @@ namespace Reflex
 	};// KeyEvent
 
 
-	struct PointerEvent : public Event
+	class PointerEvent : public Event
 	{
 
-		enum Type {NONE = 0, DOWN, UP, MOVE};
-
-		enum {MAX = 10};
-
-		Type type;
+		typedef PointerEvent This;
 
-		uint pointer_type;
+		public:
 
-		size_t size;
+			PointerEvent (bool captured = false);
 
-		uint modifiers, count;
+			PointerEvent (
+				const Pointer& pointer,
+				bool captured = false);
 
-		bool drag, capture;
+			PointerEvent (
+				const Pointer* pointers, size_t size,
+				bool captured = false);
 
-		union
-		{
-			struct {coord x, y, z;};
+			PointerEvent (const This& obj);
 
-			Coord3 positions[MAX];
-		};
+			PointerEvent& operator = (const This& obj);
 
-		PointerEvent ();
+			~PointerEvent ();
 
-		PointerEvent (
-			Type type, uint pointer_type, coord x, coord y,
-			uint modifiers = 0, uint count = 1, bool drag = false);
+			size_t size () const;
 
-		PointerEvent (
-			Type type, uint pointer_type, const Point* positions, size_t size,
-			uint modifiers = 0, uint count = 1, bool drag = false);
+			bool empty () const;
 
-		      Point& position (size_t i = 0);
+			bool is_captured () const;
 
-		const Point& position (size_t i = 0) const;
+			const Pointer& operator [] (size_t index) const;
 
-		      Point& operator [] (size_t i);
+			struct Data;
 
-		const Point& operator [] (size_t i) const;
+			Xot::PImpl<Data> self;
 
 	};// PointerEvent
 

data/include/reflex/pointer.h

@@ -0,0 +1,107 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_POINTER_H__
+#define __REFLEX_POINTER_H__
+
+
+#include <xot/pimpl.h>
+#include <xot/util.h>
+#include <rays/point.h>
+#include <reflex/defs.h>
+
+
+namespace Reflex
+{
+
+
+	class Pointer
+	{
+
+		typedef Pointer This;
+
+		public:
+
+			typedef int ID;
+
+			enum Type
+			{
+
+				TYPE_NONE    = 0,
+
+				MOUSE        = Xot::bit(0),
+
+				MOUSE_LEFT   = Xot::bit(1),
+
+				MOUSE_RIGHT  = Xot::bit(2),
+
+				MOUSE_MIDDLE = Xot::bit(3),
+
+				TOUCH        = Xot::bit(4),
+
+				PEN          = Xot::bit(5),
+
+			};// Type
+
+			enum Action
+			{
+
+				ACTION_NONE = 0,
+
+				DOWN,
+
+				UP,
+
+				MOVE,
+
+				CANCEL,
+
+				STAY
+
+			};// Action
+
+			Pointer ();
+
+			Pointer (
+				ID id, uint type, Action action,
+				const Point& position, uint modifiers, uint click_count, bool drag,
+				double time);
+
+			Pointer (const This& obj);
+
+			Pointer& operator = (const This& obj);
+
+			~Pointer ();
+
+			ID id () const;
+
+			uint type () const;
+
+			Action action () const;
+
+			const Point& position () const;
+
+			uint modifiers () const;
+
+			uint click_count () const;
+
+			bool is_drag () const;
+
+			double time () const;
+
+			const Pointer* prev () const;
+
+			operator bool () const;
+
+			bool operator ! () const;
+
+			struct Data;
+
+			Xot::PImpl<Data> self;
+
+	};// Pointer
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex/ruby/pointer.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_POINTER_H__
+#define __REFLEX_RUBY_POINTER_H__
+
+
+#include <rucy/rucy.h>
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/pointer.h>
+
+
+namespace Reflex
+{
+
+
+	Rucy::Class pointer_class ();
+	// class Reflex::Pointer
+
+
+}// Reflex
+
+
+RUCY_DECLARE_VALUE_FROM_TO(Reflex::Pointer)
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Pointer> ()
+	{
+		return Reflex::pointer_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH