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

Compare commits

base: Suckless:statusbutton
Branches Tags
Suckless:master Suckless:systray Suckless:vanitygaps Suckless:statuscmd-signal Suckless:statusbutton Suckless:perseltag Suckless:pertag Suckless:statuscmd Suckless:bottomstack Suckless:fibonacci Suckless:nodmenu Suckless:config Suckless:patched Suckless:distrosymbol
..
compare: Suckless:config
Branches Tags
Suckless:systray Suckless:vanitygaps Suckless:statuscmd-signal Suckless:statusbutton Suckless:perseltag Suckless:pertag Suckless:statuscmd Suckless:bottomstack Suckless:fibonacci Suckless:nodmenu Suckless:config Suckless:patched Suckless:distrosymbol Suckless:master

5 Commits
statusbutt ... config

Author SHA1 Message Date
Fabian Schmidt
8de0296eae Open st with tabbed 2020-06-01 13:41:28 +02:00
Fabian Schmidt
24cf574eb0 Fixed firefox rule and shortcut 2020-05-31 11:53:40 +02:00
Fabian Schmidt
d463c42e5c Fixed spawn dmenu 2020-05-30 22:51:00 +02:00
Fabian Schmidt
3bd7b071d8 Fixed audio shortcuts 2020-05-30 22:16:47 +02:00
Fabian Schmidt
5170b060fa Initial config change (font, tag icons, shortcuts,...) 2020-05-30 21:48:11 +02:00
2 changed files with 55 additions and 48 deletions
Expand all files Collapse all files

69
config.def.h
View File

@@ -5,9 +5,11 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
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 topbar = 1; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const char buttonbar[] = "<O>"; static const char *fonts[] = {
static const char *fonts[] = { "monospace:size=10" }; "SauceCodePro Nerd Font Mono:pixelsize=15:antialias=true:autohint=true",
static const char dmenufont[] = "monospace:size=10"; "Inconsolata for Powerline:pixelsize=15:antialias=true:autohint=true"
};
static const char dmenufont[] = "SauceCodePro Nerd Font Mono:pixelsize=15:antialias=true:autohint=true";
static const char col_gray1[] = "#222222"; static const char col_gray1[] = "#222222";
static const char col_gray2[] = "#444444"; static const char col_gray2[] = "#444444";
static const char col_gray3[] = "#bbbbbb"; static const char col_gray3[] = "#bbbbbb";
@@ -20,7 +22,7 @@ static const char *colors[][3] = {
}; };
/* tagging */ /* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const char *tags[] = { "", "", "", "", "", "", "", "", "", "" };
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):
@@ -28,14 +30,14 @@ static const Rule rules[] = {
* WM_NAME(STRING) = title * WM_NAME(STRING) = title
*/ */
/* class instance title tags mask isfloating monitor */ /* class instance title tags mask isfloating monitor */
{ "Gimp", NULL, NULL, 0, 1, -1 }, { "firefox", NULL, NULL, 1 << 1, 0, -1 },
{ "Firefox", NULL, NULL, 1 << 8, 0, -1 }, { "Steam", NULL, NULL, 1 << 7, 0, -1 },
}; };
/* layout(s) */ /* layout(s) */
static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ 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 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 = 0; /* 1 means respect size hints in tiled resizals */
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
@@ -45,7 +47,7 @@ static const Layout layouts[] = {
}; };
/* key definitions */ /* key definitions */
#define MODKEY Mod1Mask #define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \ #define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \ { MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
@@ -60,31 +62,28 @@ 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_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
static const char *termcmd[] = { "st", NULL }; static const char *termcmd[] = { "st", NULL };
#include <X11/XF86keysym.h>
static Key keys[] = { static Key keys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ MODKEY, XK_p, spawn, {.v = dmenucmd } }, // Relaod dwm
{ MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY|Mod1Mask, XK_r, quit, {0} },
// Spawn
{ MODKEY, XK_d, spawn, SHCMD("j4-dmenu-desktop --dmenu=\"dmenu -i\"") },
{ MODKEY, XK_Return, spawn, SHCMD("tabbed -r 2 st -w ''") },
{ MODKEY|ControlMask, XK_q, spawn, SHCMD("dmenu_quit") },
{ MODKEY, XK_u, spawn, SHCMD("udmenu") },
{ MODKEY, XK_g, spawn, SHCMD("firefox") },
// Toggle status bar
{ MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_b, togglebar, {0} },
// Stack manipulation
{ MODKEY, XK_j, focusstack, {.i = +1 } }, { MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_k, focusstack, {.i = -1 } }, { MODKEY, XK_k, focusstack, {.i = -1 } },
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_Return, zoom, {0} }, { MODKEY|ShiftMask, XK_Return, zoom, {0} },
{ MODKEY, XK_q, killclient, {0} },
// Tag manipulation
{ MODKEY, XK_Tab, view, {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, 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 } },
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2) TAGKEYS( XK_3, 2)
@@ -94,14 +93,30 @@ static Key keys[] = {
TAGKEYS( XK_7, 6) TAGKEYS( XK_7, 6)
TAGKEYS( XK_8, 7) TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8) TAGKEYS( XK_9, 8)
{ MODKEY|ShiftMask, XK_q, quit, {0} }, TAGKEYS( XK_0, 9)
// Layout manipulation
{ 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} },
{ 0, XF86XK_AudioMute, spawn, SHCMD("pactl set-sink-mute 0 toggle") },
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("pactl set-sink-volume 0 +5%") },
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("pactl set-sink-volume 0 -5%") },
//{ MODKEY, XK_i, incnmaster, {.i = +1 } },
//{ MODKEY, XK_d, incnmaster, {.i = -1 } },
//{ 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_0, view, {.ui = ~0 } },
//{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~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 Button buttons[] = { static Button buttons[] = {
/* click event mask button function argument */ /* click event mask button function argument */
{ ClkButton, 0, Button1, spawn, {.v = dmenucmd } },
{ 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} },

10
dwm.c
View File

@@ -64,7 +64,7 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMFullscreen, NetActiveWindow, NetWMWindowType,
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkButton, ClkWinTitle, enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
typedef union { typedef union {
@@ -432,10 +432,6 @@ buttonpress(XEvent *e)
} }
if (ev->window == selmon->barwin) { if (ev->window == selmon->barwin) {
i = x = 0; i = x = 0;
x += TEXTW(buttonbar);
if(ev->x < x) {
click = ClkButton;
} else {
do do
x += TEXTW(tags[i]); x += TEXTW(tags[i]);
while (ev->x >= x && ++i < LENGTH(tags)); while (ev->x >= x && ++i < LENGTH(tags));
@@ -448,7 +444,6 @@ buttonpress(XEvent *e)
click = ClkStatusText; click = ClkStatusText;
else else
click = ClkWinTitle; click = ClkWinTitle;
}
} else if ((c = wintoclient(ev->window))) { } else if ((c = wintoclient(ev->window))) {
focus(c); focus(c);
restack(selmon); restack(selmon);
@@ -720,9 +715,6 @@ drawbar(Monitor *m)
urg |= c->tags; urg |= c->tags;
} }
x = 0; x = 0;
w = blw = TEXTW(buttonbar);
drw_setscheme(drw, scheme[SchemeNorm]);
x = drw_text(drw, x, 0, w, bh, lrpad / 2, buttonbar, 0);
for (i = 0; i < LENGTH(tags); i++) { for (i = 0; i < LENGTH(tags); i++) {
w = TEXTW(tags[i]); w = TEXTW(tags[i]);
drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);