added second window

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index b4e2d79..ffe6f6a 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);
@@ -74,8 +73,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;
@@ -117,6 +116,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);
@@ -231,14 +232,12 @@ static void display(Window *win)
 
 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");
+                       prev_x = x;
+                       prev_y = y;
                }
        }
 }
@@ -252,7 +251,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);
        }