X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=layout.c;h=1e8f113484d834edd55d7c3d5c59c507f9ca7419;hb=27b0595af72060d7cc406639b6c53a854f0a3590;hp=21ee99c3febfefb59e22456f8231c9564e5c93e3;hpb=825b7c3eb17fd0a79005110bf28e92c4ed2f1a90;p=dwm.git

diff --git a/layout.c b/layout.c
index 21ee99c..1e8f113 100644
--- a/layout.c
+++ b/layout.c
@@ -70,30 +70,26 @@ LAYOUTS
 /* extern */
 
 void
-focusnext(const char *arg) {
+focusclient(const char *arg) {
 	Client *c;
    
-	if(!sel)
+	if(!sel || !arg)
 		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
-	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
-	if(c) {
-		focus(c);
-		restack();
-	}
-}
-
-void
-focusprev(const char *arg) {
-	Client *c;
-
-	if(!sel)
+	switch(atoi(arg)) {
+	default:
 		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
-	if(!c) {
-		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c); c = c->prev);
+	case 1:
+		for(c = sel->next; c && !isvisible(c); c = c->next);
+		if(!c)
+			for(c = clients; c && !isvisible(c); c = c->next);
+		break;
+	case -1:
+		for(c = sel->prev; c && !isvisible(c); c = c->prev);
+		if(!c) {
+			for(c = clients; c && c->next; c = c->next);
+			for(; c && !isvisible(c); c = c->prev);
+		}
+		break;
 	}
 	if(c) {
 		focus(c);
@@ -120,11 +116,17 @@ incmasterw(const char *arg) {
 
 void
 incnmaster(const char *arg) {
-	int i = arg ? atoi(arg) : 0;
-	if((lt->arrange != tile) || (nmaster + i < 1)
-	|| (wah / (nmaster + i) <= 2 * BORDERPX))
-		return;
-	nmaster += i;
+	int i;
+
+	if(!arg)
+		nmaster = NMASTER;
+	else {
+		i = atoi(arg);
+		if((lt->arrange != tile) || (nmaster + i < 1)
+		|| (wah / (nmaster + i) <= 2 * BORDERPX))
+			return;
+		nmaster += i;
+	}
 	if(sel)
 		lt->arrange();
 	else
@@ -175,7 +177,7 @@ restack(void) {
 
 void
 setlayout(const char *arg) {
-	unsigned int i;
+	int i;
 
 	if(!arg) {
 		for(i = 0; i < nlayouts && lt != &layout[i]; i++);