diff options
| -rw-r--r-- | config.def.h | 5 | ||||
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | dwm.c | 5 |
3 files changed, 10 insertions, 2 deletions
diff --git a/config.def.h b/config.def.h index f318988..2c53956 100644 --- a/config.def.h +++ b/config.def.h @@ -80,7 +80,12 @@ static const Rule rules[] = { /* layout(s) */ static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ static const int nmaster = 1; /* number of clients in master area */ +<<<<<<< HEAD static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */ +======= +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ +static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ +>>>>>>> origin/master static const Layout layouts[] = { /* symbol arrange function */ @@ -1,5 +1,5 @@ # dwm version -VERSION = 6.2 +VERSION = 6.3 # Customize below to fit your system @@ -870,6 +870,9 @@ drawbar(Monitor *m) unsigned int i, occ = 0, urg = 0; Client *c; + if (!m->showbar) + return; + /* draw status first so it can be overdrawn by tags later */ if (m == selmon) { /* status is only drawn on selected monitor */ drw_setscheme(drw, scheme[SchemeNorm]); @@ -1061,7 +1064,7 @@ focusstack(const Arg *arg) { Client *c = NULL, *i; - if (!selmon->sel) + if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen)) return; if (arg->i > 0) { for (c = selmon->sel->next; c && (!ISVISIBLE(c) || !c->canfocus); c = c->next); |