raise works

[winnie] / src / window.cc

diff --git a/src/window.cc b/src/window.cc
index b5635ed..ab1e3e7 100644 (file)
--- a/src/window.cc
+++ b/src/window.cc
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <stdio.h> //TODO
 #include <string.h>
 
 #include "gfx.h"
@@ -86,30 +87,30 @@ const char *Window::get_title() const
 void Window::invalidate()
 {
        dirty = true;
-       Rect abs_rect = get_absolute_rect(); 
+       Rect abs_rect = get_absolute_rect();
        wm->invalidate_region(abs_rect);
 }
 
-void Window::draw(const Rect &dirty_region)
+void Window::draw(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);
+               *dirty_region = rect_union(*dirty_region, abs_rect);
        }
 }
 
 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);
        }
 }
 
@@ -145,6 +146,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;