X-Git-Url: https://eleni.mutantstargoat.com/git/?a=blobdiff_plain;f=src%2Fwm.cc;h=b4e2d79472891f0f65bdac81251a14f508d87909;hb=981f0eab2195d34f7c186a2e3e891810e14ce5b4;hp=6577a67e416e0d41dc100387c2a4517c514380dd;hpb=4047a2dc058e7e54e4ff95311fb556ae8eeeedb9;p=winnie

diff --git a/src/wm.cc b/src/wm.cc
index 6577a67..b4e2d79 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -35,6 +35,7 @@ void WindowManager::create_frame(Window *win)
 	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,21 +226,19 @@ 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)
 {
 	if(bn == 0) {
 		if(pressed) {
 			get_pointer_pos(&prev_x, &prev_y);
+			printf("pressed: %d\n", prev_x);
 		} else {
-			prev_x = -1;
+			printf("released\n");
 		}
 	}
 }
@@ -233,12 +246,13 @@ 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;
 
+		printf("dx: %d dy: %d\n", dx, dy);
 		Rect rect = win->get_rect();
 		win->move(rect.x + dx, rect.y + dy);
 	}