*work in progress*

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index 0428a7c..16b5a2a 100644 (file)
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,8 +1,8 @@
 #include <stdexcept>
+#include "gfx.h"
 #include "wm.h"
 #include "window.h"
 
-
 WindowManager *wm;
 static WindowManager wminst;
 
@@ -13,6 +13,10 @@ WindowManager::WindowManager()
        } else {
                throw std::runtime_error("Trying to create a second instance of WindowManager!\n");
        }
+
+       bg_color[0] = 210;
+       bg_color[1] = 106;
+       bg_color[2] = 106;
 }
 
 void WindowManager::invalidate_region(const Rect &rect)
@@ -22,15 +26,23 @@ void WindowManager::invalidate_region(const Rect &rect)
 
 void WindowManager::process_windows()
 {
-       //TODO:
-       //sta dirty rectangles na brw to union
-       //na eleg3w poia einai sto dirty area k na ta kanw dirty
-       //na ka8arizw ta dirty areas
-       //prwta render to bg
-       //meta ola ta dirty:
+       if(dirty_rects.empty()) {
+               return;
+       }
+
+       std::list<Rect>::iterator drit = dirty_rects.begin();
+       Rect uni = *drit++;
+       while(drit != dirty_rects.end()) {
+               uni = rect_union(uni, *drit++);
+       }
+       dirty_rects.clear();
+
+       fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
+       
        std::list<Window*>::iterator it = windows.begin();
        while(it != windows.end()) {
-               if((*it)->dirty) {
+               Rect intersect = rect_intersection((*it)->rect, uni); 
+               if(intersect.width && intersect.height) {
                        (*it)->draw();
                }
        }