aselimov/dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: aselimov:e9f05098d8bccc5a933309caf64870aa2ace0f23
Branches Tags
aselimov:master
..
compare: aselimov:0db1bd06f4c6b3dd06c1647dd9c0ea79fdd4786b
Branches Tags
aselimov:master

No commits in common. "e9f05098d8bccc5a933309caf64870aa2ace0f23" and "0db1bd06f4c6b3dd06c1647dd9c0ea79fdd4786b" have entirely different histories.
e9f05098d8 ... 0db1bd06f4

4 changed files with 2243 additions and 2215 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config.def.h
View file

@ -46,7 +46,6 @@ static const unsigned int alphas[][3] = {
/* tagging */ /* tagging */
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
static const char *alttags[] = { "<01>", "<02>", "<03>", "<04>", "<05>" };
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):

68
config.h
View file

@ -1,12 +1,10 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* appearance */ /* appearance */
static const char center_command[] = "/home/aselimov/bin/title_text.sh"; static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int borderpx = 2; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */ static const unsigned int snap = 32; /* snap pixel */
static const unsigned int gappih = 15; /* horiz inner gap between windows */ static const unsigned int gappih = 10; /* horiz inner gap between windows */
static const unsigned int gappiv = 15; /* vert inner gap between windows */ static const unsigned int gappiv = 10; /* vert inner gap between windows */
static const int vertpadbar = 5; /* vertical padding for statusbar */
static const unsigned int gappoh = static const unsigned int gappoh =
10; /* horiz outer gap between windows and screen edge */ 10; /* horiz outer gap between windows and screen edge */
static const unsigned int gappov = static const unsigned int gappov =
@ -19,26 +17,26 @@ static int smartgaps =
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 *fonts[] = { static const char *fonts[] = {
"IosevkaTermSlab Nerd Font Propo:size=13:antialias=true:autohint=true"}; "FiraCode Nerd Font:size=11:antialias=true:autohint=true"};
static const char dmenufont[] = static const char dmenufont[] =
"SauceCodePro Nerd Font:size=10:antialias=true:autohint=true"; "SauceCodePro Nerd Font:size=10:antialias=true:autohint=true";
static const char col_gray1[] = "#191919"; static const char col_gray1[] = "#282828";
static const char col_gray2[] = "#3d3839"; static const char col_gray2[] = "#444444";
static const char col_gray3[] = "#B4bdc3"; static const char col_gray3[] = "#ebdbb2";
static const char col_gray4[] = "#3d3839"; static const char col_gray4[] = "#928374";
static const char col_cyan[] = "#6099C0"; static const char col_cyan[] = "#458588";
static const char col_green[] = "#819b69"; static const char col_green[] = "#98971a";
static const char col_red[] = "#de6e76"; static const char col_red[] = "#fb4934";
static const char col_yellow[] = "#d68c67"; static const char col_yellow[] = "#fabd2f";
static const char col_teal[] = "#8ec07c"; static const char col_teal[] = "#8ec07c";
static const char col_purple[] = "#b16286"; static const char col_purple[] = "#b16286";
static const unsigned int baralpha = OPAQUE; static const unsigned int baralpha = 175;
static const unsigned int borderalpha = OPAQUE; static const unsigned int borderalpha = OPAQUE;
static const char *colors[][3] = { static const char *colors[][3] = {
/* fg bg border */ /* fg bg border */
[SchemeNorm] = {col_gray3, col_gray1, col_gray1}, [SchemeNorm] = {col_gray3, col_gray1, "#000000"},
[SchemeSel] = {col_gray3, col_cyan, col_gray2}, [SchemeSel] = {col_gray3, col_cyan, col_cyan},
[SchemeStatus] = {col_gray3, col_gray1, col_gray1}, [SchemeStatus] = {col_gray4, col_gray1, "#000000"},
[SchemeTagsSel] = {col_gray3, col_gray1, col_gray1}, [SchemeTagsSel] = {col_gray3, col_gray1, col_gray1},
// Tagbar left unselected {text,background,not used but cannot be empty} // Tagbar left unselected {text,background,not used but cannot be empty}
[SchemeTagsNorm] = {col_gray4, col_gray1, col_gray1}, [SchemeTagsNorm] = {col_gray4, col_gray1, col_gray1},
@ -52,7 +50,7 @@ static const char *colors[][3] = {
static const unsigned int alphas[][3] = { static const unsigned int alphas[][3] = {
/* fg bg border */ /* fg bg border */
[SchemeNorm] = {OPAQUE, baralpha, 0}, [SchemeNorm] = {OPAQUE, baralpha, borderalpha},
[SchemeSel] = {OPAQUE, baralpha, borderalpha}, [SchemeSel] = {OPAQUE, baralpha, borderalpha},
[SchemeStatus] = {OPAQUE, baralpha, borderalpha}, [SchemeStatus] = {OPAQUE, baralpha, borderalpha},
[SchemeTagsSel] = {OPAQUE, baralpha, borderalpha}, [SchemeTagsSel] = {OPAQUE, baralpha, borderalpha},
@ -63,12 +61,7 @@ static const unsigned int alphas[][3] = {
[SchemeUrgent] = {OPAQUE, baralpha, borderalpha}}; [SchemeUrgent] = {OPAQUE, baralpha, borderalpha}};
/* tagging */ /* tagging */
static const char *tags[] = { static const char *tags[] = {"󰭹", "", "󰈙", "󰏘", "", ""};
"", "", "", "", "",
};
static const char *alttags[] = {
"", "", "", "", "",
};
static const Rule rules[] = { static const Rule rules[] = {
/* xprop(1): /* xprop(1):
@ -78,12 +71,13 @@ static const Rule rules[] = {
/* class instance title tags mask isfloating isterminal /* class instance title tags mask isfloating isterminal
noswallow, monitor */ noswallow, monitor */
{"Gimp", NULL, NULL, 0, 1, 0, 0, -1}, {"Gimp", NULL, NULL, 0, 1, 0, 0, -1},
{"Brave-browser", NULL, NULL, 0, 0, 0, 0, 1},
{"mpv", NULL, NULL, 0, 1, 0, 0, -1}, {"mpv", NULL, NULL, 0, 1, 0, 0, -1},
{"sxiv", NULL, NULL, 0, 1, 0, 1, -1}, {"sxiv", NULL, NULL, 0, 1, 0, 1, -1},
{"Sxiv", NULL, NULL, 0, 1, 0, 1, -1}, {"Sxiv", NULL, NULL, 0, 1, 0, 1, -1},
{"matplotlib", NULL, NULL, 0, 1, 0, 1, -1}, {"matplotlib", NULL, NULL, 0, 1, 0, 1, -1},
{"Matplotlib", NULL, NULL, 0, 1, 0, 1, -1}, {"Matplotlib", NULL, NULL, 0, 1, 0, 1, -1},
{"xcom2.exe", NULL, NULL, 0, 1, 0, 1, -1}, {"inscryption.exe", NULL, NULL, 0, 1, 0, 1, -1},
{NULL, NULL, "Figure 1", 0, 1, 0, 1, -1}, {NULL, NULL, "Figure 1", 0, 1, 0, 1, -1},
{NULL, NULL, "Figure 2", 0, 1, 0, 1, -1}, {NULL, NULL, "Figure 2", 0, 1, 0, 1, -1},
{NULL, NULL, "Figure 3", 0, 1, 0, 1, -1}, {NULL, NULL, "Figure 3", 0, 1, 0, 1, -1},
@ -99,9 +93,7 @@ static const Rule rules[] = {
{"Python3", NULL, NULL, 0, 1, 0, 1, -1}, {"Python3", NULL, NULL, 0, 1, 0, 1, -1},
//{ "" , NULL , NULL , 0 , 1 , 0 , 1 , -1 } , //{ "" , NULL , NULL , 0 , 1 , 0 , 1 , -1 } ,
{"St", NULL, NULL, 0, 0, 1, 0, -1}, {"St", NULL, NULL, 0, 0, 1, 0, -1},
{"Firefox", NULL, NULL, 1 << 4, 0, 0, 0, -1}, {"Firefox", NULL, NULL, 1 << 5, 0, 0, 0, -1},
{"Navigator", NULL, NULL, 1 << 4, 0, 0, 0, -1},
{"zen", NULL, NULL, 1 << 4, 0, 0, 0, -1},
{"dragon", NULL, NULL, 0, 1, 0, 1, -1}, {"dragon", NULL, NULL, 0, 1, 0, 1, -1},
{"Dragon", NULL, NULL, 0, 1, 0, 1, -1}, {"Dragon", NULL, NULL, 0, 1, 0, 1, -1},
{"zbar", NULL, NULL, 0, 1, 0, 1, -1}, {"zbar", NULL, NULL, 0, 1, 0, 1, -1},
@ -111,7 +103,7 @@ static const Rule rules[] = {
}; };
/* layout(s) */ /* layout(s) */
static const float mfact = 0.50; /* 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 = static const int resizehints =
0; /* 1 means respect size hints in tiled resizals */ 0; /* 1 means respect size hints in tiled resizals */
@ -121,14 +113,14 @@ static const int resizehints =
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
{"󰋁", tile}, /* first entry is default */ {"[]=", tile}, /* first entry is default */
{"", NULL}, /* no layout function means floating behavior */ {"><>", NULL}, /* no layout function means floating behavior */
{"", monocle}, {"[M]", monocle},
{"󰘹", deck}, {"H[]", deck},
}; };
/* 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}}, \
@ -160,10 +152,8 @@ static Key keys[] = {
{MODKEY, XK_k, focusstack, {.i = -1}}, {MODKEY, XK_k, focusstack, {.i = -1}},
{MODKEY, XK_i, incnmaster, {.i = +1}}, {MODKEY, XK_i, incnmaster, {.i = +1}},
{MODKEY, XK_d, incnmaster, {.i = -1}}, {MODKEY, XK_d, incnmaster, {.i = -1}},
{MODKEY | ShiftMask, XK_h, setmfact, {.f = -0.05}}, {MODKEY, XK_h, setmfact, {.f = -0.05}},
{MODKEY | ShiftMask, XK_l, setmfact, {.f = +0.05}}, {MODKEY, XK_l, setmfact, {.f = +0.05}},
{MODKEY, XK_h, viewtoleft, {0}},
{MODKEY, XK_l, viewtoright, {0}},
{MODKEY, XK_Return, zoom, {0}}, {MODKEY, XK_Return, zoom, {0}},
{MODKEY, XK_Tab, view, {0}}, {MODKEY, XK_Tab, view, {0}},
{MODKEY | ShiftMask, XK_c, killclient, {0}}, {MODKEY | ShiftMask, XK_c, killclient, {0}},

4352
dwm.c
View file

File diff suppressed because it is too large Load diff

37
util.c
View file

@ -6,27 +6,30 @@
#include "util.h" #include "util.h"
void *ecalloc(size_t nmemb, size_t size) { void *
void *p; ecalloc(size_t nmemb, size_t size)
{
void *p;
if (!(p = calloc(nmemb, size))) if (!(p = calloc(nmemb, size)))
die("calloc:"); die("calloc:");
return p; return p;
} }
void die(const char *fmt, ...) { void
va_list ap; die(const char *fmt, ...) {
va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
vfprintf(stderr, fmt, ap); vfprintf(stderr, fmt, ap);
va_end(ap); va_end(ap);
if (fmt[0] && fmt[strlen(fmt) - 1] == ':') { if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
fputc(' ', stderr); fputc(' ', stderr);
perror(NULL); perror(NULL);
} else { } else {
fputc('\n', stderr); fputc('\n', stderr);
} }
exit(1); exit(1);
} }