X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fwindow.h;h=040f6b578f47a1ab08333402fa9c4e95b73acf49;hp=dae3a42f9a5f9a9c6fddbb96212e25ef1da65508;hb=a43297a61d69ca5fa5bb7ae8407757da978b4dd4;hpb=52e08b5a5e7d44271d217892372c6c0878484c44

diff --git a/src/window.h b/src/window.h
index dae3a42..040f6b5 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,6 +1,8 @@
 #ifndef WINDOW_H_
 #define WINDOW_H_
 
+#include <vector>
+
 #include "geom.h"
 #include "event.h"
 
@@ -10,14 +12,18 @@ private:
 	Rect rect;
 	Callbacks callbacks;
 
+	std::vector<Window*> children;
+	Window* parent;
+
 	bool dirty;
+	bool managed; // whether the wm manages (+decorates) this win
 
 public:
 	Window();
 	~Window();
 
 	const Rect &get_rect() const;
-	bool contains_ptr(int ptr_x, int ptr_y);
+	bool contains_point(int ptr_x, int ptr_y);
 
 	void move(int x, int y);
 	void resize(int x, int y);
@@ -30,11 +36,15 @@ public:
 	 */
 	void invalidate();
 
-	void draw();
+	void draw(const Rect &dirty_region);
+	void draw_children(const Rect &dirty_region);
 
 	unsigned char *get_win_start_on_fb();
 	int get_scanline_width();
 
+	void set_managed(bool managed);
+	bool get_managed() const;
+
 	void set_display_callback(DisplayFuncType func);
 	void set_keyboard_callback(KeyboardFuncType func);
 	void set_mouse_button_callback(MouseButtonFuncType func);
@@ -45,6 +55,13 @@ public:
 	const MouseButtonFuncType get_mouse_button_callback() const;
 	const MouseMotionFuncType get_mouse_motion_callback() const;
 
+	// win hierarchy
+	void add_child(Window *win);
+	void remove_child(Window *win);
+
+	const Window *get_parent() const;
+	Window *get_parent();
+
 	// XXX remove if not needed
 	friend class WindowManager;
 };