maximize windows

[winnie] / src / wm.cc

diff --git a/src/wm.cc b/src/wm.cc
index 7fe13fb..7791e79 100644 (file)
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <limits.h>
 #include <stdexcept>
 #include <stdio.h>     // TODO
 
@@ -8,14 +9,30 @@
 #include "text.h"
 #include "wm.h"
 #include "window.h"
+#include "winnie.h"
+
+#define DCLICK_INTERVAL 400
 
 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 +89,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 +99,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();
@@ -315,6 +333,45 @@ void WindowManager::sink_window(Window *win)
        }
 }
 
+void WindowManager::maximize_window(Window *win)
+{
+       win->normal_rect = win->rect;
+       
+       Rect rect = get_screen_size();
+
+       Window *frame;
+       if((frame = win->get_parent())) {
+               frame->normal_rect = frame->rect;
+               frame->resize(rect.width, rect.height);
+               frame->move(rect.x, rect.y);
+
+               rect.width -= frame_thickness * 2;
+               rect.height -= frame_thickness * 2 + titlebar_thickness;
+       }
+       else {
+               rect.x = 0;
+               rect.y = 0;
+               win->move(rect.x, rect.y);
+       }
+
+       win->resize(rect.width, rect.height);
+       win->set_state(Window::STATE_MAXIMIZED);
+}
+
+void WindowManager::unmaximize_window(Window *win)
+{
+       win->resize(win->normal_rect.width, win->normal_rect.height);
+       win->move(win->normal_rect.x, win->normal_rect.y);
+
+       Window *frame;
+       if((frame = win->get_parent())) {
+               frame->resize(frame->normal_rect.width, frame->normal_rect.height);
+               frame->move(frame->normal_rect.x, frame->normal_rect.y);
+       }
+
+       win->set_state(Window::STATE_NORMAL);
+}
+
 static void display(Window *win)
 {
        //frame display:
@@ -342,12 +399,29 @@ static int prev_x, prev_y;
 
 static void mouse(Window *win, int bn, bool pressed, int x, int y)
 {
+       static long last_click = 0;
+
        if(bn == 0) {
                if(pressed) {
+                       long time = winnie_get_time();
+                       if((time - last_click) < DCLICK_INTERVAL) {
+                               Window *child = win->get_children()[0];
+                               Window::State state = child->get_state();
+                               if(state == Window::STATE_MAXIMIZED) {
+                                       child->set_state(Window::STATE_NORMAL);
+                                       wm->unmaximize_window(child);
+                               }
+                               else if(state == Window::STATE_NORMAL) {
+                                       wm->maximize_window(child);
+                               }
+                       }
+
                        wm->grab_mouse(win);
                        wm->raise_window(win);
                        prev_x = x;
                        prev_y = y;
+
+                       last_click = time;
                }
                else {
                        wm->release_mouse();
@@ -358,7 +432,6 @@ 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;