X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fwm.cc;h=621a23f3366066954a73033851939f08d52657a2;hb=9261ecb0ad85bdf8b21e17b7309ddaeb76a57d96;hp=056c6e7b94a839281b6791d8cbbcd7a6ef71821e;hpb=906b341b177e5947710107eceb9ab2e4ee09528c;p=winnie
diff --git a/src/wm.cc b/src/wm.cc
index 056c6e7..621a23f 100644
--- a/src/wm.cc
+++ b/src/wm.cc
@@ -1,20 +1,66 @@
+/*
+winnie - an experimental window system
+
+Copyright (C) 2013 Eleni Maria Stea
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+
+Author: Eleni Maria Stea
+*/
+
#include
+#include
#include
#include // TODO
#include "gfx.h"
-#include "wm.h"
-#include "window.h"
#include "mouse.h"
#include "mouse_cursor.h"
+#include "shalloc.h"
+#include "text.h"
+#include "window.h"
+#include "winnie.h"
+#include "wm.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()
+{
+ void *wm_mem;
+ if(!(wm_mem = sh_malloc(sizeof *wm))) {
+ return false;
+ }
+
+ wm = new (wm_mem) WindowManager;
+
+ get_subsys()->wm_offset = (int)((char*)wm - (char*)get_pool());
+
+ return true;
+}
+
+void destroy_window_manager()
+{
+ wm->~WindowManager();
+ sh_free(wm);
+}
+
void WindowManager::create_frame(Window *win)
{
Window *frame = new Window;
@@ -71,7 +117,9 @@ WindowManager::WindowManager()
root_win->move(0, 0);
root_win->set_managed(false);
+ grab_win = 0;
focused_win = 0;
+ background = 0;
bg_color[0] = 210;
bg_color[1] = 106;
@@ -80,8 +128,8 @@ WindowManager::WindowManager()
frame_thickness = 8;
titlebar_thickness = 16;
- frame_fcolor[0] = frame_fcolor[1] = frame_fcolor[2] = 0;
- frame_ucolor[0] = frame_ucolor[1] = frame_ucolor[2] = 255;
+ 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();
@@ -122,7 +170,13 @@ void WindowManager::process_windows()
wait_vsync();
- fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
+ if(!background) {
+ fill_rect(uni, bg_color[0], bg_color[1], bg_color[2]);
+ }
+ else {
+ blit(background->pixels, Rect(0, 0, background->width, background->height),
+ get_framebuffer(), get_screen_size(), 0, 0);
+ }
root_win->draw_children(uni);
@@ -134,10 +188,10 @@ void WindowManager::process_windows()
get_framebuffer(), get_screen_size(), mouse_x, mouse_y,
0, 0, 0);
- Rect mouse_rect = {mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height()};
+ Rect mouse_rect(mouse_x, mouse_y, mouse_cursor.get_width(), mouse_cursor.get_height());
invalidate_region(mouse_rect);
- gfx_update();
+ gfx_update(uni);
}
void WindowManager::add_window(Window *win)
@@ -244,7 +298,7 @@ void WindowManager::set_focused_frame_color(int r, int g, int b)
frame_fcolor[2] = b;
}
-void WindowManager::get_focused_frame_color(int *r, int *g, int *b)
+void WindowManager::get_focused_frame_color(int *r, int *g, int *b) const
{
*r = frame_fcolor[0];
*g = frame_fcolor[1];
@@ -258,6 +312,32 @@ void WindowManager::set_unfocused_frame_color(int r, int g, int b)
frame_ucolor[2] = b;
}
+void WindowManager::get_unfocused_frame_color(int *r, int *g, int *b) const
+{
+ *r = frame_ucolor[0];
+ *g = frame_ucolor[1];
+ *b = frame_ucolor[2];
+}
+
+void WindowManager::set_background(const Pixmap *pixmap)
+{
+ if(background) {
+ delete background;
+ }
+
+ if(pixmap) {
+ background = new Pixmap(*pixmap);
+ }
+ else {
+ background = 0;
+ }
+}
+
+const Pixmap *WindowManager::get_background() const
+{
+ return background;
+}
+
Window *WindowManager::get_grab_window() const
{
return grab_win;
@@ -307,34 +387,93 @@ 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 {
+ win->move(0, 0);
+ }
+
+ 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:
- Window **children = win->get_children();
- for(int i=0; iget_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;
- }
+ Window *child = win->get_children()[0];
+ int r, g, b;
+ Rect abs_rect = win->get_absolute_rect();
+
+ //TODO 5 not hardcoded
+ set_text_position(abs_rect.x + 5, abs_rect.y + 15);
+ set_text_color(255, 255, 255);
+
+ if(child == wm->get_focused_window()) {
+ wm->get_focused_frame_color(&r, &g, &b);
+ fill_rect(abs_rect, r, g, b);
+ }
+ else {
+ wm->get_unfocused_frame_color(&r, &g, &b);
+ fill_rect(win->get_absolute_rect(), r, g, b);
}
- fill_rect(win->get_absolute_rect(), 74, 175, 198);
+ draw_text(child->get_title());
}
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) {
+ if(pressed) {
wm->grab_mouse(win);
wm->raise_window(win);
prev_x = x;
prev_y = y;
}
else {
+ 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) {
+ wm->unmaximize_window(child);
+ }
+ else if(state == Window::STATE_NORMAL) {
+ wm->maximize_window(child);
+ }
+ }
+ last_click = time;
+
wm->release_mouse();
}
}
@@ -343,7 +482,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;
@@ -351,7 +489,9 @@ static void motion(Window *win, int x, int y)
prev_x = x - dx;
prev_y = y - dy;
- Rect rect = win->get_rect();
- win->move(rect.x + dx, rect.y + dy);
+ if(win->get_children()[0]->get_state() != Window::STATE_MAXIMIZED) {
+ Rect rect = win->get_rect();
+ win->move(rect.x + dx, rect.y + dy);
+ }
}
}