diff --git a/config.def.h b/config.def.h index 3316b25..17ac56e 100644 --- a/config.def.h +++ b/config.def.h @@ -8,7 +8,7 @@ static const unsigned int gappx = 15; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int showextrabar = 1; /* 0 means no extra bar */ -static const int topbar = 0; /* 0 means bottom bar */ +static const int topbar = 1; /* 0 means bottom bar */ static const char statussep = ';'; static const int horizpadbar = 8; /* horizontal padding for statusbar */ static const int vertpadbar = 12; /* vertical padding for statusbar */ @@ -53,12 +53,14 @@ static const Rule rules[] = { { "steamwebhelper", NULL, NULL, 1 << 4, 0, -1 }, // ----- 7 ----- { "QjackCtl", NULL, NULL, 1 << 6, 1, -1 }, + { "qpwgraph", NULL, NULL, 1 << 6, 0, -1 }, + { "nekoray", NULL, NULL, 1 << 6, 0, -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 }, + { "LibreWolf", NULL, NULL, 1 << 8, 0, -1 }, // ----- OTHER ----- { "xwinwrap", NULL, NULL, 1 << 9, 0, -1 }, }; diff --git a/config.h b/config.h deleted file mode 100644 index bd3e56b..0000000 --- a/config.h +++ /dev/null @@ -1,168 +0,0 @@ -/* See LICENSE file for copyright and license details. */ - -#include - -/* appearance */ -static const unsigned int borderpx = 4; /* border pixel of windows */ -static const unsigned int gappx = 15; /* gaps between windows */ -static const unsigned int snap = 32; /* snap pixel */ -static const int showbar = 1; /* 0 means no bar */ -static const int showextrabar = 1; /* 0 means no extra bar */ -static const int topbar = 1; /* 0 means bottom bar */ -static const char statussep = ';'; -static const int horizpadbar = 8; /* horizontal padding for statusbar */ -static const int vertpadbar = 12; /* vertical padding for statusbar */ -static const char *fonts[] = { "Ubuntu Mono:size=12" }; -static const char dmenufont[] = "Ubuntu Mono:size=12"; -static const char col_gray1[] = "#222222"; -static const char col_gray2[] = "#444444"; -static const char col_gray3[] = "#bbbbbb"; -static const char col_gray4[] = "#eeeeee"; -static const char col_cyan[] = "#005577"; -static const char *colors[][3] = { - /* fg bg border */ - [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, - [SchemeSel] = { col_gray4, col_cyan, col_cyan }, -}; - -/* tagging */ -static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" }; - -static const Rule rules[] = { - /* xprop(1): - * WM_CLASS(STRING) = instance, class - * WM_NAME(STRING) = title - */ - /* class instance title tags mask isfloating monitor */ - // ----- 1 ----- - { "st-256color", NULL, NULL, 0, 0, -1 }, - // ----- 2 ----- - { "Nemo", NULL, NULL, 1 << 1, 0, -1 }, - { "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 }, - { NULL, "Telegram", 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 }, -}; - -/* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ -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 "layouts.c" - -static const Layout layouts[] = { - /* symbol arrange function */ - { "###", gaplessgrid }, - { "[]=", tile }, - { "><>", NULL }, - { "[M]", monocle }, -}; - -/* key definitions */ -#define SUPERKEY Mod4Mask -#define ALTKEY Mod1Mask -#define TAGKEYS(KEY,TAG) \ - { SUPERKEY, KEY, view, {.ui = 1 << TAG} }, \ - { SUPERKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ - { SUPERKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ - { SUPERKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, - -/* helper for spawning shell commands in the pre dwm-5.0 fashion */ -#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } - -/* commands */ -static const char *screenshot[] = { "scrsht", NULL }; -static const char *screenshotarea[] = { "scrsht", "-s", 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 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 *termcmd[] = { "st", NULL }; - -static const Key keys[] = { - /* modifier key function argument */ - { 0, XK_Print, spawn, {.v = screenshot } }, - { ShiftMask, XK_Print, spawn, {.v = screenshotarea } }, - { 0, XF86XK_AudioRaiseVolume, spawn, {.v = volup } }, - { 0, XF86XK_AudioLowerVolume, spawn, {.v = voldown } }, - { 0, XF86XK_MonBrightnessUp, spawn, {.v = backlightup } }, - { 0, XF86XK_MonBrightnessDown, spawn, {.v = backlightdown } }, - { 0, XF86XK_AudioMute, spawn, {.v = volmute } }, - { SUPERKEY, XK_d, spawn, {.v = dmenucmd } }, - { SUPERKEY, XK_Return, spawn, {.v = termcmd } }, - { SUPERKEY, XK_b, togglebar, {0} }, - { SUPERKEY|ShiftMask, XK_b, toggleextrabar, {0} }, - { ALTKEY, XK_Tab, focusstack, {.i = +1 } }, - { SUPERKEY, XK_i, incnmaster, {.i = +1 } }, - { SUPERKEY, XK_p, incnmaster, {.i = -1 } }, - { SUPERKEY, XK_o, setmfact, {.f = -0.05} }, - { SUPERKEY, XK_l, setmfact, {.f = +0.05} }, - { SUPERKEY|ShiftMask, XK_Return, zoom, {0} }, - { SUPERKEY, XK_q, killclient, {0} }, - { SUPERKEY, XK_g, setlayout, {.v = &layouts[0]} }, -// { SUPERKEY, XK_t, setlayout, {.v = &layouts[1]} }, - { SUPERKEY, XK_f, setlayout, {.v = &layouts[2]} }, - { SUPERKEY, XK_m, setlayout, {.v = &layouts[3]} }, - { SUPERKEY|ShiftMask, XK_space, togglefloating, {0} }, -// { SUPERKEY, XK_comma, focusmon, {.i = -1 } }, -// { SUPERKEY, XK_period, focusmon, {.i = +1 } }, -// { SUPERKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, -// { SUPERKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, - { SUPERKEY|ShiftMask, XK_f, togglefullscr, {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 */ -/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ -static const Button buttons[] = { - /* clickevent mask button function argument */ - { ClkLtSymbol, 0, Button1, setlayout, {0} }, - { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, - { ClkClientWin, SUPERKEY, Button1, movemouse, {0} }, - { ClkClientWin, SUPERKEY, Button2, togglefloating, {0} }, - { ClkClientWin, SUPERKEY, Button3, resizemouse, {0} }, - { ClkTagBar, 0, Button1, view, {0} }, - { ClkTagBar, 0, Button3, toggleview, {0} }, - { ClkTagBar, SUPERKEY, Button1, tag, {0} }, - { ClkTagBar, SUPERKEY, Button3, toggletag, {0} }, -}; diff --git a/drw.o b/drw.o index 5c650f4..dd8df65 100644 Binary files a/drw.o and b/drw.o differ diff --git a/dwm b/dwm index 20fe676..a70d70d 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.o b/dwm.o index 6273efd..4a1f410 100644 Binary files a/dwm.o and b/dwm.o differ diff --git a/util.o b/util.o index 9d3e585..debe56b 100644 Binary files a/util.o and b/util.o differ