reflexion 0.6.0 → 0.7.0

data/ext/reflex/window.cpp

@@ -13,7 +13,8 @@ RUCY_DEFINE_WRAPPER_VALUE_FROM_TO(REFLEX_EXPORT, Reflex::Window)
 
 #define THIS      to<Reflex::Window*>(self)
 
-#define CHECK     RUCY_CHECK_OBJECT(Reflex::Window, self)
+#define CHECK_PTR RUCY_CHECK_PTR(Reflex::Window, self)
+#define CHECK     RUCY_CHECK_OBJ(Reflex::Window, self)
 
 #define CALL(fun) RUCY_CALL_SUPER(THIS, fun)
 
@@ -44,7 +45,7 @@ RUCY_DEF0(hide)
 RUCY_END
 
 static
-RUCY_DEF0(hidden)
+RUCY_DEF0(is_hidden)
 {
 	CHECK;
 	return value(THIS->hidden());
@@ -54,8 +55,8 @@ RUCY_END
 static
 RUCY_DEF0(close)
 {
-	CHECK;
-	THIS->close();
+	CHECK_PTR;
+	if (*THIS) THIS->close();
 	return self;
 }
 RUCY_END
@@ -210,6 +211,88 @@ RUCY_DEF0(is_resizable)
 }
 RUCY_END
 
+static const uint TITLEBAR_MASK =
+	Reflex::Window::FLAG_TITLEBAR_BUTTONS |
+	Reflex::Window::FLAG_TITLEBAR_BACKGROUND;
+
+static
+RUCY_DEF1(set_titlebar, titlebar)
+{
+	CHECK;
+
+	uint flags = to<uint>(titlebar);
+	THIS->set_flags((flags & TITLEBAR_MASK) | (THIS->flags() & ~TITLEBAR_MASK));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_titlebar)
+{
+	CHECK;
+	return value(THIS->flags() & TITLEBAR_MASK);
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_unlisted, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_UNLISTED);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_UNLISTED);
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_unlisted)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_UNLISTED));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_shadow, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_SHADOW);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_SHADOW);
+}
+RUCY_END
+
+static
+RUCY_DEF0(has_shadow)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_SHADOW));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_transparent, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_TRANSPARENT);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_TRANSPARENT);
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_transparent)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_TRANSPARENT));
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_fullscreen, state)
 {
@@ -232,18 +315,98 @@ RUCY_DEF0(is_fullscreen)
 }
 RUCY_END
 
+static
+RUCY_DEF1(set_always_on_top, state)
+{
+	CHECK;
+
+	if (state)
+	{
+		THIS->remove_flag(Reflex::Window::FLAG_ALWAYS_ON_BOTTOM);
+		THIS->   add_flag(Reflex::Window::FLAG_ALWAYS_ON_TOP);
+	}
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_ALWAYS_ON_TOP);
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_always_on_top)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_ALWAYS_ON_TOP));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_always_on_bottom, state)
+{
+	CHECK;
+
+	if (state)
+	{
+		THIS->remove_flag(Reflex::Window::FLAG_ALWAYS_ON_TOP);
+		THIS->   add_flag(Reflex::Window::FLAG_ALWAYS_ON_BOTTOM);
+	}
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_ALWAYS_ON_BOTTOM);
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_always_on_bottom)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_ALWAYS_ON_BOTTOM));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_pointer_through, state)
+{
+	CHECK;
+
+	if (state)
+		THIS->   add_flag(Reflex::Window::FLAG_POINTER_THROUGH);
+	else
+		THIS->remove_flag(Reflex::Window::FLAG_POINTER_THROUGH);
+}
+RUCY_END
+
+static
+RUCY_DEF0(is_pointer_through)
+{
+	CHECK;
+	return value(THIS->has_flag(Reflex::Window::FLAG_POINTER_THROUGH));
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_pointer_through_alpha, alpha)
+{
+	CHECK;
+	THIS->set_pointer_through_alpha(to<float>(alpha));
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_pointer_through_alpha)
+{
+	CHECK;
+	return value(THIS->pointer_through_alpha());
+}
+RUCY_END
+
 static const uint ORIENTATION_MASK =
 	Reflex::Window::FLAG_PORTRAIT | Reflex::Window::FLAG_LANDSCAPE;
 
 static
 RUCY_DEF1(set_orientations, orientations)
 {
-	using namespace Reflex;
-
 	CHECK;
 
 	uint flags = to<uint>(orientations);
-	THIS->set_flag(
+	THIS->set_flags(
 		(      flags   &  ORIENTATION_MASK) |
 		(THIS->flags() & ~ORIENTATION_MASK));
 }
@@ -252,8 +415,6 @@ RUCY_END
 static
 RUCY_DEF0(get_orientations)
 {
-	using namespace Reflex;
-
 	CHECK;
 	return value(THIS->flags() & ORIENTATION_MASK);
 }
@@ -296,9 +457,6 @@ RUCY_DEF1(on_show, event)
 {
 	CHECK;
 
-	RUCY_SYM(call_show_block);
-	self.call(call_show_block);
-
 	CALL(on_show(to<Reflex::Event*>(event)));
 }
 RUCY_END
@@ -391,6 +549,30 @@ RUCY_DEF1(on_key_up, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_text, event)
+{
+	CHECK;
+	CALL(on_text(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_text_preedit, event)
+{
+	CHECK;
+	CALL(on_text_preedit(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_text_commit, event)
+{
+	CHECK;
+	CALL(on_text_commit(to<Reflex::TextEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_pointer, event)
 {
@@ -455,6 +637,30 @@ RUCY_DEF1(on_wheel, event)
 }
 RUCY_END
 
+static
+RUCY_DEF1(on_file, event)
+{
+	CHECK;
+	CALL(on_file(to<Reflex::FileEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_file_open, event)
+{
+	CHECK;
+	CALL(on_file_open(to<Reflex::FileEvent*>(event)));
+}
+RUCY_END
+
+static
+RUCY_DEF1(on_file_save, event)
+{
+	CHECK;
+	CALL(on_file_save(to<Reflex::FileEvent*>(event)));
+}
+RUCY_END
+
 static
 RUCY_DEF1(on_midi, event)
 {
@@ -505,8 +711,9 @@ Init_reflex_window ()
 
 	cWindow = mReflex.define_class("Window");
 	cWindow.define_alloc_func(alloc);
-	cWindow.define_method("show", show);
-	cWindow.define_method("hide", hide);
+	cWindow.define_method("show",       show);
+	cWindow.define_method("hide",       hide);
+	cWindow.define_method("hidden?", is_hidden);
 	cWindow.define_method("close", close);
 	cWindow.define_method("redraw", redraw);
 	cWindow.define_method("from_screen", from_screen);
@@ -518,17 +725,32 @@ Init_reflex_window ()
 	cWindow.define_method("frame",  get_frame);
 	cWindow.define_method("menu=",  set_menu);
 	cWindow.define_method("menu",   get_menu);
-	cWindow.define_method("closable=",    set_closable);
-	cWindow.define_method("closable?",     is_closable);
-	cWindow.define_method("minimizable=", set_minimizable);
-	cWindow.define_method("minimizable?",  is_minimizable);
-	cWindow.define_method("resizable=",   set_resizable);
-	cWindow.define_method("resizable?",    is_resizable);
-	cWindow.define_method("fullscreen=",  set_fullscreen);
-	cWindow.define_method("fullscreen?",   is_fullscreen);
-	cWindow.define_method("orientations=", set_orientations);
-	cWindow.define_method("orientations",  get_orientations);
-	cWindow.define_method("hidden", hidden);
+	cWindow.define_method("closable=",              set_closable);
+	cWindow.define_method("closable?",               is_closable);
+	cWindow.define_method("minimizable=",           set_minimizable);
+	cWindow.define_method("minimizable?",            is_minimizable);
+	cWindow.define_method("resizable=",             set_resizable);
+	cWindow.define_method("resizable?",              is_resizable);
+	cWindow.define_method("titlebar=",              set_titlebar);
+	cWindow.define_method("titlebar",               get_titlebar);
+	cWindow.define_method("unlisted=",              set_unlisted);
+	cWindow.define_method("unlisted?",               is_unlisted);
+	cWindow.define_method("shadow=",                set_shadow);
+	cWindow.define_method("shadow?",                has_shadow);
+	cWindow.define_method("transparent=",           set_transparent);
+	cWindow.define_method("transparent?",            is_transparent);
+	cWindow.define_method("fullscreen=",            set_fullscreen);
+	cWindow.define_method("fullscreen?",             is_fullscreen);
+	cWindow.define_method("always_on_top=",         set_always_on_top);
+	cWindow.define_method("always_on_top?",          is_always_on_top);
+	cWindow.define_method("always_on_bottom=",      set_always_on_bottom);
+	cWindow.define_method("always_on_bottom?",       is_always_on_bottom);
+	cWindow.define_method("pointer_through=",       set_pointer_through);
+	cWindow.define_method("pointer_through?",        is_pointer_through);
+	cWindow.define_method("pointer_through_alpha=", set_pointer_through_alpha);
+	cWindow.define_method("pointer_through_alpha",  get_pointer_through_alpha);
+	cWindow.define_method("orientations=",          set_orientations);
+	cWindow.define_method("orientations",           get_orientations);
 	cWindow.define_method("screen",  get_screen);
 	cWindow.define_method("root",    get_root);
 	cWindow.define_method("focus",   get_focus);
@@ -545,6 +767,9 @@ Init_reflex_window ()
 	cWindow.define_method("on_key",      on_key);
 	cWindow.define_method("on_key_down", on_key_down);
 	cWindow.define_method("on_key_up",   on_key_up);
+	cWindow.define_method("on_text",         on_text);
+	cWindow.define_method("on_text_preedit", on_text_preedit);
+	cWindow.define_method("on_text_commit",  on_text_commit);
 	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);
@@ -553,12 +778,18 @@ Init_reflex_window ()
 	cWindow.define_method("on_pointer_enter",  on_pointer_enter);
 	cWindow.define_method("on_pointer_leave",  on_pointer_leave);
 	cWindow.define_method("on_wheel",          on_wheel);
+	cWindow.define_method("on_file",      on_file);
+	cWindow.define_method("on_file_open", on_file_open);
+	cWindow.define_method("on_file_save", on_file_save);
 	cWindow.define_method("on_midi",           on_midi);
 	cWindow.define_method("on_note",           on_note);
 	cWindow.define_method("on_note_on",        on_note_on);
 	cWindow.define_method("on_note_off",       on_note_off);
 	cWindow.define_method("on_control_change", on_control_change);
 
+	cWindow.define_const("TITLEBAR_BUTTONS",    Reflex::Window::FLAG_TITLEBAR_BUTTONS);
+	cWindow.define_const("TITLEBAR_BACKGROUND", Reflex::Window::FLAG_TITLEBAR_BACKGROUND);
+
 	cWindow.define_const("ORIENTATION_PORTRAIT",  Reflex::Window::FLAG_PORTRAIT);
 	cWindow.define_const("ORIENTATION_LANDSCAPE", Reflex::Window::FLAG_LANDSCAPE);
 

data/include/reflex/application.h

@@ -50,6 +50,16 @@ namespace Reflex
 
 			virtual const Menu* menu () const;
 
+			virtual void    set_background (bool state);
+
+			virtual bool        background () const;
+
+			virtual void    set_background_menu (Menu* menu);
+
+			virtual       Menu* background_menu ();
+
+			virtual const Menu* background_menu () const;
+
 			virtual       window_iterator window_begin ();
 
 			virtual const_window_iterator window_begin () const;

data/include/reflex/color_picker.h

@@ -0,0 +1,65 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_COLOR_PICKER_H__
+#define __REFLEX_COLOR_PICKER_H__
+
+
+#include <xot/ref.h>
+#include <xot/pimpl.h>
+#include <reflex/defs.h>
+#include <reflex/event.h>
+
+
+namespace Reflex
+{
+
+
+	class Window;
+
+
+	class ColorPicker : public Xot::RefCountable<>
+	{
+
+		typedef ColorPicker This;
+
+		public:
+
+			typedef Xot::Ref<This> Ref;
+
+			ColorPicker ();
+
+			virtual ~ColorPicker ();
+
+			virtual void pick_color ();
+
+			virtual void pick_color (const Color& initial);
+
+			virtual void      set_owner (Window* window);
+
+			virtual       Window* owner ();
+
+			virtual const Window* owner () const;
+
+			virtual void set_alpha (bool state);
+
+			virtual bool     alpha () const;
+
+			virtual void on_color (ColorEvent* e);
+
+			virtual void on_close (Event* e);
+
+			virtual operator bool () const;
+
+			virtual bool operator ! () const;
+
+			struct Data;
+
+			Xot::PSharedImpl<Data> self;
+
+	};// ColorPicker
+
+
+}// Reflex
+
+
+#endif//EOH