using 2 windows, focus works

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index b4e2d79..fd86d1d 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,16 +23,15 @@ 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);
@@ -46,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()) {
@@ -74,11 +77,11 @@ 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;
+       frame_fcolor[0] = frame_fcolor[1] = frame_fcolor[2] = 0;
+       frame_ucolor[0] = frame_ucolor[1] = frame_ucolor[2] = 255;
 
        mouse_cursor.set_image(mouse_cursor_width, mouse_cursor_height);
        unsigned char *pixels = mouse_cursor.get_image();
@@ -117,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);
@@ -166,15 +171,17 @@ void WindowManager::remove_window(Window *win)
 
 void WindowManager::set_focused_window(Window *win)
 {
-       if(win == focused_win) {
+       if(win && win == focused_win) {
                return;
        }
 
+       Window *parent;
        if(focused_win) {
                // invalidate the frame (if any)
-               Window *parent = focused_win->get_parent();
+               parent = focused_win->get_parent();
                if(parent && parent != root_win) {
                        parent->invalidate();
+                       fill_rect(parent->get_absolute_rect(), frame_ucolor[0], frame_ucolor[1], frame_ucolor[2]);
                }
        }
 
@@ -185,6 +192,8 @@ void WindowManager::set_focused_window(Window *win)
 
        if(win->get_focusable()) {
                focused_win = win;
+               parent = focused_win->get_parent();
+               fill_rect(parent->get_absolute_rect(), frame_fcolor[0], frame_fcolor[1], frame_fcolor[2]);
                return;
        }
 
@@ -192,6 +201,7 @@ void WindowManager::set_focused_window(Window *win)
        for(int i=0; i<win->get_children_count(); i++) {
                if(children[0]->get_focusable()) {
                        set_focused_window(children[0]);
+                       fill_rect(win->get_absolute_rect(), frame_fcolor[0], frame_fcolor[1], frame_fcolor[2]);
                        return;
                }
        }
@@ -224,21 +234,70 @@ Window *WindowManager::get_window_at_pos(int pointer_x, int pointer_y)
        return 0;
 }
 
+void WindowManager::set_focused_frame_color(int r, int g, int b)
+{
+       frame_fcolor[0] = r;
+       frame_fcolor[1] = g;
+       frame_fcolor[2] = b;
+}
+
+void WindowManager::get_focused_frame_color(int *r, int *g, int *b)
+{
+       *r = frame_fcolor[0];
+       *g = frame_fcolor[1];
+       *b = frame_fcolor[2];
+}
+
+void WindowManager::set_unfocused_frame_color(int r, int g, int b)
+{
+       frame_ucolor[0] = r;
+       frame_ucolor[1] = g;
+       frame_ucolor[2] = b;
+}
+
+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_absolute_rect(), 255, 211, 5);
+       //frame display:
+       Window **children = win->get_children();
+       for(int i=0; i<win->get_children_count(); i++) {
+               if(children[0] == wm->get_focused_window()) {
+                       int r, g, b;
+                       wm->get_focused_frame_color(&r, &g, &b);
+                       fill_rect(win->get_absolute_rect(), r, g, b);
+                       return;
+               }
+       }
+
+       fill_rect(win->get_absolute_rect(), 74, 175, 198);
 }
 
 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);
-                       printf("pressed: %d\n", prev_x);
-               } else {
-                       printf("released\n");
+                       wm->grab_mouse(win);
+                       prev_x = x;
+                       prev_y = y;
+               }
+               else {
+                       wm->release_mouse();
                }
        }
 }
@@ -252,7 +311,6 @@ static void motion(Window *win, int x, int 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);
        }