From b56f202e3ec41752a4ef23c4e2bf49292b1bccc7 Mon Sep 17 00:00:00 2001
From: Kris Maglione <jg@suckless.org>
Date: Wed, 21 Mar 2007 22:58:59 -0400
Subject: [PATCH] "object-oriented design is the roman numerals of computing."
 --rob; Removed Roman Numerals.

---
 LICENSE    | 10 +++++-----
 Makefile   |  4 ++--
 area.c     |  4 ++--
 bar.c      |  4 ++--
 client.c   |  4 ++--
 column.c   |  4 ++--
 draw.c     |  2 +-
 event.c    |  4 ++--
 frame.c    |  2 +-
 fs.c       |  2 +-
 geom.c     |  2 +-
 key.c      |  2 +-
 main.c     |  6 +++---
 mouse.c    |  2 +-
 rc/rc.wmii | 17 ++++++++++-------
 rule.c     |  2 +-
 view.c     |  4 ++--
 wmii.1     |  7 ++++---
 wmii.h     |  2 +-
 wmiiloop.1 |  2 +-
 wmiir.1    |  2 +-
 wmiiwm.1   |  4 ++--
 22 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/LICENSE b/LICENSE
index 58a4a848..a768181c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,10 @@
 MIT/X Consortium License
 
-(C)opyright MMIII-MMVI Anselm R. Garbe <garbeam at suckless dot org>
-(C)opyright MMV-MMVI Georg Neis <gn at suckless dot org>
-(C)opyright MMVI Sander van Dijk <sander at suckless dot org>
-(C)opyright MMVI Kris Maglione <bsdaemon at comcast dot net>
-(C)opyright MMVI Denis Grelich <denisg at suckless dot org>
+© 2003-2006 Anselm R. Garbe <garbeam at suckless dot org>
+© 2005-2006 Georg Neis <gn at suckless dot org>
+© 2006 Sander van Dijk <sander at suckless dot org>
+© 2006-2007 Kris Maglione <bsdaemon at comcast dot net>
+© 2006 Denis Grelich <denisg at suckless dot org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/Makefile b/Makefile
index 597bab28..f96953e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # window manager improved 2 - window manager improved 2
-#   (C)opyright MMVI Anselm R. Garbe
-#   (C)opyright MMVI-MMVII Kris Maglione
+#   © 2006 Anselm R. Garbe
+#   © 2006-2007 Kris Maglione
 .POSIX:
 
 include config.mk
diff --git a/area.c b/area.c
index e20847a8..f4c7581b 100644
--- a/area.c
+++ b/area.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <assert.h>
diff --git a/bar.c b/bar.c
index 70506b00..9215cb40 100644
--- a/bar.c
+++ b/bar.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <math.h>
diff --git a/client.c b/client.c
index 0a6e13d3..6ea6835b 100644
--- a/client.c
+++ b/client.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <assert.h>
diff --git a/column.c b/column.c
index 23f2bc10..258f0719 100644
--- a/column.c
+++ b/column.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <assert.h>
diff --git a/draw.c b/draw.c
index 6f78460e..43c1f29b 100644
--- a/draw.c
+++ b/draw.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include <stdio.h>
diff --git a/event.c b/event.c
index c5e42d22..6f1959b1 100644
--- a/event.c
+++ b/event.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <fcntl.h>
diff --git a/frame.c b/frame.c
index a808af31..faf904b2 100644
--- a/frame.c
+++ b/frame.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <stdlib.h>
diff --git a/fs.c b/fs.c
index a57832f3..6833fcd3 100644
--- a/fs.c
+++ b/fs.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Kris Maglione <fbsdaemon at gmail dot com>
+/* © 2006 Kris Maglione <fbsdaemon at gmail dot com>
  * See LICENSE file for license details.
  */
 #include <assert.h>
diff --git a/geom.c b/geom.c
index b81d63fc..b18c8eab 100644
--- a/geom.c
+++ b/geom.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "wmii.h"
diff --git a/key.c b/key.c
index 5f2a73ab..e337d662 100644
--- a/key.c
+++ b/key.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include <string.h>
diff --git a/main.c b/main.c
index eb8fb5db..a98e5e6b 100644
--- a/main.c
+++ b/main.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <X11/Xatom.h>
@@ -21,7 +21,7 @@
 
 static Bool check_other_wm;
 static int (*x_error_handler) (Display *, XErrorEvent *);
-static char version[] = "wmiiwm - " VERSION ", (C)opyright MMVI-MMVII Kris Maglione\n";
+static char version[] = "wmiiwm - " VERSION ", © 2007 Kris Maglione\n";
 static struct sigaction sa;
 static int sleeperfd;
 
diff --git a/mouse.c b/mouse.c
index 30618775..0a1489bf 100644
--- a/mouse.c
+++ b/mouse.c
@@ -1,4 +1,4 @@
-/* (C)opyright MMVI Kris Maglione <fbsdaemon@gmail.com>
+/* © 2006 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 #include <stdlib.h>
diff --git a/rc/rc.wmii b/rc/rc.wmii
index f55fd9f5..d040fa03 100755
--- a/rc/rc.wmii
+++ b/rc/rc.wmii
@@ -57,6 +57,9 @@ fn status {
 	echo -n `{uptime | sed 's/.*://; s/,//g'} '|' `{date}
 }
 
+# View Titles
+fn viewtitle { echo $* }
+
 # Events
 fn Event-Start {
 	switch($1) {
@@ -68,10 +71,10 @@ fn Event-Start {
 
 fn Event-Key { eval Key-$1 $1 }
 
-fn Event-CreateTag { echo $WMII_NORMCOLORS $* | wmiir create /lbar/$"* }
+fn Event-CreateTag { echo $WMII_NORMCOLORS `{viewtitle $*} | wmiir create /lbar/$"* }
 fn Event-DestroyTag { wmiir remove /lbar/$"* }
-fn Event-FocusTag { wmiir xwrite /lbar/$"* $WMII_FOCUSCOLORS $* }
-fn Event-UnfocusTag { wmiir xwrite /lbar/$"* $WMII_NORMCOLORS $* }
+fn Event-FocusTag { wmiir xwrite /lbar/$"* $WMII_FOCUSCOLORS `{viewtitle $*} }
+fn Event-UnfocusTag { wmiir xwrite /lbar/$"* $WMII_NORMCOLORS `{viewtitle $*} }
 fn Event-UrgentTag { shift; wmiir xwrite /lbar/$"* '*'$"* }
 fn Event-NotUrgentTag { shift; wmiir xwrite /lbar/$"* $"* }
 
@@ -184,7 +187,7 @@ fn read_tags {
 fn run_command {
 	@{	rfork ns
 		path=$oldpath
-		eval exec $* </dev/null
+		eval exec $*
 	}
 }
 
@@ -213,9 +216,9 @@ ifs='#
 	seltag=`{wmiir read /tag/sel/ctl}
 	for(tag in `{read_tags}) {
 		if(~ $tag $seltag)
-			echo $WMII_FOCUSCOLORS $tag | wmiir create /lbar/$tag
+			echo $WMII_FOCUSCOLORS `{viewtitle $tag} | wmiir create /lbar/$tag
 		if not
-			echo $WMII_NORMCOLORS $tag | wmiir create /lbar/$tag
+			echo $WMII_NORMCOLORS `{viewtitle $tag} | wmiir create /lbar/$tag
 	}
 }
 
@@ -230,4 +233,4 @@ wmiir read /event |
 	while(*=`{read}) {
 		event = $1; shift
 		Event-$event $*
-	} >[2]/dev/null
+	} >[2]/dev/null </dev/null | cat
diff --git a/rule.c b/rule.c
index 2377b036..6c3d876f 100644
--- a/rule.c
+++ b/rule.c
@@ -1,5 +1,5 @@
 /*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
diff --git a/view.c b/view.c
index 47d502a9..374f5667 100644
--- a/view.c
+++ b/view.c
@@ -1,5 +1,5 @@
-/* (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * (C)opyright MMVI-MMVII Kris Maglione <fbsdaemon@gmail.com>
+/* © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Kris Maglione <fbsdaemon@gmail.com>
  * See LICENSE file for license details.
  */
 
diff --git a/wmii.1 b/wmii.1
index f75d8045..5f28a4b5 100644
--- a/wmii.1
+++ b/wmii.1
@@ -1,13 +1,14 @@
 .TH WMII 1 wmii-VERSION
 .SH NAME
-wmii \- window manager improved 2
+wmii \(em window manager improved\(emimproved
 .SH SYNOPSIS
 .B wmii
 .SH DESCRIPTION
 .SS Overview
 .B wmii
-is a script that launches the wmii window manager and its various utilities and
-makes sure that they are configured for use.
+is a dynamic window manager for X11. See
+.BR wmiiwm (1)
+for more info.
 .SS Actions
 An action is a shell script in the default setup, but it can actually be
 any executable file.  It is executed usually by selecting it from the
diff --git a/wmii.h b/wmii.h
index 9f54ef02..82e5e0a5 100644
--- a/wmii.h
+++ b/wmii.h
@@ -1,5 +1,5 @@
 /*
- * (C)opyright MMIV-MMVI Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2004-2006 Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
diff --git a/wmiiloop.1 b/wmiiloop.1
index f7693b8f..b427d6dd 100644
--- a/wmiiloop.1
+++ b/wmiiloop.1
@@ -1,6 +1,6 @@
 .TH WMIIR 1 wmii\-VERSION
 .SH NAME
-wmiiloop \- wmii event loop processor
+wmiiloop \(em wmii event loop processor
 .SH SYNOPSIS
 .B cat 
 .I events
diff --git a/wmiir.1 b/wmiir.1
index 84cb488b..7481ddb7 100644
--- a/wmiir.1
+++ b/wmiir.1
@@ -1,6 +1,6 @@
 .TH WMIIR 1 wmii-VERSION
 .SH NAME
-wmiir \- wrapper script for ixpc
+wmiir \(em wrapper script for ixpc
 .SH SYNOPSIS
 .B wmiir
 .RB [ \-a
diff --git a/wmiiwm.1 b/wmiiwm.1
index 95231956..2054c1bd 100644
--- a/wmiiwm.1
+++ b/wmiiwm.1
@@ -1,6 +1,6 @@
 .TH WMIIWM 1 wmii-VERSION
 .SH NAME
-wmiiwm \- window manager improved 2 (core)
+wmiiwm \(em window manager improved\(emimproved (core)
 .SH SYNOPSIS
 .B wmiiwm
 .B \-a
@@ -12,7 +12,7 @@ wmiiwm \- window manager improved 2 (core)
 .PD 0
 .SS Overview
 .BR wmiiwm (1)
-is the core of window manager improved 2.
+is the core of window manager improved\(emimproved.
 .P
 .B wmii
 is a dynamic window manager for X11. In contrast to static window management