aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnselm R. Garbe2007-02-22 12:15:48 +0100
committerAnselm R. Garbe2007-02-22 12:15:48 +0100
commit5711609203602bd01b4b131572142bb171ffc560 (patch)
treeaa0c27a21869acd9fa2696aedab6020024f812b7
parent825b7c3eb17fd0a79005110bf28e92c4ed2f1a90 (diff)
small bugfix
-rw-r--r--layout.c18
-rw-r--r--tag.c6
2 files changed, 15 insertions, 9 deletions
diff --git a/layout.c b/layout.c
index 21ee99c..5d43187 100644
--- a/layout.c
+++ b/layout.c
@@ -120,11 +120,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 +181,7 @@ restack(void) {
void
setlayout(const char *arg) {
- unsigned int i;
+ int i;
if(!arg) {
for(i = 0; i < nlayouts && lt != &layout[i]; i++);
diff --git a/tag.c b/tag.c
index a96cc62..ccc2956 100644
--- a/tag.c
+++ b/tag.c
@@ -108,7 +108,7 @@ tag(const char *arg) {
if(!sel)
return;
for(i = 0; i < ntags; i++)
- sel->tags[i] = arg ? False : True;
+ sel->tags[i] = arg != NULL;
i = arg ? atoi(arg) : 0;
if(i >= 0 && i < ntags)
sel->tags[i] = True;
@@ -135,7 +135,7 @@ toggleview(const char *arg) {
i = arg ? atoi(arg) : 0;
seltag[i] = !seltag[i];
- for(j = 0; j < ntags && !seltag[j]; i++);
+ for(j = 0; j < ntags && !seltag[j]; j++);
if(j == ntags)
seltag[i] = True; /* cannot toggle last view */
lt->arrange();
@@ -146,7 +146,7 @@ view(const char *arg) {
int i;
for(i = 0; i < ntags; i++)
- seltag[i] = arg ? False : True;
+ seltag[i] = arg != NULL;
i = arg ? atoi(arg) : 0;
if(i >= 0 && i < ntags)
seltag[i] = True;