commit 2e38296edd5fbafbb93a42333af22ba9edd667bf
parent 59aa02a0750ebc82dbcb30897bbf427391edffa0
Author: Anselm R Garbe <garbeam@gmail.com>
Date: Wed, 5 Mar 2008 10:31:37 +0000
renamed maximise to monocle again.
Diffstat:
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -31,7 +31,7 @@ Layout layouts[] = {
/* symbol function */
{ "[]=", tile }, /* first entry is default */
{ "><>", floating },
- { "[M]", maximise },
+ { "[M]", monocle },
};
/* key definitions */
@@ -42,9 +42,6 @@ Key keys[] = {
"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
{ MODKEY|ShiftMask, XK_Return, spawn, "exec uxterm" },
{ MODKEY, XK_b, togglebar, NULL },
- { MODKEY, XK_t, setlayout, "[]=" },
- { MODKEY, XK_f, setlayout, "><>" },
- { MODKEY, XK_m , setlayout, "[M]" },
{ MODKEY, XK_j, focusnext, NULL },
{ MODKEY, XK_k, focusprev, NULL },
{ MODKEY, XK_h, setmwfact, "-0.05" },
@@ -52,6 +49,7 @@ Key keys[] = {
{ MODKEY, XK_r, reapply, NULL },
{ MODKEY, XK_Return, zoom, NULL },
{ MODKEY, XK_Tab, viewprevtag, NULL },
+ { MODKEY, XK_space, setlayout, NULL },
{ MODKEY|ShiftMask, XK_space, togglefloating, NULL },
{ MODKEY|ShiftMask, XK_c, killclient, NULL },
{ MODKEY, XK_0, view, NULL },
diff --git a/dwm.1 b/dwm.1
@@ -5,13 +5,13 @@ dwm \- dynamic window manager
.B dwm
.RB [ \-v ]
.SH DESCRIPTION
-dwm is a dynamic window manager for X. It manages windows in tiled, maximised
+dwm is a dynamic window manager for X. It manages windows in tiled, monocle
and floating layouts. Either layout can be applied dynamically, optimising the
environment for the application in use and the task performed.
.P
In tiled layout windows are managed in a master and stacking area. The master
area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows. In maximised layout all windows are
+stacking area contains all other windows. In monocle layout all windows are
maximised to the screen size. In floating layout windows can be resized and
moved freely. Dialog windows are always managed floating, regardless of the
layout applied.
@@ -63,15 +63,6 @@ Zooms/cycles current window to/from master area (tiled layout only).
.B Mod1\-Tab
Toggles to the previously selected tags.
.TP
-.B Mod1\-t
-Applies tiled layout.
-.TP
-.B Mod1\-f
-Applies loating layout.
-.TP
-.B Mod1\-m
-Applies maximised layout.
-.TP
.B Mod1\-space
Toggles between layouts.
.TP
diff --git a/dwm.c b/dwm.c
@@ -44,7 +44,7 @@
* TODO: Idea:
* I intend to not provide real Xinerama support, but instead having a Column
* tilecols[] array which is used by tile(), and a Column maxcols[] arrays which is used by
- * maximise(). Those arrays should be initialized in config.h. For simplicity
+ * monocle(). Those arrays should be initialized in config.h. For simplicity
* reasons mwfact should be replaced with a more advanced method which
* implements the same, but using the boundary between tilecols[0] and
* tilecols[1] instead. Besides this, get rid of BARPOS and use instead the
@@ -172,7 +172,7 @@ void killclient(const char *arg);
void manage(Window w, XWindowAttributes *wa);
void mappingnotify(XEvent *e);
void maprequest(XEvent *e);
-void maximise(void);
+void monocle(void);
void movemouse(Client *c);
Client *nexttiled(Client *c);
void propertynotify(XEvent *e);
@@ -1086,7 +1086,7 @@ maprequest(XEvent *e) {
}
void
-maximise(void) {
+monocle(void) {
Client *c;
domwfact = dozoom = False;
