reflexion 0.1.2 → 0.1.3

data/ext/reflex/reflex.cpp

@@ -1,6 +1,6 @@
 #include <rucy.h>
 #include <reflex/reflex.h>
-#include "reflex.h"
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -10,19 +10,12 @@ namespace Reflex
 {
 
 
+	static Module mReflex;
+
 	Module
 	reflex_module ()
 	{
-		static Module m = define_module("Reflex");
-		return m;
-	}
-
-	Class
-	reflex_error_class ()
-	{
-		static Class c =
-			reflex_module().define_class("ReflexError", native_error_class());
-		return c;
+		return mReflex;
 	}
 
 
@@ -73,11 +66,11 @@ RUBY_END
 void
 Init_reflex ()
 {
-	Reflex::reflex_error_class();
+	Module m = define_module("Reflex");
+	Reflex::mReflex = m;
 
-	Reflex::reflex_module()
-		.define_singleton_method("init!", init)
-		.define_singleton_method("fin!", fin)
-		.define_singleton_method("run!", run)
-		.define_singleton_method("quit", quit);
+	m.define_singleton_method("init!", init);
+	m.define_singleton_method("fin!", fin);
+	m.define_singleton_method("run!", run);
+	m.define_singleton_method("quit", quit);
 }

data/ext/reflex/window.cpp

@@ -4,7 +4,7 @@
 #include <rucy.h>
 #include <reflex/ruby/key.h>
 #include <reflex/ruby/points.h>
-#include "reflex.h"
+#include "defs.h"
 
 
 using namespace Rucy;
@@ -16,11 +16,12 @@ namespace Reflex
 {
 
 
+	static Class cWindow;
+
 	Class
 	window_class ()
 	{
-		static Class c = reflex_module().define_class("Window");
-		return c;
+		return cWindow;
 	}
 
 
@@ -334,24 +335,28 @@ RUBY_END
 void
 Init_window ()
 {
-	Reflex::window_class()
-		.define_alloc_func(alloc)
-		.define_method("close",  close)
-		.define_method("show",   show)
-		.define_method("hide",   hide)
-		.define_method("hidden", hidden)
-		.define_method("update", update)
-		.define_method("draw",   draw)
-		.define_method("redraw", redraw)
-		.define_method("title",  get_title)
-		.define_method("title=", set_title)
-		.define_private_method("get_bounds", get_bounds)
-		.define_private_method("set_bounds", set_bounds)
-		.define_method("moved",   moved)
-		.define_method("resized", resized)
-		.define_method("key_down", key_down)
-		.define_method("key_up",   key_up)
-		.define_method("points_down", points_down)
-		.define_method("points_up",   points_up)
-		.define_method("points_moved", points_moved);
+	Module m = define_module("Reflex");
+
+	Class c = m.define_class("Window");
+	Reflex::cWindow = c;
+
+	c.define_alloc_func(alloc);
+	c.define_method("close",  close);
+	c.define_method("show",   show);
+	c.define_method("hide",   hide);
+	c.define_method("hidden", hidden);
+	c.define_method("update", update);
+	c.define_method("draw",   draw);
+	c.define_method("redraw", redraw);
+	c.define_method("title",  get_title);
+	c.define_method("title=", set_title);
+	c.define_private_method("get_bounds", get_bounds);
+	c.define_private_method("set_bounds", set_bounds);
+	c.define_method("moved",   moved);
+	c.define_method("resized", resized);
+	c.define_method("key_down", key_down);
+	c.define_method("key_up",   key_up);
+	c.define_method("points_down", points_down);
+	c.define_method("points_up",   points_up);
+	c.define_method("points_moved", points_moved);
 }

data/include/reflex/application.h

@@ -44,6 +44,9 @@ namespace Reflex
 	};// Application
 
 
+	Application* app ();
+
+
 }// Reflex
 
 

data/include/reflex/defs.h

@@ -4,34 +4,26 @@
 #define __REFLEX_DEFS_H__
 
 
-#include <string>
-#include <vector>
+#include <xot/defs.h>
+#include <xot/string.h>
 
 
 namespace Reflex
 {
 
 
-	typedef unsigned char  uchar;
+	using namespace Xot::Types;
 
-	typedef unsigned short ushort;
+	using Xot::String;
 
-	typedef unsigned int   uint;
-
-	typedef unsigned long  ulong;
 
 	typedef float coord;
 
-	typedef std::string String;
-
-
-	enum {UNKNOWN = 0};
-
 
 	enum KeyCodes
 	{
 
-		KEY_NONE = UNKNOWN,
+		KEY_NONE = 0,
 
 		KEY_RETURN,
 		KEY_ENTER = KEY_RETURN,
@@ -64,17 +56,17 @@ namespace Reflex
 		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_LCOMMAND,
-		KEY_RCOMMAND,
-
-		KEY_WIN,
-		KEY_LWIN,
-		KEY_RWIN,
+		KEY_COMMAND  = KEY_WIN,
+		KEY_LCOMMAND = KEY_LWIN,
+		KEY_RCOMMAND = KEY_RWIN,
 
 		KEY_CAPSLOCK,
 		KEY_NUMLOCK,
@@ -82,24 +74,49 @@ namespace Reflex
 
 		KEY_PRINTSCREEN,
 		KEY_PAUSE,
-
-		KEY_KANA,
-		KEY_KANJI,
+		KEY_BREAK,
 
 		KEY_SLEEP,
-		KEY_EXECUTE,
+		KEY_EXEC,//UTE,
 		KEY_HELP,
 		KEY_PRINT,
 		KEY_APPS,
 		KEY_SELECT,
-		KEY_ACCEPT,
-		KEY_CANCEL,
 		KEY_CLEAR,
-		KEY_FINAL,
-		KEY_CONVERT,
-		KEY_NONCONVERT,
-		KEY_MODECHANGE,
-		KEY_JUNJA,
+		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_F1,
 		KEY_F2,
@@ -143,7 +160,7 @@ namespace Reflex
 	enum PointTypes
 	{
 
-		POINT_NONE         = UNKNOWN,
+		POINT_NONE         = 0,
 
 		POINT_MOUSE_LEFT   = 0x1 << 0,
 
@@ -165,17 +182,21 @@ namespace Reflex
 	enum Modifiers
 	{
 
-		MOD_NONE     = UNKNOWN,
+		MOD_NONE     = 0,
 
-		MOD_SHIFT    = 0x1 << 0,
+#ifndef MOD_SHIFT
+		MOD_SHIFT    = 0x1 << 2,
 
 		MOD_CONTROL  = 0x1 << 1,
 
-		MOD_ALT      = 0x1 << 2,
+		MOD_ALT      = 0x1 << 0,
+
+		MOD_WIN      = 0x1 << 3,
+#endif
 
 		MOD_OPTION   = MOD_ALT,
 
-		MOD_COMMAND  = 0x1 << 3,
+		MOD_COMMAND  = MOD_WIN,
 
 		MOD_HELP     = 0x1 << 4,
 
@@ -193,10 +214,12 @@ namespace Reflex
 
 		String chars;
 
-		int code, repeat;
+		int code;
 
 		uint modifiers;
 
+		int repeat;
+
 		Key ();
 
 		Key (

data/include/reflex/exception.h

@@ -0,0 +1,41 @@
+// -*- c++ -*-
+#pragma once
+#ifndef __REFLEX_EXCEPTION_H__
+#define __REFLEX_EXCEPTION_H__
+
+
+#include <stdexcept>
+#include <reflex/defs.h>
+
+
+namespace Reflex
+{
+
+
+	class ReflexException : public std::runtime_error
+	{
+
+		typedef std::runtime_error Super;
+
+		public:
+
+			ReflexException (const char* format = NULL, ...);
+
+			~ReflexException () throw();
+
+			const char* what () const throw();
+
+		private:
+
+			String text;
+
+	};// ReflexException
+
+
+	void error (const char* format = NULL, ...);
+
+
+}// Reflex
+
+
+#endif//EOH

data/include/reflex.h

@@ -6,6 +6,7 @@
 
 #include <reflex/defs.h>
 #include <reflex/reflex.h>
+#include <reflex/exception.h>
 #include <reflex/window.h>
 #include <reflex/helpers.h>
 

data/lib/reflex/module.rb

@@ -15,7 +15,15 @@ module Reflex
     end
 
     def library_dirs ()
-      [File.join(root_dir, 'lib')]
+      %w[lib ext].map {|dir| File.join root_dir, dir}
+    end
+
+    def task_dir ()
+      File.join root_dir, 'task'
+    end
+
+    def load_tasks ()
+      Dir["#{task_dir}/**/*.rake"].each {|path| load path}
     end
 
     def version ()

data/reflex.gemspec

@@ -1,15 +1,21 @@
 # -*- mode: ruby; coding: utf-8 -*-
+
+
 $: << File.join(File.dirname(__FILE__), 'lib')
+
 require 'rake'
 require 'reflex/module'
 
 
-FILES = FileList[*%w[
-  ChangeLog
+MODULE = Reflex
+NAME   = MODULE.name.downcase
+
+
+FILES = FileList[*%W[
   README
+  ChangeLog
   Rakefile
-  support.rb
-  reflex.gemspec
+  #{NAME}.gemspec
   VERSION
   task/**/*.rake
   ext/**/*.rb
@@ -28,20 +34,27 @@ FILES = FileList[*%w[
   test/**/*.rb
 ]]
 
+RDOCS = FileList[*%W[
+  README
+  .doc/ext/**/*.cpp
+]]
+
+
 Gem::Specification.new do |s|
-  s.name        = 'reflexion'
+  s.name        = "#{NAME}ion"
   s.summary     = 'A Graphical User Interface Tool Kit.'
   s.description = 'This library helps you to develop interactive graphical user interface.'
-  s.version     = Reflex.version
+  s.version     = MODULE.version
 
   s.authors  = %w[snori]
   s.email    = 'snori@xord.org'
-  s.homepage = 'http://github.com/xord/reflex'
+  s.homepage = "http://github.com/xord/#{NAME}"
 
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>=1.9.0'
   s.require_paths         << 'ext'
 
+  s.add_runtime_dependency 'xot'
   s.add_runtime_dependency 'rucy'
   s.add_runtime_dependency 'rays'
   s.add_development_dependency 'rake'
@@ -51,7 +64,7 @@ Gem::Specification.new do |s|
   s.test_files = FileList['test/**/test_*.rb'].to_a
 
   s.has_rdoc         = true
-  s.extra_rdoc_files = ['README']
+  s.extra_rdoc_files = RDOCS.to_a
 
   s.extensions << 'Rakefile'
 end

data/src/cocoa/application.mm

@@ -3,6 +3,7 @@
 
 
 #import <Cocoa/Cocoa.h>
+#include <reflex/exception.h>
 #include "applicationdata.h"
 #import "cocoaapplication.h"
 
@@ -11,8 +12,22 @@ namespace Reflex
 {
 
 
+	static Application* instance = NULL;
+
+
+	Application*
+	app ()
+	{
+		return instance;
+	}
+
+
 	Application::Application ()
 	{
+		if (instance) error("multiple application instance.");
+
+		instance = this;
+
 		self->this_ = this;
 		self->self_ = NSApp ? [NSApp retain] : nil;
 		if (self->self_)
@@ -27,6 +42,8 @@ namespace Reflex
 			self->self_ = nil;
 		}
 		self->this_ = NULL;
+
+		instance = NULL;
 	}
 
 	bool

data/src/cocoa/reflex.mm

@@ -18,6 +18,12 @@ namespace Reflex
 	}// global
 
 
+	bool
+	initialized ()
+	{
+		return global::pool;
+	}
+
 	bool
 	init ()
 	{
@@ -41,28 +47,5 @@ namespace Reflex
 		return true;
 	}
 
-	bool
-	run (const char* name)
-	{
-		if (!global::pool || !NSApp) return false;
-
-		Application app;
-		if (!app) return false;
-
-		if (name && !app.set_name(name))
-			return false;
-
-		return app.run();
-	}
-
-	bool
-	quit ()
-	{
-		if (!global::pool || !NSApp) return false;
-
-		[NSApp terminate: nil];
-		return true;
-	}
-
 
 }// Reflex

data/src/defs.cpp

@@ -6,12 +6,12 @@ namespace Reflex
 
 
 	Key::Key ()
-	:	code(KEY_NONE), repeat(0), modifiers(MOD_NONE)
+	:	code(KEY_NONE), modifiers(MOD_NONE), repeat(0)
 	{
 	}
 
 	Key::Key (const char* chars, int code, uint modifiers, int repeat)
-	:	chars(chars), code(code), repeat(repeat), modifiers(modifiers)
+	:	chars(chars ? chars : ""), code(code), modifiers(modifiers), repeat(repeat)
 	{
 	}
 

data/src/exception.cpp

@@ -0,0 +1,49 @@
+#include "reflex/exception.h"
+
+
+#define VA_STRING(format, result) \
+	String result; \
+	do \
+	{ \
+		if (format) \
+		{ \
+			va_list args; \
+			va_start(args, format); \
+			result = Xot::stringf(format, args); \
+			va_end(args); \
+		} \
+	} \
+	while (false)
+
+
+namespace Reflex
+{
+
+
+	ReflexException::ReflexException (const char* format, ...)
+	:	Super("")
+	{
+		VA_STRING(format, s);
+		text = s;
+	}
+
+	ReflexException::~ReflexException () throw()
+	{
+	}
+
+	const char*
+	ReflexException::what () const throw()
+	{
+		return text.c_str();
+	}
+
+
+	void
+	error (const char* format, ...)
+	{
+		VA_STRING(format, s);
+		throw ReflexException(s.c_str());
+	}
+
+
+}// Reflex

data/src/reflex.cpp

@@ -0,0 +1,37 @@
+#include "reflex/reflex.h"
+
+
+#include <reflex/application.h>
+
+
+namespace Reflex
+{
+
+
+	bool initialized ();
+
+
+	bool
+	run (const char* name)
+	{
+		if (!initialized() || app()) return false;
+
+		Application a;
+		if (!a) return false;
+
+		if (name && !a.set_name(name))
+			return false;
+
+		return a.run();
+	}
+
+	bool
+	quit ()
+	{
+		if (!initialized() || !app()) return false;
+
+		return app()->quit();
+	}
+
+
+}// Reflex