summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h2
-rw-r--r--dwm.128
-rw-r--r--dwm.c2
3 files changed, 18 insertions, 14 deletions
diff --git a/config.h b/config.h
index 7bee0b0..09cce39 100644
--- a/config.h
+++ b/config.h
@@ -7,6 +7,7 @@ static const unsigned int gappih = 20; /* horiz inner gap between windo
static const unsigned int gappiv = 10; /* vert inner gap between windows */
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
static const unsigned int gappov = 30; /* vert outer gap between windows and screen edge */
+static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
@@ -47,6 +48,7 @@ static const Rule rules[] = {
/* class instance title tags mask isfloating isterminal noswallow monitor */
{ "Gimp", NULL, NULL, 1 << 8, 0, 0, 0, -1 },
{ "St", NULL, NULL, 0, 0, 1, 0, -1 },
+ { NULL, NULL, "Event Tester", 0, 0, 0, 1, -1 },
{ NULL, "spterm", NULL, SPTAG(0), 1, 1, 0, -1 },
{ NULL, "spcalc", NULL, SPTAG(1), 1, 1, 0, -1 },
};
diff --git a/dwm.1 b/dwm.1
index 8c457b5..fdbac6a 100644
--- a/dwm.1
+++ b/dwm.1
@@ -75,23 +75,26 @@ Toggles bar on and off.
.B Super\-q
Close focused window.
.TP
-.B Super\-t
-Sets tiled layout.
+.B Super\-t/T
+Sets tiled/bstack layouts.
.TP
.B Super\-f
Toggle fullscreen window.
.TP
-.B Super\-y
-Sets Fibonacci spiral layout.
+.B Super\-F
+Toggle floating layout.
.TP
-.B Super\-u
+.B Super\-y/Y
+Sets Fibonacci spiral/dwinde layouts.
+.TP
+.B Super\-u/U
Sets centered master layout.
.TP
-.B Super\-i
-Sets floating centered master layout.
+.B Super\-i/I
+Sets centered master or floating master layouts.
.TP
.B Super\-space
-Zooms/cycles focused window to/from master area (tiled layouts only).
+Zooms/cycles focused window to/from master area.
.TP
.B Super\-j/k
Focus next/previous window.
@@ -99,11 +102,8 @@ Focus next/previous window.
.B Super\-Shift\-j/k
Move selected window down/up in stack.
.TP
-.B Super\-o
-Increase number of windows in master area.
-.TP
-.B Super\-Shift\-o
-Decrease number of windows in master area.
+.B Super\-o/O
+Increase/decrease number of windows in master area.
.TP
.B Super\-l
Increase master area size.
@@ -139,7 +139,7 @@ Add/remove all windows with nth tag to/from the view.
Quit dwm.
.TP
.B Mod1\-Control\-Shift\-q
-Restart dwm.
+Menu to refresh/quit/reboot/shutdown.
.SS Mouse commands
.TP
.B Super\-Left click
diff --git a/dwm.c b/dwm.c
index 9331025..242909e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -485,6 +485,8 @@ swallow(Client *p, Client *c)
{
if (c->noswallow || c->isterminal)
return;
+ if (!swallowfloating && c->isfloating)
+ return;
detach(c);
detachstack(c);