dwm: comparison client.c

equal deleted inserted replaced

-:148f25ed0ad7
+:035617ee18d1
 /*
 * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
 * See LICENSE file for license details.
 */
-#include <math.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <X11/Xatom.h>
 #include <X11/Xutil.h>
 #include "dwm.h"
-static void (*arrange)(Arg *) = floating;
+static void (*arrange)(Arg *) = tiling;
-static void
+static Rule rule[] = {
-center(Client *c)
+	{ "Firefox-bin", "Gecko", { [Twww] = "www" } },
-{
+};
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w / 2, c->h / 2);
-}
 static Client *
 next(Client *c)
 {
 	for(; c && !c->tags[tsel]; c = c->next);
 }
 void
 zoom(Arg *arg)
 {
-	Client **l;
+	Client **l, *old;
-	if(!sel)
+	if(!(old = sel))
 		return;
 	for(l = &clients; *l && *l != sel; l = &(*l)->next);
 	*l = sel->next;
-	sel->next = clients; /* pop */
+	old->next = clients; /* pop */
-	clients = sel;
+	clients = old;
+	sel = old;
 	arrange(NULL);
-	center(sel);
 	focus(sel);
 }
 void
 max(Arg *arg)
 void
 tiling(Arg *arg)
 {
 	Client *c;
-	int n, cols, rows, gw, gh, i, j;
+	int n, i, w, h;
-float rt, fd;
+	w = sw - mw;
 	arrange = tiling;
-	for(n = 0, c = clients; c; c = next(c->next), n++);
+	for(n = 0, c = clients; c; c = c->next)
-	if(n) {
+		if(c->tags[tsel])
-		rt = sqrt(n);
+			n++;
-		if(modff(rt, &fd) < 0.5)
-			rows = floor(rt);
+	h = (n > 2) ? sh / (n - 2) : sh;
-		else
-			rows = ceil(rt);
+	for(i = 0, c = clients; c; c = c->next) {
-		if(rows * rows < n)
-			cols = rows + 1;
-		else
-			cols = rows;
-		gw = (sw - 2)  / cols;
-		gh = (sh - 2) / rows;
-	}
-	else
-		cols = rows = gw = gh = 0;
-	for(i = j = 0, c = clients; c; c = c->next) {
 		if(c->tags[tsel]) {
-			c->x = i * gw;
+			if(n == 1) {
-			c->y = j * gh;
+				c->x = sx;
-			c->w = gw;
+				c->y = sy;
-			c->h = gh;
+				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);
-			if(++i == cols) {
+			i++;
-				j++;
-				i = 0;
-			}
 		}
 		else
 			ban_client(c);
 	}
 	if(sel && !sel->tags[tsel]) {
 	if(!sel)
 		return;
 	if((c = sel->revert && sel->revert->tags[tsel] ? sel->revert : NULL)) {
 		craise(c);
-		center(c);
 		focus(c);
 	}
 }
 void
 	if(!(c = next(sel->next)))
 		c = next(clients);
 	if(c) {
 		craise(c);
-		center(c);
 		c->revert = sel;
 		focus(c);
 	}
 }
 	XSetWindowBorder(dpy, c->win, dc.fg);
 	draw_client(c);
 	XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	XFlush(dpy);
 	discard_events(EnterWindowMask);
+}
+static void
+init_tags(Client *c)
+{
+	XClassHint ch;
+	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	unsigned int i, j;
+	Bool matched = False;
+	if(!len) {
+		c->tags[tsel] = tags[tsel];
+		return;
+	}
+	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];
+					matched = True;
+					break;
+				}
+		}
+		if(ch.res_class)
+			XFree(ch.res_class);
+		if(ch.res_name)
+			XFree(ch.res_name);
+	}
+	if(!matched)
+		c->tags[tsel] = tags[tsel];
 }
 void
 manage(Window w, XWindowAttributes *wa)
 {
 	XGetTransientForHint(dpy, c->win, &c->trans);
 	twa.override_redirect = 1;
 	twa.background_pixmap = ParentRelative;
 	twa.event_mask = ExposureMask;
-	c->tags[tsel] = tags[tsel];
 	c->title = XCreateWindow(dpy, root, c->tx, c->ty, c->tw, c->th,
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 	update_name(c);
+	init_tags(c);
 	for(l = &clients; *l; l = &(*l)->next);
 	c->next = *l; /* *l == nil */
 	*l = c;
 	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 	arrange(NULL);
-	center(c);
+	if(c->tags[tsel])
-	focus(c);
+		focus(c);
+	else
+		ban_client(c);
 }
 void
 gravitate(Client *c, Bool invert)
 {

changeset 51	035617ee18d1
parent 50	148f25ed0ad7
child 52	d18f6dd0cf23