X-Git-Url: https://eleni.mutantstargoat.com/git/?p=winnie;a=blobdiff_plain;f=src%2Fwm.cc;h=ec73a5bc112558c015c573bb4ae533247aaaebce;hp=0428a7cce19e0f6722a8a34c168d672d2cc1c132;hb=d114b136897ca569d819da5f9b75bd08f9cbe2c0;hpb=8a92836b3af157fd47c657cfe546887e5f5683a8

diff --git a/src/wm.cc b/src/wm.cc
index 0428a7c..ec73a5b 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,11 +1,59 @@
+#include <algorithm>
 #include <stdexcept>
+#include <stdio.h>	// TODO
+
+#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 bn, 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);
+	frame->set_focusable(false);
+
+	windows.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(windows.begin(), windows.end(), frame);
+	if(it != windows.end()) {
+		root_win->add_child(win);
+		windows.erase(it);
+		delete frame;
+	}
+}
+
 WindowManager::WindowManager()
 {
 	if(!wm) {
@@ -13,6 +61,41 @@ WindowManager::WindowManager()
 	} else {
 		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)
@@ -22,16 +105,142 @@ 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:
-	std::list<Window*>::iterator it = windows.begin();
-	while(it != windows.end()) {
-		if((*it)->dirty) {
-			(*it)->draw();
+	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]);
+
+	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)
+{
+	if(!win) {
+		focused_win = 0;
+		return;
+	}
+
+	if(win->get_focusable()) {
+		focused_win = win;
+		return;
+	}
+
+	Window **children = win->get_children();
+	for(int i=0; i<win->get_children_count(); i++) {
+		if(children[0]->get_focusable()) {
+			set_focused_window(children[0]);
+			return;
+		}
+	}
+
+	focused_win = 0;
+}
+
+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)
+{
+	std::list<Window*>::reverse_iterator rit = windows.rbegin();
+	while(rit != windows.rend()) {
+		Window *w = *rit++;
+		Window *parent = w->get_parent();
+
+		if(parent == root_win && w->contains_point(pointer_x, pointer_y)) {
+			return w;
+		}
+	}
+
+	return 0;
+}
+
+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 int prev_x = -1, prev_y;
+
+static void mouse(Window *win, int bn, bool pressed)
+{
+	printf("mouse callback (%d, %s)\n", bn, pressed ? "pressed" : "released");
+	if(bn == 0) {
+		if(pressed) {
+			get_pointer_pos(&prev_x, &prev_y);
+		} else {
+			prev_x = -1;
 		}
 	}
 }
+
+static void motion(Window *win, int x, int y)
+{
+	int left_bn = get_button(0);
+	if(left_bn && prev_x != -1) {
+		int dx = x - prev_x;
+		int dy = y - prev_y;
+		prev_x = x;
+		prev_y = y;
+
+		Rect rect = win->get_rect();
+		win->move(rect.x + dx, rect.y + dy);
+	}
+}