This commit is contained in:
BitHeaven 2024-05-31 10:22:18 +05:00
parent adc2ff2b17
commit c2ab5aa057
10 changed files with 309 additions and 927 deletions

View File

@ -6,13 +6,7 @@ include config.mk
SRC = drw.c dwm.c util.c SRC = drw.c dwm.c util.c
OBJ = ${SRC:.c=.o} OBJ = ${SRC:.c=.o}
all: options dwm all: dwm
options:
@echo dwm build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}"
.c.o: .c.o:
${CC} -c ${CFLAGS} $< ${CC} -c ${CFLAGS} $<
@ -26,7 +20,7 @@ dwm: ${OBJ}
${CC} -o $@ ${OBJ} ${LDFLAGS} ${CC} -o $@ ${OBJ} ${LDFLAGS}
clean: clean:
rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz config.h rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
dist: clean dist: clean
mkdir -p dwm-${VERSION} mkdir -p dwm-${VERSION}
@ -48,4 +42,4 @@ uninstall:
rm -f ${DESTDIR}${PREFIX}/bin/dwm\ rm -f ${DESTDIR}${PREFIX}/bin/dwm\
${DESTDIR}${MANPREFIX}/man1/dwm.1 ${DESTDIR}${MANPREFIX}/man1/dwm.1
.PHONY: all options clean dist install uninstall .PHONY: all clean dist install uninstall

4
PATCHES Normal file
View File

@ -0,0 +1,4 @@
fullgaps
status2d
extrabar
gaplessgrid

View File

@ -1,74 +1,34 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <X11/XF86keysym.h>
/* appearance */ /* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int borderpx = 4;
static const unsigned int gappx = 15;
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */ static const int showbar = 1; /* 0 means no bar */
static const int showextrabar = 1; /* 0 means no bar */
// TODO: FIX THAT SHIT
static const int topbar = 1; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const char statussep = ';'; static const char *fonts[] = { "monospace:size=10" };
static const int horizpadbar = 8; static const char dmenufont[] = "monospace:size=10";
static const int vertpadbar = 12; static const char col_gray1[] = "#222222";
static const int vertpadstat = 0; static const char col_gray2[] = "#444444";
static const char *fonts[] = { static const char col_gray3[] = "#bbbbbb";
"Ubuntu Mono:style=Bold:size=12:antialias=true:autohint=true", static const char col_gray4[] = "#eeeeee";
"Font Awesome 6 Free Solid:style=Solid:size=12:antialias=true:autohint=true", static const char col_cyan[] = "#005577";
"Font Awesome 6 Brands Regular:style=Regular:size=12:antialias=true:autohint=true" static const char *colors[][3] = {
}; /* fg bg border */
static char dmenufont[] = "Ubuntu Mono:size=12"; [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
static char normbgcolor[] = "#222222"; [SchemeSel] = { col_gray4, col_cyan, col_cyan },
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
static char selfgcolor[] = "#eeeeee";
static char selbordercolor[] = "#005577";
static char selbgcolor[] = "#005577";
static char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
}; };
/* tagging */ /* tagging */
static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const int taglayouts[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating monitor */
// ----- 1 ----- { "Gimp", NULL, NULL, 0, 1, -1 },
{ "st-256color", NULL, NULL, 0, 0, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
// ----- 2 -----
{ "Code", NULL, NULL, 1 << 1, 0, -1 },
// ----- 3 -----
{ "thunderbird", NULL, NULL, 1 << 2, 0, -1 },
{ "KeePassXC", NULL, NULL, 1 << 2, 0, -1 },
// ----- 4 -----
{ "vesktop", NULL, NULL, 1 << 3, 0, -1 },
{ "discord", NULL, NULL, 1 << 3, 0, -1 },
{ "KotatogramDesktop", NULL, NULL, 1 << 3, 0, -1 },
// ----- 5 -----
{ "Steam", NULL, NULL, 1 << 4, 0, -1 },
{ "steam", NULL, NULL, 1 << 4, 0, -1 },
{ "steamwebhelper", NULL, NULL, 1 << 4, 0, -1 },
// ----- 7 -----
{ "QjackCtl", NULL, NULL, 1 << 6, 1, -1 },
{ "PatchMatrix", NULL, NULL, 1 << 6, 0, -1 },
{ "Blueman-manager", NULL, NULL, 1 << 6, 0, -1 },
{ "corectrl", NULL, NULL, 1 << 6, 0, -1 },
// ----- 9 -----
{ "firefox", NULL, NULL, 1 << 8, 0, -1 },
{ "librewolf-default", NULL, NULL, 1 << 8, 0, -1 },
// ----- OTHER -----
{ "xwinwrap", NULL, NULL, 1 << 9, 0, -1 },
// { NULL, NULL, "broken", 1 << 9, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
@ -77,108 +37,80 @@ 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 resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
#include "layouts.c"
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "###", gaplessgrid },
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */ { "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
{ "HHH", grid },
}; };
/* key definitions */ /* key definitions */
#define SUPERKEY Mod4Mask #define MODKEY Mod1Mask
#define ALTKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ SUPERKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ SUPERKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ SUPERKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ SUPERKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */ /* commands */
static const char *screenshot[] = { "scrsht", NULL }; static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *screenshotarea[] = { "scrsht", "-s", NULL }; 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 *volup[] = { "pactl", "set-sink-volume", "0", "+5%", NULL };
static const char *voldown[] = { "pactl", "set-sink-volume", "0", "-5%", NULL };
static const char *volmute[] = { "pactl", "set-sink-mute", "0", "toggle", NULL };
static const char *backlightup[] = { "light", "-A", "10", NULL };
static const char *backlightdown[] = { "light", "-U", "10", NULL };
static const char *lockcmd[] = { "slock", NULL };
static const char *dmenucmd[] = { "dmenu_run", "-g", "15", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
static const char *termcmd[] = { "st", NULL }; static const char *termcmd[] = { "st", NULL };
static const Key keys[] = { static const Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ 0, XF86XK_ModeLock, spawn, {.v = lockcmd } }, { MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ 0, XK_Print, spawn, {.v = screenshot } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ ShiftMask, XK_Print, spawn, {.v = screenshotarea } }, { MODKEY, XK_b, togglebar, {0} },
{ 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, { MODKEY, XK_j, focusstack, {.i = +1 } },
{ 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, { MODKEY, XK_k, focusstack, {.i = -1 } },
{ 0, XF86XK_MonBrightnessUp, spawn, {.v = backlightup } }, { MODKEY, XK_i, incnmaster, {.i = +1 } },
{ 0, XF86XK_MonBrightnessDown, spawn, {.v = backlightdown } }, { MODKEY, XK_d, incnmaster, {.i = -1 } },
{ 0, XF86XK_AudioMute, spawn, {.v = volmute } }, { MODKEY, XK_h, setmfact, {.f = -0.05} },
{ SUPERKEY, XK_d, spawn, {.v = dmenucmd } }, { MODKEY, XK_l, setmfact, {.f = +0.05} },
{ SUPERKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_Return, zoom, {0} },
{ SUPERKEY, XK_b, togglebar, {.i = 1} }, { MODKEY, XK_Tab, view, {0} },
{ SUPERKEY|ShiftMask, XK_b, togglebar, {.i = 2} }, { MODKEY|ShiftMask, XK_c, killclient, {0} },
{ ALTKEY, XK_Tab, focusstack, {.i = +1 } }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ SUPERKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ SUPERKEY, XK_p, incnmaster, {.i = -1 } }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ SUPERKEY, XK_o, setmfact, {.f = -0.05} }, { MODKEY, XK_space, setlayout, {0} },
{ SUPERKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ SUPERKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ SUPERKEY, XK_q, killclient, {0} }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ SUPERKEY, XK_t, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_comma, focusmon, {.i = -1 } },
{ SUPERKEY, XK_f, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_period, focusmon, {.i = +1 } },
{ SUPERKEY, XK_m, setlayout, {.v = &layouts[3]} }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ SUPERKEY|ShiftMask, XK_g, setlayout, {.v = &layouts[4]} }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
{ SUPERKEY, XK_g, setlayout, {.v = &layouts[0]} }, TAGKEYS( XK_1, 0)
{ SUPERKEY|ShiftMask, XK_space, togglefloating, {0} }, TAGKEYS( XK_2, 1)
// { SUPERKEY, XK_comma, focusmon, {.i = -1 } }, TAGKEYS( XK_3, 2)
// { SUPERKEY, XK_period, focusmon, {.i = +1 } }, TAGKEYS( XK_4, 3)
// { SUPERKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, TAGKEYS( XK_5, 4)
// { SUPERKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, TAGKEYS( XK_6, 5)
// { SUPERKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, TAGKEYS( XK_7, 6)
{ SUPERKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, TAGKEYS( XK_8, 7)
{ SUPERKEY|ShiftMask, XK_f, togglefullscr, {0} }, TAGKEYS( XK_9, 8)
{ SUPERKEY, XK_F5, xrdb, {.v = NULL } }, { MODKEY|ShiftMask, XK_q, quit, {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)
TAGKEYS( XK_0, 9)
TAGKEYS( XK_minus, 10)
TAGKEYS( XK_equal, 11)
{ SUPERKEY|ShiftMask, XK_q, quitprompt, {0} },
}; };
/* button definitions */ /* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = { static const Button buttons[] = {
/* click event mask button function argument */ /* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, SUPERKEY, Button3, resizemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkTagBar, 0, Button1, view, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} }, { ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, SUPERKEY, Button1, tag, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, SUPERKEY, Button3, toggletag, {0} }, { ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
}; };

206
config.h
View File

@ -1,74 +1,34 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
#include <X11/XF86keysym.h>
/* appearance */ /* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int borderpx = 4;
static const unsigned int gappx = 15;
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */ static const int showbar = 1; /* 0 means no bar */
static const int showextrabar = 1; /* 0 means no bar */
// TODO: FIX THAT SHIT
static const int topbar = 1; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const char statussep = ';'; static const char *fonts[] = { "monospace:size=10" };
static const int horizpadbar = 8; static const char dmenufont[] = "monospace:size=10";
static const int vertpadbar = 12; static const char col_gray1[] = "#222222";
static const int vertpadstat = 0; static const char col_gray2[] = "#444444";
static const char *fonts[] = { static const char col_gray3[] = "#bbbbbb";
"Ubuntu Mono:style=Bold:size=12:antialias=true:autohint=true", static const char col_gray4[] = "#eeeeee";
"Font Awesome 6 Free Solid:style=Solid:size=12:antialias=true:autohint=true", static const char col_cyan[] = "#005577";
"Font Awesome 6 Brands Regular:style=Regular:size=12:antialias=true:autohint=true" static const char *colors[][3] = {
}; /* fg bg border */
static char dmenufont[] = "Ubuntu Mono:size=12"; [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
static char normbgcolor[] = "#222222"; [SchemeSel] = { col_gray4, col_cyan, col_cyan },
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
static char selfgcolor[] = "#eeeeee";
static char selbordercolor[] = "#005577";
static char selbgcolor[] = "#005577";
static char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
}; };
/* tagging */ /* tagging */
static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const int taglayouts[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):
* WM_CLASS(STRING) = instance, class * WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating monitor */
// ----- 1 ----- { "Gimp", NULL, NULL, 0, 1, -1 },
{ "st-256color", NULL, NULL, 0, 0, -1 }, { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
// ----- 2 -----
{ "Code", NULL, NULL, 1 << 1, 0, -1 },
// ----- 3 -----
{ "thunderbird", NULL, NULL, 1 << 2, 0, -1 },
{ "KeePassXC", NULL, NULL, 1 << 2, 0, -1 },
// ----- 4 -----
{ "vesktop", NULL, NULL, 1 << 3, 0, -1 },
{ "discord", NULL, NULL, 1 << 3, 0, -1 },
{ "KotatogramDesktop", NULL, NULL, 1 << 3, 0, -1 },
// ----- 5 -----
{ "Steam", NULL, NULL, 1 << 4, 0, -1 },
{ "steam", NULL, NULL, 1 << 4, 0, -1 },
{ "steamwebhelper", NULL, NULL, 1 << 4, 0, -1 },
// ----- 7 -----
{ "QjackCtl", NULL, NULL, 1 << 6, 1, -1 },
{ "PatchMatrix", NULL, NULL, 1 << 6, 0, -1 },
{ "Blueman-manager", NULL, NULL, 1 << 6, 0, -1 },
{ "corectrl", NULL, NULL, 1 << 6, 0, -1 },
// ----- 9 -----
{ "firefox", NULL, NULL, 1 << 8, 0, -1 },
{ "librewolf-default", NULL, NULL, 1 << 8, 0, -1 },
// ----- OTHER -----
{ "xwinwrap", NULL, NULL, 1 << 9, 0, -1 },
// { NULL, NULL, "broken", 1 << 9, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
@ -77,108 +37,80 @@ 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 resizehints = 1; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
#include "layouts.c"
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{ "###", gaplessgrid },
{ "[]=", tile }, /* first entry is default */ { "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */ { "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle }, { "[M]", monocle },
{ "HHH", grid },
}; };
/* key definitions */ /* key definitions */
#define SUPERKEY Mod4Mask #define MODKEY Mod1Mask
#define ALTKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ SUPERKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ SUPERKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ SUPERKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ SUPERKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },
/* helper for spawning shell commands in the pre dwm-5.0 fashion */ /* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/* commands */ /* commands */
static const char *screenshot[] = { "scrsht", NULL }; static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *screenshotarea[] = { "scrsht", "-s", NULL }; 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 *volup[] = { "pactl", "set-sink-volume", "0", "+5%", NULL };
static const char *voldown[] = { "pactl", "set-sink-volume", "0", "-5%", NULL };
static const char *volmute[] = { "pactl", "set-sink-mute", "0", "toggle", NULL };
static const char *backlightup[] = { "light", "-A", "10", NULL };
static const char *backlightdown[] = { "light", "-U", "10", NULL };
static const char *lockcmd[] = { "slock", NULL };
static const char *dmenucmd[] = { "dmenu_run", "-g", "15", "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
static const char *termcmd[] = { "st", NULL }; static const char *termcmd[] = { "st", NULL };
static const Key keys[] = { static const Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ 0, XF86XK_ModeLock, spawn, {.v = lockcmd } }, { MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ 0, XK_Print, spawn, {.v = screenshot } }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
{ ShiftMask, XK_Print, spawn, {.v = screenshotarea } }, { MODKEY, XK_b, togglebar, {0} },
{ 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, { MODKEY, XK_j, focusstack, {.i = +1 } },
{ 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, { MODKEY, XK_k, focusstack, {.i = -1 } },
{ 0, XF86XK_MonBrightnessUp, spawn, {.v = backlightup } }, { MODKEY, XK_i, incnmaster, {.i = +1 } },
{ 0, XF86XK_MonBrightnessDown, spawn, {.v = backlightdown } }, { MODKEY, XK_d, incnmaster, {.i = -1 } },
{ 0, XF86XK_AudioMute, spawn, {.v = volmute } }, { MODKEY, XK_h, setmfact, {.f = -0.05} },
{ SUPERKEY, XK_d, spawn, {.v = dmenucmd } }, { MODKEY, XK_l, setmfact, {.f = +0.05} },
{ SUPERKEY, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_Return, zoom, {0} },
{ SUPERKEY, XK_b, togglebar, {.i = 1} }, { MODKEY, XK_Tab, view, {0} },
{ SUPERKEY|ShiftMask, XK_b, togglebar, {.i = 2} }, { MODKEY|ShiftMask, XK_c, killclient, {0} },
{ ALTKEY, XK_Tab, focusstack, {.i = +1 } }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
{ SUPERKEY, XK_i, incnmaster, {.i = +1 } }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ SUPERKEY, XK_p, incnmaster, {.i = -1 } }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
{ SUPERKEY, XK_o, setmfact, {.f = -0.05} }, { MODKEY, XK_space, setlayout, {0} },
{ SUPERKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ SUPERKEY|ShiftMask, XK_Return, zoom, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } },
{ SUPERKEY, XK_q, killclient, {0} }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ SUPERKEY, XK_t, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_comma, focusmon, {.i = -1 } },
{ SUPERKEY, XK_f, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_period, focusmon, {.i = +1 } },
{ SUPERKEY, XK_m, setlayout, {.v = &layouts[3]} }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ SUPERKEY|ShiftMask, XK_g, setlayout, {.v = &layouts[4]} }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
{ SUPERKEY, XK_g, setlayout, {.v = &layouts[0]} }, TAGKEYS( XK_1, 0)
{ SUPERKEY|ShiftMask, XK_space, togglefloating, {0} }, TAGKEYS( XK_2, 1)
// { SUPERKEY, XK_comma, focusmon, {.i = -1 } }, TAGKEYS( XK_3, 2)
// { SUPERKEY, XK_period, focusmon, {.i = +1 } }, TAGKEYS( XK_4, 3)
// { SUPERKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, TAGKEYS( XK_5, 4)
// { SUPERKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, TAGKEYS( XK_6, 5)
// { SUPERKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } }, TAGKEYS( XK_7, 6)
{ SUPERKEY|ShiftMask, XK_t, togglealwaysontop, {0} }, TAGKEYS( XK_8, 7)
{ SUPERKEY|ShiftMask, XK_f, togglefullscr, {0} }, TAGKEYS( XK_9, 8)
{ SUPERKEY, XK_F5, xrdb, {.v = NULL } }, { MODKEY|ShiftMask, XK_q, quit, {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)
TAGKEYS( XK_0, 9)
TAGKEYS( XK_minus, 10)
TAGKEYS( XK_equal, 11)
{ SUPERKEY|ShiftMask, XK_q, quitprompt, {0} },
}; };
/* button definitions */ /* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = { static const Button buttons[] = {
/* click event mask button function argument */ /* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, SUPERKEY, Button3, resizemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkTagBar, 0, Button1, view, {0} }, { ClkClientWin, MODKEY, Button3, resizemouse, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} }, { ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, SUPERKEY, Button1, tag, {0} }, { ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, SUPERKEY, Button3, toggletag, {0} }, { ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
}; };

View File

@ -1,5 +1,5 @@
# dwm version # dwm version
VERSION = bit_1.1 VERSION = 6.5
# Customize below to fit your system # Customize below to fit your system
@ -26,7 +26,7 @@ INCS = -I${X11INC} -I${FREETYPEINC}
LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags # flags
CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} #CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} CFLAGS = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
LDFLAGS = ${LIBS} LDFLAGS = ${LIBS}

2
drw.c
View File

@ -195,7 +195,7 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
/* Wrapper to create color schemes. The caller has to call free(3) on the /* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */ * returned color scheme when done using it. */
Clr * Clr *
drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount) drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
{ {
size_t i; size_t i;
Clr *ret; Clr *ret;

2
drw.h
View File

@ -40,7 +40,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
/* Colorscheme abstraction */ /* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount); Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
/* Cursor abstraction */ /* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape); Cur *drw_cur_create(Drw *drw, int shape);

BIN
dwm

Binary file not shown.

800
dwm.c

File diff suppressed because it is too large Load Diff

BIN
dwm.o

Binary file not shown.