Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c78718c86b |
5
Makefile
5
Makefile
@ -37,12 +37,9 @@ install: all
|
||||
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||
chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||
mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
|
||||
cp -f dwm.desktop ${DESTDIR}/usr/share/xsessions
|
||||
|
||||
uninstall:
|
||||
rm -f ${DESTDIR}${PREFIX}/bin/dwm\
|
||||
${DESTDIR}${MANPREFIX}/man1/dwm.1 \
|
||||
${DESTDIR}/usr/share/xsessions/dwm.desktop
|
||||
${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||
|
||||
.PHONY: all clean dist install uninstall
|
||||
|
||||
99
config.def.h
99
config.def.h
@ -1,8 +1,7 @@
|
||||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/* appearance */
|
||||
static const unsigned int borderpx = 1; /* border pixel of windows */
|
||||
static const unsigned int gappx = 18; /* gap pixel between windows */
|
||||
static const unsigned int gappx = 10; /* gap pixel between windows */
|
||||
static const unsigned int snap = 32; /* snap pixel */
|
||||
static const int swallowfloating = 0; /* 1 means swallow floating windows by default */
|
||||
static const int showbar = 1; /* 0 means no standard bar */
|
||||
@ -67,8 +66,9 @@ static const char *const autostart[] = {
|
||||
/* tagging */
|
||||
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
||||
|
||||
|
||||
/* launcher commands (They must be NULL terminated) */
|
||||
static const char* browser[] = { "firefox", "--newwindow", "search.brave.com", NULL };
|
||||
static const char* browser[] = { "firefox-esr", "--newwindow", NULL };
|
||||
static const char* terminal[] = { "st", NULL };
|
||||
|
||||
static const Launcher launchers[] = {
|
||||
@ -104,6 +104,7 @@ static const Rule rules[] = {
|
||||
{ "Gimp", NULL, NULL, 0, 1, 0, 0, 0, -1 },
|
||||
{ "Firefox", NULL, NULL, 1 << 8, 0, 0, 0, -1, -1 },
|
||||
{ "St", NULL, NULL, 0, 0, 0, 1, 0, -1 },
|
||||
{ "St", NULL, "pulsemixer", 0, 1, 0, 0, 1, -1 },
|
||||
{ NULL, NULL, "Event Tester", 0, 0, 0, 0, 1, -1 }, /* xev */
|
||||
};
|
||||
|
||||
@ -121,14 +122,12 @@ static const int nmaster = 1; /* number of clients in master area */
|
||||
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 */
|
||||
|
||||
#include "gaplessgrid.c"
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "[D]", deck },
|
||||
{ "###", gaplessgrid },
|
||||
};
|
||||
|
||||
/* key definitions */
|
||||
@ -146,30 +145,61 @@ static const Layout layouts[] = {
|
||||
/* commands */
|
||||
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
|
||||
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg_dim, "-nf", col_fg, "-sb", col_bg3, "-sf", col_fg, NULL };
|
||||
static const char *termcmd[] = { "st", NULL };
|
||||
static const char *layoutmenu_cmd = "layoutmenu.sh";
|
||||
#include <X11/XF86keysym.h>
|
||||
#include "exitdwm.c"
|
||||
static const Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY|ShiftMask, XK_b, toggleextrabar, {0} },
|
||||
{ MODKEY, XK_n, togglefollow, {0} },
|
||||
{ 0, XF86XK_AudioMute, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ 0, XF86XK_AudioRaiseVolume, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ 0, XF86XK_AudioLowerVolume, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ 0, XF86XK_MonBrightnessUp, spawn, { .v = (const char*[]){ "sh", "-c", "xbacklight -inc 5; notify-send -r 1001 \"$(xbacklight -get | awk '{gsub(/\\.[0-9]+/, \"\"); print \"Brightness \" $1 \"%\"}')\"", NULL } } }, // TODO status update
|
||||
{ 0, XF86XK_MonBrightnessDown, spawn, { .v = (const char*[]){ "sh", "-c", "xbacklight -dec 5; notify-send -r 1001 \"$(xbacklight -get | awk '{gsub(/\\.[0-9]+/, \"\"); print \"Brightness \" $1 \"%\"}')\"", NULL } } }, // TODO status update
|
||||
{ MODKEY, XK_BackSpace, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ MODKEY, XK_equal, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ MODKEY, XK_minus, spawn, { .v = (const char*[]){ "sh", "-c", "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-; notify-send -r 1001 \"$(wpctl get-volume @DEFAULT_SINK@ | awk '{printf \"%s %.f%% %s\\n\",$1, $2 * 100, $3}')\"", NULL } } }, // TODO status update
|
||||
{ MODKEY, XK_q, killclient, {0}},
|
||||
{ MODKEY|ShiftMask, XK_q, exitdwm, {0}},
|
||||
{ MODKEY, XK_e, spawn, SHCMD("st -e nvim")},
|
||||
{ MODKEY, XK_i, spawn, SHCMD("firefox-esr")},
|
||||
{ MODKEY, XK_p, spawn, SHCMD("dmenu-pass")},
|
||||
{ MODKEY|ShiftMask, XK_p, spawn, SHCMD("dmenu-pass -a")},
|
||||
{ MODKEY, XK_a, spawn, SHCMD("kill $(pidof -x pulsemixer); st -n pulsemixer -e pulsemixer;")}, // TODO status update
|
||||
{ MODKEY, XK_d, spawn, {.v=dmenucmd}},
|
||||
{ MODKEY, XK_f, togglefullscr, {0}},
|
||||
{ MODKEY|ShiftMask, XK_f, togglefakefullscr, {0}},
|
||||
{ MODKEY|Mod1Mask, XK_f, togglefollow, {0}},
|
||||
{ MODKEY, XK_h, focusmon, {.i=+1}},
|
||||
{ MODKEY|ShiftMask, XK_h, tagmon, {.i=+1}},
|
||||
{ MODKEY, XK_j, focusstackvis, {.i=+1}},
|
||||
{ MODKEY, XK_k, focusstackvis, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_j, focusstackhid, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, focusstackhid, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_j, movestack, {.i=+1}},
|
||||
{ MODKEY|Mod1Mask, XK_j, focusstackhid, {.i=+1}},
|
||||
{ MODKEY, XK_k, focusstackvis, {.i=-1}},
|
||||
{ MODKEY|ShiftMask, XK_k, movestack, {.i=-1}},
|
||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
||||
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
|
||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||
{ MODKEY|Mod1Mask, XK_k, focusstackhid, {.i=-1}},
|
||||
{ MODKEY, XK_l, focusmon, {.i=-1}},
|
||||
{ MODKEY|ShiftMask, XK_l, tagmon, {.i=-1}},
|
||||
{ MODKEY, XK_Return, spawn, SHCMD("st")},
|
||||
{ MODKEY|ShiftMask, XK_Return, zoom, {0}},
|
||||
{ MODKEY, XK_comma, setmfact, {.f=-0.05}},
|
||||
{ MODKEY|ShiftMask, XK_comma, incnmaster, {.i=+1}},
|
||||
{ MODKEY, XK_period, setmfact, {.f=+0.05}},
|
||||
{ MODKEY|ShiftMask, XK_period, incnmaster, {.i=-1}},
|
||||
TAGKEYS( XK_1, 0 )
|
||||
TAGKEYS( XK_2, 1 )
|
||||
TAGKEYS( XK_3, 2 )
|
||||
TAGKEYS( XK_4, 3 )
|
||||
TAGKEYS( XK_5, 4 )
|
||||
TAGKEYS( XK_6, 5 )
|
||||
TAGKEYS( XK_7, 6 )
|
||||
TAGKEYS( XK_8, 7 )
|
||||
TAGKEYS( XK_9, 8 )
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{MODKEY, XK_r, resetlayout, {0}},
|
||||
{ MODKEY, XK_Return, zoom, {0} },
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
|
||||
{MODKEY, XK_t, setlayout, {.v=&layouts[0]}},
|
||||
{MODKEY, XK_f, setlayout, {.v=&layouts[1]}},
|
||||
{MODKEY, XK_m, setlayout, {.v=&layouts[2]}},
|
||||
@ -177,6 +207,7 @@ static const Key keys[] = {
|
||||
{MODKEY, XK_space, setlayout, {0}},
|
||||
{MODKEY|ShiftMask, XK_space, togglefloating,{0}},
|
||||
{MODKEY|ShiftMask, XK_t, togglealwaysontop,{0}},
|
||||
|
||||
{MODKEY, XK_Down, moveresize, {.v="0x25y0w0h"}},
|
||||
{MODKEY, XK_Up, moveresize, {.v="0x-25y0w0h"}},
|
||||
{MODKEY, XK_Right, moveresize, {.v="25x0y0w0h"}},
|
||||
@ -193,28 +224,12 @@ static const Key keys[] = {
|
||||
{MODKEY|ControlMask|ShiftMask,XK_Down, moveresizeedge,{.v="B"}},
|
||||
{MODKEY|ControlMask|ShiftMask,XK_Left, moveresizeedge,{.v="L"}},
|
||||
{MODKEY|ControlMask|ShiftMask,XK_Right, moveresizeedge,{.v="R"}},
|
||||
{ MODKEY|ShiftMask, XK_f, togglefullscr, {0} },
|
||||
{ MODKEY|Mod1Mask, XK_f, togglefakefullscr, {0} },
|
||||
|
||||
{MODKEY, XK_0, view, {.ui=~0}},
|
||||
{MODKEY|ShiftMask, XK_0, tag, {.ui=~0}},
|
||||
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
|
||||
{ MODKEY, XK_period, focusmon, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
|
||||
{MODKEY, XK_s, show, {0}},
|
||||
{MODKEY|ShiftMask, XK_s, showall, {0}},
|
||||
{MODKEY, XK_h, hide, {0}},
|
||||
TAGKEYS( XK_1, 0)
|
||||
TAGKEYS( XK_2, 1)
|
||||
TAGKEYS( XK_3, 2)
|
||||
TAGKEYS( XK_4, 3)
|
||||
TAGKEYS( XK_5, 4)
|
||||
TAGKEYS( XK_6, 5)
|
||||
TAGKEYS( XK_7, 6)
|
||||
TAGKEYS( XK_8, 7)
|
||||
TAGKEYS( XK_9, 8)
|
||||
{ MODKEY|ShiftMask, XK_e, exitdwm, {0} }
|
||||
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
@ -226,10 +241,10 @@ static const Button buttons[] = {
|
||||
{ ClkFollowSymbol, 0, Button1, togglefollow, {0} },
|
||||
{ ClkWinTitle, 0, Button1, togglewin, {0} },
|
||||
{ ClkWinTitle, 0, Button2, zoom, {0} },
|
||||
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkExBarLeftStatus, 0, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkExBarMiddle, 0, Button2, spawn, {.v = termcmd } },
|
||||
{ ClkExBarRightStatus, 0, Button2, spawn, {.v = termcmd } },
|
||||
/* { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, */
|
||||
/* { ClkExBarLeftStatus, 0, Button2, spawn, {.v = termcmd } }, */
|
||||
/* { ClkExBarMiddle, 0, Button2, spawn, {.v = termcmd } }, */
|
||||
/* { ClkExBarRightStatus, 0, Button2, spawn, {.v = termcmd } }, */
|
||||
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
|
||||
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
|
||||
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
|
||||
|
||||
13
dwm.c
13
dwm.c
@ -2046,6 +2046,8 @@ void
|
||||
resizeclient(Client *c, int x, int y, int w, int h)
|
||||
{
|
||||
XWindowChanges wc;
|
||||
unsigned int n;
|
||||
Client *nbc;
|
||||
|
||||
c->oldx = c->x; c->x = wc.x = x;
|
||||
c->oldy = c->y; c->y = wc.y = y;
|
||||
@ -2056,6 +2058,17 @@ resizeclient(Client *c, int x, int y, int w, int h)
|
||||
if ((nexttiled(c->mon->clients) == c) && !(nexttiled(c->next)))
|
||||
resetlayout(NULL);
|
||||
|
||||
for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
|
||||
|
||||
if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
|
||||
} else {
|
||||
if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
|
||||
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);
|
||||
configure(c);
|
||||
XSync(dpy, False);
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=dwm
|
||||
Comment=dynamic tiling window manager
|
||||
Exec=dwm
|
||||
TryExec=dwm
|
||||
Type=Application
|
||||
X-LightDM-DesktopName=dwm
|
||||
DesktopNames=dwm
|
||||
Keywords=tiling;wm;windowmanager;window;manager;
|
||||
@ -1,47 +0,0 @@
|
||||
void
|
||||
gaplessgrid(Monitor *m)
|
||||
{
|
||||
unsigned int i, n;
|
||||
int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters
|
||||
Client *c;
|
||||
|
||||
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
||||
if ( n == 0 )
|
||||
return;
|
||||
|
||||
/* grid dimensions */
|
||||
for (cols = 0; cols <= n/2; cols++)
|
||||
if (cols*cols >= n)
|
||||
break;
|
||||
if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
||||
cols = 2;
|
||||
rows = n/cols;
|
||||
cn = rn = 0; // reset column no, row no, client count
|
||||
|
||||
ch = (m->wh - 2*gappx - gappx * (rows - 1)) / rows;
|
||||
cw = (m->ww - 2*gappx - gappx * (cols - 1)) / cols;
|
||||
rrest = (m->wh - 2*gappx - gappx * (rows - 1)) - ch * rows;
|
||||
crest = (m->ww - 2*gappx - gappx * (cols - 1)) - cw * cols;
|
||||
x = m->wx + gappx;
|
||||
y = m->wy + gappx;
|
||||
|
||||
for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
|
||||
if (i/rows + 1 > cols - n%cols) {
|
||||
rows = n/cols + 1;
|
||||
ch = (m->wh - 2*gappx - gappx * (rows - 1)) / rows;
|
||||
rrest = (m->wh - 2*gappx - gappx * (rows - 1)) - ch * rows;
|
||||
}
|
||||
resize(c,
|
||||
x,
|
||||
y + rn*(ch + gappx) + MIN(rn, rrest),
|
||||
cw + (cn < crest ? 1 : 0) - 2*c->bw,
|
||||
ch + (rn < rrest ? 1 : 0) - 2*c->bw,
|
||||
0);
|
||||
rn++;
|
||||
if (rn >= rows) {
|
||||
rn = 0;
|
||||
x += cw + gappx + (cn < crest ? 1 : 0);
|
||||
cn++;
|
||||
}
|
||||
}
|
||||
}
|
||||
31
patches/appearance/dwm-removeborder-20220626-d3f93c7.diff
Normal file
31
patches/appearance/dwm-removeborder-20220626-d3f93c7.diff
Normal file
@ -0,0 +1,31 @@
|
||||
diff --git a/dwm.c b/dwm.c
|
||||
index 5646a5c..27e29df 100644
|
||||
--- a/dwm.c
|
||||
+++ b/dwm.c
|
||||
@@ -1283,12 +1283,26 @@ void
|
||||
resizeclient(Client *c, int x, int y, int w, int h)
|
||||
{
|
||||
XWindowChanges wc;
|
||||
+ unsigned int n;
|
||||
+ Client *nbc;
|
||||
|
||||
c->oldx = c->x; c->x = wc.x = x;
|
||||
c->oldy = c->y; c->y = wc.y = y;
|
||||
c->oldw = c->w; c->w = wc.width = w;
|
||||
c->oldh = c->h; c->h = wc.height = h;
|
||||
wc.border_width = c->bw;
|
||||
+
|
||||
+ for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
|
||||
+
|
||||
+ if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
|
||||
+ } else {
|
||||
+ if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
|
||||
+ 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);
|
||||
configure(c);
|
||||
XSync(dpy, False);
|
||||
@ -1,43 +0,0 @@
|
||||
URL: http://dwm.suckless.org/patches/gapless_grid
|
||||
Add gapless grid layout.
|
||||
|
||||
Index: dwm/gaplessgrid.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ dwm/gaplessgrid.c
|
||||
@@ -0,0 +1,35 @@
|
||||
+void
|
||||
+gaplessgrid(Monitor *m) {
|
||||
+ unsigned int n, cols, rows, cn, rn, i, cx, cy, cw, ch;
|
||||
+ Client *c;
|
||||
+
|
||||
+ for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) ;
|
||||
+ if(n == 0)
|
||||
+ return;
|
||||
+
|
||||
+ /* grid dimensions */
|
||||
+ for(cols = 0; cols <= n/2; cols++)
|
||||
+ if(cols*cols >= n)
|
||||
+ break;
|
||||
+ if(n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
|
||||
+ cols = 2;
|
||||
+ rows = n/cols;
|
||||
+
|
||||
+ /* window geometries */
|
||||
+ cw = cols ? m->ww / cols : m->ww;
|
||||
+ cn = 0; /* current column number */
|
||||
+ rn = 0; /* current row number */
|
||||
+ for(i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
|
||||
+ if(i/rows + 1 > cols - n%cols)
|
||||
+ rows = n/cols + 1;
|
||||
+ ch = rows ? m->wh / rows : m->wh;
|
||||
+ cx = m->wx + cn*cw;
|
||||
+ cy = m->wy + rn*ch;
|
||||
+ resize(c, cx, cy, cw - 2 * c->bw, ch - 2 * c->bw, False);
|
||||
+ rn++;
|
||||
+ if(rn >= rows) {
|
||||
+ rn = 0;
|
||||
+ cn++;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
@ -5,5 +5,4 @@ cat <<EOF | xmenu
|
||||
><> Floating Layout 1
|
||||
[M] Monocle Layout 2
|
||||
[D] Deck Layout 3
|
||||
### Grid Layout 4
|
||||
EOF
|
||||
|
||||
Loading…
Reference in New Issue
Block a user