reflexion 0.5.3 → 0.7.0

data/include/reflex/ruby/pin.h

@@ -0,0 +1,40 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_RUBY_PIN_H__
+#define __REFLEX_RUBY_PIN_H__
+
+
+#include <rucy/class.h>
+#include <rucy/extension.h>
+#include <reflex/pin.h>
+
+
+RUCY_DECLARE_VALUE_OR_ARRAY_FROM_TO(REFLEX_EXPORT, Reflex::Pin)
+
+
+namespace Reflex
+{
+
+
+	REFLEX_EXPORT Rucy::Class pin_class ();
+	// class Reflex::Pin
+
+
+}// Reflex
+
+
+namespace Rucy
+{
+
+
+	template <> inline Class
+	get_ruby_class<Reflex::Pin> ()
+	{
+		return Reflex::pin_class();
+	}
+
+
+}// Rucy
+
+
+#endif//EOH

data/include/reflex/ruby/reflex.h

@@ -9,6 +9,9 @@
 #include <reflex/reflex.h>
 
 
+RUCY_DECLARE_CONVERT_TO(REFLEX_EXPORT, Reflex::KeyCode)
+
+
 namespace Reflex
 {
 

data/include/reflex/ruby/view.h

@@ -41,6 +41,27 @@ namespace Reflex
 					return Super::content_bounds();
 			}
 
+			virtual bool accepts_text_input () const
+			{
+				RUCY_SYM_Q(accepts_text_input);
+				if (this->is_overridable())
+					return Rucy::to<bool>(this->value.call(accepts_text_input));
+				else
+					return Super::accepts_text_input();
+			}
+
+			virtual Bounds text_input_bounds () const
+			{
+				RUCY_SYM(text_input_bounds);
+				if (this->is_overridable())
+				{
+					Rucy::Value ret = this->value.call(text_input_bounds);
+					return ret.is_nil() ? Super::text_input_bounds() : Rucy::to<Bounds>(ret);
+				}
+				else
+					return Super::text_input_bounds();
+			}
+
 			virtual void on_attach (Event* e)
 			{
 				RUCY_SYM(on_attach);
@@ -59,6 +80,24 @@ namespace Reflex
 					Super::on_detach(e);
 			}
 
+			virtual void on_activate (Event* e)
+			{
+				RUCY_SYM(on_activate);
+				if (this->is_overridable())
+					this->value.call(on_activate, Rucy::value(e));
+				else
+					Super::on_activate(e);
+			}
+
+			virtual void on_deactivate (Event* e)
+			{
+				RUCY_SYM(on_deactivate);
+				if (this->is_overridable())
+					this->value.call(on_deactivate, Rucy::value(e));
+				else
+					Super::on_deactivate(e);
+			}
+
 			virtual void on_show (Event* e)
 			{
 				RUCY_SYM(on_show);
@@ -176,6 +215,33 @@ namespace Reflex
 					Super::on_key_up(e);
 			}
 
+			virtual void on_text (TextEvent* e)
+			{
+				RUCY_SYM(on_text);
+				if (this->is_overridable())
+					this->value.call(on_text, Rucy::value(e));
+				else
+					Super::on_text(e);
+			}
+
+			virtual void on_text_preedit (TextEvent* e)
+			{
+				RUCY_SYM(on_text_preedit);
+				if (this->is_overridable())
+					this->value.call(on_text_preedit, Rucy::value(e));
+				else
+					Super::on_text_preedit(e);
+			}
+
+			virtual void on_text_commit (TextEvent* e)
+			{
+				RUCY_SYM(on_text_commit);
+				if (this->is_overridable())
+					this->value.call(on_text_commit, Rucy::value(e));
+				else
+					Super::on_text_commit(e);
+			}
+
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
@@ -221,58 +287,31 @@ namespace Reflex
 					Super::on_pointer_cancel(e);
 			}
 
-			virtual void on_wheel (WheelEvent* e)
+			virtual void on_pointer_enter (PointerEvent* e)
 			{
-				RUCY_SYM(on_wheel);
+				RUCY_SYM(on_pointer_enter);
 				if (this->is_overridable())
-					this->value.call(on_wheel, Rucy::value(e));
+					this->value.call(on_pointer_enter, Rucy::value(e));
 				else
-					Super::on_wheel(e);
+					Super::on_pointer_enter(e);
 			}
 
-			virtual void on_midi (MIDIEvent* e)
+			virtual void on_pointer_leave (PointerEvent* e)
 			{
-				RUCY_SYM(on_midi);
+				RUCY_SYM(on_pointer_leave);
 				if (this->is_overridable())
-					this->value.call(on_midi, Rucy::value(e));
+					this->value.call(on_pointer_leave, Rucy::value(e));
 				else
-					Super::on_midi(e);
-			}
-
-			virtual void on_note (NoteEvent* e)
-			{
-				RUCY_SYM(on_note);
-				if (this->is_overridable())
-					this->value.call(on_note, Rucy::value(e));
-				else
-					Super::on_note(e);
-			}
-
-			virtual void on_note_on (NoteEvent* e)
-			{
-				RUCY_SYM(on_note_on);
-				if (this->is_overridable())
-					this->value.call(on_note_on, Rucy::value(e));
-				else
-					Super::on_note_on(e);
+					Super::on_pointer_leave(e);
 			}
 
-			virtual void on_note_off (NoteEvent* e)
-			{
-				RUCY_SYM(on_note_off);
-				if (this->is_overridable())
-					this->value.call(on_note_off, Rucy::value(e));
-				else
-					Super::on_note_off(e);
-			}
-
-			virtual void on_control_change (ControlChangeEvent* e)
+			virtual void on_wheel (WheelEvent* e)
 			{
-				RUCY_SYM(on_control_change);
+				RUCY_SYM(on_wheel);
 				if (this->is_overridable())
-					this->value.call(on_control_change, Rucy::value(e));
+					this->value.call(on_wheel, Rucy::value(e));
 				else
-					Super::on_control_change(e);
+					Super::on_wheel(e);
 			}
 
 			virtual void on_capture (CaptureEvent* e)
@@ -329,6 +368,51 @@ namespace Reflex
 					Super::on_contact_end(e);
 			}
 
+			virtual void on_midi (MIDIEvent* e)
+			{
+				RUCY_SYM(on_midi);
+				if (this->is_overridable())
+					this->value.call(on_midi, Rucy::value(e));
+				else
+					Super::on_midi(e);
+			}
+
+			virtual void on_note (NoteEvent* e)
+			{
+				RUCY_SYM(on_note);
+				if (this->is_overridable())
+					this->value.call(on_note, Rucy::value(e));
+				else
+					Super::on_note(e);
+			}
+
+			virtual void on_note_on (NoteEvent* e)
+			{
+				RUCY_SYM(on_note_on);
+				if (this->is_overridable())
+					this->value.call(on_note_on, Rucy::value(e));
+				else
+					Super::on_note_on(e);
+			}
+
+			virtual void on_note_off (NoteEvent* e)
+			{
+				RUCY_SYM(on_note_off);
+				if (this->is_overridable())
+					this->value.call(on_note_off, Rucy::value(e));
+				else
+					Super::on_note_off(e);
+			}
+
+			virtual void on_control_change (ControlChangeEvent* e)
+			{
+				RUCY_SYM(on_control_change);
+				if (this->is_overridable())
+					this->value.call(on_control_change, Rucy::value(e));
+				else
+					Super::on_control_change(e);
+			}
+
 	};// RubyView
 
 

data/include/reflex/ruby/window.h

@@ -29,29 +29,16 @@ namespace Reflex
 
 		public:
 
-			virtual void on_activate (Event* e)
-			{
-				RUCY_SYM(on_activate);
-				if (this->is_overridable())
-					this->value.call(on_activate, Rucy::value(e));
-				else
-					return Super::on_activate(e);
-			}
-
-			virtual void on_deactivate (Event* e)
-			{
-				RUCY_SYM(on_deactivate);
-				if (this->is_overridable())
-					this->value.call(on_deactivate, Rucy::value(e));
-				else
-					return Super::on_deactivate(e);
-			}
-
 			virtual void on_show (Event* e)
 			{
-				RUCY_SYM(on_show);
 				if (this->is_overridable())
+				{
+					RUCY_SYM(call_show_block);
+					this->value.call(call_show_block);
+
+					RUCY_SYM(on_show);
 					this->value.call(on_show, Rucy::value(e));
+				}
 				else
 					return Super::on_show(e);
 			}
@@ -74,6 +61,24 @@ namespace Reflex
 					return Super::on_close(e);
 			}
 
+			virtual void on_activate (Event* e)
+			{
+				RUCY_SYM(on_activate);
+				if (this->is_overridable())
+					this->value.call(on_activate, Rucy::value(e));
+				else
+					return Super::on_activate(e);
+			}
+
+			virtual void on_deactivate (Event* e)
+			{
+				RUCY_SYM(on_deactivate);
+				if (this->is_overridable())
+					this->value.call(on_deactivate, Rucy::value(e));
+				else
+					return Super::on_deactivate(e);
+			}
+
 			virtual void on_update (UpdateEvent* e)
 			{
 				RUCY_SYM(on_update);
@@ -137,6 +142,33 @@ namespace Reflex
 					Super::on_key_up(e);
 			}
 
+			virtual void on_text (TextEvent* e)
+			{
+				RUCY_SYM(on_text);
+				if (this->is_overridable())
+					this->value.call(on_text, Rucy::value(e));
+				else
+					Super::on_text(e);
+			}
+
+			virtual void on_text_preedit (TextEvent* e)
+			{
+				RUCY_SYM(on_text_preedit);
+				if (this->is_overridable())
+					this->value.call(on_text_preedit, Rucy::value(e));
+				else
+					Super::on_text_preedit(e);
+			}
+
+			virtual void on_text_commit (TextEvent* e)
+			{
+				RUCY_SYM(on_text_commit);
+				if (this->is_overridable())
+					this->value.call(on_text_commit, Rucy::value(e));
+				else
+					Super::on_text_commit(e);
+			}
+
 			virtual void on_pointer (PointerEvent* e)
 			{
 				RUCY_SYM(on_pointer);
@@ -182,6 +214,24 @@ namespace Reflex
 					Super::on_pointer_cancel(e);
 			}
 
+			virtual void on_pointer_enter (PointerEvent* e)
+			{
+				RUCY_SYM(on_pointer_enter);
+				if (this->is_overridable())
+					this->value.call(on_pointer_enter, Rucy::value(e));
+				else
+					Super::on_pointer_enter(e);
+			}
+
+			virtual void on_pointer_leave (PointerEvent* e)
+			{
+				RUCY_SYM(on_pointer_leave);
+				if (this->is_overridable())
+					this->value.call(on_pointer_leave, Rucy::value(e));
+				else
+					Super::on_pointer_leave(e);
+			}
+
 			virtual void on_wheel (WheelEvent* e)
 			{
 				RUCY_SYM(on_wheel);
@@ -191,6 +241,33 @@ namespace Reflex
 					Super::on_wheel(e);
 			}
 
+			virtual void on_file (FileEvent* e)
+			{
+				RUCY_SYM(on_file);
+				if (this->is_overridable())
+					this->value.call(on_file, Rucy::value(e));
+				else
+					Super::on_file(e);
+			}
+
+			virtual void on_file_open (FileEvent* e)
+			{
+				RUCY_SYM(on_file_open);
+				if (this->is_overridable())
+					this->value.call(on_file_open, Rucy::value(e));
+				else
+					Super::on_file_open(e);
+			}
+
+			virtual void on_file_save (FileEvent* e)
+			{
+				RUCY_SYM(on_file_save);
+				if (this->is_overridable())
+					this->value.call(on_file_save, Rucy::value(e));
+				else
+					Super::on_file_save(e);
+			}
+
 			virtual void on_midi (MIDIEvent* e)
 			{
 				RUCY_SYM(on_midi);

data/include/reflex/ruby.h

@@ -20,6 +20,9 @@
 #include <reflex/ruby/window.h>
 #include <reflex/ruby/view.h>
 #include <reflex/ruby/screen.h>
+#include <reflex/ruby/clipboard.h>
+#include <reflex/ruby/file_dialog.h>
+#include <reflex/ruby/color_picker.h>
 
 #include <reflex/ruby/image_view.h>
 

data/include/reflex/screen.h

@@ -4,6 +4,7 @@
 #define __REFLEX_SCREEN_H__
 
 
+#include <vector>
 #include <xot/pimpl.h>
 #include <rays/bounds.h>
 #include <reflex/defs.h>
@@ -20,16 +21,24 @@ namespace Reflex
 
 		public:
 
+			typedef std::vector<Screen> List;
+
 			Screen ();
 
-			virtual ~Screen ();
+			~Screen ();
+
+			String name () const;
 
-			virtual Bounds frame () const;
+			Bounds frame () const;
+
+			float pixel_density () const;
 
 			operator bool () const;
 
 			bool operator ! () const;
 
+			static List all ();
+
 			struct Data;
 
 			Xot::PSharedImpl<Data> self;

data/include/reflex/view.h

@@ -15,6 +15,7 @@
 #include <reflex/selector.h>
 #include <reflex/style.h>
 #include <reflex/shape.h>
+#include <reflex/constraint.h>
 #include <reflex/event.h>
 
 
@@ -38,30 +39,36 @@ namespace Reflex
 
 			typedef Xot::Ref<This> Ref;
 
-			typedef std::vector<Ref>        ChildList;
+			typedef std::vector<Ref>             ChildList;
 
-			typedef std::vector<Style>      StyleList;
+			typedef std::vector<Style>           StyleList;
 
-			typedef std::vector<Shape::Ref> ShapeList;
+			typedef std::vector<Shape::Ref>      ShapeList;
 
-			typedef ChildList::      iterator       child_iterator;
+			typedef std::vector<Constraint::Ref> ConstraintList;
 
-			typedef ChildList::const_iterator const_child_iterator;
+			typedef ChildList::           iterator            child_iterator;
 
-			typedef StyleList::      iterator       style_iterator;
+			typedef ChildList::     const_iterator      const_child_iterator;
 
-			typedef StyleList::const_iterator const_style_iterator;
+			typedef StyleList::           iterator            style_iterator;
 
-			typedef ShapeList::      iterator       shape_iterator;
+			typedef StyleList::     const_iterator      const_style_iterator;
 
-			typedef ShapeList::const_iterator const_shape_iterator;
+			typedef ShapeList::           iterator            shape_iterator;
+
+			typedef ShapeList::     const_iterator      const_shape_iterator;
+
+			typedef ConstraintList::      iterator       constraint_iterator;
+
+			typedef ConstraintList::const_iterator const_constraint_iterator;
 
 			enum Flag
 			{
 
 				FLAG_CLIP          = Xot::bit(0),
 
-				FLAG_CACHE         = Xot::bit(1),
+				FLAG_DRAW_CACHE    = Xot::bit(1),
 
 				FLAG_RESIZE_TO_FIT = Xot::bit(2),
 
@@ -69,7 +76,9 @@ namespace Reflex
 
 				FLAG_FIX_ANGLE     = Xot::bit(4),
 
-				FLAG_LAST          = FLAG_FIX_ANGLE
+				FLAG_TEXT_INPUT    = Xot::bit(5),
+
+				FLAG_LAST          = FLAG_TEXT_INPUT
 
 			};// Flag
 
@@ -110,6 +119,14 @@ namespace Reflex
 
 			virtual void update_layout ();
 
+			virtual void fit_to_content ();
+
+			virtual Bounds      content_bounds () const;
+
+			virtual bool accepts_text_input () const;
+
+			virtual Bounds       text_input_bounds () const;
+
 			virtual Point from_parent (const Point& point) const;
 
 			virtual Point   to_parent (const Point& point) const;
@@ -122,7 +139,7 @@ namespace Reflex
 
 			virtual Point   to_screen (const Point& point) const;
 
-			virtual void             add_child (View* child);
+			virtual void             add_child (View* child, int index = -1);
 
 			virtual void          remove_child (View* child);
 
@@ -171,7 +188,7 @@ namespace Reflex
 
 			virtual const Shape*         shape () const;
 
-			virtual void             add_shape (Shape* shape);
+			virtual void             add_shape (Shape* shape, int index = -1);
 
 			virtual void          remove_shape (Shape* shape);
 
@@ -187,6 +204,18 @@ namespace Reflex
 
 			virtual const_shape_iterator shape_end () const;
 
+			virtual void                clear_constraints ();
+
+			virtual ConstraintList       find_constraints (const Selector& selector) const;
+
+			virtual       constraint_iterator constraint_begin ();
+
+			virtual const_constraint_iterator constraint_begin () const;
+
+			virtual       constraint_iterator constraint_end ();
+
+			virtual const_constraint_iterator constraint_end () const;
+
 			virtual void      set_filter (Filter* filter);
 
 			virtual       Filter* filter ();
@@ -209,10 +238,6 @@ namespace Reflex
 
 			virtual const Bounds& frame () const;
 
-			virtual Bounds      content_bounds () const;
-
-			virtual void fit_to_content ();
-
 			virtual void set_zoom (float zoom);
 
 			virtual float    zoom () const;
@@ -313,7 +338,7 @@ namespace Reflex
 			//
 			virtual void create_world (float pixels_per_meter);
 
-			virtual void update_world (float duration = 0);
+			virtual void update_world ();
 
 			virtual float meter2pixel (float meter = 1, bool create_world = true);
 
@@ -344,6 +369,10 @@ namespace Reflex
 
 			virtual void on_detach (Event* e);
 
+			virtual void on_activate   (Event* e);
+
+			virtual void on_deactivate (Event* e);
+
 			virtual void on_show (Event* e);
 
 			virtual void on_hide (Event* e);
@@ -370,6 +399,12 @@ namespace Reflex
 
 			virtual void on_key_up   (KeyEvent* e);
 
+			virtual void on_text         (TextEvent* e);
+
+			virtual void on_text_preedit (TextEvent* e);
+
+			virtual void on_text_commit  (TextEvent* e);
+
 			virtual void on_pointer        (PointerEvent* e);
 
 			virtual void on_pointer_down   (PointerEvent* e);
@@ -380,17 +415,11 @@ namespace Reflex
 
 			virtual void on_pointer_cancel (PointerEvent* e);
 
-			virtual void on_wheel (WheelEvent* e);
-
-			virtual void on_midi (MIDIEvent* e);
+			virtual void on_pointer_enter  (PointerEvent* e);
 
-			virtual void on_note     (NoteEvent* e);
+			virtual void on_pointer_leave  (PointerEvent* e);
 
-			virtual void on_note_on  (NoteEvent* e);
-
-			virtual void on_note_off (NoteEvent* e);
-
-			virtual void on_control_change (ControlChangeEvent* e);
+			virtual void on_wheel (WheelEvent* e);
 
 			virtual void on_capture (CaptureEvent* e);
 
@@ -404,6 +433,16 @@ namespace Reflex
 
 			virtual void   on_contact_end   (ContactEvent* e);
 
+			virtual void on_midi (MIDIEvent* e);
+
+			virtual void on_note     (NoteEvent* e);
+
+			virtual void on_note_on  (NoteEvent* e);
+
+			virtual void on_note_off (NoteEvent* e);
+
+			virtual void on_control_change (ControlChangeEvent* e);
+
 			virtual operator bool () const;
 
 			virtual bool operator ! () const;