X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwm.cc;h=d3b3c95370aad0e01f41ccfa46c0bd99d45a3a79;hb=a43297a61d69ca5fa5bb7ae8407757da978b4dd4;hp=16b5a2a6a984402ca0dc869b68c20ecf9560d79b;hpb=18aa4e842c332f25b041cc8b2e47090539197113;p=winnie

diff --git a/src/wm.cc b/src/wm.cc
index 16b5a2a..d3b3c95 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,11 +1,56 @@
+#include <algorithm>
 #include <stdexcept>
+
 #include "gfx.h"
 #include "wm.h"
 #include "window.h"
+#include "mouse.h"
+#include "mouse_cursor.h"
 
 WindowManager *wm;
 static WindowManager wminst;
 
+static void display(Window *win);
+static void mouse(Window *win, int key, bool pressed);
+static void motion(Window *win, int x, int y);
+
+void WindowManager::create_frame(Window *win)
+{
+	Window *frame = new Window;
+	Window *parent = win->get_parent();
+
+	frame->set_display_callback(display);
+//	frame->set_mouse_button_callback(mouse);
+//	frame->set_mouse_motion_callback(motion);
+
+	frame->add_child(win);
+	frames.push_back(frame);
+
+	Rect win_rect = win->get_rect();
+	frame->move(win_rect.x - frame_thickness, 
+			win_rect.y - frame_thickness - titlebar_thickness);
+	frame->resize(win_rect.width + frame_thickness * 2, 
+			win_rect.height + frame_thickness * 2 + titlebar_thickness);
+
+	parent->add_child(frame);
+}
+
+void WindowManager::destroy_frame(Window *win)
+{
+	Window *frame = win->parent;
+	if(!frame) {
+		return;
+	}
+
+	std::list<Window*>::iterator it;
+	it = std::find(frames.begin(), frames.end(), frame);
+	if(it != frames.end()) {
+		root_win->add_child(win);
+		frames.erase(it);
+		delete frame;
+	}
+}
+
 WindowManager::WindowManager()
 {
 	if(!wm) {
@@ -14,9 +59,40 @@ WindowManager::WindowManager()
 		throw std::runtime_error("Trying to create a second instance of WindowManager!\n");
 	}
 
+	root_win = new Window;
+	root_win->resize(get_screen_size().width, get_screen_size().height);
+	root_win->move(0, 0);
+	root_win->set_managed(false);
+
+	focused_win = 0;
+
 	bg_color[0] = 210;
 	bg_color[1] = 106;
 	bg_color[2] = 106;
+
+	frame_thickness = 2;
+	titlebar_thickness = 4;
+
+	frame_fcolor[0] = frame_fcolor[1] = frame_fcolor[2] = 142;
+	frame_ucolor[0] = frame_ucolor[1] = frame_ucolor[2] = 210;
+
+	mouse_cursor.set_image(mouse_cursor_width, mouse_cursor_height);
+	unsigned char *pixels = mouse_cursor.get_image();
+
+	for(int i=0; i<mouse_cursor_height; i++) {
+		for(int j=0; j<mouse_cursor_width; j++) {
+			int val = mouse_cursor_bw[i * mouse_cursor_width + j];
+			*pixels++ = val;
+			*pixels++ = val;
+			*pixels++ = val;
+			*pixels++ = 255;
+		}
+	}
+}
+
+WindowManager::~WindowManager()
+{
+	delete root_win;
 }
 
 void WindowManager::invalidate_region(const Rect &rect)
@@ -38,12 +114,87 @@ void WindowManager::process_windows()
 	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()) {
-		Rect intersect = rect_intersection((*it)->rect, uni); 
-		if(intersect.width && intersect.height) {
-			(*it)->draw();
+
+	root_win->draw_children(uni);
+
+	// draw mouse cursor
+	int mouse_x, mouse_y;
+	get_pointer_pos(&mouse_x, &mouse_y);
+
+	blit_key(mouse_cursor.get_image(), mouse_cursor.get_rect(),
+			get_framebuffer(), get_screen_size(), mouse_x, mouse_y,
+			0, 0, 0);
+
+	Rect mouse_rect = {mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height()};
+	invalidate_region(mouse_rect);
+}
+
+void WindowManager::add_window(Window *win)
+{
+	if(!win || win == root_win) {
+		return;
+	}
+
+	root_win->add_child(win);
+
+	if(windows.empty()) {
+		focused_win = win;
+	}
+
+	if(win->get_managed()) {
+		create_frame(win);
+	}
+
+	windows.push_back(win);
+}
+
+void WindowManager::remove_window(Window *win)
+{
+	std::list<Window*>::iterator it;
+	it = std::find(windows.begin(), windows.end(), win);
+
+	if(it != windows.end()) {
+		windows.erase(it);
+	}
+}
+
+void WindowManager::set_focused_window(Window *win)
+{
+	focused_win = win;
+}
+
+const Window *WindowManager::get_focused_window() const
+{
+	return focused_win;
+}
+
+Window *WindowManager::get_focused_window()
+{
+	return focused_win;
+}
+
+Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
+{
+	Window *win = 0;
+	std::list<Window*>::reverse_iterator rit = windows.rbegin();
+	while(rit != windows.rend()) {
+		if((*rit)->contains_point(pointer_x, pointer_y)) {
+			win = *rit;
+			break;
 		}
+		rit++;
+	}
+
+	return win;
+}
+
+static void display(Window *win)
+{
+	if(win->get_managed()) {
+		fill_rect(win->get_rect(), 255, 211, 5);
+		win->draw(win->get_parent()->get_rect());
 	}
 }
+
+//static void mouse(Window *win, int key, bool pressed);
+//static void motion(Window *win, int x, int y);