fixed mouse events the windows can grab the mouse

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index ec73a5b..33f2879 100644 (file)
--- 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);
@@ -130,6 +136,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 +171,18 @@ void WindowManager::remove_window(Window *win)
 
 void WindowManager::set_focused_window(Window *win)
 {
+       if(win && 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;
@@ -209,24 +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)
 {
-       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;
+                       wm->grab_mouse(win);
+                       prev_x = x;
+                       prev_y = y;
+               }
+               else {
+                       wm->release_mouse();
                }
        }
 }
@@ -234,11 +268,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);