X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwindow.cc;h=b5635ed856cda6afe04c1c2f9c8e05be74866d5c;hb=981f0eab2195d34f7c186a2e3e891810e14ce5b4;hp=f5b1ada01d28afb1eef6f4220ca05ba2ffbb7057;hpb=a43297a61d69ca5fa5bb7ae8407757da978b4dd4;p=winnie

diff --git a/src/window.cc b/src/window.cc
index f5b1ada..b5635ed 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -7,12 +7,14 @@
 
 Window::Window()
 {
+	parent = 0;
 	title = 0;
 	rect.x = rect.y = 0;
 	rect.width = rect.height = 128;
 	memset(&callbacks, 0, sizeof callbacks);
 	dirty = true;
 	managed = true;
+	focusable = true;
 }
 
 Window::~Window()
@@ -30,10 +32,28 @@ const Rect &Window::get_rect() const
 	return rect;
 }
 
+Rect Window::get_absolute_rect() const
+{
+	if(!parent) {
+		return rect;
+	}
+
+	Rect absolute_rect;
+	absolute_rect = parent->get_absolute_rect();
+
+	absolute_rect.x += rect.x;
+	absolute_rect.y += rect.y;
+	absolute_rect.width = rect.width;
+	absolute_rect.height = rect.height;
+
+	return absolute_rect;
+}
+
 bool Window::contains_point(int ptr_x, int ptr_y)
 {
-	return ptr_x >= rect.x && ptr_x < rect.x + rect.width &&
-			ptr_y >= rect.y && ptr_y < rect.y + rect.height;
+	Rect abs_rect = get_absolute_rect();
+	return ptr_x >= abs_rect.x && ptr_x < abs_rect.x + abs_rect.width &&
+			ptr_y >= abs_rect.y && ptr_y < abs_rect.y + abs_rect.height;
 }
 
 void Window::move(int x, int y)
@@ -66,7 +86,8 @@ const char *Window::get_title() const
 void Window::invalidate()
 {
 	dirty = true;
-	wm->invalidate_region(rect);
+	Rect abs_rect = get_absolute_rect(); 
+	wm->invalidate_region(abs_rect);
 }
 
 void Window::draw(const Rect &dirty_region)
@@ -95,7 +116,8 @@ void Window::draw_children(const Rect &dirty_region)
 unsigned char *Window::get_win_start_on_fb()
 {
 	unsigned char *fb = get_framebuffer();
-	return fb + get_color_depth() * (get_screen_size().x * rect.y + rect.x) / 8;
+	Rect abs_rect = get_absolute_rect();
+	return fb + get_color_depth() * (get_screen_size().x * abs_rect.y + abs_rect.x) / 8;
 }
 
 int Window::get_scanline_width()
@@ -113,6 +135,16 @@ bool Window::get_managed() const
 	return managed;
 }
 
+void Window::set_focusable(bool focusable)
+{
+	this->focusable = focusable;
+}
+
+bool Window::get_focusable() const
+{
+	return focusable;
+}
+
 void Window::set_display_callback(DisplayFuncType func)
 {
 	callbacks.display = func;
@@ -172,6 +204,19 @@ void Window::remove_child(Window *win)
 	}
 }
 
+Window **Window::get_children()
+{
+	if(children.empty()) {
+		return 0;
+	}
+	return &children[0];
+}
+
+int Window::get_children_count() const
+{
+	return (int)children.size();
+}
+
 const Window *Window::get_parent() const
 {
 	return parent;