wmii

commit 509b6f0ca754966e85b7dab3522bed6335284833
parent a2be972828c866708cfd4583eaa204986e199405
Author: garbeam <garbeam@localhost>
Date:   Sat,  7 Jan 2006 18:25:04 +0200

removed old geom syntax in all other occurences, fixed small issue in libixp2 concerning Tstat


Diffstat:
cmd/wm/frame.c
 | 
2
+-
cmd/wm/wm.c
 | 
2
+-
cmd/wmiibar.c
 | 
2
+-
cmd/wmiimenu.c
 | 
2
+-
cmd/wmiiwarp.c
 | 
12
++++++------

5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/cmd/wm/frame.c b/cmd/wm/frame.c
@@ -374,7 +374,7 @@ handle_before_read_frames(IXPServer * s, File * file, Area * a)
     char buf[32];
     for(f = a->layout->frames(a); f; f = f->next) {
         if(file == f->file[F_GEOMETRY]) {
-            snprintf(buf, sizeof(buf), "%d,%d,%d,%d", f->rect.x, f->rect.y,
+            snprintf(buf, sizeof(buf), "%d %d %d %d", f->rect.x, f->rect.y,
                      f->rect.width, f->rect.height);
             if(file->content)
                 free(file->content);
diff --git a/cmd/wm/wm.c b/cmd/wm/wm.c
@@ -616,7 +616,7 @@ handle_before_read(IXPServer * s, File * f)
 {
     char buf[64];
     if(f == def[WM_AREA_GEOMETRY]) {
-        snprintf(buf, 64, "%d,%d,%d,%d", area_rect.x, area_rect.y,
+        snprintf(buf, 64, "%d %d %d %d", area_rect.x, area_rect.y,
                  area_rect.width, area_rect.height);
         if(f->content)
             free(f->content);
diff --git a/cmd/wmiibar.c b/cmd/wmiibar.c
@@ -445,7 +445,7 @@ handle_before_read(IXPServer * s, File * f)
 {
     char buf[64];
     if(f == file[B_GEOMETRY]) {
-        snprintf(buf, 64, "%d,%d,%d,%d", brect.x, brect.y, brect.width,
+        snprintf(buf, 64, "%d %d %d %d", brect.x, brect.y, brect.width,
                  brect.height);
         if(f->content)
             free(f->content);
diff --git a/cmd/wmiimenu.c b/cmd/wmiimenu.c
@@ -604,7 +604,7 @@ handle_before_read(IXPServer * s, File * f)
     char buf[64];
     if(f != files[M_GEOMETRY])
         return;
-    snprintf(buf, sizeof(buf), "%d,%d,%d,%d", mrect.x, mrect.y,
+    snprintf(buf, sizeof(buf), "%d %d %d %d", mrect.x, mrect.y,
              mrect.width, mrect.height);
     if(f->content)
         free(f->content);
diff --git a/cmd/wmiiwarp.c b/cmd/wmiiwarp.c
@@ -19,7 +19,7 @@ static void
 usage()
 {
     fprintf(stderr,
-            "usage: wmiiwarp [-v] <x>,<y>\n"
+            "usage: wmiiwarp [-v] <x> <y>\n"
             "      -v     version info\n");
     exit(1);
 }
@@ -31,7 +31,7 @@ main(int argc, char **argv)
     int x, y;
 
     /* command line args */
-    if(argc != 2)
+    if(argc < 2)
         usage();
     if(!strncmp(argv[1], "-v", 2)) {
         fprintf(stdout, "%s", version[0]);
@@ -42,12 +42,12 @@ main(int argc, char **argv)
         fprintf(stderr, "%s", "wmiiwarp: cannot open display\n");
         exit(1);
     }
-    if(!strncmp(argv[1], "center", 7)) {
+    if((argc == 2) && !strncmp(argv[1], "center", 7)) {
         x = DisplayWidth(dpy, DefaultScreen(dpy)) / 2;
         y = DisplayHeight(dpy, DefaultScreen(dpy)) / 2;
-    } else if(sscanf(argv[1], "%d,%d", &x, &y) != 2) {
-        XCloseDisplay(dpy);
-        usage();
+    } else if(argc == 3) {
+		x = cext_strtonum(argv[1], 0, DisplayWidth(dpy, DefaultScreen(dpy)));
+		y = cext_strtonum(argv[2], 0, DisplayHeight(dpy, DefaultScreen(dpy)));
     }
     XWarpPointer(dpy, None, RootWindow(dpy, DefaultScreen(dpy)),
                  0, 0, 0, 0, x, y);