changeset:   2445:7f2809b8e1fd
tag:         tip
user:        Kris Maglione <jg_AT_suckless.org>
date:        Wed May 13 12:57:22 2009 -0400
files:       LICENSE cmd/click/_util.c cmd/click/main.c cmd/menu/event.c cmd/menu/main.c cmd/menu/menu.c cmd/strut/_util.c cmd/strut/event.c cmd/strut/ewmh.c cmd/strut/main.c cmd/strut/win.c cmd/wmii/_util.c cmd/wmii/area.c cmd/wmii/bar.c cmd/wmii/client.c cmd/wmii/column.c cmd/wmii/div.c cmd/wmii/event.c cmd/wmii/ewmh.c cmd/wmii/float.c cmd/wmii/fns.h cmd/wmii/frame.c cmd/wmii/fs.c cmd/wmii/geom.c cmd/wmii/key.c cmd/wmii/layout.c cmd/wmii/main.c cmd/wmii/message.c cmd/wmii/mouse.c cmd/wmii/root.c cmd/wmii/screen.c cmd/wmii/view.c cmd/wmii/x11.c cmd/wmii/xdnd.c cmd/wmii/xext.c cmd/wmiir.c img/mkfile rc/wmiirc.sh
description:
Update copyright dates, allow space indents in wmiirc key/event specs, fix 'Urgent toggle'.
diff -r b2bc0a877017 -r 7f2809b8e1fd LICENSE
--- a/LICENSE	Sat Apr 11 17:02:54 2009 -0400
+++ b/LICENSE	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-© 2006-2007 Kris Maglione <fbsdaemon_AT_gmail.com>
+© 2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
 © 2003-2006 Anselm R. Garbe <garbeam at suckless dot org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/click/_util.c
--- a/cmd/click/_util.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/click/_util.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2008-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/click/main.c
--- a/cmd/click/main.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/click/main.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #define EXTERN
@@ -9,7 +9,7 @@
 #include <string.h>
 #include "fns.h"
 
-static const char version[] = "click-"VERSION", ©2008 Kris Maglione\n";
+static const char version[] = "click-"VERSION", ©2009 Kris Maglione\n";
 
 static void
 usage(void) {
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/menu/event.c
--- a/cmd/menu/event.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/menu/event.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/menu/main.c
--- a/cmd/menu/main.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/menu/main.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #define IXP_NO_P9_
@@ -13,7 +13,7 @@
 #include "fns.h"
 #define link _link
 
-static const char version[] = "wimenu-"VERSION", ©2008 Kris Maglione\n";
+static const char version[] = "wimenu-"VERSION", ©2009 Kris Maglione\n";
 static IxpClient* client;
 static IxpCFid*	ctlfid;
 static Biobuf*	inbuf;
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/menu/menu.c
--- a/cmd/menu/menu.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/menu/menu.c	Wed May 13 12:57:22 2009 -0400
@@ -272,6 +272,14 @@
                 case XK_E:
                         menu_cmd(FORWARD, LINE);
                         return;
+		case XK_b:
+		case XK_B:
+			menu_cmd(BACKWARD, CHAR);
+			return;
+		case XK_f:
+		case XK_F:
+			menu_cmd(FORWARD, CHAR);
+			return;
                 case XK_n:
                 case XK_N:
                         menu_cmd(HIST, FORWARD);
@@ -324,6 +332,14 @@
                         return;
                 case XK_G:
                         menu_cmd(CMPL_LAST, 0);
+			return;
+		case XK_b:
+		case XK_B:
+			menu_cmd(BACKWARD, WORD);
+			return;
+		case XK_f:
+		case XK_F:
+			menu_cmd(FORWARD, WORD);
                         return;
                 }
         }
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/strut/_util.c
--- a/cmd/strut/_util.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/strut/_util.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2008-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/strut/event.c
--- a/cmd/strut/event.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/strut/event.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/strut/ewmh.c
--- a/cmd/strut/ewmh.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/strut/ewmh.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2007-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2007-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/strut/main.c
--- a/cmd/strut/main.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/strut/main.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #define EXTERN
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/strut/win.c
--- a/cmd/strut/win.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/strut/win.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyright ©2008-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/_util.c
--- a/cmd/wmii/_util.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/_util.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2008-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
@@ -239,9 +239,8 @@
 comm(int cols, char **toka, char **tokb) {
         Vector_ptr vec;
         char **ret;
-	int cmp, len;
+	int cmp;
 
-	len = 0;
         vector_pinit(&vec);
         while(*toka || *tokb) {
                 if(!*toka)
@@ -251,22 +250,16 @@
                 else
                         cmp = strcmp(*toka, *tokb);
                 if(cmp < 0) {
-			if(cols & CLeft) {
+			if(cols & CLeft)
                                 vector_ppush(&vec, *toka);
-				len += strlen(*toka) + 1;
-			}
                         toka++;
                 }else if(cmp > 0) {
-			if(cols & CRight) {
+			if(cols & CRight)
                                 vector_ppush(&vec, *tokb);
-				len += strlen(*tokb) + 1;
-			}
                         tokb++;
                 }else {
-			if(cols & CCenter) {
+			if(cols & CCenter)
                                 vector_ppush(&vec, *toka);
-				len += strlen(*toka) + 1;
-			}
                         toka++;
                         tokb++;
                 }
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/area.c
--- a/cmd/wmii/area.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/area.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/bar.c
--- a/cmd/wmii/bar.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/bar.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/client.c
--- a/cmd/wmii/client.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/client.c	Wed May 13 12:57:22 2009 -0400
@@ -1,5 +1,5 @@
 /* Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
- * Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+ * Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
@@ -629,7 +629,7 @@
 }
 
 void
-client_seturgent(Client *c, bool urgent, int from) {
+client_seturgent(Client *c, int urgent, int from) {
         XWMHints *wmh;
         char *cfrom, *cnot;
         Frame *f, *ff;
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/column.c
--- a/cmd/wmii/column.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/column.c	Wed May 13 12:57:22 2009 -0400
@@ -1,5 +1,5 @@
 /* Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
- * Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+ * Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/div.c
--- a/cmd/wmii/div.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/div.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/event.c
--- a/cmd/wmii/event.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/event.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/ewmh.c
--- a/cmd/wmii/ewmh.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/ewmh.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2007-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2007-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/float.c
--- a/cmd/wmii/float.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/float.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/fns.h
--- a/cmd/wmii/fns.h	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/fns.h	Wed May 13 12:57:22 2009 -0400
@@ -84,7 +84,7 @@
 void	client_reparent(Client*, Window*, Point);
 void	client_resize(Client*, Rectangle);
 void	client_setcursor(Client*, Cursor);
-void	client_seturgent(Client*, bool, int);
+void	client_seturgent(Client*, int, int);
 void	client_setviews(Client*, char**);
 void	client_unmap(Client*, int state);
 Frame*	client_viewframe(Client *c, View *v);
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/frame.c
--- a/cmd/wmii/frame.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/frame.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/fs.c
--- a/cmd/wmii/fs.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/fs.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
@@ -212,8 +212,10 @@
         s->muid = user;
 }
 
-/* All lookups and directory organization should be performed through
- * lookup_file, mostly through the dirtabs[] tree. */
+/* 
+ * All lookups and directory organization should be performed through
+ * lookup_file, mostly through the dirtab[] tree.
+ */
 static IxpFileId*
 lookup_file(IxpFileId *parent, char *name)
 {
@@ -249,12 +251,15 @@
                                                 file->p.client = c;
                                                 file->id = c->w.w;
                                                 file->index = c->w.w;
-					}if(name) goto LastItem;
+					}
+					if(name)
+						goto LastItem;
                                 }
                                 SET(id);
                                 if(name) {
                                         id = (uint)strtol(name, &name, 16);
-					if(*name) goto NextItem;
+					if(*name)
+						goto NextItem;
                                 }
                                 for(c=client; c; c=c->next) {
                                         if(!name || c->w.w == id) {
@@ -264,7 +269,8 @@
                                                 file->id = c->w.w;
                                                 file->index = c->w.w;
                                                 assert(file->tab.name);
-						if(name) goto LastItem;
+						if(name)
+							goto LastItem;
                                         }
                                 }
                                 break;
@@ -273,7 +279,8 @@
                                         if(!name || !strcmp(name, debugtab[i])) {
                                                 push_file(debugtab[i]);
                                                 file->id = i;
-						if(name) goto LastItem;
+						if(name)
+							goto LastItem;
                                         }
                                 break;
                         case FsDTags:
@@ -283,7 +290,9 @@
                                                 file->volatil = true;
                                                 file->p.view = selview;
                                                 file->id = selview->id;
-					}if(name) goto LastItem;
+					}
+					if(name)
+						goto LastItem;
                                 }
                                 for(v=view; v; v=v->next) {
                                         if(!name || !strcmp(name, v->name)) {
@@ -291,7 +300,8 @@
                                                 file->volatil = true;
                                                 file->p.view = v;
                                                 file->id = v->id;
-						if(name) goto LastItem;
+						if(name)
+							goto LastItem;
                                         }
                                 }
                                 break;
@@ -302,7 +312,8 @@
                                                 file->volatil = true;
                                                 file->p.bar = b;
                                                 file->id = b->id;
-						if(name) goto LastItem;
+						if(name)
+							goto LastItem;
                                         }
                                 }
                                 break;
@@ -329,7 +340,8 @@
                                 file->p.rule = &def.tagrules;
                                 break;
                         }
-			if(name) goto LastItem;
+			if(name)
+				goto LastItem;
                 }
         NextItem:
                 continue;
@@ -466,7 +478,8 @@
                                 return;
                         }
                         r->ofcall.io.data = smprint("%C", f->p.client);
-			r->ofcall.io.count = strlen(r->ofcall.io.data); /* will die if nil */
+			/* Will (and should) die if result is nil */
+			r->ofcall.io.count = strlen(r->ofcall.io.data);
                         respond(r, nil);
                         return;
                 case FsFTindex:
@@ -483,10 +496,7 @@
                         return;
                 }
         }
-	/*
-	 * This is an assert because this should this should not be called if
-	 * the file is not open for reading.
-	 */
+	/* This should not be called if the file is not open for reading. */
         die("Read called on an unreadable file");
 }
 
@@ -566,9 +576,7 @@
                 return;
         }
         /*
-	 * This is an assert because this function should not be called if
-	 * the file is not open for writing.
-	 */
+	/* This should not be called if the file is not open for writing. */
         die("Write called on an unwritable file");
 }
 
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/geom.c
--- a/cmd/wmii/geom.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/geom.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/key.c
--- a/cmd/wmii/key.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/key.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <fbsdaemon at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <fbsdaemon at Gmail>
  * Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/layout.c
--- a/cmd/wmii/layout.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/layout.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/main.c
--- a/cmd/wmii/main.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/main.c	Wed May 13 12:57:22 2009 -0400
@@ -1,5 +1,5 @@
 /* Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
- * Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+ * Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #define EXTERN
@@ -16,7 +16,7 @@
 #include "fns.h"
 
 static const char
-	version[] = "wmii-"VERSION", ©2008 Kris Maglione\n";
+	version[] = "wmii-"VERSION", ©2009 Kris Maglione\n";
 
 static char*	address;
 static char*	ns_path;
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/message.c
--- a/cmd/wmii/message.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/message.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/mouse.c
--- a/cmd/wmii/mouse.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/mouse.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/root.c
--- a/cmd/wmii/root.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/root.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2008-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/screen.c
--- a/cmd/wmii/screen.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/screen.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/view.c
--- a/cmd/wmii/view.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/view.c	Wed May 13 12:57:22 2009 -0400
@@ -1,5 +1,5 @@
 /* Copyright ©2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
- * Copyright ©2006-2008 Kris Maglione <maglione.k at Gmail>
+ * Copyright ©2006-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/x11.c
--- a/cmd/wmii/x11.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/x11.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2007-2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2007-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #define _X11_VISIBLE
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/xdnd.c
--- a/cmd/wmii/xdnd.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/xdnd.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2008-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #include "dat.h"
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmii/xext.c
--- a/cmd/wmii/xext.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmii/xext.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyright ©2008 Kris Maglione <maglione.k at Gmail>
+/* Copyright ©2008-2009 Kris Maglione <maglione.k at Gmail>
  * See LICENSE file for license details.
  */
 #define _X11_VISIBLE
diff -r b2bc0a877017 -r 7f2809b8e1fd cmd/wmiir.c
--- a/cmd/wmiir.c	Sat Apr 11 17:02:54 2009 -0400
+++ b/cmd/wmiir.c	Wed May 13 12:57:22 2009 -0400
@@ -1,4 +1,4 @@
-/* Copyight ©2007-2008 Kris Maglione <fbsdaemon_AT_gmail.com>
+/* Copyight ©2007-2009 Kris Maglione <fbsdaemon_AT_gmail.com>
  * See LICENSE file for license details.
  */
 #define IXP_NO_P9_
@@ -384,7 +384,7 @@
 
         ARGBEGIN{
         case 'v':
-		print("%s-" VERSION ", ©2008 Kris Maglione\n", argv0);
+		print("%s-" VERSION ", ©2009 Kris Maglione\n", argv0);
                 exit(0);
         case 'a':
                 address = EARGF(usage());
diff -r b2bc0a877017 -r 7f2809b8e1fd img/mkfile
--- a/img/mkfile	Sat Apr 11 17:02:54 2009 -0400
+++ b/img/mkfile	Wed May 13 12:57:22 2009 -0400
@@ -2,11 +2,12 @@
 path=$PLAN9/bin $path
 
 eps = wmii.eps
+calc = rc -c 'hoc -e $"*'
 
 epsbox = `{sed -n '/^%%BoundingBox:/{s/.*://p; q;}' $eps}
 iconwidth = 154
-iconscale = `{*=$epsbox; hoc -e $iconwidth/'('$3-' '$1')'}
-iconheight = `{*=$epsbox; hoc -e '('$4-' '$2')*'$iconscale}
+iconscale = `{*=$epsbox; $calc $iconwidth / '('$3 - $1')'}
+iconheight = `{*=$epsbox; $calc '('$4 - $2') *' $iconscale}
 
 %.png: %.eps
         * = `{hoc -e'-('$epsbox')'}
diff -r b2bc0a877017 -r 7f2809b8e1fd rc/wmiirc.sh
--- a/rc/wmiirc.sh	Sat Apr 11 17:02:54 2009 -0400
+++ b/rc/wmiirc.sh	Wed May 13 12:57:22 2009 -0400
@@ -51,7 +51,7 @@
 
 # Event processing
 events() {
-	sed 's/^	//' <<'!'
+	cat <<'!'
         # Events
         Event CreateTag
                 echo "$WMII_NORMCOLORS" "$@" | wmiir create "/lbar/$@"
@@ -186,7 +186,7 @@
                 wmiir xwrite /tag/sel/ctl send sel up
 !
         for i in 0 1 2 3 4 5 6 7 8 9; do
-		sed 's/^	//' <<!
+		cat <<'!'
         Key $MODKEY-$i
                 wmiir xwrite /ctl view "$i"
         Key $MODKEY-Shift-$i
@@ -195,7 +195,7 @@
         done
 }
 wi_events <<!
-$(events)
+$(events | sed 's/^	\|^        //')
 $(local_events)
 !
 unset events local_events
Received on Wed May 13 2009 - 16:57:32 UTC
This archive was generated by hypermail 2.2.0 : Wed May 13 2009 - 17:00:06 UTC