X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwindow.cc;h=ca8bdbc7a88b7e70f511bcd2591118ae16604975;hb=15e07ead145a859762b48ac9062a07cddf826151;hp=a0388fe28bae10b9374dc07e2fb3fea54deed654;hpb=026158b5ee6ffac95c3efc6eee4c155497cd8594;p=winnie

diff --git a/src/window.cc b/src/window.cc
index a0388fe..ca8bdbc 100644
--- a/src/window.cc
+++ b/src/window.cc
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <stdio.h> //TODO
 #include <string.h>
 
 #include "gfx.h"
@@ -15,6 +16,7 @@ Window::Window()
 	dirty = true;
 	managed = true;
 	focusable = true;
+	state = STATE_NORMAL;
 }
 
 Window::~Window()
@@ -90,23 +92,31 @@ void Window::invalidate()
 	wm->invalidate_region(abs_rect);
 }
 
-void Window::draw(const Rect &dirty_region)
+void Window::draw(Rect *dirty_region)
 {
-	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) {
+		Rect prev_clip = get_clipping_rect();
+		set_clipping_rect(abs_rect);
+		
 		if(callbacks.display) {
 			callbacks.display(this);
 		}
 		dirty = false;
 
-		draw_children(rect);
+		draw_children(abs_rect);
+		
+		*dirty_region = rect_union(*dirty_region, abs_rect);
+		set_clipping_rect(prev_clip);
 	}
 }
 
 void Window::draw_children(const Rect &dirty_region)
 {
+	Rect drect = dirty_region;
 	for(size_t i=0; i<children.size(); i++) {
-		children[i]->draw(dirty_region);
+		children[i]->draw(&drect);
 	}
 }
 
@@ -142,6 +152,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;
@@ -223,3 +238,13 @@ Window *Window::get_parent()
 {
 	return parent;
 }
+
+void Window::set_state(State state)
+{
+	this->state = state;
+}
+
+Window::State Window::get_state() const
+{
+	return state;
+}