pgrondek/dwm
pgrondek/dwm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: pgrondek:40701c6c583aecc7da3d17ad973b5f315bd22422
Branches Tags
pgrondek:master
..
compare: pgrondek:e9719522e60fbf33d78ea27620a0269b4e42531e
Branches Tags
pgrondek:master

17 Commits
40701c6c58 ... e9719522e6

Author SHA1 Message Date
Przemek Grondek
e9719522e6 Merge remote-tracking branch 'origin/master' 2022-07-25 23:53:33 +02:00
Przemek Grondek
5ea0081aaf Update screenshot shortcuts 2022-07-25 23:53:10 +02:00
Przemek Grondek
3807b98084 Change config 
Fix firefox
add android-studio
 2022-03-19 15:33:48 +01:00
Przemek Grondek
12569e61c5 Selective fullscreen config 2022-01-10 22:09:42 +01:00
Francisco Tapia
50514a2e9a [PATCH] Selective fake full screen 2022-01-10 22:09:30 +01:00
Przemek Grondek
bb6ccde971 Fix fullscreen 2021-11-13 02:03:43 +01:00
Sermak
75a4d98edc [PATCH] Simulate toggleable fullscreen mode 2021-11-13 01:15:37 +01:00
Przemek Grondek
590f4d7602 Update keybindings 2021-10-15 01:04:42 +02:00
Soenke Lambert
43d9dc4a93 [PATCH] Fullscreen current window with [Alt]+[Shift]+[f] 
This actually fullscreens a window, instead of just hiding the statusbar
and applying the monocle layout.
 2021-09-27 22:37:32 +02:00
Przemek Grondek
f8030a0859 Add makefile target for reloading dwm 2021-09-27 22:26:48 +02:00
Przemek Grondek
f20074cd72 Add bt-menu shortcut 2021-09-27 22:25:58 +02:00
Przemek Grondek
cedafa274c Add configuration for more jetbrains apps 2021-07-07 01:54:34 +02:00
Przemek Grondek
24c27ad415 Add ignoretransient to default config 2021-07-07 01:52:21 +02:00
Wilfried SUGNIAUX
9d11cd7d18 DWM 6.2: 
-Making a Workaround patch for WebStorm:
do not care about property notification saying that a second window is transient to the first webstorm window

(cherry picked from commit f47c3c83257eed490c6aaf876fbb67b2ddb8b62c)
 2021-07-07 01:51:11 +02:00
Przemek Grondek
d2b23e176d Change command to run when clicked on statusbar 2021-07-07 01:43:01 +02:00
Przemek Grondek
7a3a2c3cc1 Fix gapps in column mode 2021-07-07 01:04:04 +02:00
Przemek Grondek
c4ccdce0b6 Change colors 2021-07-07 00:51:47 +02:00
4 changed files with 111 additions and 46 deletions
Show Stats Expand all files Collapse all files

3
Makefile
View File

@ -48,4 +48,7 @@ uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/dwm\ rm -f ${DESTDIR}${PREFIX}/bin/dwm\
${DESTDIR}${MANPREFIX}/man1/dwm.1 ${DESTDIR}${MANPREFIX}/man1/dwm.1
reload:
pkill dwm
.PHONY: all options clean dist install uninstall .PHONY: all options clean dist install uninstall

10
config.def.h
View File

@ -31,10 +31,10 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating isterminal noswallow monitor */ /* class instance title tags mask isfloating isfakefullscreen isterminal noswallow ignoretransient monitor */
{ "Gimp", NULL, NULL, 0, 1, 0, 0, -1 }, { "Gimp", NULL, NULL, 0, 1, 0, 0, 0, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, 0, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, 1, 0, 0, 0, -1 },
{ "st", NULL, NULL, 0, 0, 1, 1, -1 }, { "st", NULL, NULL, 0, 0, 0, 1, 1, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
@ -84,8 +84,10 @@ static Key keys[] = {
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_c, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_c, setlayout, {.v = &layouts[3]} },
{ MODKEY|ShiftMask, XK_f, fullscreen, {0} },
{ MODKEY, XK_space, setlayout, {0} }, { MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } },

56
config.h
View File

@ -17,7 +17,7 @@
#define XF86AudioPause 0x1008ff31 #define XF86AudioPause 0x1008ff31
/* appearance */ /* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 2; /* border pixel of windows */
static const unsigned int gappx = 5; /* gaps between windows */ static const unsigned int gappx = 5; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */ static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
@ -26,17 +26,17 @@ static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display
static const int showsystray = 1; /* 0 means no systray */ static const int showsystray = 1; /* 0 means no systray */
static const int showbar = 1; /* 0 means no bar */ static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=10" }; static const char *fonts[] = { "emojione:size=10", "monospace:size=10"};
static const char dmenufont[] = "monospace:size=10"; static const char dmenufont[] = "monospace:size=10";
static const char col_gray1[] = "#141414"; static const char col_gray1[] = "#232323";
static const char col_gray2[] = "#444444"; static const char col_gray2[] = "#303030";
static const char col_gray3[] = "#bbbbbb"; static const char col_gray3[] = "#404040";
static const char col_gray4[] = "#eeeeee"; static const char col_gray4[] = "#b1b1b1";
static const char col_cyan[] = "#224488"; static const char col_gray5[] = "#c0c0c0";
static const char *colors[][3] = { static const char *colors[][3] = {
/* fg bg border */ /* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, [SchemeNorm] = { col_gray4, col_gray1, col_gray2 },
[SchemeSel] = { col_gray4, col_cyan, col_cyan }, [SchemeSel] = { col_gray4, col_gray2, col_gray5 },
}; };
/* tagging */ /* tagging */
@ -47,16 +47,21 @@ static const Rule rules[] = {
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating isterminal noswallow monitor */ /* class instance title tags mask isfloating isfakefullscreen isterminal noswallow ignoretransient monitor */
{"jetbrains-studio", NULL, NULL, 0, 1, 0, 0, 0, 0, -1},
{"jetbrains-studio", NULL, NULL, 0, 1, 0, 0, -1 }, {"st", NULL, NULL, 0, 0, 0, 1, 1, 0, -1},
{"st", NULL, NULL, 0, 0, 1, 1, -1}, {"Xephyr", NULL, NULL, 0, 1, 0, 0, 0, 0, -1},
{"Xephyr", NULL, NULL, 0, 1, 0, 0, -1}, {"Xnest", NULL, NULL, 0, 1, 0, 0, 0, 0, -1},
{"Xnest", NULL, NULL, 0, 1, 0, 0, -1}, {"streamdeck", NULL, NULL, 0, 0, 0, 0, 1, 0, -1},
{"streamdeck", NULL, NULL, 0, 0, 0, 1, -1}, {"jetbrains-toolbox", NULL, NULL, 0, 1, 0, 0, 1, 0, -1},
{"jetbrains-toolbox", NULL, NULL, 0, 1, 0, 1, -1}, {"jetbrains-idea", NULL, NULL, 0, 0, 0, 0, 1, 1, -1},
{"jetbrains-idea", NULL, NULL, 0, 0, 0, 1, -1}, {"jetbrains-studio", NULL, NULL, 0, 0, 0, 0, 1, 1, -1},
{"jetbrains-idea", NULL, "Welcome to IntelliJ IDEA", 0, 1, 0, 1, -1}, {"jetbrains-webstorm", NULL, NULL, 0, 0, 0, 0, 1, 1, -1},
{"jetbrains-clion", NULL, NULL, 0, 0, 0, 0, 1, 1, -1},
{"jetbrains-pycharm", NULL, NULL, 0, 0, 0, 0, 1, 1, -1},
{"jetbrains-idea", NULL, "Welcome to IntelliJ IDEA", 0, 1, 0, 0, 1, 0, -1},
{"looking-glass-client", NULL, NULL, 0, 1, 0, 0, 1, 0, -1},
{"firefox", NULL, NULL, 0, 0, 1, 0, 0, 0, -1},
}; };
/* layout(s) */ /* layout(s) */
@ -85,12 +90,13 @@ static const Layout layouts[] = {
/* commands */ /* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray5, "-sb", col_gray2, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "st", NULL }; static const char *termcmd[] = { "st", NULL };
static Key keys[] = { static Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XK_d, spawn, {.v = dmenucmd } }, { MODKEY, XK_d, spawn, {.v = dmenucmd } },
{ MODKEY, XK_b, spawn, SHCMD("bt-menu") },
{ MODKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } },
@ -106,6 +112,8 @@ static Key keys[] = {
// { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, // { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_space, setlayout, {0} }, { MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
{ MODKEY|ShiftMask, XK_g, fullscreen, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } },
@ -121,13 +129,17 @@ static Key keys[] = {
{ MODKEY, XK_F5, spawn, SHCMD("idea") }, { MODKEY, XK_F5, spawn, SHCMD("idea") },
{ MODKEY, XK_F6, spawn, SHCMD("clion") }, { MODKEY, XK_F6, spawn, SHCMD("clion") },
{ MODKEY, XK_F7, spawn, SHCMD("pycharm") }, { MODKEY, XK_F7, spawn, SHCMD("pycharm") },
{ 0, XK_Print, spawn, SHCMD("screenshot") }, { 0, XK_Print, spawn, SHCMD("gnome-screenshot -i") },
{ MODKEY|ShiftMask, XK_s, spawn, SHCMD("gnome-screenshot -a")},
{ 0, XF86AudioPlay, spawn, SHCMD("playerctl play-pause")} , { 0, XF86AudioPlay, spawn, SHCMD("playerctl play-pause")} ,
{ 0, XF86AudioPause, spawn, SHCMD("playerctl pause")} , { 0, XF86AudioPause, spawn, SHCMD("playerctl pause")} ,
{ 0, XF86AudioStop, spawn, SHCMD("playerctl stop")} , { 0, XF86AudioStop, spawn, SHCMD("playerctl stop")} ,
{ 0, XF86AudioNext, spawn, SHCMD("playerctl next")} , { 0, XF86AudioNext, spawn, SHCMD("playerctl next")} ,
{ 0, XF86AudioPrev, spawn, SHCMD("playerctl previous")} , { 0, XF86AudioPrev, spawn, SHCMD("playerctl previous")} ,
{ 0, XF86AudioLowerVolume, spawn, SHCMD("volume-set 2%-")},
{ 0, XF86AudioRaiseVolume, spawn, SHCMD("volume-set 2%+")},
{ 0, XF86AudioMute, spawn, SHCMD("amixer -D pulse sset Master toggle")},
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
@ -148,7 +160,7 @@ static Button buttons[] = {
{ ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkWinTitle, 0, Button2, zoom, {0} }, { ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkStatusText, 0, Button2, spawn, SHCMD("gsimplecal") },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} },

70
dwm.c
View File

@ -113,7 +113,7 @@ struct Client {
int basew, baseh, incw, inch, maxw, maxh, minw, minh; int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int bw, oldbw; int bw, oldbw;
unsigned int tags; unsigned int tags;
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow; int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isfakefullscreen, isterminal, noswallow, ignoretransient;
pid_t pid; pid_t pid;
Client *next; Client *next;
Client *snext; Client *snext;
@ -162,8 +162,10 @@ typedef struct {
const char *title; const char *title;
unsigned int tags; unsigned int tags;
int isfloating; int isfloating;
int isfakefullscreen;
int isterminal; int isterminal;
int noswallow; int noswallow;
int ignoretransient;
int monitor; int monitor;
} Rule; } Rule;
@ -241,6 +243,7 @@ static void sendmon(Client *c, Monitor *m);
static void setclientstate(Client *c, long state); static void setclientstate(Client *c, long state);
static void setfocus(Client *c); static void setfocus(Client *c);
static void setfullscreen(Client *c, int fullscreen); static void setfullscreen(Client *c, int fullscreen);
static void fullscreen(const Arg *arg);
static void setgaps(const Arg *arg); static void setgaps(const Arg *arg);
static void setlayout(const Arg *arg); static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg); static void setmfact(const Arg *arg);
@ -257,6 +260,7 @@ static Client *termforwin(const Client *c);
static void tile(Monitor *); static void tile(Monitor *);
static void togglebar(const Arg *arg); static void togglebar(const Arg *arg);
static void togglefloating(const Arg *arg); static void togglefloating(const Arg *arg);
static void togglefullscr(const Arg *arg);
static void toggletag(const Arg *arg); static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg); static void toggleview(const Arg *arg);
static void unfocus(Client *c, int setfocus); static void unfocus(Client *c, int setfocus);
@ -354,6 +358,8 @@ applyrules(Client *c)
{ {
c->isterminal = r->isterminal; c->isterminal = r->isterminal;
c->isfloating = r->isfloating; c->isfloating = r->isfloating;
c->isfakefullscreen = r->isfakefullscreen;
c->ignoretransient = r->ignoretransient;
c->tags |= r->tags; c->tags |= r->tags;
for (m = mons; m && m->num != r->monitor; m = m->next); for (m = mons; m && m->num != r->monitor; m = m->next);
if (m) if (m)
@ -688,7 +694,8 @@ clientmessage(XEvent *e)
if (cme->data.l[1] == netatom[NetWMFullscreen] if (cme->data.l[1] == netatom[NetWMFullscreen]
|| cme->data.l[2] == netatom[NetWMFullscreen]) || cme->data.l[2] == netatom[NetWMFullscreen])
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */ setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen))); || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */
&& (!c->isfullscreen || c->isfakefullscreen))));
} else if (cme->message_type == netatom[NetActiveWindow]) { } else if (cme->message_type == netatom[NetActiveWindow]) {
if (c != selmon->sel && !c->isurgent) if (c != selmon->sel && !c->isurgent)
seturgent(c, 1); seturgent(c, 1);
@ -732,7 +739,8 @@ configurenotify(XEvent *e)
updatebars(); updatebars();
for (m = mons; m; m = m->next) { for (m = mons; m; m = m->next) {
for (c = m->clients; c; c = c->next) for (c = m->clients; c; c = c->next)
if (c->isfullscreen) if (c->isfullscreen
&& !c->isfakefullscreen)
resizeclient(c, m->mx, m->my, m->mw, m->mh); resizeclient(c, m->mx, m->my, m->mw, m->mh);
resizebarwin(m); resizebarwin(m);
} }
@ -1353,7 +1361,8 @@ movemouse(const Arg *arg)
if (!(c = selmon->sel)) if (!(c = selmon->sel))
return; return;
if (c->isfullscreen) /* no support moving fullscreen windows by mouse */ if (c->isfullscreen
&& !c->isfakefullscreen) /* no support moving fullscreen windows by mouse */
return; return;
restack(selmon); restack(selmon);
ocx = c->x; ocx = c->x;
@ -1453,7 +1462,7 @@ propertynotify(XEvent *e)
switch(ev->atom) { switch(ev->atom) {
default: break; default: break;
case XA_WM_TRANSIENT_FOR: case XA_WM_TRANSIENT_FOR:
if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) && if (!c->ignoretransient && !c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
(c->isfloating = (wintoclient(trans)) != NULL)) (c->isfloating = (wintoclient(trans)) != NULL))
arrange(c->mon); arrange(c->mon);
break; break;
@ -1534,6 +1543,14 @@ resizeclient(Client *c, int x, int y, int w, int h)
c->oldw = c->w; c->w = wc.width = w; c->oldw = c->w; c->w = wc.width = w;
c->oldh = c->h; c->h = wc.height = h; c->oldh = c->h; c->h = wc.height = h;
wc.border_width = c->bw; wc.border_width = c->bw;
if(selmon->showbar) {
} else {
wc.border_width = 0;
c->w = wc.width += c->bw * 2;
c->h = wc.height += c->bw * 2;
}
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c); configure(c);
XSync(dpy, False); XSync(dpy, False);
@ -1550,7 +1567,8 @@ resizemouse(const Arg *arg)
if (!(c = selmon->sel)) if (!(c = selmon->sel))
return; return;
if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */ if (c->isfullscreen
&& !c->isfakefullscreen) /* no support resizing fullscreen windows by mouse */
return; return;
restack(selmon); restack(selmon);
ocx = c->x; ocx = c->x;
@ -1751,6 +1769,10 @@ setfullscreen(Client *c, int fullscreen)
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1); PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
c->isfullscreen = 1; c->isfullscreen = 1;
if (c->isfakefullscreen) {
resizeclient(c, c->x, c->y, c->w, c->h);
return;
}
c->oldstate = c->isfloating; c->oldstate = c->isfloating;
c->oldbw = c->bw; c->oldbw = c->bw;
c->bw = 0; c->bw = 0;
@ -1761,6 +1783,10 @@ setfullscreen(Client *c, int fullscreen)
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32, XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
PropModeReplace, (unsigned char*)0, 0); PropModeReplace, (unsigned char*)0, 0);
c->isfullscreen = 0; c->isfullscreen = 0;
if (c->isfakefullscreen) {
resizeclient(c, c->x, c->y, c->w, c->h);
return;
}
c->isfloating = c->oldstate; c->isfloating = c->oldstate;
c->bw = c->oldbw; c->bw = c->oldbw;
c->x = c->oldx; c->x = c->oldx;
@ -1782,6 +1808,19 @@ setgaps(const Arg *arg)
arrange(selmon); arrange(selmon);
} }
Layout *last_layout;
void
fullscreen(const Arg *arg)
{
if (selmon->showbar) {
for(last_layout = (Layout *)layouts; last_layout != selmon->lt[selmon->sellt]; last_layout++);
setlayout(&((Arg) { .v = &layouts[3] }));
} else {
setlayout(&((Arg) { .v = last_layout }));
}
togglebar(arg);
}
void void
setlayout(const Arg *arg) setlayout(const Arg *arg)
{ {
@ -1912,7 +1951,8 @@ showhide(Client *c)
if (ISVISIBLE(c)) { if (ISVISIBLE(c)) {
/* show clients top down */ /* show clients top down */
XMoveWindow(dpy, c->win, c->x, c->y); XMoveWindow(dpy, c->win, c->x, c->y);
if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen) if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating)
&& (!c->isfullscreen || c->isfakefullscreen))
resize(c, c->x, c->y, c->w, c->h, 0); resize(c, c->x, c->y, c->w, c->h, 0);
showhide(c->snext); showhide(c->snext);
} else { } else {
@ -2004,13 +2044,13 @@ col(Monitor *m) {
mw = m->ww - m->gappx; mw = m->ww - m->gappx;
for(i =0, x = y = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { for(i =0, x = y = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
if(i < m->nmaster) { if(i < m->nmaster) {
w = (mw - x) / (MIN(n, m->nmaster)-i) - m->gappx; w = (mw - x) / (MIN(n, m->nmaster)-i);
resize(c, x + m->wx + m->gappx, m->wy + m->gappx, w - (2*c->bw) - (2*m->gappx), m->wh - ((2*c->bw) + (2*m->gappx)), False); resize(c, x + m->wx, m->wy + m->gappx, w - (2*c->bw), m->wh - ((2*c->bw) + (2*m->gappx)), False);
x += WIDTH(c) + m->gappx; x += WIDTH(c) + m->gappx;
} }
else { else {
h = (m->wh - y) / (n - i) - m->gappx; h = (m->wh - y) / (n - i) - m->gappx;
resize(c, x + m->wx + m->gappx, m->wy + y, m->ww - x - (2*c->bw) - (2*m->gappx), h - (2*c->bw), False); resize(c, x + m->wx, m->wy + y, m->ww - x - (2*c->bw) - m->gappx, h - (2*c->bw), False);
y += HEIGHT(c) + m->gappx; y += HEIGHT(c) + m->gappx;
} }
} }
@ -2041,7 +2081,8 @@ togglefloating(const Arg *arg)
{ {
if (!selmon->sel) if (!selmon->sel)
return; return;
if (selmon->sel->isfullscreen) /* no support for fullscreen windows */ if (selmon->sel->isfullscreen
&& !selmon->sel->isfakefullscreen) /* no support for fullscreen windows */
return; return;
selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed; selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
if (selmon->sel->isfloating) if (selmon->sel->isfloating)
@ -2050,6 +2091,13 @@ togglefloating(const Arg *arg)
arrange(selmon); arrange(selmon);
} }
void
togglefullscr(const Arg *arg)
{
if(selmon->sel)
setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
}
void void
toggletag(const Arg *arg) toggletag(const Arg *arg)
{ {