elal
/
ewm
mirror of https://github.com/E-Almqvist/ewm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor things after a long time

Browse Source
main
Elias Almqvist 8 months ago
parent ed5ba21dd1
commit 58b8c50b30
No known key found for this signature in database
GPG Key ID: E31A99CE3E75A158
2 changed files with 201 additions and 162 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 22
      src/compile_commands.json
  2. 87
      src/config.h

22
src/compile_commands.json
Unescape View File

@ -0,0 +1,22 @@
[
{
"directory": ".",
"command": "cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/include/X11 -I/usr/include/freetype2 -I/usr/include/yajl -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\\\"6.2\\\" -DXINERAMA drw.c",
"file": "drw.c"
},
{
"directory": ".",
"command": "cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/include/X11 -I/usr/include/freetype2 -I/usr/include/yajl -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\\\"6.2\\\" -DXINERAMA dwm.c",
"file": "dwm.c"
},
{
"directory": ".",
"command": "cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/include/X11 -I/usr/include/freetype2 -I/usr/include/yajl -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\\\"6.2\\\" -DXINERAMA util.c",
"file": "util.c"
},
{
"directory": ".",
"command": "cc -c -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os -I/usr/include/X11 -I/usr/include/freetype2 -I/usr/include/yajl -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\\\"6.2\\\" -DXINERAMA dwm-msg.c",
"file": "dwm-msg.c"
}
]

87
src/config.h
Unescape View File

@ -2,24 +2,27 @@
#include <X11/XF86keysym.h> #include <X11/XF86keysym.h>
#define STATUSBAR "dwmblocks" #define STATUSBAR "dwmblocks"
/* appearance */ /* appearance */
static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int borderpx = 0; /* border pixel of windows */
static const unsigned int snap = 0; /* snap pixel (32)*/ static const unsigned int snap = 0; /* snap pixel (32)*/
static const unsigned int gappx = 0; static const unsigned int gappx = 0;
static const unsigned int gapmodes[] = { 0, 20 }; static const unsigned int gapmodes[] = {20, 0};
static const int showbar = 1; /* 0 means no bar */ static const int showbar = 1; /* 0 means no bar */
static const int topbar = 0; /* 0 means bottom bar */ static const int topbar = 1; /* 0 means bottom bar */
static const int barverticalpadding = 6; /* Vertical bar padding */ static const int barverticalpadding = 6; /* Vertical bar padding */
static const int usealtbar = 1; /* 1 means use non-dwm status bar */ static const int usealtbar = 0; /* 1 means use non-dwm status bar */
static const char *altbarclass = "Polybar"; /* Alternate bar class name */ static const char *altbarclass = "Polybar"; /* Alternate bar class name */
static const char *alttrayname = "tray"; /* Polybar tray instance name */ static const char *alttrayname = "tray"; /* Polybar tray instance name */
static const char *altbarcmd = "$HOME/.config/polybar/launch"; /* Alternate bar launch command */ // static const char *altbarcmd = "$HOME/.config/polybar/launch"; /*
// Alternate bar launch command */
static const char *altbarcmd = "";
static const char *fonts[] = {"Fira Code:size=11"}; static const char *fonts[] = {"Fira Code:size=11"};
static const char dmenufont[] = "Fira Code:size=15"; static const char dmenufont[] = "Fira Code:size=15";
static const char bg_alt_color[] = "#272a34"; static const char bg_color[] = "#181818";
static const char bg_color[] = "#282c34"; static const char bg_alt_color[] = "#111111";
static const char text_color[] = "#bbc2cf"; static const char text_color[] = "#bbc2cf";
static const char selected_color[] = "#81a2be"; static const char selected_color[] = "#81a2be";
static const char border_color_sel[] = "#444953"; static const char border_color_sel[] = "#444953";
@ -45,7 +48,9 @@ static const Rule rules[] = {
* 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
*/
{"Gimp", NULL, NULL, 0, 1, -1}, {"Gimp", NULL, NULL, 0, 1, -1},
{"Firefox", NULL, NULL, 1 << 8, 0, -1}, {"Firefox", NULL, NULL, 1 << 8, 0, -1},
{"discord", NULL, NULL, 0, 0, -1}, {"discord", NULL, NULL, 0, 0, -1},
@ -56,7 +61,8 @@ static const Rule rules[] = {
/* 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 =
1; /* 1 means respect size hints in tiled resizals */
static const Layout layouts[] = { static const Layout layouts[] = {
/* symbol arrange function */ /* symbol arrange function */
@ -74,24 +80,39 @@ static const Layout layouts[] = {
{MODKEY | 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 char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ static char dmenumon[2] =
static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-p", "Run $", "-z", "512", NULL }; "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = {"dmenu_run", "-m", dmenumon, "-p",
"Run $", "-z", "512", NULL};
static const char *termcmd[] = {"alacritty", NULL}; static const char *termcmd[] = {"alacritty", NULL};
static const char *browsercmd[] = {"firefox", NULL}; static const char *browsercmd[] = {"firefox", NULL};
static const char *betterlockscreencmd[] = { "betterlockscreen", "--lock", "blur", NULL }; static const char *betterlockscreencmd[] = {"betterlockscreen", "--lock",
"blur", NULL};
static const char *screenshotcmd[] = {"flameshot", "gui", NULL}; static const char *screenshotcmd[] = {"flameshot", "gui", NULL};
static const char *cmuspausecmd[] = {"cmus-remote", "--pause", NULL}; static const char *cmuspausecmd[] = {"cmus-remote", "--pause", NULL};
static Key keys[] = { static Key keys[] = {
/* modifier key function argument */ /* modifier key
{ MODKEY, XF86XK_AudioLowerVolume, spawn, SHCMD("amixer -q set Master 5%- unmute; pkill -RTMIN+1 dwmblocks") }, * function argument
{ MODKEY, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer -q set Master 5%+ unmute; pkill -RTMIN+1 dwmblocks") }, */
{ MODKEY, XF86XK_AudioMute, spawn, SHCMD("amixer -q set Master toggle; pkill -RTMIN+1 dwmblocks") }, {MODKEY, XF86XK_AudioLowerVolume, spawn,
{ MODKEY|ShiftMask, XF86XK_AudioMute, spawn, SHCMD("amixer set Capture toggle") }, SHCMD("amixer -q set Master 5%- unmute; pkill -RTMIN+1 dwmblocks")},
//{ MODKEY, XK_d, spawn, {.v = dmenucmd } }, {MODKEY, XF86XK_AudioRaiseVolume, spawn,
SHCMD("amixer -q set Master 5%+ unmute; pkill -RTMIN+1 dwmblocks")},
{MODKEY, XF86XK_AudioMute, spawn,
SHCMD("amixer -q set Master toggle; pkill -RTMIN+1 dwmblocks")},
{MODKEY | ShiftMask, XF86XK_AudioMute, spawn,
SHCMD("amixer set Capture toggle")},
//{ MODKEY, XK_d, spawn, {.v
//= dmenucmd
//}
//},
{MODKEY, XK_d, spawn, SHCMD("rofi -show drun")}, {MODKEY, XK_d, spawn, SHCMD("rofi -show drun")},
{MODKEY, XK_s, spawn, SHCMD("rofi -show ssh")}, {MODKEY, XK_s, spawn, SHCMD("rofi -show ssh")},
{MODKEY, XK_w, spawn, SHCMD("rofi -show window")}, {MODKEY, XK_w, spawn, SHCMD("rofi -show window")},
@ -127,7 +148,9 @@ static Key keys[] = {
{MODKEY, XK_f, setlayout, {.v = &layouts[1]}}, {MODKEY, XK_f, setlayout, {.v = &layouts[1]}},
{MODKEY, XK_t, setlayout, {.v = &layouts[0]}}, {MODKEY, XK_t, setlayout, {.v = &layouts[0]}},
{MODKEY, XK_m, setlayout, {.v = &layouts[2]}}, {MODKEY, XK_m, setlayout, {.v = &layouts[2]}},
//{ MODKEY, XK_space, setlayout, {0} }, //{ MODKEY, XK_space, setlayout,
//{0}
//},
{MODKEY | ShiftMask, XK_space, togglefloating, {0}}, {MODKEY | ShiftMask, XK_space, togglefloating, {0}},
{MODKEY | ShiftMask, XK_f, togglefullscr, {0}}, {MODKEY | ShiftMask, XK_f, togglefullscr, {0}},
{MODKEY, XK_0, view, {.ui = ~0}}, {MODKEY, XK_0, view, {.ui = ~0}},
@ -144,22 +167,18 @@ static Key keys[] = {
{MODKEY, XK_minus, setgaps, {.i = -1}}, {MODKEY, XK_minus, setgaps, {.i = -1}},
{MODKEY, XK_plus, setgaps, {.i = +1}}, {MODKEY, XK_plus, setgaps, {.i = +1}},
{MODKEY | ShiftMask, XK_equal, setgaps, {.i = 0}}, {MODKEY | ShiftMask, XK_equal, setgaps, {.i = 0}},
TAGKEYS( XK_1, 0) TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3)
TAGKEYS( XK_2, 1) TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7)
TAGKEYS( XK_3, 2) TAGKEYS(XK_9, 8){MODKEY | ShiftMask, XK_e, quit, {0}},
TAGKEYS( XK_4, 3)
TAGKEYS( XK_5, 4)
TAGKEYS( XK_6, 5)
TAGKEYS( XK_7, 6)
TAGKEYS( XK_8, 7)
TAGKEYS( XK_9, 8)
{ MODKEY|ShiftMask, XK_e, quit, {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
*/
{ClkStatusText, 0, Button1, sigstatusbar, {.i = 1}}, {ClkStatusText, 0, Button1, sigstatusbar, {.i = 1}},
{ClkStatusText, 0, Button2, sigstatusbar, {.i = 2}}, {ClkStatusText, 0, Button2, sigstatusbar, {.i = 2}},
{ClkStatusText, 0, Button3, sigstatusbar, {.i = 3}}, {ClkStatusText, 0, Button3, sigstatusbar, {.i = 3}},
@ -178,7 +197,6 @@ static Button buttons[] = {
{ClkTagBar, MODKEY, Button3, toggletag, {0}}, {ClkTagBar, MODKEY, Button3, toggletag, {0}},
}; };
static const char *ipcsockpath = "/tmp/dwm.sock"; static const char *ipcsockpath = "/tmp/dwm.sock";
static IPCCommand ipccommands[] = { static IPCCommand ipccommands[] = {
IPCCOMMAND(view, 1, {ARG_TYPE_UINT}), IPCCOMMAND(view, 1, {ARG_TYPE_UINT}),
@ -194,5 +212,4 @@ static IPCCommand ipccommands[] = {
IPCCOMMAND(togglefloating, 1, {ARG_TYPE_NONE}), IPCCOMMAND(togglefloating, 1, {ARG_TYPE_NONE}),
IPCCOMMAND(setmfact, 1, {ARG_TYPE_FLOAT}), IPCCOMMAND(setmfact, 1, {ARG_TYPE_FLOAT}),
IPCCOMMAND(setlayoutsafe, 1, {ARG_TYPE_PTR}), IPCCOMMAND(setlayoutsafe, 1, {ARG_TYPE_PTR}),
IPCCOMMAND( quit, 1, {ARG_TYPE_NONE} ) IPCCOMMAND(quit, 1, {ARG_TYPE_NONE})};
};

Write Preview
Loading…
Cancel
Save