fixed grab win initialization

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index 6652325..7c5959e 100644 (file)
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -10,12 +10,25 @@
 #include "window.h"
 
 WindowManager *wm;
-static WindowManager wminst;
 
 static void display(Window *win);
 static void mouse(Window *win, int bn, bool pressed, int x, int y);
 static void motion(Window *win, int x, int y);
 
+bool init_window_manager()
+{
+       if(!(wm = new WindowManager)) {
+               return false;
+       }
+
+       return true;
+}
+
+void destroy_window_manager()
+{
+       delete wm;
+}
+
 void WindowManager::create_frame(Window *win)
 {
        Window *frame = new Window;
@@ -72,6 +85,7 @@ WindowManager::WindowManager()
        root_win->move(0, 0);
        root_win->set_managed(false);
 
+       grab_win = 0;
        focused_win = 0;
 
        bg_color[0] = 210;
@@ -81,8 +95,8 @@ WindowManager::WindowManager()
        frame_thickness = 8;
        titlebar_thickness = 16;
 
-       set_focused_frame_color(36, 59, 98);
-       set_unfocused_frame_color(80, 129, 162);
+       set_focused_frame_color(0, 0, 0);
+       set_unfocused_frame_color(200, 200, 200);
 
        mouse_cursor.set_image(mouse_cursor_width, mouse_cursor_height);
        unsigned char *pixels = mouse_cursor.get_image();