wmii

commit a197963ea92b81ad71854e36bda91053bf57400f
parent c9e7b1b913171d82049fd0ac3a1dd7902ef781ba
Author: garbeam <garbeam@localhost>
Date:   Wed,  4 Jan 2006 17:46:32 +0200

changed geometry syntax from 'x,y,dx,dy' to 'x y dx dy'


Diffstat:
cmd/wm/frame.c
 | 
2
+-
cmd/wm/wm.c
 | 
4
++--
liblitz/geometry.c
 | 
6
+++---
rc/wmiirc
 | 
30
+++++++++++++++---------------

4 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
@@ -425,7 +425,7 @@ handle_after_write_frames(IXPServer * s, File * file, Area * a)
             return f;
         } else if(file == f->file[F_GEOMETRY]) {
             char *geom = f->file[F_GEOMETRY]->content;
-            if(geom && strrchr(geom, ',')) {
+            if(geom && strrchr(geom, ' ')) {
                 XRectangle frect = f->rect;
                 blitz_strtorect(&rect, &frect, geom);
                 resize_frame(f, &frect, 0);
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -366,7 +366,7 @@ draw_detached_clients()
 static void
 reserve_area(void *obj, char *arg)
 {
-    if(arg && strrchr(arg, ',')) {
+    if(arg && strrchr(arg, ' ')) {
         XRectangle r;
         blitz_strtorect(&rect, &r, arg);
     }
@@ -643,7 +643,7 @@ handle_after_write(IXPServer * s, File * f)
         font = blitz_getfont(dpy, def[WM_FONT]->content);
     } else if(f == def[WM_AREA_GEOMETRY]) {
         char *geom = def[WM_AREA_GEOMETRY]->content;
-        if(geom && strrchr(geom, ',')) {
+        if(geom && strrchr(geom, ' ')) {
             area_rect = rect;
             blitz_strtorect(&rect, &area_rect, geom);
             update_pages();
diff --git a/liblitz/geometry.c b/liblitz/geometry.c
@@ -62,11 +62,11 @@ int blitz_strtorect(XRectangle *root, XRectangle *r, char *val)
 	x = y = w = h = 0;
 	cext_strlcpy(buf, val, sizeof(buf));
 
-	x = strtok_r(buf, ",", &p);
+	x = strtok_r(buf, " ", &p);
 	if (x) {
-		y = strtok_r(0, ",", &p);
+		y = strtok_r(0, " ", &p);
 		if (y) {
-			w = strtok_r(0, ",", &p);
+			w = strtok_r(0, " ", &p);
 			if (w) {
 				h = strtok_r(0, "", &p);
 			}
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -57,7 +57,7 @@ fn framesconf {
     for(frame in `{wmiir read $1 | grep '^[0-9]'}) {
     	wmiir write $1/$frame/tab $TAB
     	wmiir write $1/$frame/handleinc $HANDLEINC
-    	wmiir write $1/$frame/geometry +0,+0,+0,+0  # causes refresh
+    	wmiir write $1/$frame/geometry '+0 +0 +0 +0'  # causes refresh
 	}
 }
 
@@ -72,9 +72,9 @@ fn barsucks {
 
 wmiir write /bar/geometry $BAR_ALIGN
 if (~ $BAR_ALIGN south)
-    wmiir write /bar/event/resize 'val=`{wmiir read /bar/geometry|awk -F, ''{print $4}''} wmiir write /wm/default/area/geometry ''+0,+0,+0,-''^$val'
+    wmiir write /bar/event/resize 'val=`{wmiir read /bar/geometry|awk -F, ''{print $4}''} wmiir write /wm/default/area/geometry ''+0 +0 +0 -''^$val'
 if not
-    wmiir write /bar/event/resize 'val=`{wmiir read /bar/geometry|awk -F, ''{print $4}''} wmiir write /wm/default/area/geometry ''+0,+''^$val^'',+0,-''^$val'
+    wmiir write /bar/event/resize 'val=`{wmiir read /bar/geometry|awk -F, ''{print $4}''} wmiir write /wm/default/area/geometry ''+0 +''^$val^'' +0 -''^$val'
 
 
 wmiir write /bar/ctl reset
@@ -135,21 +135,21 @@ kbind bare $MODKEY-Escape 'kmode normal'
 
 kbind move Escape 'kmode normal'
 kbind move $MODKEY-C-r 'kmode resize'
-kbind move $NORTHKEY   'wmiir write /wm/sel/layout/sel/frame/sel/geometry -0,-30,-0,-0'
-kbind move $SOUTHKEY   'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,+30,+0,+0'
-kbind move $WESTKEY    'wmiir write /wm/sel/layout/sel/frame/sel/geometry -40,-0,-0,-0'
-kbind move $EASTKEY    'wmiir write /wm/sel/layout/sel/frame/sel/geometry +40,+0,+0,+0'
-kbind move S-$NORTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry -0,north,-0,-0'
-kbind move S-$SOUTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,south,+0,+0'
-kbind move S-$WESTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry west,-0,-0,-0'
-kbind move S-$EASTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry east,+0,+0,+0'
+kbind move $NORTHKEY   'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''-0 -30 -0 -0'''
+kbind move $SOUTHKEY   'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 +30 +0 +0'''
+kbind move $WESTKEY    'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''-40 -0 -0 -0'''
+kbind move $EASTKEY    'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+40 +0 +0 +0'''
+kbind move S-$NORTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''-0 north -0 -0'''
+kbind move S-$SOUTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 south +0 +0'''
+kbind move S-$WESTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''west -0 -0 -0'''
+kbind move S-$EASTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''east +0 +0 +0'''
 
 kbind resize Escape 'kmode normal'
 kbind resize $MODKEY-C-m 'kmode move'
-kbind resize $NORTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,+0,+0,-30'
-kbind resize $SOUTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,+0,+0,+30'
-kbind resize $WESTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,+0,-40,+0'
-kbind resize $EASTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry +0,+0,+40,+0'
+kbind resize $NORTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 +0 +0 -30'''
+kbind resize $SOUTHKEY 'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 +0 +0 +30'''
+kbind resize $WESTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 +0 -40 +0'''
+kbind resize $EASTKEY  'wmiir write /wm/sel/layout/sel/frame/sel/geometry ''+0 +0 +40 +0'''
 
 kbind normal $MODKEY-C-b 'kmode bare'
 kbind normal $MODKEY-C-m 'kmode move'