X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=d8f2e618e39689c23c7176cc997905c1476fe9f8;hb=2d53c59cc3444ac0223127b6861742e85fa33ce4;hp=4268b24cce596d5aa1d6d77d9be3ce9f5ae104e6;hpb=ec9567149f71990e947d5d0c475aaac14a8cc9c7;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 4268b24..d8f2e61 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -50,7 +50,7 @@
 
 static const char	*cvstag = "$scrotwm$";
 
-#define	SWM_VERSION	"0.7"
+#define	SWM_VERSION	"0.8"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -183,6 +183,7 @@ char			*bar_fonts[] = {
 char			*spawn_term[] = { "xterm", NULL };
 char			*spawn_screenshot[] = { "screenshot.sh", NULL, NULL };
 char			*spawn_lock[] = { "xlock", NULL };
+char			*spawn_initscr[] = { "initscreen.sh", NULL };
 char			*spawn_menu[] = { "dmenu_run", "-fn", NULL, "-nb", NULL,
 			    "-nf", NULL, "-sb", NULL, "-sf", NULL, NULL };
 
@@ -267,8 +268,10 @@ struct workspace {
 	struct {
 				int horizontal_msize;
 				int horizontal_mwin;
+				int horizontal_stacks;
 				int vertical_msize;
 				int vertical_mwin;
+				int vertical_stacks;
 	} l_state;
 };
 
@@ -314,6 +317,10 @@ union arg {
 #define SWM_ARG_ID_CYCLEWS_DOWN	(13)
 #define SWM_ARG_ID_CYCLESC_UP	(14)
 #define SWM_ARG_ID_CYCLESC_DOWN	(15)
+#define SWM_ARG_ID_COLINC	(16)
+#define SWM_ARG_ID_COLDEC	(17)
+#define SWM_ARG_ID_ROWINC	(16)
+#define SWM_ARG_ID_ROWDEL	(17)
 #define SWM_ARG_ID_SS_ALL	(0)
 #define SWM_ARG_ID_SS_WINDOW	(1)
 #define SWM_ARG_ID_DONTCENTER	(0)
@@ -326,14 +333,16 @@ struct quirk {
 	char			*class;
 	char			*name;
 	unsigned long		quirk;
-#define SWM_Q_FLOAT		(1<<0)
-#define SWM_Q_TRANSSZ		(1<<1)
+#define SWM_Q_FLOAT		(1<<0)	/* float this window */
+#define SWM_Q_TRANSSZ		(1<<1)	/* transiend window size too small */
+#define SWM_Q_ANYWHERE		(1<<2)	/* don't position this window */
 } quirks[] = {
 	{ "MPlayer",		"xv",		SWM_Q_FLOAT },
 	{ "OpenOffice.org 2.4",	"VCLSalFrame",	SWM_Q_FLOAT },
 	{ "OpenOffice.org 3.0",	"VCLSalFrame",	SWM_Q_FLOAT },
 	{ "Firefox-bin",	"firefox-bin",	SWM_Q_TRANSSZ},
-	{ NULL,		NULL,		0},
+	{ "Gimp",		"gimp",		SWM_Q_FLOAT | SWM_Q_ANYWHERE},
+	{ NULL,			NULL,		0},
 };
 
 /* events */
@@ -1304,7 +1313,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	XWindowChanges		wc;
 	struct swm_geometry	win_g, r_g = *g;
 	struct ws_win		*win, *winfocus;
-	int			i, j, w_inc, h_inc, w_base, h_base;
+	int			i, j, s, w_inc, h_inc, w_base, h_base, stacks; 
 	int			hrh, extra, h_slice, last_h = 0;
 	int			split, colno, winno, mwin, msize, mscale;
 	int			remain, missing, v_slice;;
@@ -1326,22 +1335,27 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 		w_base = win->sh.base_width;
 		mwin = ws->l_state.horizontal_mwin;
 		mscale = ws->l_state.horizontal_msize;
+		stacks = ws->l_state.horizontal_stacks;
 		SWAPXY(&r_g);
 	} else {
 		w_inc = win->sh.height_inc;
 		w_base = win->sh.base_height;
 		mwin = ws->l_state.vertical_mwin;
 		mscale = ws->l_state.vertical_msize;
+		stacks = ws->l_state.vertical_stacks;
 	}
 	win_g = r_g;
 
+	if (stacks > winno - mwin)
+		stacks = winno - mwin;
+
 	h_slice = r_g.h / SWM_H_SLICE;
 	if (mwin && winno > mwin) {
 		v_slice = r_g.w / SWM_V_SLICE;
 
 		split = mwin;
 		colno = split;
-		msize = v_slice * mscale;
+		win_g.w = v_slice * mscale;
 
 		if (w_inc > 1 && w_inc < v_slice) {
 			/* adjust for window's requested size increment */
@@ -1357,32 +1371,44 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 			}
 		}
 
-		win_g.w = msize;
+		msize = win_g.w;
 		if (flip) 
 			win_g.x += r_g.w - msize;
 	} else {
-		colno = winno;
-		split = 0;
+		if (stacks > 1) {
+			colno = split = (winno - mwin) / stacks;
+		} else {
+			split = 0;
+			colno = winno;
+		}
 	}
 	hrh = r_g.h / colno;
 	extra = r_g.h - (colno * hrh);
 	win_g.h = hrh - 2;
 
 	/*  stack all the tiled windows */
-	i = j = 0;
+	i = j = 0, s = stacks;
 	TAILQ_FOREACH(win, &ws->winlist, entry) {
 		if (win->transient != 0 || win->floating != 0)
 			continue;
 
 		if (split && i == split) {
-			colno = winno - split;
+			colno = (winno - mwin) / stacks;
+			if (s <= (winno - mwin) % stacks)
+				colno++;
+			split = split + colno;
 			hrh = (r_g.h / colno);
 			extra = r_g.h - (colno * hrh);
 			if (flip)
 				win_g.x = r_g.x;
 			else
-				win_g.x += msize + 2;
-			win_g.w = r_g.w - (msize + 2);
+				win_g.x += win_g.w + 2;
+			win_g.w = (((r_g.w - (msize + 2)) -
+			    ((stacks - 1) * 2)) / stacks);
+			if (s == 1)
+				win_g.w += (((r_g.w - (msize + 2)) -
+				    ((stacks - 1) * 2)) % stacks);
+			s--;
 			j = 0;
 		}
 		win_g.h = hrh - 2;
@@ -1459,6 +1485,7 @@ vertical_config(struct workspace *ws, int id)
 	case SWM_ARG_ID_STACKINIT:
 		ws->l_state.vertical_msize = SWM_V_SLICE / 2;
 		ws->l_state.vertical_mwin = 1;
+		ws->l_state.vertical_stacks = 1;
 		break;
 	case SWM_ARG_ID_MASTERSHRINK:
 		if (ws->l_state.vertical_msize > 1)
@@ -1474,6 +1501,12 @@ vertical_config(struct workspace *ws, int id)
 	case SWM_ARG_ID_MASTERDEL:
 		if (ws->l_state.vertical_mwin > 0)
 			ws->l_state.vertical_mwin--;
+	case SWM_ARG_ID_COLINC:
+		ws->l_state.vertical_stacks++;
+		break;
+	case SWM_ARG_ID_COLDEC:
+		if (ws->l_state.vertical_stacks > 1)
+			ws->l_state.vertical_stacks--;
 		break;
 	default:
 		return;
@@ -1498,6 +1531,7 @@ horizontal_config(struct workspace *ws, int id)
 	case SWM_ARG_ID_STACKINIT:
 		ws->l_state.horizontal_mwin = 1;
 		ws->l_state.horizontal_msize = SWM_H_SLICE / 2;
+		ws->l_state.horizontal_stacks = 1;
 		break;
 	case SWM_ARG_ID_MASTERSHRINK:
 		if (ws->l_state.horizontal_msize > 1)
@@ -1514,6 +1548,12 @@ horizontal_config(struct workspace *ws, int id)
 		if (ws->l_state.horizontal_mwin > 0)
 			ws->l_state.horizontal_mwin--;
 		break;
+	case SWM_ARG_ID_COLINC:
+		ws->l_state.horizontal_stacks++;
+		break;
+	case SWM_ARG_ID_COLDEC:
+		if (ws->l_state.horizontal_stacks > 1)
+			ws->l_state.horizontal_stacks--;
 	default:
 		return;
 	}
@@ -1682,6 +1722,8 @@ struct key {
 	{ MODKEY,		XK_l,		stack_config,	{.id = SWM_ARG_ID_MASTERGROW} },
 	{ MODKEY,		XK_comma,	stack_config,	{.id = SWM_ARG_ID_MASTERADD} },
 	{ MODKEY,		XK_period,	stack_config,	{.id = SWM_ARG_ID_MASTERDEL} },
+	{ MODKEY | ShiftMask,	XK_comma,	stack_config,	{.id = SWM_ARG_ID_COLINC} },
+	{ MODKEY | ShiftMask,	XK_period,	stack_config,	{.id = SWM_ARG_ID_COLDEC} },
 	{ MODKEY,		XK_Return,	swapwin,	{.id = SWM_ARG_ID_SWAPMAIN} },
 	{ MODKEY,		XK_j,		focus,		{.id = SWM_ARG_ID_FOCUSNEXT} },
 	{ MODKEY,		XK_k,		focus,		{.id = SWM_ARG_ID_FOCUSPREV} },
@@ -1725,6 +1767,7 @@ struct key {
 	{ MODKEY,		XK_t,		floating_toggle,{0} },
 	{ MODKEY | ShiftMask,	XK_v,		version,	{0} },
 	{ MODKEY | ShiftMask,	XK_Delete,	spawn,		{.argv = spawn_lock} },
+	{ MODKEY | ShiftMask,	XK_i,		spawn,		{.argv = spawn_initscr} },
 };
 
 void
@@ -2037,6 +2080,7 @@ manage_window(Window id)
 	struct swm_region	*r;
 	long			mask;
 	const char		*errstr;
+	XWindowChanges		wc;
 
 	if ((win = find_window(id)) != NULL)
 			return (win);	/* already being managed */
@@ -2112,11 +2156,33 @@ manage_window(Window id)
 		}
 	}
 
+	/* alter window position if quirky */
+	if (win->quirks & SWM_Q_ANYWHERE) {
+		win->manual = 1; /* don't center the quirky windows */
+		bzero(&wc, sizeof wc);
+		mask = 0;
+		if (win->g.y < bar_height) {
+			win->g.y = wc.y = bar_height;
+			mask |= CWY;
+		}
+		if (win->g.w + win->g.x > WIDTH(r)) {
+			win->g.x = wc.x = WIDTH(win->ws->r) - win->g.w - 2;
+			mask |= CWX;
+		}
+		wc.border_width = 1;
+		mask |= CWBorderWidth;
+		XConfigureWindow(display, win->id, mask, &wc);
+	}
+
 	XSelectInput(display, id, EnterWindowMask | FocusChangeMask |
 	    PropertyChangeMask | StructureNotifyMask);
 
 	set_win_state(win, NormalState);
 
+	/* floaters need to be mapped if they are in the current workspace */
+	if (win->floating && (ws->idx == r->ws->idx))
+		XMapRaised(display, win->id);
+
 	/* make new win focused */
 	focus_win(win);
 
@@ -2207,8 +2273,8 @@ configurerequest(XEvent *e)
 					ev->value_mask |= CWY | CWHeight;
 				}
 			}
-			if ((ev->value_mask & (CWX|CWY)) &&
-			    !(ev->value_mask & (CWWidth|CWHeight)))
+			if ((ev->value_mask & (CWX | CWY)) &&
+			    !(ev->value_mask & (CWWidth | CWHeight)))
 				config_win(win);
 			XMoveResizeWindow(display, win->id,
 			    win->g.x, win->g.y, win->g.w, win->g.h);
@@ -2288,6 +2354,7 @@ maprequest(XEvent *e)
 	if (wa.override_redirect)
 		return;
 	manage_window(e->xmaprequest.window);
+
 	stack();
 }
 
@@ -2728,7 +2795,8 @@ main(int argc, char *argv[])
 					handler[e.type](&e);
 				else
 					DNPRINTF(SWM_D_EVENT,
-					    "unkown event: %d\n", e.type);
+					    "win: %lu unknown event: %d\n",
+					    e.xany.window, e.type);
 			} else {
 				switch (e.type - xrandr_eventbase) {
 				case RRScreenChangeNotify:
@@ -2736,7 +2804,8 @@ main(int argc, char *argv[])
 					break;
 				default:
 					DNPRINTF(SWM_D_EVENT,
-					    "unkown event: %d\n", e.type);
+					    "win: %lu unknown xrandr event: "
+					    "%d\n", e.xany.window, e.type);
 					break;
 				}
 			}