--- a/layout.c	Thu Feb 22 11:15:31 2007 +0100
+++ b/layout.c	Thu Feb 22 11:42:08 2007 +0100
@@ -69,7 +69,7 @@
 /* extern */
 
 void
-focusnext(Arg arg) {
+focusnext(const char *arg) {
 	Client *c;
    
 	if(!sel)
@@ -84,7 +84,7 @@
 }
 
 void
-focusprev(Arg arg) {
+focusprev(const char *arg) {
 	Client *c;
 
 	if(!sel)
@@ -101,26 +101,29 @@
 }
 
 void
-incmasterw(Arg arg) {
+incmasterw(const char *arg) {
+	int i;
 	if(lt->arrange != tile)
 		return;
-	if(arg.i == 0)
+	if(!arg)
 		masterw = MASTERWIDTH;
 	else {
-		if(waw * (masterw + arg.i) / 1000 >= waw - 2 * BORDERPX
-		|| waw * (masterw + arg.i) / 1000 <= 2 * BORDERPX)
+		i = atoi(arg);
+		if(waw * (masterw + i) / 1000 >= waw - 2 * BORDERPX
+		|| waw * (masterw + i) / 1000 <= 2 * BORDERPX)
 			return;
-		masterw += arg.i;
+		masterw += i;
 	}
 	lt->arrange();
 }
 
 void
-incnmaster(Arg arg) {
-	if((lt->arrange != tile) || (nmaster + arg.i < 1)
-	|| (wah / (nmaster + arg.i) <= 2 * BORDERPX))
+incnmaster(const char *arg) {
+	int i = arg ? atoi(arg) : 0;
+	if((lt->arrange != tile) || (nmaster + i < 1)
+	|| (wah / (nmaster + i) <= 2 * BORDERPX))
 		return;
-	nmaster += arg.i;
+	nmaster += i;
 	if(sel)
 		lt->arrange();
 	else
@@ -170,10 +173,10 @@
 }
 
 void
-setlayout(Arg arg) {
+setlayout(const char *arg) {
 	unsigned int i;
 
-	if(arg.i == -1) {
+	if(!arg) {
 		for(i = 0; i < nlayouts && lt != &layout[i]; i++);
 		if(i == nlayouts - 1)
 			lt = &layout[0];
@@ -181,9 +184,10 @@
 			lt = &layout[++i];
 	}
 	else {
-		if(arg.i < 0 || arg.i >= nlayouts)
+		i = atoi(arg);
+		if(i < 0 || i >= nlayouts)
 			return;
-		lt = &layout[arg.i];
+		lt = &layout[i];
 	}
 	if(sel)
 		lt->arrange();
@@ -192,7 +196,7 @@
 }
 
 void
-togglemax(Arg arg) {
+togglemax(const char *arg) {
 	XEvent ev;
 
 	if(!sel || (lt->arrange != versatile && !sel->isversatile) || sel->isfixed)
@@ -234,7 +238,7 @@
 }
 
 void
-zoom(Arg arg) {
+zoom(const char *arg) {
 	unsigned int n;
 	Client *c;