X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwm.cc;h=dd47d30f4ffcab400c59bf87b43152b84cc33266;hb=32869d8ffb64be82541f48166c5e73a6c4336135;hp=2bdd49eee43d7b5f3bb434cc5b29de6ae1407c8b;hpb=ed66dbc4e6c017dad675a83dbcd7619b1b5d1e7d;p=winnie

diff --git a/src/wm.cc b/src/wm.cc
index 2bdd49e..dd47d30 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <limits.h>
 #include <stdexcept>
 #include <stdio.h>	// TODO
 
@@ -8,14 +9,30 @@
 #include "text.h"
 #include "wm.h"
 #include "window.h"
+#include "winnie.h"
+
+#define DCLICK_INTERVAL 400
 
 WindowManager *wm;
-static WindowManager wminst;
 
 static void display(Window *win);
 static void mouse(Window *win, int bn, bool pressed, int x, int y);
 static void motion(Window *win, int x, int y);
 
+bool init_window_manager()
+{
+	if(!(wm = new WindowManager)) {
+		return false;
+	}
+
+	return true;
+}
+
+void destroy_window_manager()
+{
+	delete wm;
+}
+
 void WindowManager::create_frame(Window *win)
 {
 	Window *frame = new Window;
@@ -72,7 +89,9 @@ WindowManager::WindowManager()
 	root_win->move(0, 0);
 	root_win->set_managed(false);
 
+	grab_win = 0;
 	focused_win = 0;
+	background = 0;
 
 	bg_color[0] = 210;
 	bg_color[1] = 106;
@@ -123,7 +142,13 @@ void WindowManager::process_windows()
 
 	wait_vsync();
 
-	fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
+	if(!background) {
+		fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
+	}
+	else {
+		blit(background->pixels, Rect(0, 0, background->width, background->height),
+				get_framebuffer(), get_screen_size(), 0, 0);
+	}
 
 	root_win->draw_children(uni);
 
@@ -135,10 +160,10 @@ void WindowManager::process_windows()
 			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()};
+	Rect mouse_rect(mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height());
 	invalidate_region(mouse_rect);
 
-	gfx_update();
+	gfx_update(uni);
 }
 
 void WindowManager::add_window(Window *win)
@@ -266,6 +291,25 @@ void WindowManager::get_unfocused_frame_color(int *r, int *g, int *b) const
 	*b = frame_ucolor[2];
 }
 
+void WindowManager::set_background(const Pixmap *pixmap)
+{
+	if(background) {
+		delete background;
+	}
+
+	if(pixmap) {
+		background = new Pixmap(*pixmap);
+	}
+	else {
+		background = 0;
+	}
+}
+
+const Pixmap *WindowManager::get_background() const
+{
+	return background;
+}
+
 Window *WindowManager::get_grab_window() const
 {
 	return grab_win;
@@ -315,6 +359,43 @@ void WindowManager::sink_window(Window *win)
 	}
 }
 
+void WindowManager::maximize_window(Window *win)
+{
+	win->normal_rect = win->rect;
+	
+	Rect rect = get_screen_size();
+
+	Window *frame;
+	if((frame = win->get_parent())) {
+		frame->normal_rect = frame->rect;
+		frame->resize(rect.width, rect.height);
+		frame->move(rect.x, rect.y);
+
+		rect.width -= frame_thickness * 2;
+		rect.height -= frame_thickness * 2 + titlebar_thickness;
+	}
+	else {
+		win->move(0, 0);
+	}
+
+	win->resize(rect.width, rect.height);
+	win->set_state(Window::STATE_MAXIMIZED);
+}
+
+void WindowManager::unmaximize_window(Window *win)
+{
+	win->resize(win->normal_rect.width, win->normal_rect.height);
+	win->move(win->normal_rect.x, win->normal_rect.y);
+
+	Window *frame;
+	if((frame = win->get_parent())) {
+		frame->resize(frame->normal_rect.width, frame->normal_rect.height);
+		frame->move(frame->normal_rect.x, frame->normal_rect.y);
+	}
+
+	win->set_state(Window::STATE_NORMAL);
+}
+
 static void display(Window *win)
 {
 	//frame display:
@@ -342,14 +423,29 @@ static int prev_x, prev_y;
 
 static void mouse(Window *win, int bn, bool pressed, int x, int y)
 {
+	static long last_click = 0;
+
 	if(bn == 0) {
-		if(pressed) {
+		if(pressed) {	
 			wm->grab_mouse(win);
 			wm->raise_window(win);
 			prev_x = x;
 			prev_y = y;
 		}
 		else {
+			long time = winnie_get_time();
+			if((time - last_click) < DCLICK_INTERVAL) {
+				Window *child = win->get_children()[0];
+				Window::State state = child->get_state();
+				if(state == Window::STATE_MAXIMIZED) {
+					wm->unmaximize_window(child);
+				}
+				else if(state == Window::STATE_NORMAL) {
+					wm->maximize_window(child);
+				}
+			}
+			last_click = time;
+
 			wm->release_mouse();
 		}
 	}
@@ -365,7 +461,9 @@ static void motion(Window *win, int x, int y)
 		prev_x = x - dx;
 		prev_y = y - dy;
 
-		Rect rect = win->get_rect();
-		win->move(rect.x + dx, rect.y + dy);
+		if(win->get_children()[0]->get_state() != Window::STATE_MAXIMIZED) {
+			Rect rect = win->get_rect();
+			win->move(rect.x + dx, rect.y + dy);
+		}
 	}
 }