projects
/
winnie
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed comments
[winnie]
/
src
/
window.cc
diff --git
a/src/window.cc
b/src/window.cc
index
a0388fe
..
ca8bdbc
100644
(file)
--- a/
src/window.cc
+++ b/
src/window.cc
@@
-1,4
+1,5
@@
#include <algorithm>
#include <algorithm>
+#include <stdio.h> //TODO
#include <string.h>
#include "gfx.h"
#include <string.h>
#include "gfx.h"
@@
-15,6
+16,7
@@
Window::Window()
dirty = true;
managed = true;
focusable = true;
dirty = true;
managed = true;
focusable = true;
+ state = STATE_NORMAL;
}
Window::~Window()
}
Window::~Window()
@@
-90,23
+92,31
@@
void Window::invalidate()
wm->invalidate_region(abs_rect);
}
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) {
if(intersect.width && intersect.height) {
+ Rect prev_clip = get_clipping_rect();
+ set_clipping_rect(abs_rect);
+
if(callbacks.display) {
callbacks.display(this);
}
dirty = false;
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)
{
}
}
void Window::draw_children(const Rect &dirty_region)
{
+ Rect drect = dirty_region;
for(size_t i=0; i<children.size(); i++) {
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;
}
return focusable;
}
+bool Window::get_dirty() const
+{
+ return dirty;
+}
+
void Window::set_display_callback(DisplayFuncType func)
{
callbacks.display = func;
void Window::set_display_callback(DisplayFuncType func)
{
callbacks.display = func;
@@
-223,3
+238,13
@@
Window *Window::get_parent()
{
return parent;
}
{
return parent;
}
+
+void Window::set_state(State state)
+{
+ this->state = state;
+}
+
+Window::State Window::get_state() const
+{
+ return state;
+}