X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=dwm.c;h=71ab0f2ae30a36c6acbfc6de7323d2079ea8e954;hp=a04e2b60727990d9a2d35de06c157cd5610e90b6;hb=e5d1064c01081044c63325f4c195fcec58442654;hpb=63f792db45b8422aef1be9127c3b5a53ce2e926d

diff --git a/dwm.c b/dwm.c
index a04e2b6..71ab0f2 100644
--- a/dwm.c
+++ b/dwm.c
@@ -90,8 +90,9 @@ struct Client {
 	int oldx, oldy, oldw, oldh;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int bw, oldbw;
+	int opacity;
 	unsigned int tags;
-	Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
+	Bool isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, screen_hog;
 	Client *next;
 	Client *snext;
 	Monitor *mon;
@@ -137,6 +138,7 @@ typedef struct {
 	const char *title;
 	unsigned int tags;
 	Bool isfloating;
+	Bool screen_hog;
 	int monitor;
 } Rule;
 
@@ -145,6 +147,7 @@ static void applyrules(Client *c);
 static Bool applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact);
 static void arrange(Monitor *m);
 static void arrangemon(Monitor *m);
+static void attach_as_master(Client *c);
 static void attach(Client *c);
 static void attachstack(Client *c);
 static void buttonpress(XEvent *e);
@@ -208,6 +211,7 @@ static void sigchld(int unused);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
+static void jason_layout(Monitor *);
 static void tile(Monitor *);
 static void togglebar(const Arg *arg);
 static void togglefloating(const Arg *arg);
@@ -269,16 +273,59 @@ static Monitor *mons, *selmon;
 static Window root;
 
 // unfocused windows get transparent (feature)
-static const unsigned long unfocused_opacity[] = { 0xbfffffff };
+static const unsigned long opacities[] = { 0, 0xbfffffff, 0x00000000 }; // first unused
 static void window_set_opaque(Client *c);
 static void window_set_translucent(Client *c);
+static void window_set_invisible(Client *c);
+static void window_set_opacity(Client *c, int opacity_index);
+static void update_window_opacities(Monitor *m);
+void
+window_set_opacity(Client *c, int opacity_index) {
+	if (c->opacity == opacity_index) {
+		return;
+	}
+	c->opacity = opacity_index;
+	if (opacity_index == 0) {
+		XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]);
+	} else {
+		XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)(&opacities[opacity_index]), 1);
+	}
+}
 void
 window_set_opaque(Client *c) {
-	XDeleteProperty(dpy, c->win, netatom[NetWMWindowOpacity]);
+	window_set_opacity(c, 0);
 }
 void
 window_set_translucent(Client *c) {
-	XChangeProperty(dpy, c->win, netatom[NetWMWindowOpacity], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)unfocused_opacity, 1);
+	window_set_opacity(c, 1);
+}
+void
+window_set_invisible(Client *c) {
+	window_set_opacity(c, 2);
+}
+void
+update_window_opacities(Monitor *m) {
+	Client *master, *slave, *c;
+	Bool selection_floating = False;
+	slave = master = nexttiled(m->clients);
+	if (master) slave = nexttiled(master->next);
+	if (m->sel && m->sel != master) {
+		if (nexttiled(m->sel) == m->sel) // if selection is tiled
+			slave = m->sel;
+		else
+			selection_floating = True;
+	}
+	for (c = m->clients; c; c = c->next) {
+		if (ISVISIBLE(c)) {
+			if (c->isfloating || c == m->sel || (c == master && selection_floating)) {
+				window_set_opaque(c);
+			} else if (c == master || c == slave) {
+				window_set_translucent(c);
+			} else {
+				window_set_invisible(c);
+			}
+		}
+	}
 }
 
 
@@ -298,19 +345,20 @@ applyrules(Client *c) {
 	XClassHint ch = { NULL, NULL };
 
 	/* rule matching */
-	c->isfloating = c->tags = 0;
+	c->isfloating = c->tags = c->screen_hog = 0;
 	XGetClassHint(dpy, c->win, &ch);
 	class    = ch.res_class ? ch.res_class : broken;
 	instance = ch.res_name  ? ch.res_name  : broken;
 
 	for(i = 0; i < LENGTH(rules); i++) {
 		r = &rules[i];
-		if((!r->title || strstr(c->name, r->title))
+		if((!r->title || c->name == strstr(c->name, r->title))
 		&& (!r->class || strstr(class, r->class))
 		&& (!r->instance || strstr(instance, r->instance)))
 		{
 			c->isfloating = r->isfloating;
 			c->tags |= r->tags;
+			c->screen_hog = r->screen_hog;
 			for(m = mons; m && m->num != r->monitor; m = m->next);
 			if(m)
 				c->mon = m;
@@ -410,13 +458,17 @@ arrangemon(Monitor *m) {
 }
 
 void
+attach_as_master(Client *c) {
+	c->next = c->mon->clients;
+	c->mon->clients = c;
+}
+void
 attach(Client *c) {
 	if (c->mon->sel) {
 		c->next = c->mon->sel->next;
 		c->mon->sel->next = c;
 	} else {
-		c->next = c->mon->clients;
-		c->mon->clients = c;
+		attach_as_master(c);
 	}
 }
 
@@ -835,6 +887,7 @@ focus(Client *c) {
 		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
 	}
 	selmon->sel = c;
+	update_window_opacities(selmon);
 	drawbars();
 	if(c && (!root || (c->win!=root)) )
 		window_set_opaque(c);
@@ -1055,6 +1108,7 @@ manage(Window w, XWindowAttributes *wa) {
 
 	if(!(c = calloc(1, sizeof(Client))))
 		die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+	c->opacity = -1; // who knows
 	c->win = w;
 	updatetitle(c);
 	if(XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
@@ -1238,7 +1292,7 @@ nextvisible(Client *c) {
 void
 pop(Client *c) {
 	detach(c);
-	attach(c);
+	attach_as_master(c);
 	focus(c);
 	arrange(c->mon);
 }
@@ -1630,6 +1684,17 @@ sigchld(int unused) {
 
 void
 spawn(const Arg *arg) {
+	int tag = 0, i;
+	if(arg->v == termcmd) {
+		for(i = 0; i < 32; ++i) {
+			if(selmon->tagset[selmon->seltags] & (1 << i)) {
+				tag = i;
+				break;
+			}
+		}
+		_SWM_WS[8] = swm_tags[tag][0];
+		_SWM_WS[9] = swm_tags[tag][1];
+	}
 	if(arg->v == dmenucmd)
 		dmenumon[0] = '0' + selmon->num;
 	if(fork() == 0) {
@@ -1670,8 +1735,13 @@ tile(Monitor *m) {
 
 	if(n > m->nmaster)
 		mw = m->nmaster ? m->ww * m->mfact : 0;
-	else
-		mw = m->ww;
+	else {
+		c = nexttiled(m->clients);
+		if (c && !c->screen_hog)
+			mw = m->ww * m->mfact;
+		else
+			mw = m->ww;
+	}
 	for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
 		if(i < m->nmaster) {
 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
@@ -1686,6 +1756,47 @@ tile(Monitor *m) {
 }
 
 void
+jason_layout(Monitor *m) {
+	unsigned int i, n, mw;
+	Client *c, *vis_slave;
+
+	for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
+	if(n == 0) {
+		return;
+	}
+
+	c = nexttiled(m->clients);
+	if (c == m->sel) {
+		// if master is selected, show first slave
+		vis_slave = nexttiled(c->next);
+	} else {
+		vis_slave = m->sel;
+	}
+	if(n > 1 || (n == 1 && !c->screen_hog)) {
+		mw = m->ww * m->mfact;
+	} else {
+		// one of these:
+		// * zero tiled windows
+		// * one tiled window that's not a screen hog
+		// * miltiple tiled windows
+		mw = m->ww;
+	}
+	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+		if (i == 0) {
+			resize(c, m->wx, m->wy, mw, m->wh, False);
+		} else {
+			if (c == vis_slave) {
+				resize(c, m->wx + mw, m->wy, m->ww - mw, m->wh, False);
+			} else {
+				// this function does not get called when focus changes
+				// resize(c, m->wx + m->ww, m->wy, m->ww - mw, m->wh, False);
+				resize(c, m->wx + mw, m->wy, m->ww - mw, m->wh, False);
+			}
+		}
+	}
+}
+
+void
 togglebar(const Arg *arg) {
 	selmon->showbar = !selmon->showbar;
 	updatebarpos(selmon);
@@ -1735,8 +1846,6 @@ void
 unfocus(Client *c, Bool setfocus) {
 	if(!c)
 		return;
-	if(!root || c->win!=root)
-		window_set_translucent(c);
 	grabbuttons(c, False);
 	XSetWindowBorder(dpy, c->win, scheme[SchemeNorm].border->rgb);
 	if(setfocus) {