ryan
/
dwm
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ryan:ea4b6f32ea65f57bcff7d63684b2e1bd93fcf5f6
Branches Tags
ryan:master
ryan:config
...
compare: ryan:d2c66c146e4ed1a6dff0281ba731b84b7c31f000
Branches Tags
ryan:master
ryan:config

17 Commits
ea4b6f32ea ... d2c66c146e

Author SHA1 Message Date
Ryan d2c66c146e
fix focus bindings 2023-12-26 12:55:32 -05:00
Ryan a5077d6a74
update confg 
- Disable bartab border
- Remove font from xresourcs config and manually set font
- Update keybindings
 2023-12-26 12:55:32 -05:00
Ryan 23c1ec98a4
setup basic keybindings 
Layout loosely inspired by https://github.com/xahlee/xah-fly-keys.

More so the concept of rebinding based on ergonomics not using letters
to remember.
 2023-12-26 12:55:32 -05:00
Ryan bf359cd131
setup window rules 2023-12-26 12:55:32 -05:00
Ryan edb218805f
create initial configuration 2023-12-26 12:55:31 -05:00
Ryan 92493c4ddf
fix bartabgroup colors 2023-12-26 12:54:46 -05:00
Ryan 87f69c027b
fix transparent borders 
Applies a patch that fixes an issue where compositors make window
borders transparent.
 2023-10-15 19:04:58 -04:00
Ryan d9dfdcf0ae
refactor config.def.h 
Slightly more opionated w/r/t xresources and bindings.
 2023-10-04 23:21:07 -04:00
Ryan 54595af8fd
apply single tagset patch 
The goat patch.
 2023-10-04 23:17:59 -04:00
Ryan c95de45613
cleanup compiler warnings 2023-10-04 22:43:41 -04:00
Ryan f37cd53557
fix bartabgroups and systray overlap 
Both the bartabgroup systray patches draw to the topbar. This would
result in bartabgroups writing over the bar widgets. This commit fixes
that by making bartabgroup section take the width of the systray into
consdiration when calculating its width.
 2023-10-04 22:40:03 -04:00
Ryan ec9c475986
apply the restartsig patch 2023-09-19 20:09:36 -04:00
Ryan 8b06991e7f
apply bar tab groups patch 2023-09-19 20:09:35 -04:00
Ryan d0236d7daa
apply windowmap patch 2023-09-19 20:06:09 -04:00
Ryan 0e87fa42f6
apply pertag patch 2023-09-19 20:06:09 -04:00
Ryan 07dad8fb84
apply xresources patch 2023-09-19 20:05:57 -04:00
Ryan 58c8a95346
apply systray patch 2023-09-19 19:50:56 -04:00
6 changed files with 1181 additions and 132 deletions
Show Stats Expand all files Collapse all files

120
config.def.h
View File

@ -1,24 +1,45 @@
/* See LICENSE file for copyright and license details. */
/* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=10" };
static const char dmenufont[] = "monospace:size=10";
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] = {
/*
* Appearance
*/
static unsigned int snap = 32; /* snap pixel */
static char *fonts[] = { "monospace:size=14" };
static unsigned int borderpx = 1; /* border pixel of windows */
static char normbgcolor[] = "#222222";
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
static char selfgcolor[] = "#eeeeee";
static char selbordercolor[] = "#005577";
static char selbgcolor[] = "#005577";
/* color schemes */
static char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
[SchemeSel] = { col_gray4, col_cyan, col_cyan },
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
[SchemeTabActive] = { selfgcolor, normbgcolor, selbordercolor },
[SchemeTabInactive] = { normfgcolor, normbgcolor, normbordercolor }
};
/* tagging */
/*
* Bar configuration
*/
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
/*
* Systray
*/
static const int showsystray = 1; /* 0 means no systray */
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
static const unsigned int systrayspacing = 2; /* systray spacing */
static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
/*
* Tagging
*/
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const Rule rules[] = {
@ -31,12 +52,25 @@ static const Rule rules[] = {
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 },
};
/* layout(s) */
/*
* 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 */
/*
* Bartabgroups properties
*/
#define BARTAB_BORDERS 1 // 0 = off, 1 = on
#define BARTAB_BOTTOMBORDER 1 // 0 = off, 1 = on
#define BARTAB_TAGSINDICATOR 1 // 0 = off, 1 = on if >1 client/view tag, 2 = always on
#define BARTAB_TAGSPX 5 // # pixels for tag grid boxes
#define BARTAB_TAGSROWS 3 // # rows in tag grid (9 tags, e.g. 3x3)
static void (*bartabmonfns[])(Monitor *) = { monocle /* , customlayoutfn */ };
static void (*bartabfloatfns[])(Monitor *) = { NULL /* , customlayoutfn */ };
static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile }, /* first entry is default */
@ -44,7 +78,9 @@ static const Layout layouts[] = {
{ "[M]", monocle },
};
/* key definitions */
/*
* Key definitions
*/
#define MODKEY Mod1Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
@ -54,37 +90,64 @@ static const Layout layouts[] = {
/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
/*
* Xresources preferences to load at startup
*/
ResourcePref resources[] = {
{ "normbgcolor", STRING, &normbgcolor },
{ "normbordercolor", STRING, &normbordercolor },
{ "normfgcolor", STRING, &normfgcolor },
{ "selbgcolor", STRING, &selbgcolor },
{ "selbordercolor", STRING, &selbordercolor },
{ "selfgcolor", STRING, &selfgcolor },
{ "borderpx", INTEGER, &borderpx },
};
/* commands */
/*
* Commands
*/
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, NULL };
static const char *termcmd[] = { "st", NULL };
static const Key keys[] = {
static Key keys[] = {
/* modifier key function argument */
/* spawn programs */
{ MODKEY, XK_p, spawn, {.v = dmenucmd } },
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } },
/* window manager controls */
{ MODKEY, XK_b, togglebar, {0} },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ 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, 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]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
{ MODKEY|ShiftMask, XK_q, quit, {0} },
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
/* window management */
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
{ MODKEY, XK_Return, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_c, killclient, {0} },
/* monitor navigation */
{ 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 } },
/* tags */
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)
@ -94,7 +157,6 @@ static const Key keys[] = {
TAGKEYS( XK_7, 6)
TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8)
{ MODKEY|ShiftMask, XK_q, quit, {0} },
};
/* button definitions */
@ -103,6 +165,8 @@ static const Button buttons[] = {
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
{ ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },

204
config.h Normal file
View File

@ -0,0 +1,204 @@
/* See LICENSE file for copyright and license details. */
#include <X11/XF86keysym.h>
/*
* Appearance
*/
static unsigned int snap = 32; /* snap pixel */
static char *fonts[] = { "Iosevka Term:size=14" };
static unsigned int borderpx = 1; /* border pixel of windows */
static char normbgcolor[] = "#222222";
static char normbordercolor[] = "#444444";
static char normfgcolor[] = "#bbbbbb";
static char selfgcolor[] = "#eeeeee";
static char selbordercolor[] = "#005577";
static char selbgcolor[] = "#005577";
/* color schemes */
static char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
[SchemeTabActive] = { selfgcolor, normbgcolor, selbordercolor },
[SchemeTabInactive] = { normfgcolor, normbgcolor, normbordercolor }
};
/*
* Bar configuration
*/
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
/*
* Systray
*/
static const int showsystray = 1; /* 0 means no systray */
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
static const unsigned int systrayonleft = 0; /* 0: systray in the right corner, >0: systray on left of status text */
static const unsigned int systrayspacing = 2; /* systray spacing */
static const int systraypinningfailfirst = 1; /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
/*
* Tagging
*/
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const Rule rules[] = {
/* xprop(1):
* WM_CLASS(STRING) = instance, class
* WM_NAME(STRING) = title
*/
/* class instance title tags mask isfloating monitor */
{ "Emacs", NULL, NULL, 1 << 0, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 1, 0, -1 },
{ "st", NULL, NULL, 1 << 2, 0, -1 },
{ "Slack", NULL, NULL, 1 << 3, 0, -1 },
{ "discord", NULL, NULL, 1 << 3, 0, -1 },
{ "Signal", NULL, NULL, 1 << 3, 0, -1 },
{ "Spotify", NULL, NULL, 1 << 4, 0, -1 },
{ "vlc", NULL, NULL, 1 << 5, 0, -1 },
{ "1Password", NULL, NULL, 1 << 6, 0, -1 },
{ "Zoom", NULL, NULL, 0, 1, -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 */
/*
* Bartabgroups properties
*/
#define BARTAB_BORDERS 1 // 0 = off, 1 = on
#define BARTAB_BOTTOMBORDER 0 // 0 = off, 1 = on
#define BARTAB_TAGSINDICATOR 1 // 0 = off, 1 = on if >1 client/view tag, 2 = always on
#define BARTAB_TAGSPX 5 // # pixels for tag grid boxes
#define BARTAB_TAGSROWS 3 // # rows in tag grid (9 tags, e.g. 3x3)
static void (*bartabmonfns[])(Monitor *) = { monocle /* , customlayoutfn */ };
static void (*bartabfloatfns[])(Monitor *) = { NULL /* , customlayoutfn */ };
static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
};
/*
* Xresources preferences to load at startup
*/
ResourcePref resources[] = {
{ "normbgcolor", STRING, &normbgcolor },
{ "normbordercolor", STRING, &normbordercolor },
{ "normfgcolor", STRING, &normfgcolor },
{ "selbgcolor", STRING, &selbgcolor },
{ "selbordercolor", STRING, &selbordercolor },
{ "selfgcolor", STRING, &selfgcolor },
{ "borderpx", INTEGER, &borderpx },
};
/*
* Key definitions
*/
#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|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 char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, NULL };
static const char *termcmd[] = { "st", NULL };
static Key keys[] = {
/* modifier key function argument */
/* spawn programs */
{ MODKEY, XK_t, spawn, {.v = dmenucmd } },
{ MODKEY, XK_a, spawn, {.v = termcmd } },
{ MODKEY, XK_g, spawn, SHCMD("emacsclient -c") },
{ MODKEY|ShiftMask, XK_g, spawn, SHCMD("emacs") },
{ MODKEY, XK_s, spawn, SHCMD("pass-dmenu type") },
{ MODKEY|ShiftMask, XK_S, spawn, SHCMD("pass-dmenu clip") },
/* window manager controls */
{ MODKEY|ControlMask, XK_q, spawn, SHCMD("dmenu-sys") },
{ MODKEY|ControlMask, XK_z, togglebar, {0} },
{ MODKEY|ControlMask, XK_l, incnmaster, {.i = -1 } },
{ MODKEY|ControlMask, XK_u, incnmaster, {.i = +1 } },
{ MODKEY|ControlMask, XK_m, setmfact, {.f = -0.05} },
{ MODKEY|ControlMask, XK_i, setmfact, {.f = +0.05} },
{ MODKEY, XK_w, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_f, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_p, setlayout, {.v = &layouts[2]} },
{ MODKEY, XK_space, setlayout, {0} },
{ MODKEY|ShiftMask, XK_q, quit, {0} },
{ MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
/* window management */
{ MODKEY, XK_n, focusstack, {.i = +1 } },
{ MODKEY, XK_e, focusstack, {.i = -1 } },
{ MODKEY, XK_m, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_x, togglefloating, {0} },
{ MODKEY, XK_q, killclient, {0} },
/* monitor navigation */
{ MODKEY, XK_comma, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = +1 } },
/* system managemment */
{ 0, XF86XK_AudioMute, spawn, SHCMD("pamixer --toggle-mute") },
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 5") },
{ ShiftMask, XF86XK_AudioLowerVolume, spawn, SHCMD("pamixer -d 10") },
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 5") },
{ ShiftMask, XF86XK_AudioRaiseVolume, spawn, SHCMD("pamixer -i 10") },
{ 0, XF86XK_MonBrightnessUp, spawn, SHCMD("sudo light -A 5") },
{ 0, XF86XK_MonBrightnessDown, spawn, SHCMD("sudo light -U 5") },
{ 0, XF86XK_AudioPlay, spawn, SHCMD("playerctl play-pause") },
{ 0, XF86XK_AudioNext, spawn, SHCMD("playerctl next") },
{ 0, XF86XK_AudioPrev, spawn, SHCMD("playerctl previous") },
{ 0, XF86XK_Display, spawn, SHCMD("autorandr --change") },
/* tags */
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)
};
/* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = {
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
{ ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
{ ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
};

6
drw.c
View File

@ -154,7 +154,7 @@ xfont_free(Fnt *font)
}
Fnt*
drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
drw_fontset_create(Drw* drw, char *fonts[], size_t fontcount)
{
Fnt *cur, *ret = NULL;
size_t i;
@ -190,12 +190,14 @@ drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
DefaultColormap(drw->dpy, drw->screen),
clrname, dest))
die("error, cannot allocate color '%s'", clrname);
dest->pixel |= 0xff << 24;
}
/* Wrapper to create color schemes. The caller has to call free(3) on the
* returned color scheme when done using it. */
Clr *
drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount)
{
size_t i;
Clr *ret;

5
drw.h
View File

@ -32,7 +32,8 @@ void drw_resize(Drw *drw, unsigned int w, unsigned int h);
void drw_free(Drw *drw);
/* Fnt abstraction */
Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
Fnt *drw_fontset_create(Drw* drw, char *fonts[], size_t fontcount);
void drw_fontset_free(Fnt* set);
unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
@ -40,7 +41,7 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned in
/* Colorscheme abstraction */
void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount);
/* Cursor abstraction */
Cur *drw_cur_create(Drw *drw, int shape);

10
dwm.1
View File

@ -150,6 +150,9 @@ Add/remove all windows with nth tag to/from the view.
.TP
.B Mod1\-Shift\-q
Quit dwm.
.TP
.B Mod1\-Control\-Shift\-q
Restart dwm.
.SS Mouse commands
.TP
.B Mod1\-Button1
@ -178,6 +181,13 @@ This file is started before any autostart.sh; dwm waits for its termination.
.SH CUSTOMIZATION
dwm is customized by creating a custom config.h and (re)compiling the source
code. This keeps it fast, secure and simple.
.SH SIGNALS
.TP
.B SIGHUP - 1
Restart the dwm process.
.TP
.B SIGTERM - 15
Cleanly terminate the dwm process.
.SH SEE ALSO
.BR dmenu (1),
.BR st (1)

960
dwm.c
View File

File diff suppressed because it is too large Load Diff