X-Git-Url: http://git.mutantstargoat.com?p=winnie;a=blobdiff_plain;f=src%2Fwm.cc;h=33f28795c30d65f4a63629f9379bd7378280c607;hp=7aa112b9518fc253d3ee5a8faad6ccbe841e329d;hb=287b4d5d1b7eadfe9d5d0aa3b33700f3e1bed55e;hpb=785cbd66e05639ef9ba8c31675fece86e55b2f34

diff --git a/src/wm.cc b/src/wm.cc
index 7aa112b..33f2879 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -12,7 +12,7 @@ WindowManager *wm;
 static WindowManager wminst;
 
 static void display(Window *win);
-static void mouse(Window *win, int bn, bool pressed);
+static void mouse(Window *win, int bn, bool pressed, int x, int y);
 static void motion(Window *win, int x, int y);
 
 void WindowManager::create_frame(Window *win)
@@ -23,18 +23,18 @@ void WindowManager::create_frame(Window *win)
 	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);
+	frame->add_child(win);
 
 	windows.push_back(frame);
 
 	Rect win_rect = win->get_rect();
-	frame->move(win_rect.x - frame_thickness, 
+	frame->move(win_rect.x - frame_thickness,
 			win_rect.y - frame_thickness - titlebar_thickness);
-	frame->resize(win_rect.width + frame_thickness * 2, 
+	frame->resize(win_rect.width + frame_thickness * 2,
 			win_rect.height + frame_thickness * 2 + titlebar_thickness);
 
+	win->move(frame_thickness, frame_thickness + titlebar_thickness);
 	parent->add_child(frame);
 }
 
@@ -45,6 +45,10 @@ void WindowManager::destroy_frame(Window *win)
 		return;
 	}
 
+	if(grab_win == win) {
+		release_mouse();
+	}
+
 	std::list<Window*>::iterator it;
 	it = std::find(windows.begin(), windows.end(), frame);
 	if(it != windows.end()) {
@@ -73,8 +77,8 @@ WindowManager::WindowManager()
 	bg_color[1] = 106;
 	bg_color[2] = 106;
 
-	frame_thickness = 2;
-	titlebar_thickness = 4;
+	frame_thickness = 8;
+	titlebar_thickness = 16;
 
 	frame_fcolor[0] = frame_fcolor[1] = frame_fcolor[2] = 142;
 	frame_ucolor[0] = frame_ucolor[1] = frame_ucolor[2] = 210;
@@ -116,6 +120,8 @@ void WindowManager::process_windows()
 	}
 	dirty_rects.clear();
 
+	wait_vsync();
+
 	fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
 
 	root_win->draw_children(uni);
@@ -165,7 +171,7 @@ void WindowManager::remove_window(Window *win)
 
 void WindowManager::set_focused_window(Window *win)
 {
-	if(win == focused_win) {
+	if(win && win == focused_win) {
 		return;
 	}
 
@@ -223,20 +229,38 @@ Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
 	return 0;
 }
 
+Window *WindowManager::get_grab_window() const
+{
+	return grab_win;
+}
+
+void WindowManager::grab_mouse(Window *win)
+{
+	grab_win = win;
+}
+
+void WindowManager::release_mouse()
+{
+	grab_win = 0;
+}
+
 static void display(Window *win)
 {
-	fill_rect(win->get_rect(), 255, 211, 5);
+	fill_rect(win->get_absolute_rect(), 255, 211, 5);
 }
 
-static int prev_x = -1, prev_y;
+static int prev_x, prev_y;
 
-static void mouse(Window *win, int bn, bool pressed)
+static void mouse(Window *win, int bn, bool pressed, int x, int y)
 {
 	if(bn == 0) {
 		if(pressed) {
-			get_pointer_pos(&prev_x, &prev_y);
-		} else {
-			prev_x = -1;
+			wm->grab_mouse(win);
+			prev_x = x;
+			prev_y = y;
+		}
+		else {
+			wm->release_mouse();
 		}
 	}
 }
@@ -244,7 +268,7 @@ static void mouse(Window *win, int bn, bool pressed)
 static void motion(Window *win, int x, int y)
 {
 	int left_bn = get_button(0);
-	if(left_bn && prev_x != -1) {
+	if(left_bn) {
 		int dx = x - prev_x;
 		int dy = y - prev_y;
 		prev_x = x - dx;