X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/3aad92202d58208c4197857d3f17c535ba0bd56a..29355bd38284ed9aec8d3ffabde61db73947c9f9:/client.c?ds=sidebyside

diff --git a/client.c b/client.c
index 3c8825d..63fb1e5 100644
--- a/client.c
+++ b/client.c
@@ -11,13 +11,12 @@
 
 #include "dwm.h"
 
-static void (*arrange)(Arg *) = tiling;
-
 static Rule rule[] = {
-	{ "Firefox-bin", "Gecko", { [Twww] = "www" } },
+	/* class			instance	tags						floating */
+	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
 };
 
-static Client *
+Client *
 next(Client *c)
 {
 	for(; c && !c->tags[tsel]; c = c->next);
@@ -25,185 +24,12 @@ next(Client *c)
 }
 
 void
-zoom(Arg *arg)
-{
-	Client **l, *old;
-
-	if(!(old = sel))
-		return;
-
-	for(l = &clients; *l && *l != sel; l = &(*l)->next);
-	*l = sel->next;
-
-	old->next = clients; /* pop */
-	clients = old;
-	sel = old;
-	arrange(NULL);
-	focus(sel);
-}
-
-void
-max(Arg *arg)
-{
-	if(!sel)
-		return;
-	sel->x = sx;
-	sel->y = sy;
-	sel->w = sw - 2 * sel->border;
-	sel->h = sh - 2 * sel->border;
-	craise(sel);
-	resize(sel);
-	discard_events(EnterWindowMask);
-}
-
-void
-view(Arg *arg)
-{
-	tsel = arg->i;
-	arrange(NULL);
-}
-
-void
-tag(Arg *arg)
-{
-	int i, n;
-	if(!sel)
-		return;
-
-	if(arg->i == tsel) {
-		for(n = i = 0; i < TLast; i++)
-			if(sel->tags[i])
-				n++;
-		if(n < 2)
-			return;
-	}
-
-	if(sel->tags[arg->i])
-		sel->tags[arg->i] = NULL; /* toggle tag */
-	else
-		sel->tags[arg->i] = tags[arg->i];
-	arrange(NULL);
-}
-
-static void
 ban_client(Client *c)
 {
 	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	XMoveWindow(dpy, c->title, c->tx + 2 * sw, c->ty);
 }
 
-void
-floating(Arg *arg)
-{
-	Client *c;
-
-	arrange = floating;
-	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c);
-		else
-			ban_client(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = next(clients))) {
-			craise(sel);
-			focus(sel);
-		}
-	}
-	discard_events(EnterWindowMask);
-}
-
-void
-tiling(Arg *arg)
-{
-	Client *c;
-	int n, i, w, h;
-
-	w = sw - mw;
-	arrange = tiling;
-	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel])
-			n++;
-
-	h = (n > 2) ? sh / (n - 2) : sh;
-
-	for(i = 0, c = clients; c; c = c->next) {
-		if(c->tags[tsel]) {
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy;
-				c->w = sw;
-				c->h = sh;
-			}
-			else if(i == 1) {
-				c->x = sx;
-				c->y = sy;
-				c->w = mw;
-				c->h = sh;
-			}
-			else {
-				c->x = sx + mw;
-				c->y = sy + (i - 2) * h;
-				c->w = w;
-				c->h = h;
-			}
-			resize(c);
-			i++;
-		}
-		else
-			ban_client(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = next(clients))) {
-			craise(sel);
-			focus(sel);
-		}
-	}
-	discard_events(EnterWindowMask);
-}
-
-void
-prevc(Arg *arg)
-{
-	Client *c;
-
-	if(!sel)
-		return;
-
-	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
-		craise(c);
-		focus(c);
-	}
-}
-
-void
-nextc(Arg *arg)
-{
-	Client *c;
-   
-	if(!sel)
-		return;
-
-	if(!(c = next(sel->next)))
-		c = next(clients);
-	if(c) {
-		craise(c);
-		c->revert = sel;
-		focus(c);
-	}
-}
-
-void
-ckill(Arg *arg)
-{
-	if(!sel)
-		return;
-	if(sel->proto & WM_PROTOCOL_DELWIN)
-		send_message(sel->win, wm_atom[WMProtocols], wm_atom[WMDelete]);
-	else
-		XKillClient(dpy, sel->win);
-}
-
 static void
 resize_title(Client *c)
 {
@@ -212,8 +38,8 @@ resize_title(Client *c)
 	c->tw = 0;
 	for(i = 0; i < TLast; i++)
 		if(c->tags[i])
-			c->tw += textw(c->tags[i]) + dc.font.height;
-	c->tw += textw(c->name) + dc.font.height;
+			c->tw += textw(c->tags[i]);
+	c->tw += textw(c->name);
 	if(c->tw > c->w)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
@@ -304,18 +130,17 @@ lower(Client *c)
 void
 focus(Client *c)
 {
-	if(sel && sel != c) {
-		XSetWindowBorder(dpy, sel->win, dc.bg);
-		XMapWindow(dpy, sel->title);
-		draw_client(sel);
-	}
+	Client *old = sel;
+	XEvent ev;
+
+	XFlush(dpy);
 	sel = c;
-	XUnmapWindow(dpy, c->title);
-	XSetWindowBorder(dpy, c->win, dc.fg);
+	if(old && old != c)
+		draw_client(old);
 	draw_client(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XFlush(dpy);
-	discard_events(EnterWindowMask);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 static void
@@ -333,14 +158,13 @@ init_tags(Client *c)
 
 	if(XGetClassHint(dpy, c->win, &ch)) {
 		if(ch.res_class && ch.res_name) {
-			fprintf(stderr, "%s:%s\n", ch.res_class, ch.res_name);
 			for(i = 0; i < len; i++)
 				if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
 					&& !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
 				{
-			fprintf(stderr, "->>>%s:%s\n", ch.res_class, ch.res_name);
 					for(j = 0; j < TLast; j++)
 						c->tags[j] = rule[i].tags[j];
+					c->floating = rule[i].floating;
 					matched = True;
 					break;
 				}
@@ -360,20 +184,23 @@ manage(Window w, XWindowAttributes *wa)
 {
 	Client *c, **l;
 	XSetWindowAttributes twa;
+	Window trans;
 
 	c = emallocz(sizeof(Client));
 	c->win = w;
 	c->tx = c->x = wa->x;
 	c->ty = c->y = wa->y;
+	if(c->y < bh)
+		c->ty = c->y += bh;
 	c->tw = c->w = wa->width;
 	c->h = wa->height;
-	c->th = th;
+	c->th = bh;
 	c->border = 1;
 	c->proto = win_proto(c->win);
 	update_size(c);
 	XSelectInput(dpy, c->win,
 			StructureNotifyMask | PropertyChangeMask | EnterWindowMask);
-	XGetTransientForHint(dpy, c->win, &c->trans);
+	XGetTransientForHint(dpy, c->win, &trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask;
@@ -390,20 +217,29 @@ manage(Window w, XWindowAttributes *wa)
 	c->next = *l; /* *l == nil */
 	*l = c;
 
-	XSetWindowBorderWidth(dpy, c->win, 1);
-	XMapRaised(dpy, c->win);
-	XMapRaised(dpy, c->title);
 	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
+
+	if(!c->floating)
+		c->floating = trans
+			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
+
 	arrange(NULL);
-	if(c->tags[tsel])
+	/* mapping the window now prevents flicker */
+	if(c->tags[tsel]) {
+		XMapRaised(dpy, c->win);
+		XMapRaised(dpy, c->title);
 		focus(c);
-	else
+	}
+	else {
 		ban_client(c);
+		XMapRaised(dpy, c->win);
+		XMapRaised(dpy, c->title);
+	}
 }
 
 void
@@ -463,14 +299,20 @@ gravitate(Client *c, Bool invert)
 
 
 void
-resize(Client *c)
+resize(Client *c, Bool inc)
 {
 	XConfigureEvent e;
 
-	if(c->incw)
-		c->w -= (c->w - c->basew) % c->incw;
-	if(c->inch)
-		c->h -= (c->h - c->baseh) % c->inch;
+	if(inc) {
+		if(c->incw)
+			c->w -= (c->w - c->basew) % c->incw;
+		if(c->inch)
+			c->h -= (c->h - c->baseh) % c->inch;
+	}
+	if(c->x > sw) /* might happen on restart */
+		c->x = sw - c->w;
+	if(c->y > sh)
+		c->ty = c->y = sh - c->h;
 	if(c->minw && c->w < c->minw)
 		c->w = c->minw;
 	if(c->minh && c->h < c->minh)
@@ -480,6 +322,7 @@ resize(Client *c)
 	if(c->maxh && c->h > c->maxh)
 		c->h = c->maxh;
 	resize_title(c);
+	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 	e.type = ConfigureNotify;
 	e.event = c->win;
@@ -549,29 +392,3 @@ getclient(Window w)
 			return c;
 	return NULL;
 }
-
-void
-draw_client(Client *c)
-{
-	int i;
-	if(c == sel)
-		return;
-
-	dc.x = dc.y = 0;
-	dc.h = c->th;
-
-	dc.w = 0;
-	for(i = 0; i < TLast; i++) {
-		if(c->tags[i]) {
-			dc.x += dc.w;
-			dc.w = textw(c->tags[i]) + dc.font.height;
-			draw(True, c->tags[i]);
-		}
-	}
-	dc.x += dc.w;
-	dc.w = textw(c->name) + dc.font.height;
-	draw(True, c->name);
-	XCopyArea(dpy, dc.drawable, c->title, dc.gc,
-			0, 0, c->tw, c->th, 0, 0);
-	XFlush(dpy);
-}