X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwindow.cc;h=59302d4ec309f9e683413a7e5fc62f57092a7b4c;hb=be0a7f10421181033894629afbba677986bb9f44;hp=2a8b6f513aa28e5bf5fcef5ccd14a4b447e12f13;hpb=d114b136897ca569d819da5f9b75bd08f9cbe2c0;p=winnie

diff --git a/src/window.cc b/src/window.cc
index 2a8b6f5..59302d4 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -7,6 +7,7 @@
 
 Window::Window()
 {
+	parent = 0;
 	title = 0;
 	rect.x = rect.y = 0;
 	rect.width = rect.height = 128;
@@ -31,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)
@@ -67,22 +86,21 @@ 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)
 {
-	//TODO
-	//titlebar, frame
-
-	Rect intersect = rect_intersection(rect, dirty_region);
+	Rect abs_rect = get_absolute_rect();
+	Rect intersect = rect_intersection(abs_rect, dirty_region);
 	if(intersect.width && intersect.height) {
 		if(callbacks.display) {
 			callbacks.display(this);
 		}
 		dirty = false;
 
-		draw_children(rect);
+		draw_children(abs_rect);
 	}
 }
 
@@ -96,7 +114,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()
@@ -124,6 +143,11 @@ bool Window::get_focusable() const
 	return focusable;
 }
 
+bool Window::get_dirty() const
+{
+	return dirty;
+}
+
 void Window::set_display_callback(DisplayFuncType func)
 {
 	callbacks.display = func;