X-Git-Url: http://pileus.org/git/?p=wmpus;a=blobdiff_plain;f=wm-wmii.c;h=9e44400899a69377e160839f4f991e3a8d7eb6a8;hp=4a6c0245e1fb789644f856dc297cce3caa1253a4;hb=bdfa912aef69869a2385d65d5e8486080fc66895;hpb=9b4ab92753e6e9ff8cdf96c20c6c0a2c8b5f1d33

diff --git a/wm-wmii.c b/wm-wmii.c
index 4a6c024..9e44400 100644
--- a/wm-wmii.c
+++ b/wm-wmii.c
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2011 Andy Spencer <andy753421@gmail.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -5,9 +22,15 @@
 #include "sys.h"
 #include "wm.h"
 
+#ifndef MODKEY
 #define MODKEY alt
+#endif
+#ifndef MARGIN
 #define MARGIN 0
+#endif
+#ifndef STACK
 #define STACK  25
+#endif
 
 /* Enums */
 typedef enum {
@@ -18,97 +41,153 @@ typedef enum {
 	split, stack, max, tab
 } mode_t;
 
+typedef enum {
+	tiling, floating
+} layer_t;
 
 /* Window structure types */
 struct win_wm { };
 
 typedef struct {
-	win_t  *win;
-	int     height;
+	win_t  *win;     // the window
+	int     height;  // win height in _this_ tag
 } row_t;
 
 typedef struct {
-	list_t *rows; // of row_t
-	row_t  *row;
-	int     width;
-	mode_t  mode;
+	list_t *rows;    // of row_t
+	row_t  *row;     // focused row
+	int     width;   // column width
+	mode_t  mode;    // display mode
 } col_t;
 
 typedef struct {
-	list_t *cols; // of col_t
-	col_t  *col;
-	win_t  *geom;
+	win_t *win;      // the window
+	int x, y, w, h;  // position of window (in this tag)
+} flt_t;
+
+typedef struct {
+	list_t *cols;    // of col_t
+	col_t  *col;     // focused col
+	list_t *flts;    // of flt_t
+	flt_t  *flt;     // focused flt
+	layer_t layer;   // focused layer
+	win_t  *geom;    // display size and position
 } dpy_t;
 
 typedef struct {
-	list_t *dpys; // of dpy_t
-	dpy_t  *dpy;
-	int     name;
+	list_t *dpys;    // of dpy_t
+	dpy_t  *dpy;     // focused dpy
+	int     name;    // tag name
 } tag_t;
 
 typedef struct {
-	list_t *tags; // of tag_t
-	tag_t  *tag;
-	win_t  *root;
-	list_t *screens;
+	list_t *tags;    // of tag_t
+	tag_t  *tag;     // focused tag
+	win_t  *root;    // root/background window
+	list_t *screens; // display geometry
 } wm_t;
 
+#define WIN(node) ((win_t*)(node)->data)
+#define ROW(node) ((row_t*)(node)->data)
+#define COL(node) ((col_t*)(node)->data)
+#define FLT(node) ((flt_t*)(node)->data)
+#define DPY(node) ((dpy_t*)(node)->data)
+#define TAG(node) ((tag_t*)(node)->data)
+
+#define tag_foreach_col(tag, dpy, col, row, win) \
+	for (list_t *dpy =     tag ->dpys; dpy; dpy = dpy->next) \
+	for (list_t *col = DPY(dpy)->cols; col; col = col->next) \
+	for (list_t *row = COL(col)->rows; row; row = row->next) \
+	for (win_t  *win = ROW(row)->win;  win; win = NULL)
+
+#define tag_foreach_flt(tag, dpy, flt, win) \
+	for (list_t *dpy =     tag ->dpys; dpy; dpy = dpy->next) \
+	for (list_t *flt = DPY(dpy)->flts; flt; flt = flt->next) \
+	for (win_t  *win = FLT(flt)->win;  win; win = NULL)      \
+
+/* Window management data
+ *   wm_* macros represent the currently focused item
+ *   _only_ wm_focus protects against NULL pointers */
+static wm_t *wm;
+#define wm_tag   wm->tag
+#define wm_dpy   wm->tag->dpy
+#define wm_col   wm->tag->dpy->col
+#define wm_row   wm->tag->dpy->col->row
+#define wm_flt   wm->tag->dpy->flt
+#define wm_focus get_focus()
+
 /* Mouse drag data */
 static drag_t  move_mode;
 static list_t *move_lrow;
 static list_t *move_lcol;
+static list_t *move_lflt;
 static ptr_t   move_prev;
+static layer_t move_layer;
 static struct { int v, h; } move_dir;
 
-/* Window management data */
-static wm_t  *wm;
-#define wm_win   wm->tag->dpy->col->row->win
-#define wm_row   wm->tag->dpy->col->row
-#define wm_col   wm->tag->dpy->col
-#define wm_dpy   wm->tag->dpy
-#define wm_tag   wm->tag
-#define wm_focus (wm_tag && wm_dpy && wm_col && wm_row ? wm_win : NULL)
-
-#define ROW(l) ((row_t*)(l)->data)
-#define COL(l) ((col_t*)(l)->data)
-#define DPY(l) ((dpy_t*)(l)->data)
-#define TAG(l) ((tag_t*)(l)->data)
+/********************
+ * Helper functions *
+ ********************/
+static win_t *get_focus(void)
+{
+	if (!wm_tag || !wm_dpy)
+		return NULL;
+	switch (wm_dpy->layer) {
+	case tiling:
+		return wm_col && wm_row ? wm_row->win : NULL;
+	case floating:
+		return wm_flt ? wm_flt->win : NULL;
+	}
+	return NULL;
+}
 
-/* Helper functions */
+/* Search for the target window in a given tag
+ * win may exist in other tags as well */
 static int searchl(tag_t *tag, win_t *target,
-		list_t **_dpy, list_t **_col, list_t **_row)
+		list_t **_dpy, list_t **_col, list_t **_row, list_t **_flt)
 {
-	for (list_t *dpy =     tag ->dpys; dpy; dpy = dpy->next)
-	for (list_t *col = DPY(dpy)->cols; col; col = col->next)
-	for (list_t *row = COL(col)->rows; row; row = row->next) {
-		win_t *win = ROW(row)->win;
+	tag_foreach_col(tag, dpy, col, row, win) {
 		if (win == target) {
 			if (_dpy) *_dpy = dpy;
 			if (_col) *_col = col;
 			if (_row) *_row = row;
-			return 1;
+			return tiling;
 		}
 	}
-	return 0;
+	tag_foreach_flt(tag, dpy, flt, win) {
+		if (win == target) {
+			if (_dpy) *_dpy = dpy;
+			if (_flt) *_flt = flt;
+			return floating;
+		}
+	}
+	return -1;
 }
 
 static int search(tag_t *tag, win_t *target,
-		dpy_t **_dpy, col_t **_col, row_t **_row)
+		dpy_t **_dpy, col_t **_col, row_t **_row, flt_t **_flt)
 {
-	list_t *dpy, *col, *row;
-	if (searchl(tag, target, &dpy, &col, &row)) {
+	list_t *dpy, *col, *row, *flt;
+	switch (searchl(tag, target, &dpy, &col, &row, &flt)) {
+	case tiling:
 		if (_dpy) *_dpy = DPY(dpy);
 		if (_col) *_col = COL(col);
 		if (_row) *_row = ROW(row);
-		return 1;
+		return tiling;
+	case floating:
+		if (_dpy) *_dpy = DPY(dpy);
+		if (_flt) *_flt = FLT(flt);
+		return floating;
 	}
-	return 0;
+	return -1;
 }
 
+/* Set the mode for the windows column in the current tag */
 static void set_mode(win_t *win, mode_t mode)
 {
 	col_t *col;
-	search(wm_tag, win, NULL, &col, NULL);
+	if (tiling != search(wm_tag, win, NULL, &col, NULL, NULL))
+		return;
 	printf("set_mode: %p, %d -> %d\n",
 			col, col->mode, mode);
 	col->mode = mode;
@@ -120,8 +199,15 @@ static void set_mode(win_t *win, mode_t mode)
 	wm_update();
 }
 
+/* Focus the window in the current tag and record
+ * it as the currently focused window */
 static void set_focus(win_t *win)
 {
+	if (win == NULL || win == wm->root) {
+		sys_focus(wm->root);
+		return;
+	}
+
 	/* - Only grab mouse button on unfocused window,
 	 *   this prevents stealing all mouse clicks from client windows,
 	 * - A better way may be to re-send mouse clicks to client windows
@@ -132,76 +218,115 @@ static void set_focus(win_t *win)
 		sys_unwatch(win, i, MOD());
 	}
 
-	dpy_t *dpy; col_t *col; row_t *row;
-	if (search(wm_tag, win, &dpy, &col, &row)) {
+	dpy_t *dpy; col_t *col; row_t *row; flt_t *flt;
+	switch (search(wm_tag, win, &dpy, &col, &row, &flt)) {
+	case tiling:
 		wm_dpy = dpy;
 		wm_col = col;
 		wm_row = row;
+		dpy->layer = tiling;
+		break;
+	case floating:
+		wm_dpy = dpy;
+		wm_flt = flt;
+		dpy->layer = floating;
+		break;
 	}
 	sys_focus(win);
 }
 
+/* Save mouse start location when moving/resizing windows */
 static void set_move(win_t *win, ptr_t ptr, drag_t drag)
 {
 	printf("set_move: %d - %p@%d,%d\n",
 			drag, win, ptr.rx, ptr.ry);
 	move_mode = drag;
 	if (drag == move || drag == resize) {
-		searchl(wm_tag, win, NULL, &move_lcol, &move_lrow);
+		move_layer = searchl(wm_tag, win, NULL,
+				&move_lcol, &move_lrow, &move_lflt);
+		if (move_layer < 0)
+			return;
 		move_prev = ptr;
-		int my = win->y + (win->h/2);
-		int mx = win->x + (win->w/2);
-		move_dir.v = ptr.ry < my ? -1 : +1;
-		move_dir.h = ptr.rx < mx ? -1 : +1;
+		int midy = win->y + (win->h/2);
+		int midx = win->x + (win->w/2);
+		move_dir.v = ptr.ry < midy ? -1 : +1;
+		move_dir.h = ptr.rx < midx ? -1 : +1;
 	}
 }
 
+/* Print a text representation of the window layout
+ * Quite useful for debugging */
 static void print_txt(void)
 {
 	for (list_t *ltag = wm->tags; ltag; ltag = ltag->next) {
 		tag_t *tag = ltag->data;
-		printf("tag:       <%-9p [%p->%p] >%-9p  -  %d\n",
-				ltag->prev, ltag, ltag->data, ltag->next, tag->name);
+		printf("tag:       <%-9p [%p->%p] >%-9p d=%-9p - %d\n",
+				ltag->prev, ltag, ltag->data, ltag->next,
+				tag->dpy, tag->name);
 	for (list_t *ldpy = tag->dpys; ldpy; ldpy = ldpy->next) {
 		dpy_t *dpy  = ldpy->data;
 		win_t *geom = dpy->geom;
-		printf("  dpy:     <%-9p [%p->%p] >%-9p  -  %d,%d %dx%d\n",
+		printf("  dpy:     <%-9p [%p->%p] >%-9p %c=%-9p - %d,%d %dx%d\n",
 				ldpy->prev, ldpy, ldpy->data, ldpy->next,
+				dpy->layer == tiling   ? 'c' : 'f',
+				dpy->layer == tiling   ? (void*)dpy->col : (void*)dpy->flt,
 				geom->x, geom->y, geom->h, geom->w);
 	for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next) {
 		col_t *col = lcol->data;
-		printf("    col:   <%-9p [%p->%p] >%-9p  -  %dpx @ %d !!%p\n",
+		printf("    col:   <%-9p [%p->%p] >%-9p r=%-9p - %dpx @ %d\n",
 				lcol->prev, lcol, lcol->data, lcol->next,
-				col->width, col->mode, col->row);
+				col->row, col->width, col->mode);
 	for (list_t *lrow = col->rows; lrow; lrow = lrow->next) {
 		row_t *row = lrow->data;
 		win_t *win = row->win;
-		printf("      win: <%-9p [%p>>%p] >%-9p  -  %4dpx focus=%d%d\n",
+		printf("      win: <%-9p [%p>>%p] >%-9p focus=%d%d    - %4dpx \n",
 				lrow->prev, lrow, win, lrow->next,
-				win->h, col->row == row, wm_focus == win);
-	} } } }
+				col->row == row, wm_focus == win, win->h);
+	} }
+	for (list_t *lflt = dpy->flts; lflt; lflt = lflt->next) {
+		flt_t *flt = lflt->data;
+		printf("    flt:   <%-9p [%p->%p] >%-9p focus=%d%d    - %d,%d %dx%d \n",
+				lflt->prev, lflt, lflt->data, lflt->next,
+				dpy->flt == flt, wm_focus == flt->win,
+				flt->x, flt->y, flt->h, flt->w);
+	}  } }
 }
 
-static void cut_win(tag_t *tag, win_t *win)
+/* Cleanly remove a window from a tag
+ *   Determines the new focused row/col
+ *   Prunes empty lists */
+static layer_t cut_win(win_t *win, tag_t *tag)
 {
-	list_t *ldpy, *lcol, *lrow;
-	if (!searchl(tag, win, &ldpy, &lcol, &lrow))
-		return;
-	col_t  *col  = COL(lcol);
-	dpy_t  *dpy  = DPY(ldpy);
-
-	col->row  = lrow->prev ? lrow->prev->data :
-	            lrow->next ? lrow->next->data : NULL;
-	col->rows = list_remove(col->rows, lrow);
+	list_t *ldpy, *lcol, *lrow, *lflt;
+	layer_t layer = searchl(tag, win, &ldpy, &lcol, &lrow, &lflt);
+
+	dpy_t  *dpy   = DPY(ldpy);
+	if (layer == tiling) {
+		col_t  *col  = COL(lcol);
+		col->row  = lrow->prev ? lrow->prev->data :
+			    lrow->next ? lrow->next->data : NULL;
+		col->rows = list_remove(col->rows, lrow);
+		if (col->rows == NULL && (lcol->next || lcol->prev)) {
+			dpy->col  = lcol->prev ? lcol->prev->data :
+				    lcol->next ? lcol->next->data : NULL;
+			dpy->cols = list_remove(dpy->cols, lcol);
+		}
+	}
 
-	if (col->rows == NULL && (lcol->next || lcol->prev)) {
-		dpy->col  = lcol->prev ? lcol->prev->data :
-			    lcol->next ? lcol->next->data : NULL;
-		dpy->cols = list_remove(dpy->cols, lcol);
+	if (layer == floating) {
+		dpy->flts = list_remove(dpy->flts, lflt);
+		dpy->flt  = dpy->flts ? list_last(dpy->flts)->data : NULL;
+		if (!dpy->flt && dpy->col && dpy->col->row)
+			dpy->layer = tiling;
 	}
+
+	return layer;
 }
 
-static void put_win(win_t *win, dpy_t *dpy, col_t *col)
+/* Insert a window into the tiling layer
+ *   The window is added immediately after the
+ *   columns currently focused row */
+static void put_win_col(win_t *win, tag_t *tag, dpy_t *dpy, col_t *col)
 {
 	row_t *row = new0(row_t);
 	row->win = win;
@@ -218,9 +343,10 @@ static void put_win(win_t *win, dpy_t *dpy, col_t *col)
 	} else {
 		col->rows = list_insert(col->rows, row);
 	}
-	wm_tag->dpy           = dpy;
-	wm_tag->dpy->col      = col;
-	wm_tag->dpy->col->row = row;
+	tag->dpy           = dpy;
+	tag->dpy->col      = col;
+	tag->dpy->col->row = row;
+	tag->dpy->layer    = tiling;
 
 	row->height = dpy->geom->h / MAX(nrows,1);
 	if (nrows == 0) {
@@ -229,16 +355,49 @@ static void put_win(win_t *win, dpy_t *dpy, col_t *col)
 	}
 }
 
+/* Insert a window into the floating layer */
+static void put_win_flt(win_t *win, tag_t *tag, dpy_t *dpy)
+{
+	flt_t *flt = new0(flt_t);
+	flt->win = win;
+	flt->w   = dpy->geom->w / 2;
+	flt->h   = dpy->geom->h / 2;
+	flt->x   = dpy->geom->x + flt->w / 2;
+	flt->y   = dpy->geom->y + flt->h / 2;
+	if (dpy->flt) {
+		flt->x = dpy->flt->x + 20;
+		flt->y = dpy->flt->y + 20;
+	}
+	dpy->flts = list_append(dpy->flts, flt);
+	tag->dpy        = dpy;
+	tag->dpy->flt   = flt;
+	tag->dpy->layer = floating;
+}
+
+/* Insert a window into a tag */
+static void put_win(win_t *win, tag_t *tag, layer_t layer)
+{
+	if (layer == tiling)
+		put_win_col(win, tag, tag->dpy, tag->dpy->col);
+	if (layer == floating)
+		put_win_flt(win, tag, tag->dpy);
+}
+
+/* Move a window up, down, left, or right
+ *   This handles moving with a column, between
+ *   columns, and between multiple monitors. */
 static void shift_window(win_t *win, int col, int row)
 {
 	if (!win) return;
 	printf("shift_window: %p - %+d,%+d\n", win, col, row);
 	print_txt();
 	printf("shift_window: >>>\n");
-	list_t *ldpy, *lcol, *lrow;
-	searchl(wm_tag, win, &ldpy, &lcol, &lrow);
+	list_t *ldpy, *lcol, *lrow, *lflt;
+	if (tiling != searchl(wm_tag, win, &ldpy, &lcol, &lrow, &lflt))
+		return;
 	dpy_t *dpy = ldpy->data;
 	if (row != 0) {
+		/* Move with a column, just swap rows */
 		list_t *src = lrow, *dst = NULL;
 		if (row < 0) dst = src->prev;
 		if (row > 0) dst = src->next;
@@ -250,18 +409,24 @@ static void shift_window(win_t *win, int col, int row)
 			goto update;
 		}
 	} else {
+		/* Moving between columns */
 		int onlyrow = !lrow->prev && !lrow->next;
 		list_t *src = lcol, *dst = NULL;
 		if (col < 0) {
 			if (src->prev) {
+				/* Normal move between columns */
 				dst = src->prev;
 			} else if (!onlyrow) {
+				/* Create new column */
 				dpy->cols = list_insert(dpy->cols, new0(col_t));
 				dst = src->prev;
 			} else if (ldpy->prev) {
+				/* Move to next monitor */
 				dpy = ldpy->prev->data;
 				dst = list_last(dpy->cols);
 			} else {
+				/* We, shall, not, be,
+				 * we shall not be moved */
 				return;
 			}
 		}
@@ -278,8 +443,8 @@ static void shift_window(win_t *win, int col, int row)
 				return;
 			}
 		}
-		cut_win(wm_tag, win);
-		put_win(win, dpy, dst ? dst->data : NULL);
+		cut_win(win, wm_tag);
+		put_win_col(win, wm_tag, dpy, dst ? dst->data : NULL);
 		goto update;
 	}
 update:
@@ -287,6 +452,7 @@ update:
 	wm_update();
 }
 
+/* Get next/prev item, with wraparound */
 static list_t *get_next(list_t *list, int forward)
 {
 	list_t *next = forward ? list->next : list->prev;
@@ -297,26 +463,35 @@ static list_t *get_next(list_t *list, int forward)
 	}
 	return next;
 }
+
+/* Move keyboard focus in a given direction */
 static void shift_focus(int cols, int rows)
 {
 	printf("shift_focus: %+d,%+d\n", cols, rows);
 	if (rows != 0 && wm_focus) {
+		/* Move focus up/down */
 		list_t *dpy, *col, *row;
-		searchl(wm_tag, wm_focus, &dpy, &col, &row);
+		if (tiling != searchl(wm_tag, wm_focus, &dpy, &col, &row, NULL))
+			return;
 		row_t *next = get_next(row, rows > 0)->data;
 		set_focus(next->win);
 		if (COL(col)->mode != split)
 			wm_update();
 	}
 	if (cols != 0) {
+		/* Move focus left/right */
 		list_t *dpy, *col, *row, *ndpy, *ncol = NULL;
 		if (wm_focus) {
-			searchl(wm_tag, wm_focus, &dpy, &col, &row);
+			/* Currently focused on a window */
+			if (tiling != searchl(wm_tag, wm_focus, &dpy, &col, &row, NULL))
+				return;
 			ncol = cols > 0 ? col->next : col->prev;
 		} else {
+			/* Currently focused on an empty display */
 			dpy = list_find(wm_tag->dpys, wm_dpy);
 		}
 		if (ncol == NULL) {
+			/* Moving focus to a different display */
 			ndpy = get_next(dpy, cols > 0);
 			ncol = cols > 0 ? DPY(ndpy)->cols :
 				list_last(DPY(ndpy)->cols);
@@ -329,6 +504,42 @@ static void shift_focus(int cols, int rows)
 	}
 }
 
+/* Raise the window in the floating */
+static void raise_float(win_t *win)
+{
+	printf("raise_float: %p\n", win);
+	list_t *cur;
+	for (cur = wm_dpy->flts; cur; cur = cur->next)
+		if (FLT(cur)->win == win)
+			break;
+	if (cur) {
+		flt_t *flt = cur->data;
+		wm_dpy->flts = list_remove(wm_dpy->flts, cur);
+		wm_dpy->flts = list_append(wm_dpy->flts, flt);
+	}
+	sys_raise(win);
+}
+
+/* Toggle between floating and tiling layers */
+static void switch_layer(void)
+{
+	printf("switch_float: %p %d\n",
+			wm_dpy, wm_dpy->layer);
+	wm_dpy->layer = !wm_dpy->layer;
+	wm_update();
+}
+
+/* Move current window between floating and tiling layers */
+static void set_layer(win_t *win)
+{
+	if (!win) return;
+	printf("set_float: %p %p\n", wm_dpy, win);
+	wm_dpy->layer = !cut_win(win, wm_tag);
+	put_win(win, wm_tag, wm_dpy->layer);
+	wm_update();
+}
+
+/* Allocate a new tag */
 static tag_t *tag_new(list_t *screens, int name)
 {
 	tag_t *tag = new0(tag_t);
@@ -342,6 +553,9 @@ static tag_t *tag_new(list_t *screens, int name)
 	return tag;
 }
 
+/* Search for a tag
+ *   If it does not exist it is based on the
+ *   display geometry in wm->screens */
 static tag_t *tag_find(int name)
 {
 	tag_t *tag = NULL;
@@ -352,63 +566,85 @@ static tag_t *tag_find(int name)
 		}
 	if (!tag) {
 		tag = tag_new(wm->screens, name);
-		wm->tags = list_insert(wm->tags, tag);
+		wm->tags = list_append(wm->tags, tag);
 	}
 	return tag;
 }
 
+/* Move the window from the current tag to the new tag
+ *   Unlike wmii, only remove the current tag, not all tags */
 static void tag_set(win_t *win, int name)
 {
 	printf("tag_set: %p %d\n", win, name);
 	if (wm_tag->name == name)
 		return;
-	cut_win(wm_tag, win);
-	win_t *focus = wm_focus;
-
 	tag_t *tag = tag_find(name);
-	put_win(win, tag->dpy, tag->dpy->col);
-	set_focus(focus);
+	layer_t layer = cut_win(win, wm_tag);
+	put_win(win, tag, layer);
+	set_focus(wm_focus);
+}
+
+/* Switch to a different tag */
+static void tag_switch(int name)
+{
+	printf("tag_switch: %d\n", name);
+	if ((wm_col == NULL || wm_row == NULL) && wm_flt == NULL)
+		wm->tags = list_remove(wm->tags,
+				list_find(wm->tags, wm_tag));
+	wm_tag = tag_find(name);
 }
 
-/* Window management functions */
-void wm_update_dpy(dpy_t *dpy)
+/* Tile all windows in the given display
+ *   This performs all the actual window tiling
+ *   Currently supports  split, stack and maximized modes */
+static void wm_update_cols(dpy_t *dpy)
 {
 	int  x=0,  y=0; // Current window top-left position
-	int tx=0, ty=0; // Total x/y size
-	int mx=0, my=0; // Maximum x/y size (screen size)
-	int       sy=0; // Size of focused stack window
+	int tx=0, ty=0; // Total size (sum of initial col widths and row heights w/o margin)
+	int mx=0, my=0; // Maximum usable size (screen size minus margins)
+	int       sy=0; // Stack size (height of focused stack window)
 
 	/* Scale horizontally */
 	x  = dpy->geom->x;
 	mx = dpy->geom->w - (list_length(dpy->cols)+1)*MARGIN;
-	for (list_t *lx = dpy->cols; lx; lx = lx->next)
-		tx += COL(lx)->width;
-	for (list_t *lx = dpy->cols; lx; lx = lx->next)
-		COL(lx)->width *= (float)mx / tx;
+	for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next)
+		tx += COL(lcol)->width;
+	for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next)
+		COL(lcol)->width *= (float)mx / tx;
 
 	/* Scale each column vertically */
-	for (list_t *lx = dpy->cols; lx; lx = lx->next) {
-		col_t *col = lx->data;
+	for (list_t *lcol = dpy->cols; lcol; lcol = lcol->next) {
+		col_t *col = lcol->data;
+		int nrows = list_length(col->rows);
 		ty = 0;
-		for (list_t *ly = col->rows; ly; ly = ly->next)
-			ty += ROW(ly)->height;
+		for (list_t *lrow = col->rows; lrow; lrow = lrow->next)
+			ty += ROW(lrow)->height;
 		y  = dpy->geom->y;
-		my = dpy->geom->h - (list_length(col->rows)+1)*MARGIN;
-		sy = my              - (list_length(col->rows)-1)*STACK;
-		for (list_t *ly = col->rows; ly; ly = ly->next) {
-			win_t *win = ROW(ly)->win;
-			win->h = ROW(ly)->height;
+		my = dpy->geom->h - (MARGIN + (nrows-1)* MARGIN    + MARGIN);
+		sy = dpy->geom->h - (MARGIN + (nrows-1)*(MARGIN/2) + MARGIN)
+		                  -           (nrows-1)* STACK;
+		for (list_t *lrow = col->rows; lrow; lrow = lrow->next) {
+			win_t *win = ROW(lrow)->win;
+			win->h = ROW(lrow)->height;
 			int height = 0;
 			switch (col->mode) {
 			case split:
 				sys_move(win, x+MARGIN, y+MARGIN,
 					col->width, win->h * ((float)my / ty));
 				height = win->h;
+				y += height + MARGIN;
 				break;
 			case stack:
-				height = col->row->win == win ? sy : STACK;
+				if (lrow->next && ROW(lrow->next)->win == col->row->win) {
+					/* Hack to prevent flashing */
+					win_t *next = ROW(lrow->next)->win;
+					sys_move(next, x+MARGIN, y+MARGIN+STACK+MARGIN/2,
+						col->width, sy);
+				}
+				height = win == col->row->win ? sy : STACK;
 				sys_move(win, x+MARGIN, y+MARGIN,
 					col->width, height);
+				y += height + (MARGIN/2);
 				break;
 			case max:
 			case tab:
@@ -418,26 +654,38 @@ void wm_update_dpy(dpy_t *dpy)
 					sys_raise(win);
 				break;
 			}
-			y += height + MARGIN;
-			ROW(ly)->height = win->h;
+			ROW(lrow)->height = win->h;
 		}
 		x += col->width + MARGIN;
 	}
 }
 
+/*******************************
+ * Window management functions *
+ *******************************/
 void wm_update(void)
 {
 	/* Show/hide tags */
-	for (list_t *ltag =       wm ->tags; ltag; ltag = ltag->next)
-	for (list_t *ldpy = TAG(ltag)->dpys; ldpy; ldpy = ldpy->next)
-	for (list_t *lcol = DPY(ldpy)->cols; lcol; lcol = lcol->next)
-	for (list_t *lrow = COL(lcol)->rows; lrow; lrow = lrow->next)
-		sys_show(ROW(lrow)->win,
-			ltag->data == wm_tag ? st_show : st_hide);
-
-	/* Refrsh the display */
+	tag_foreach_col(wm_tag, dpy, col, row, win)
+		sys_show(win, st_show);
+	tag_foreach_flt(wm_tag, dpy, flt, win)
+		sys_show(win, st_show);
+	for (list_t *tag = wm ->tags; tag; tag = tag->next)
+		if (tag->data != wm_tag) {
+			tag_foreach_col(TAG(tag), dpy, col, row, win)
+					sys_show(win, st_hide);
+			tag_foreach_flt(TAG(tag), dpy, flt, win)
+					sys_show(win, st_hide);
+		}
+
+	/* Refresh the display */
 	for (list_t *ldpy = wm_tag->dpys; ldpy; ldpy = ldpy->next)
-		wm_update_dpy(ldpy->data);
+		wm_update_cols(ldpy->data);
+	tag_foreach_flt(wm_tag, ldpy, lflt, win) {
+		flt_t *flt = lflt->data;
+		sys_move(win, flt->x, flt->y, flt->w, flt->h);
+		sys_raise(flt->win);
+	}
 	if (wm_focus)
 		set_focus(wm_focus);
 }
@@ -453,12 +701,19 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 	//	mod.win   ? 'w' : '-');
 
 	/* Mouse movement */
-	if (key_mouse0 <= key && key <= key_mouse7 && mod.up)
-		return set_move(win,ptr,none), 1;
-	else if (key == key_mouse1 && mod.MODKEY)
-		return set_move(win,ptr,move), 1;
-	else if (key == key_mouse3 && mod.MODKEY)
-		return set_move(win,ptr,resize), 1;
+	if (key == key_mouse1)
+		raise_float(win);
+	if (key_mouse0 <= key && key <= key_mouse7) {
+		if (key == key_mouse1 && mod.MODKEY && !mod.up)
+			return set_move(win,ptr,move),   1;
+		if (key == key_mouse3 && mod.MODKEY && !mod.up)
+			return set_move(win,ptr,resize), 1;
+		if (move_mode != none && mod.up)
+			return set_move(win,ptr,none),   1;
+		if (key == key_mouse1 && !mod.up && win->h == STACK)
+			return wm_update(),              0;
+		return 0;
+	}
 
 	/* Only handle key-down */
 	if (mod.up)
@@ -466,15 +721,23 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 
 	/* Misc */
 	if (mod.MODKEY) {
-		if (key == key_f1) return sys_raise(win), 1;
+#ifdef DEBUG
+		if (key == key_f1) return raise_float(win), 1;
 		if (key == key_f2) return set_focus(win), 1;
 		if (key == key_f3) return sys_show(win, st_show), 1;
 		if (key == key_f4) return sys_show(win, st_hide), 1;
+#endif
 		if (key == key_f5) return wm_update(),    1;
-		if (key == key_f6) return print_txt(), 1;
+		if (key == key_f6) return print_txt(),    1;
+	}
+
+	/* Floating layer */
+	if (key == ' ') {
+		if (mod.MODKEY && mod.shift)
+			return set_layer(win), 1;
+		if (mod.MODKEY)
+			return switch_layer(), 1;
 	}
-	if (key_mouse0 <= key && key <= key_mouse7)
-		sys_raise(win);
 
 	/* Movement commands */
 	if (mod.MODKEY && mod.shift) {
@@ -510,12 +773,10 @@ int wm_handle_key(win_t *win, Key_t key, mod_t mod, ptr_t ptr)
 	/* Tag switching */
 	if (mod.MODKEY && '0' <= key && key <= '9') {
 		int name = key - '0';
-		if (mod.shift) {
+		if (mod.shift)
 			tag_set(win, name);
-		} else {
-			printf("tag_switch: %d\n", name);
-			wm_tag = tag_find(name);
-		}
+		else
+			tag_switch(name);
 		wm_update();
 	}
 
@@ -543,11 +804,11 @@ int wm_handle_ptr(win_t *cwin, ptr_t ptr)
 	if (move_mode == none)
 		return 0;
 
-	/* Tiling */
 	int dx = ptr.rx - move_prev.rx;
 	int dy = ptr.ry - move_prev.ry;
 	move_prev = ptr;
-	if (move_mode == resize) {
+
+	if (move_layer == tiling && move_mode == resize) {
 		list_t *vert = move_dir.v < 0 ? move_lrow->prev : move_lrow->next;
 		list_t *horz = move_dir.h < 0 ? move_lcol->prev : move_lcol->next;
 		if (vert) {
@@ -561,15 +822,20 @@ int wm_handle_ptr(win_t *cwin, ptr_t ptr)
 		wm_update();
 	}
 
-	/* Floating */
-	//win_t *mwin = move_win;
-	//int dx = ptr.rx - move_prev.rx;
-	//int dy = ptr.ry - move_prev.ry;
-	//move_prev = ptr;
-	//if (move_mode == move)
-	//	sys_move(mwin, mwin->x+dx, mwin->y+dy, mwin->w, mwin->h);
-	//else if (move_mode == resize)
-	//	sys_move(mwin, mwin->x, mwin->y, mwin->w+dx, mwin->h+dy);
+	if (move_layer == floating) {
+		flt_t *flt = move_lflt->data;
+		win_t *win = flt->win;
+		if (move_mode == move)
+			sys_move(win, win->x+dx, win->y+dy, win->w, win->h);
+		else if (move_mode == resize)
+			sys_move(win,
+				win->x + dx * (move_dir.h < 0),
+				win->y + dy * (move_dir.v < 0),
+				win->w + dx *  move_dir.h,
+				win->h + dy *  move_dir.v);
+		flt->x = win->x; flt->y = win->y;
+		flt->w = win->w; flt->h = win->h;
+	}
 
 	return 0;
 }
@@ -581,15 +847,16 @@ void wm_insert(win_t *win)
 
 	/* Initialize window */
 	win->wm = new0(win_wm_t);
-	sys_watch(win, key_enter, MOD());
-	sys_watch(win, key_focus, MOD());
+	sys_watch(win, key_enter,  MOD());
+	sys_watch(win, key_focus,  MOD());
+	sys_watch(win, key_mouse1, MOD());
 
 	/* Add to screen */
-	put_win(win, wm_dpy, wm_col);
+	put_win(win, wm_tag, wm_dpy->layer);
 
 	/* Arrange */
 	wm_update();
-	sys_focus(wm_focus);
+	set_focus(wm_focus);
 	print_txt();
 }
 
@@ -598,29 +865,35 @@ void wm_remove(win_t *win)
 	printf("wm_remove: %p\n", win);
 	print_txt();
 	for (list_t *tag = wm->tags; tag; tag = tag->next)
-		cut_win(tag->data, win);
-	if (wm_focus)
-		sys_focus(wm_focus);
-	else
-		sys_focus(wm->root);
+		cut_win(win, tag->data);
+	set_focus(wm_focus);
 	wm_update();
 	print_txt();
 }
-
 void wm_init(win_t *root)
 {
 	printf("wm_init: %p\n", root);
 
+	/* Hack, fix screen order */
+	list_t *screens = sys_info(root);
+	list_t *left  = screens;
+	list_t *right = screens->next;
+	if (left && right && WIN(left)->x > WIN(right)->x) {
+	    	void *tmp   = left->data;
+	    	left->data  = right->data;
+	    	right->data = tmp;
+	}
+
 	wm          = new0(wm_t);
 	wm->root    = root;
-	wm->screens = sys_info(root);
+	wm->screens = screens;
 	wm->tag     = tag_new(wm->screens, 1);
 	wm->tags    = list_insert(NULL, wm->tag);
 
 	Key_t keys_e[] = {key_enter, key_focus};
-	Key_t keys_s[] = {'h', 'j', 'k', 'l',
+	Key_t keys_s[] = {'h', 'j', 'k', 'l', ' ',
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9'};
-	Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't',
+	Key_t keys_m[] = {'h', 'j', 'k', 'l', 'd', 's', 'm', 't', ' ',
 		'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
 		key_f1, key_f2, key_f3, key_f4, key_f5, key_f6,
 		key_mouse1, key_mouse3};