reflexion 0.1.3 → 0.1.4

data/src/win32/window.cpp

@@ -1,10 +1,13 @@
 #include "reflex/window.h"
 
 
+#define NOMINMAX
 #include <windows.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/scoped_array.hpp>
+#include <rays/painter.h>
 #include "reflex/reflex.h"
+#include "reflex/view.h"
 #include "opengl.h"
 
 
@@ -21,11 +24,52 @@ namespace Reflex
 
 		int hidecount;
 
+		bool redraw;
+
+		Painter painter;
+
+		View::Ref root;
+
+		String title_tmp;
+
 		OpenGL opengl;
 
 		Data ()
-		:	this_(NULL), hwnd(NULL), hidecount(1)
+		:	this_(NULL), hwnd(NULL), hidecount(1), redraw(true), root(new View)
+		{
+			root->set_name("root");
+		}
+
+		~Data ()
+		{
+			unbind();
+		}
+
+		void bind_reflex (Window* obj)
+		{
+			if (!obj) return;
+
+			this_ = obj;
+		}
+
+		void unbind_reflex ()
+		{
+			this_ = NULL;
+		}
+
+		void unbind ()
+		{
+			unbind_reflex();
+		}
+
+		operator bool () const
+		{
+			return this_ && hwnd && IsWindow(hwnd);
+		}
+
+		bool operator ! () const
 		{
+			return !operator bool();
 		}
 
 	};// Window::Data
@@ -198,7 +242,7 @@ namespace Reflex
 			case WM_TIMER:
 			{
 				if (wp == UPDATE_TIMER_ID)
-					win->update();
+					win->update(1);
 				return 0;
 			}
 
@@ -291,24 +335,18 @@ namespace Reflex
 
 	Window::Window ()
 	{
-		self->this_ = this;
+		self->bind_reflex(this);
 
 		create_window(this);
+
+		self->painter.canvas(0, 0, 1, 1);
 	}
 
 	Window::~Window ()
 	{
 		close();
-		self->this_ = NULL;
-	}
-
-	bool
-	Window::close ()
-	{
-		if (!self->hwnd || !IsWindow(self->hwnd))
-			return false;
 
-		return DestroyWindow(self->hwnd) != FALSE;
+		self->unbind_reflex();
 	}
 
 	static bool
@@ -361,11 +399,12 @@ namespace Reflex
 	}
 
 	bool
-	Window::hidden () const
+	Window::close ()
 	{
-		if (!*this) return true;
+		if (!self->hwnd || !IsWindow(self->hwnd))
+			return false;
 
-		return self->hidecount > 0;
+		return DestroyWindow(self->hwnd) != FALSE;
 	}
 
 	bool
@@ -374,6 +413,9 @@ namespace Reflex
 		if (!*this) return false;
 
 		#if 1
+			self->redraw = true;
+			return true;
+		#elif 1
 			InvalidateRect(self->hwnd, NULL, FALSE);
 			return true;
 		#else
@@ -383,45 +425,66 @@ namespace Reflex
 	}
 
 	bool
-	Window::get_title (String* title) const
+	Window::set_title (const char* title)
 	{
 		if (!*this || !title) return false;
 
-		*title = "";
+		return SetWindowText(self->hwnd, title) != FALSE;
+	}
+
+	const char*
+	Window::title () const
+	{
+		if (!*this) return "";
 
 		int size = GetWindowTextLength(self->hwnd);
-		if (size <= 0) return true;
+		if (size <= 0) return "";
 
 		boost::scoped_array<char> buf(new char[size + 1]);
 		if (GetWindowText(self->hwnd, &buf[0], size + 1) != size)
-			return false;
+			return "";
 
-		*title = &buf[0];
-		return true;
-	}
-
-	bool
-	Window::set_title (const char* title)
-	{
-		if (!*this || !title) return false;
-
-		return SetWindowText(self->hwnd, title) != FALSE;
+		self->title_tmp = &buf[0];
+		return self->title_tmp.c_str();
 	}
 
-	bool
-	Window::get_bounds (coord* x, coord* y, coord* width, coord* height)
+	static bool
+	get_window_bounds (
+		HWND hwnd, coord* x, coord* y, coord* width, coord* height,
+		coord* nonclient_width = NULL, coord* nonclient_height = NULL)
 	{
-		if (!*this || (!x && !y && !width && !height))
+		if (
+			!hwnd ||
+			(!x && !y && !width && !height) ||
+			!!nonclient_width != !!nonclient_height)
+		{
 			return false;
+		}
 
-		RECT rect;
-		if (!GetWindowRect(self->hwnd, &rect))
+		RECT window, client;
+		if (
+			!GetWindowRect(hwnd, &window) ||
+			!GetClientRect(hwnd, &client))
+		{
 			return false;
+		}
+
+		if (x)      *x      = window.left;
+		if (y)      *y      = window.top;
+		if (width)  *width  = client.right  - client.left;
+		if (height) *height = client.bottom - client.top;
+
+		if (nonclient_width || nonclient_height)
+		{
+			coord ww = window.right  - window.left;
+			coord wh = window.bottom - window.top;
+			coord cw = client.right  - client.left;
+			coord ch = client.bottom - client.top;
+
+			*nonclient_width  = ww - cw;
+			*nonclient_height = wh - ch;
+		}
 
-		if (x)      *x      = rect.left;
-		if (y)      *y      = rect.top;
-		if (width)  *width  = rect.right  - rect.left + 1;
-		if (height) *height = rect.bottom - rect.top  + 1;
 		return true;
 	}
 
@@ -430,9 +493,16 @@ namespace Reflex
 	{
 		if (!*this) return false;
 
-		coord xx, yy, ww, hh;
-		if (!get_bounds(&xx, &yy, &ww, &hh))
+		coord xx, yy, ww, hh, nonclient_w, nonclient_h;
+		if (
+			!get_window_bounds(
+				self->hwnd, &xx, &yy, &ww, &hh, &nonclient_w, &nonclient_h))
+		{
 			return false;
+		}
+
+		width  += nonclient_w;
+		height += nonclient_h;
 
 		UINT flags = 0;
 		if (x     == xx && y      == yy) flags |= SWP_NOMOVE;
@@ -445,9 +515,35 @@ namespace Reflex
 			flags | SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOOWNERZORDER);
 	}
 
+	bool
+	Window::get_bounds (coord* x, coord* y, coord* width, coord* height)
+	{
+		return *this && get_window_bounds(self->hwnd, x, y, width, height);
+	}
+
+	bool
+	Window::hidden () const
+	{
+		if (!*this) return true;
+
+		return self->hidecount > 0;
+	}
+
+	View*
+	Window::root ()
+	{
+		return self->root.get();
+	}
+
+	Painter*
+	Window::painter ()
+	{
+		return &self->painter;
+	}
+
 	Window::operator bool () const
 	{
-		return self && self->this_ && self->hwnd && IsWindow(self->hwnd);
+		return self && *self;
 	}
 
 

data/src/window.cpp

@@ -1,18 +1,50 @@
 #include "reflex/window.h"
 
 
+#include <rays/bounds.h>
+#include <rays/painter.h>
+#include <reflex/view.h>
+
+
 namespace Reflex
 {
 
 
+	void update_view_tree (View* v, float dt);
+
+	void draw_view_tree (View* v, Painter* p, coord left, coord top);
+
+
+	const View*
+	Window::root () const
+	{
+		return const_cast<Window*>(this)->root();
+	}
+
+	const Painter*
+	Window::painter () const
+	{
+		return const_cast<Window*>(this)->painter();
+	}
+
 	void
-	Window::update ()
+	Window::update (float dt)
 	{
+		update_view_tree(root(), dt);
 	}
 
 	void
 	Window::draw ()
 	{
+		Painter* p = painter();
+		if (!p) return;
+
+		View* v = root();
+		if (!v) return;
+
+		if (!p->begin()) return;
+		draw_view_tree(v, p, 0, 0);
+		p->end();
 	}
 
 	void
@@ -23,6 +55,11 @@ namespace Reflex
 	void
 	Window::resized (coord width, coord height)
 	{
+		Painter* p = painter();
+		if (p) p->canvas(0, 0, width, height);
+
+		View* v = root();
+		if (v) v->set_bounds(0, 0, width, height);
 	}
 
 	void

data/test/helpers.rb

@@ -1,11 +1,8 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
 
 
-%w[rays reflex].product(%w[ext lib]).each do |paths|
-  paths = %w[.. ..] + paths
-  $: << File.expand_path(File.join File.dirname(__FILE__), *paths)
-end
+require 'bundler/setup'
+require 'test/unit'
 require 'reflex'
 
 

data/test/test_application.rb

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestApplication < Test::Unit::TestCase
+
+  @@app = Reflex::Application.new
+
+  def test_name ()
+    assert_equal '', @@app.name
+    @@app.name = 'AppName'
+    assert_equal 'AppName', @@app.name
+  end
+
+end# TestApplication

data/test/test_reflex.rb

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
-$: << File.dirname(__FILE__)
+
+
 $RAYS_NOAUTOINIT = true
 $REFLEX_NOAUTOINIT = true
-require 'helpers'
+
+require_relative 'helpers'
 
 
 class TestReflex < Test::Unit::TestCase

data/test/test_view.rb

@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+
+require_relative 'helpers'
+
+
+class TestView < Test::Unit::TestCase
+
+  def view (*args)
+    Reflex::View.new *args
+  end
+
+  def test_initialize ()
+    assert_equal '', view.name
+    assert_equal 'Test', view(:name => 'Test').name
+  end
+
+  def test_hidden ()
+    v = view
+    assert_equal false, v.hidden
+    v.hide
+    assert_equal true, v.hidden
+    v.show
+    assert_equal false, v.hidden
+  end
+
+  def test_hidden_count ()
+    v = view
+    v.show
+    assert_equal false, v.hidden
+    v.hide
+    assert_equal false, v.hidden
+    v.hide
+    assert_equal true, v.hidden
+  end
+
+  def test_add_child ()
+    assert_raise(ArgumentError) {view.add_child}
+    assert_raise(ArgumentError) {view.add_child nil}
+    assert_raise(ArgumentError) {view.add_child 1}
+    assert_nothing_raised {view.add_child view}
+  end
+
+  def test_remove_child ()
+    assert_raise(ArgumentError) {view.remove_child}
+    assert_raise(ArgumentError) {view.remove_child nil}
+    assert_raise(ArgumentError) {view.remove_child 1}
+    assert_raise(Rucy::NativeError) {view.remove_child view}
+    v = view
+    v.add_child child = view
+    assert_nothing_raised {v.remove_child child}
+  end
+
+  def test_find_child ()
+    v = view
+    v.add_child child = view(:name => :Test)
+    assert_equal child, v.find_child(:Test)
+  end
+
+  def test_parent ()
+    parent, child = view, view
+    parent.add_child child
+    assert_nil parent.parent
+    assert_equal parent, child.parent
+  end
+
+  def test_name ()
+    v = view
+    assert_equal '', v.name
+    v.name = 'Test'
+    assert_equal 'Test', v.name
+  end
+
+end# TestView

data/test/test_window.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-$: << File.dirname(__FILE__)
-require 'helpers'
+
+
+require_relative 'helpers'
 
 
 class TestWindow < Test::Unit::TestCase
@@ -36,4 +37,34 @@ class TestWindow < Test::Unit::TestCase
     assert_equal 'test title', @w.title
   end
 
+  def test_root ()
+    assert_not_nil @w.root
+    assert_nil     @w.root.parent
+    assert_equal 'root', @w.root.name
+  end
+
+  def test_window ()
+    assert_equal @w, @w.root.window
+  end
+
+  def test_move ()
+    b = @w.bounds.to_a
+    @w.move_to 100, 100
+    assert_equal [100, 100], @w.bounds.pos.to_a
+    @w.move_by 5, 5
+    assert_equal [105, 105], @w.bounds.pos.to_a
+    @w.move_by -1, -1
+    assert_equal [104, 104], @w.bounds.pos.to_a
+  end
+
+  def test_resize ()
+    b = @w.bounds.to_a
+    @w.resize_to 200, 200
+    assert_equal [200, 200], @w.bounds.size.to_a
+    @w.resize_by 5, 5
+    assert_equal [205, 205], @w.bounds.size.to_a
+    @w.resize_by -1, -1
+    assert_equal [204, 204], @w.bounds.size.to_a
+  end
+
 end# TestWindow