X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwm.cc;h=a6e29b08df8aa8718888e5e1c1750aa8f5a04176;hb=026158b5ee6ffac95c3efc6eee4c155497cd8594;hp=ec73a5bc112558c015c573bb4ae533247aaaebce;hpb=d114b136897ca569d819da5f9b75bd08f9cbe2c0;p=winnie

diff --git a/src/wm.cc b/src/wm.cc
index ec73a5b..a6e29b0 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)
@@ -30,11 +30,12 @@ void WindowManager::create_frame(Window *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);
 }
 
@@ -130,6 +131,8 @@ void WindowManager::process_windows()
 
 	Rect mouse_rect = {mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height()};
 	invalidate_region(mouse_rect);
+
+	gfx_update();
 }
 
 void WindowManager::add_window(Window *win)
@@ -163,6 +166,18 @@ void WindowManager::remove_window(Window *win)
 
 void WindowManager::set_focused_window(Window *win)
 {
+	if(win == focused_win) {
+		return;
+	}
+
+	if(focused_win) {
+		// invalidate the frame (if any)
+		Window *parent = focused_win->get_parent();
+		if(parent && parent != root_win) {
+			parent->invalidate();
+		}
+	}
+
 	if(!win) {
 		focused_win = 0;
 		return;
@@ -211,22 +226,17 @@ Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
 
 static void display(Window *win)
 {
-	if(win->get_managed()) {
-		fill_rect(win->get_rect(), 255, 211, 5);
-		win->draw(win->get_parent()->get_rect());
-	}
+	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)
 {
-	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;
+			prev_x = x;
+			prev_y = y;
 		}
 	}
 }
@@ -234,11 +244,11 @@ 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;
-		prev_y = y;
+		prev_x = x - dx;
+		prev_y = y - dy;
 
 		Rect rect = win->get_rect();
 		win->move(rect.x + dx, rect.y + dy);