commit a6b98d2c4229d8360edaa77081793fd3cff8ce9b
parent fac4419e89f9482030c1b67b429304c83210eb63
Author: gn <gn@wmii.de>
Date: Sun, 18 Dec 2005 17:55:06 +0200
s/wmi/wmii/ and the like
Diffstat:
14 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/cmd/wm/wmii b/cmd/wm/wmii
@@ -13,7 +13,7 @@ WMII_CONFDIR=CONFPREFIX/wmii-3
OLD_PATH=$PATH
PATH=$HOME/.wmii-3:$WMII_CONFDIR:9PREFIX/bin:$PATH
WMII_IDENT=`{date -n}^'-'^$pid
-WMIR_SOCKET=/tmp/.ixp-$USER/wmiifs-$WMII_IDENT
+WMIIR_SOCKET=/tmp/.ixp-$USER/wmiifs-$WMII_IDENT
# start window manager and utilities:
mkdir -p /tmp/.ixp-$USER
diff --git a/cmd/wm/wmii.1 b/cmd/wm/wmii.1
@@ -81,7 +81,7 @@ Unique identifier for the
.BR wmii (1)
session. Part of the socket file names.
.TP
-WMIR_SOCKET
+WMIIR_SOCKET
Socket file of
.BR wmiifs (1).
Used by
diff --git a/cmd/wm/wmiiwm.1 b/cmd/wm/wmiiwm.1
@@ -23,10 +23,10 @@ as
.BR wmiifs (1),
.BR wmiimenu (1),
.BR wmiikeys (1),
-.BR wmiplumb (1),
+.BR wmiiplumb (1),
.BR wmiir (1)
and
-.BR wmiwarp (1).
+.BR wmiiwarp (1).
.SH SYNOPSIS
.B wmii
@@ -165,7 +165,7 @@ Copyright \(co 2003 - 2005 by Anselm R. Garbe <garbeam (at) gmail (dot) com>
.BR wmiifs (1),
.BR wmiimenu (1),
.BR wmiikeys (1),
-.BR wmiplumb (1),
+.BR wmiiplumb (1),
.BR wmiir (1),
-.BR wmiwarp (1),
+.BR wmiiwarp (1),
.BR wmii.rc (5).
diff --git a/cmd/wmiibar.1 b/cmd/wmiibar.1
@@ -1,4 +1,4 @@
-.TH WMIBAR 1 wmii-3
+.TH WMIIBAR 1 wmii-3
.SH NAME
wmiibar \- window manager improved 2 bar
.SH SYNOPSIS
diff --git a/cmd/wmiifs.1 b/cmd/wmiifs.1
@@ -1,4 +1,4 @@
-.TH WMIFS 1 wmii-3
+.TH WMIIFS 1 wmii-3
.SH NAME
wmiifs \- window manager improved 2 filesystem
.SH SYNOPSIS
diff --git a/cmd/wmiikeys.1 b/cmd/wmiikeys.1
@@ -1,4 +1,4 @@
-.TH WMIKEYS 1 wmii-3
+.TH WMIIKEYS 1 wmii-3
.SH NAME
wmiikeys \- window manager improved 2 keys
.SH SYNOPSIS
diff --git a/cmd/wmiimenu.1 b/cmd/wmiimenu.1
@@ -1,4 +1,4 @@
-.TH WMIMENU 1 wmii-3
+.TH WMIIMENU 1 wmii-3
.SH NAME
wmiimenu \- window manager improved 2 menu
.SH SYNOPSIS
diff --git a/cmd/wmiiplumb.c b/cmd/wmiiplumb.c
@@ -11,14 +11,14 @@
#include <X11/Xatom.h>
static char *version[] = {
- "wmiplumb - window manager improved plumb - " VERSION "\n"
+ "wmiiplumb - window manager improved plumb - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr, "%s\n",
- "usage: wmiplumb [-v]\n" " -v version info\n");
+ "usage: wmiiplumb [-v]\n" " -v version info\n");
exit(1);
}
@@ -60,7 +60,7 @@ int main(int argc, char **argv)
}
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmiplumb: cannot open display\n");
+ fprintf(stderr, "%s", "wmiiplumb: cannot open display\n");
exit(1);
}
xa_clip_string = XInternAtom(dpy, "PLUMB_STRING", False);
diff --git a/cmd/wmiir.1 b/cmd/wmiir.1
@@ -1,4 +1,4 @@
-.TH WMIR 1 wmii-3
+.TH WMIIR 1 wmii-3
.SH NAME
wmiir \- window manager improved 2 remote
.SH SYNOPSIS
@@ -19,7 +19,7 @@ wmiir \- window manager improved 2 remote
.SH DESCRIPTION
.SS Overview
.B wmiir
-is a client to access wmi* fileservers for the command line and
+is a client to access wmii* fileservers for the command line and
scripts. It can be used to configure wmii(1).
.SS Options
.TP
@@ -27,7 +27,7 @@ scripts. It can be used to configure wmii(1).
lets you specify the socketfile to which
.B wmiir
a connection will be established. If the environment variable
-.B WMIR_SOCKET
+.B WMIIR_SOCKET
is set and points to a socket file, wmiir will use that file, if this
option is not supplied.
.TP
@@ -54,7 +54,7 @@ reads file or directory contents
removes file or directory tree
.SH ENVIRONMENT
.TP
-WMIR_SOCKET
+WMIIR_SOCKET
See above.
.SH EXAMPLES
.TP
diff --git a/cmd/wmiir.c b/cmd/wmiir.c
@@ -21,7 +21,7 @@ static void usage()
{
fprintf(stderr, "%s",
"usage: wmiir [-s <socket file>] [-v] <action> <action_arg> [...]\n"
- " -s socket file (default: $WMIR_SOCKET)\n"
+ " -s socket file (default: $WMIIR_SOCKET)\n"
" -f read actions from stdin\n"
" -v version info\n"
"actions:\n"
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
{
int i = 0, read_stdin = 0;
char line[4096], *p;
- char *sockfile = getenv("WMIR_SOCKET");
+ char *sockfile = getenv("WMIIR_SOCKET");
/* command line args */
if (argc > 1) {
@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
}
if (!sockfile) {
fprintf(stderr, "%s",
- "wmiir: error: WMIR_SOCKET environment not set\n");
+ "wmiir: error: WMIIR_SOCKET environment not set\n");
usage();
}
/* open socket */
diff --git a/cmd/wmiir2.c b/cmd/wmiir2.c
@@ -39,7 +39,7 @@ static void usage()
{
fprintf(stderr, "%s",
"usage: wmiir [-s <socket file>] [-v] <command> <args> [...]\n"
- " -s socket file (default: $WMIR_SOCKET)\n"
+ " -s socket file (default: $WMIIR_SOCKET)\n"
" -f read commands from stdin\n"
" -v version info\n"
"commands:\n"
@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
{
int i = 0, ret, read_stdin = 0;
char line[4096];
- char *sockfile = getenv("WMIR_SOCKET");
+ char *sockfile = getenv("WMIIR_SOCKET");
/* command line args */
if (argc > 1) {
@@ -216,7 +216,7 @@ int main(int argc, char *argv[])
}
if (!sockfile) {
fprintf(stderr, "%s",
- "wmiir: error: WMIR_SOCKET environment not set\n");
+ "wmiir: error: WMIIR_SOCKET environment not set\n");
usage();
}
/* open socket */
diff --git a/cmd/wmiiwarp.c b/cmd/wmiiwarp.c
@@ -11,14 +11,14 @@
#include <X11/Xatom.h>
static char *version[] = {
- "wmiwarp - window manager improved warp - " VERSION "\n"
+ "wmiiwarp - window manager improved warp - " VERSION "\n"
" (C)opyright MMIV-MMV Anselm R. Garbe\n", 0
};
static void usage()
{
fprintf(stderr,
- "usage: wmiwarp [-v] <x>,<y>\n" " -v version info\n");
+ "usage: wmiiwarp [-v] <x>,<y>\n" " -v version info\n");
exit(1);
}
@@ -36,7 +36,7 @@ int main(int argc, char **argv)
}
dpy = XOpenDisplay(0);
if (!dpy) {
- fprintf(stderr, "%s", "wmiwarp: cannot open display\n");
+ fprintf(stderr, "%s", "wmiiwarp: cannot open display\n");
exit(1);
}
if (!strncmp(argv[1], "center", 7)) {
diff --git a/rc/welcome b/rc/welcome
@@ -17,8 +17,8 @@ Let's go!
- Start a terminal by pressing M-t. This assumes that you have xterm(1)
installed.
- Open the actions menu: C-M-a
- Type 'term' and press Enter. You've now used wmimenu(1) to accomplish what
- wmikeys(1) did before when you pressed M-t: executing the term action.
+ Type 'term' and press Enter. You've now used wmiimenu(1) to accomplish what
+ wmiikeys(1) did before when you pressed M-t: executing the term action.
Notice how the tiled layout arranges the windows.
- Switch between the three windows: M-j, M-k
You can also use M-Tab instead of M-j. If you prefer the mouse, then
@@ -53,7 +53,7 @@ Let's go!
in the shell of the terminal will list all the files in the root directory.
Files ending with a slash are directories. As you can see, / contains a
"normal" file and four directories. These directories correspond to the
- four main components of wmii: wmiiwm, wmibar, wmikeys, and wmimenu. If you
+ four main components of wmii: wmiiwm, wmiibar, wmiikeys, and wmiimenu. If you
are curious, you can now dig deeper into the directory trees. For instance,
wmiir read /bar/1/b1press
will show you which command gets executed when you left-click on the page
diff --git a/rc/wmiirc b/rc/wmiirc
@@ -69,7 +69,7 @@ fn framesconf {
}
-# WMIBAR CONFIGURATION
+# WMIIBAR CONFIGURATION
fn barsucks {
wmiir write /bar/$1/b1press 'wmiir write /wm/ctl ''select prev'''
@@ -125,7 +125,7 @@ for(layout in /wm/sel/layout/float /wm/sel/layout/managed)
frameconf /wm/default norefresh
-# WMIKEYS CONFIGURATION
+# WMIIKEYS CONFIGURATION
kbind bare $MODKEY-Escape 'kmode normal'
@@ -166,7 +166,7 @@ wmiir write /keys/box/font $FONT
selstyle /keys/box
kmode normal
-# WMIMENU CONFIGURATION
+# WMIIMENU CONFIGURATION
wmiir write /menu/geometry $BAR_ALIGN
items actions $WMII_CONFDIR:$HOME/.wmii-3
wmiir create /menu/items/actions/rmpage 'wmiir write /wm/ctl destroy'
