fixed focus: get_window_at_pos now searches back to front in root_window

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index fd86d1d..056c6e7 100644 (file)
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -221,19 +221,22 @@ Window *WindowManager::get_focused_window()
 
 Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
 {
-       std::list<Window*>::reverse_iterator rit = windows.rbegin();
-       while(rit != windows.rend()) {
-               Window *w = *rit++;
-               Window *parent = w->get_parent();
-
-               if(parent == root_win && w->contains_point(pointer_x, pointer_y)) {
-                       return w;
+       Window *root_win = wm->get_root_window();
+       Window **children = root_win->get_children();
+       for(int i=root_win->get_children_count() - 1; i>=0; i--) {
+               if(children[i]->contains_point(pointer_x, pointer_y)) {
+                       return children[i];
                }
        }
 
        return 0;
 }
 
+Window *WindowManager::get_root_window() const
+{
+       return root_win;
+}
+
 void WindowManager::set_focused_frame_color(int r, int g, int b)
 {
        frame_fcolor[0] = r;
@@ -270,6 +273,40 @@ void WindowManager::release_mouse()
        grab_win = 0;
 }
 
+void WindowManager::raise_window(Window *win)
+{
+       if(!win) {
+               return;
+       }
+
+       Window *parent = win->get_parent();
+       if(parent != root_win) {
+               if(parent->get_parent() == root_win) {
+                       win = parent;
+               }
+               else {
+                       return;
+               }
+       }
+
+       root_win->remove_child(win);
+       root_win->add_child(win);
+}
+
+void WindowManager::sink_window(Window *win)
+{
+       if(!win) {
+               return;
+       }
+
+       std::list<Window*>::iterator it;
+       it = std::find(windows.begin(), windows.end(), win);
+       if(it != windows.end()) {
+               windows.erase(it);
+               windows.push_front(win);
+       }
+}
+
 static void display(Window *win)
 {
        //frame display:
@@ -293,6 +330,7 @@ static void mouse(Window *win, int bn, bool pressed, int x, int y)
        if(bn == 0) {
                if(pressed) {
                        wm->grab_mouse(win);
+                       wm->raise_window(win);
                        prev_x = x;
                        prev_y = y;
                }
@@ -305,6 +343,8 @@ static void mouse(Window *win, int bn, bool pressed, int x, int y)
 static void motion(Window *win, int x, int y)
 {
        int left_bn = get_button(0);
+       int right_button = get_button(2);
+
        if(left_bn) {
                int dx = x - prev_x;
                int dy = y - prev_y;