dwmc and personal config added
This commit is contained in:
Luke Smith
parent
d726fa8612
commit
66f629b545
3 changed files with 394 additions and 2 deletions
2
Makefile
2
Makefile
|
|
@ -38,7 +38,7 @@ dist: clean
|
|||
|
||||
install: all
|
||||
mkdir -p ${DESTDIR}${PREFIX}/bin
|
||||
cp -f dwm ${DESTDIR}${PREFIX}/bin
|
||||
cp -f dwm dwmc ${DESTDIR}${PREFIX}/bin
|
||||
chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
|
||||
mkdir -p ${DESTDIR}${MANPREFIX}/man1
|
||||
sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
|
||||
|
|
|
|||
342
config.h
Normal file
342
config.h
Normal file
|
|
@ -0,0 +1,342 @@
|
|||
/* See LICENSE file for copyright and license details. */
|
||||
|
||||
/* appearance */
|
||||
static const unsigned int gappih = 10; /* horiz inner gap between windows */
|
||||
static const unsigned int gappiv = 10; /* vert inner gap between windows */
|
||||
static const unsigned int gappoh = 10; /* horiz outer gap between windows and screen edge */
|
||||
static const unsigned int gappov = 10; /* vert outer gap between windows and screen edge */
|
||||
static const int smartgaps = 0; /* 1 means no outer gap when there is only one window */
|
||||
static const unsigned int borderpx = 3; /* 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 int vertpad = 10; /* vertical padding of bar */
|
||||
static const int sidepad = 20; /* horizontal padding of bar */
|
||||
static const char *fonts[] = { "monospace:size=10" };
|
||||
static const char dmenufont[] = "monospace:size=10";
|
||||
static char normbgcolor[] = "#222222";
|
||||
static char normbordercolor[] = "#444444";
|
||||
static char normfgcolor[] = "#bbbbbb";
|
||||
static char selfgcolor[] = "#eeeeee";
|
||||
static char selbordercolor[] = "#005577";
|
||||
static char selbgcolor[] = "#005577";
|
||||
static char *colors[][3] = {
|
||||
/* fg bg border */
|
||||
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
|
||||
[SchemeSel] = { selfgcolor, selbgcolor, selbordercolor },
|
||||
};
|
||||
|
||||
/* 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 */
|
||||
/* { "Gimp", NULL, NULL, 0, 1, -1 }, */
|
||||
{ "Firefox", NULL, NULL, 1 << 8, 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 */
|
||||
|
||||
#include "shiftview.c"
|
||||
#include "fibonacci.c"
|
||||
static const Layout layouts[] = {
|
||||
/* symbol arrange function */
|
||||
{ "[]=", tile }, /* first entry is default */
|
||||
{ "><>", NULL }, /* no layout function means floating behavior */
|
||||
{ "[M]", monocle },
|
||||
{ "|M|", centeredmaster },
|
||||
{ ">M>", centeredfloatingmaster },
|
||||
{ "[@]", spiral },
|
||||
{ "[\\]", dwindle },
|
||||
};
|
||||
|
||||
/* 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, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
|
||||
static const char *termcmd[] = { "st", NULL };
|
||||
static const char scratchpadname[] = "scratchpad";
|
||||
static const char *scratchpadcmd[] = { "st", "-t", scratchpadname, "-g", "120x34", NULL };
|
||||
|
||||
#include <X11/XF86keysym.h>
|
||||
#include "movestack.c"
|
||||
static Key keys[] = {
|
||||
/* modifier key function argument */
|
||||
|
||||
{ MODKEY, XK_grave, spawn, SHCMD("dmenuunicode") },
|
||||
/* { MODKEY|ShiftMask, XK_grave, togglescratch, SHCMD("") }, */
|
||||
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)
|
||||
{ MODKEY, XK_0, view, {.ui = ~0 } },
|
||||
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
|
||||
{ MODKEY, XK_minus, spawn, SHCMD("amixer sset Master 5%-") },
|
||||
{ MODKEY|ShiftMask, XK_minus, spawn, SHCMD("amixer sset Master 15%-") },
|
||||
{ MODKEY, XK_equal, spawn, SHCMD("amixer sset Master 5%+") },
|
||||
{ MODKEY|ShiftMask, XK_equal, spawn, SHCMD("amixer sset Master 15%+") },
|
||||
/* { MODKEY, XK_BackSpace, spawn, SHCMD("") }, */
|
||||
{ MODKEY|ShiftMask, XK_BackSpace, spawn, SHCMD("prompt \"Reboot computer?\" \"sudo -A reboot\"") },
|
||||
|
||||
{ MODKEY, XK_Tab, view, {0} },
|
||||
/* { MODKEY|ShiftMask, XK_Tab, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_q, killclient, {0} },
|
||||
/* { MODKEY|ShiftMask, XK_q, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_w, spawn, SHCMD("$BROWSER") },
|
||||
/* { MODKEY|ShiftMask, XK_w, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_e, spawn, SHCMD("st -e neomutt") },
|
||||
{ MODKEY|ShiftMask, XK_e, spawn, SHCMD("tutorialvids") },
|
||||
{ MODKEY, XK_r, spawn, SHCMD("st -e $FILE") },
|
||||
/* { MODKEY|ShiftMask, XK_r, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
|
||||
/* { MODKEY|ShiftMask, XK_t, spawn, SHCMD("") }, */
|
||||
/* { MODKEY, XK_y, spawn, SHCMD("") }, */
|
||||
/* { MODKEY|ShiftMask, XK_y, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_u, setlayout, {.v = &layouts[3]} },
|
||||
/* { MODKEY|ShiftMask, XK_u, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_i, incnmaster, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_i, incnmaster, {.i = -1 } },
|
||||
{ MODKEY, XK_o, setlayout, {.v = &layouts[4]} },
|
||||
/* { MODKEY|ShiftMask, XK_o, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_p, spawn, SHCMD("mpc toggle") },
|
||||
{ MODKEY|ShiftMask, XK_p, spawn, SHCMD("mpc pause ; pauseallmpv") },
|
||||
{ MODKEY, XK_bracketleft, spawn, SHCMD("mpc seek -10") },
|
||||
{ MODKEY|ShiftMask, XK_bracketleft, spawn, SHCMD("mpc seek -120") },
|
||||
{ MODKEY, XK_bracketright, spawn, SHCMD("mpc seek +10") },
|
||||
{ MODKEY|ShiftMask, XK_bracketright, spawn, SHCMD("mpc seek +120") },
|
||||
{ MODKEY, XK_backslash, view, {0} },
|
||||
/* { MODKEY|ShiftMask, XK_backslash, spawn, SHCMD("") }, */
|
||||
|
||||
{ MODKEY, XK_a, spawn, SHCMD("st -e alsamixer") },
|
||||
/* { MODKEY|ShiftMask, XK_a, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_s, togglesticky, {0} },
|
||||
/* { MODKEY|ShiftMask, XK_s, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_d, spawn, {.v = dmenucmd } },
|
||||
{ MODKEY|ShiftMask, XK_d, togglegaps, {0} },
|
||||
{ MODKEY, XK_f, togglefullscr, {0} },
|
||||
/* { MODKEY|ShiftMask, XK_f, togglefullscr, {0} }, */
|
||||
{ MODKEY, XK_g, shiftview, { .i = -1 } },
|
||||
/* { MODKEY|ShiftMask, XK_g, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
|
||||
{ MODKEY, XK_j, focusstack, {.i = +1 } },
|
||||
{ MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } },
|
||||
{ MODKEY, XK_k, focusstack, {.i = -1 } },
|
||||
{ MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },
|
||||
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
|
||||
{ MODKEY, XK_semicolon, shiftview, { .i = 1 } },
|
||||
/* { MODKEY|ShiftMask, XK_semicolon, shiftview, SHCMD("") }, */
|
||||
/* { MODKEY, XK_apostrophe, spawn, SHCMD("") }, */
|
||||
/* { MODKEY|ShiftMask, XK_apostrophe, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
|
||||
{ MODKEY|ShiftMask, XK_Return, togglescratch, {.v = scratchpadcmd } },
|
||||
|
||||
/* { MODKEY, XK_z, spawn, SHCMD("") }, */
|
||||
/* { MODKEY|ShiftMask, XK_z, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_x, spawn, SHCMD("slock & xset dpms force off; mpc pause ; pauseallmpv") },
|
||||
{ MODKEY|ShiftMask, XK_x, spawn, SHCMD("prompt \"Shutdown computer?\" \"sudo -A shutdown -h now\"") },
|
||||
/* { MODKEY, XK_c, spawn, SHCMD("") }, */
|
||||
{ MODKEY|ShiftMask, XK_c, spawn, SHCMD("mpv --no-osc --no-input-default-bindings --input-conf=/dev/null --title=mpvfloat /dev/video0") },
|
||||
/* { MODKEY, XK_v, spawn, SHCMD("") }, */
|
||||
/* { MODKEY|ShiftMask, XK_v, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_b, togglebar, {0} },
|
||||
{ MODKEY|ShiftMask, XK_b, spawn, SHCMD("hover left") },
|
||||
{ MODKEY, XK_n, spawn, SHCMD("st -e newsboat") },
|
||||
{ MODKEY|ShiftMask, XK_n, spawn, SHCMD("hover right") },
|
||||
{ MODKEY, XK_m, spawn, SHCMD("st -e ncmpcpp") },
|
||||
{ MODKEY|ShiftMask, XK_m, spawn, SHCMD("amixer sset Master toggle") },
|
||||
{ MODKEY, XK_comma, spawn, SHCMD("mpc prev") },
|
||||
{ MODKEY|ShiftMask, XK_comma, spawn, SHCMD("mpc seek 0%") },
|
||||
{ MODKEY, XK_period, spawn, SHCMD("mpc next") },
|
||||
/* { MODKEY|ShiftMask, XK_period, spawn, SHCMD("") }, */
|
||||
|
||||
|
||||
{ MODKEY, XK_Page_Up, shiftview, { .i = -1 } },
|
||||
{ MODKEY, XK_Page_Down, shiftview, { .i = 1 } },
|
||||
{ MODKEY, XK_Insert, spawn, SHCMD("showclip") },
|
||||
|
||||
/* Audio commands */
|
||||
|
||||
{ MODKEY, XK_F1, spawn, SHCMD("groff -mom $HOME/.local/share/larbs/readme.mom -Tpdf | zathura -") },
|
||||
{ MODKEY, XK_F2, quit, {0} },
|
||||
{ MODKEY, XK_F3, spawn, SHCMD("displayselect") },
|
||||
{ MODKEY, XK_F4, spawn, SHCMD("prompt \"Hibernate computer?\" \"sudo -A zzz -Z\"") },
|
||||
{ MODKEY, XK_F5, xrdb, {.v = NULL } },
|
||||
{ MODKEY, XK_F6, spawn, SHCMD("torwrap") },
|
||||
{ MODKEY, XK_F7, spawn, SHCMD("td-toggle") },
|
||||
{ MODKEY, XK_F8, spawn, SHCMD("mailsync") },
|
||||
{ MODKEY, XK_F9, spawn, SHCMD("dmenumount") },
|
||||
{ MODKEY, XK_F10, spawn, SHCMD("dmenuumount") },
|
||||
/* { MODKEY, XK_F11, spawn, SHCMD("") }, */
|
||||
{ MODKEY, XK_F12, spawn, SHCMD("st -e sudo nmtui") },
|
||||
|
||||
{ MODKEY, XK_m, setlayout, {.v = &layouts[2]} },
|
||||
|
||||
|
||||
{ MODKEY, XK_space, zoom, {0} },
|
||||
{ MODKEY|ShiftMask, XK_space, togglefloating, {0} },
|
||||
|
||||
|
||||
/* { XK_Print, spawn, SHCMD("maim pic-full-$(date '+%y%m\\%d-%H%M-\\%S').png") }, */
|
||||
{ ShiftMask, XK_Print, spawn, SHCMD("maimpick") },
|
||||
{ MODKEY, XK_Print, spawn, SHCMD("dmenurecord") },
|
||||
{ MODKEY|ShiftMask, XK_Print, spawn, SHCMD("dmenurecord kill") },
|
||||
{ MODKEY, XK_Delete, spawn, SHCMD("dmenurecord kill") },
|
||||
|
||||
{ 0, XF86XK_AudioMute, spawn, SHCMD("amixer sset Master toggle") },
|
||||
{ 0, XF86XK_AudioRaiseVolume, spawn, SHCMD("amixer sset Master 5%+") },
|
||||
{ 0, XF86XK_AudioLowerVolume, spawn, SHCMD("amixer sset Master 5%-") },
|
||||
{ 0, XF86XK_AudioPrev, spawn, SHCMD("mpc prev") },
|
||||
{ 0, XF86XK_AudioNext, spawn, SHCMD("mpc next") },
|
||||
{ 0, XF86XK_AudioPause, spawn, SHCMD("mpc pause") },
|
||||
{ 0, XF86XK_AudioPlay, spawn, SHCMD("mpc play") },
|
||||
{ 0, XF86XK_AudioStop, spawn, SHCMD("mpc stop") },
|
||||
{ 0, XF86XK_AudioRewind, spawn, SHCMD("mpc seek -10") },
|
||||
{ 0, XF86XK_AudioForward, spawn, SHCMD("mpc seek +10") },
|
||||
{ 0, XF86XK_AudioMedia, spawn, SHCMD("st -e ncmpcpp") },
|
||||
{ 0, XF86XK_PowerOff, spawn, SHCMD("prompt \"Shutdown computer?\" \"sudo -A shutdown -h now\"") },
|
||||
{ 0, XF86XK_Calculator, spawn, SHCMD("st -e bc -l") },
|
||||
{ 0, XF86XK_Sleep, spawn, SHCMD("prompt \"Hibernate computer?\" \"sudo -A zzz -Z\"") },
|
||||
{ 0, XF86XK_WWW, spawn, SHCMD("$BROWSER") },
|
||||
{ 0, XF86XK_DOS, spawn, SHCMD("st") },
|
||||
{ 0, XF86XK_ScreenSaver, spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
|
||||
{ 0, XF86XK_TaskPane, spawn, SHCMD("st -e htop") },
|
||||
{ 0, XF86XK_Mail, spawn, SHCMD("st -e neomutt") },
|
||||
{ 0, XF86XK_MyComputer, spawn, SHCMD("st -e $FILE /") },
|
||||
{ 0, XF86XK_Battery, spawn, SHCMD("notify-send \"Battery status\" \"$(batstat)\"") },
|
||||
{ 0, XF86XK_Launch1, spawn, SHCMD("xset dpms force off") },
|
||||
|
||||
/* { MODKEY, XK_space, setlayout, {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 } }, */
|
||||
|
||||
/* { MODKEY|Mod4Mask, XK_h, incrgaps, {.i = +1 } }, */
|
||||
/* { MODKEY|Mod4Mask, XK_l, incrgaps, {.i = -1 } }, */
|
||||
/* { MODKEY|Mod4Mask|ShiftMask, XK_h, incrogaps, {.i = +1 } }, */
|
||||
/* { MODKEY|Mod4Mask|ShiftMask, XK_l, incrogaps, {.i = -1 } }, */
|
||||
/* { MODKEY|Mod4Mask|ControlMask, XK_h, incrigaps, {.i = +1 } }, */
|
||||
/* { MODKEY|Mod4Mask|ControlMask, XK_l, incrigaps, {.i = -1 } }, */
|
||||
/* { MODKEY|Mod4Mask|ShiftMask, XK_0, defaultgaps, {0} }, */
|
||||
/* { MODKEY, XK_y, incrihgaps, {.i = +1 } }, */
|
||||
/* { MODKEY, XK_o, incrihgaps, {.i = -1 } }, */
|
||||
/* { MODKEY|ControlMask, XK_y, incrivgaps, {.i = +1 } }, */
|
||||
/* { MODKEY|ControlMask, XK_o, incrivgaps, {.i = -1 } }, */
|
||||
/* { MODKEY|Mod4Mask, XK_y, incrohgaps, {.i = +1 } }, */
|
||||
/* { MODKEY|Mod4Mask, XK_o, incrohgaps, {.i = -1 } }, */
|
||||
/* { MODKEY|ShiftMask, XK_y, incrovgaps, {.i = +1 } }, */
|
||||
/* { MODKEY|ShiftMask, XK_o, incrovgaps, {.i = -1 } }, */
|
||||
|
||||
|
||||
};
|
||||
|
||||
/* button definitions */
|
||||
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
|
||||
static Button buttons[] = {
|
||||
/* click event mask button function argument */
|
||||
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
|
||||
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
|
||||
{ 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} },
|
||||
};
|
||||
|
||||
void
|
||||
setlayoutex(const Arg *arg)
|
||||
{
|
||||
setlayout(&((Arg) { .v = &layouts[arg->i] }));
|
||||
}
|
||||
|
||||
void
|
||||
viewex(const Arg *arg)
|
||||
{
|
||||
view(&((Arg) { .ui = 1 << arg->ui }));
|
||||
}
|
||||
|
||||
void
|
||||
viewall(const Arg *arg)
|
||||
{
|
||||
view(&((Arg){.ui = ~0}));
|
||||
}
|
||||
|
||||
void
|
||||
toggleviewex(const Arg *arg)
|
||||
{
|
||||
toggleview(&((Arg) { .ui = 1 << arg->ui }));
|
||||
}
|
||||
|
||||
void
|
||||
tagex(const Arg *arg)
|
||||
{
|
||||
tag(&((Arg) { .ui = 1 << arg->ui }));
|
||||
}
|
||||
|
||||
void
|
||||
toggletagex(const Arg *arg)
|
||||
{
|
||||
toggletag(&((Arg) { .ui = 1 << arg->ui }));
|
||||
}
|
||||
|
||||
void
|
||||
tagall(const Arg *arg)
|
||||
{
|
||||
tag(&((Arg){.ui = ~0}));
|
||||
}
|
||||
|
||||
/* signal definitions */
|
||||
/* signum must be greater than 0 */
|
||||
/* trigger signals using `xsetroot -name "fsignal:<signame> [<type> <value>]"` */
|
||||
static Signal signals[] = {
|
||||
/* signum function */
|
||||
{ "focusstack", focusstack },
|
||||
{ "setmfact", setmfact },
|
||||
{ "togglebar", togglebar },
|
||||
{ "incnmaster", incnmaster },
|
||||
{ "togglefloating", togglefloating },
|
||||
{ "focusmon", focusmon },
|
||||
{ "tagmon", tagmon },
|
||||
{ "zoom", zoom },
|
||||
{ "view", view },
|
||||
{ "viewall", viewall },
|
||||
{ "viewex", viewex },
|
||||
{ "toggleview", view },
|
||||
{ "toggleviewex", toggleviewex },
|
||||
{ "tag", tag },
|
||||
{ "tagall", tagall },
|
||||
{ "tagex", tagex },
|
||||
{ "toggletag", tag },
|
||||
{ "toggletagex", toggletagex },
|
||||
{ "killclient", killclient },
|
||||
{ "quit", quit },
|
||||
{ "setlayout", setlayout },
|
||||
{ "setlayoutex", setlayoutex },
|
||||
};
|
||||
50
dwm.c
50
dwm.c
|
|
@ -122,6 +122,11 @@ typedef struct {
|
|||
const Arg arg;
|
||||
} Key;
|
||||
|
||||
typedef struct {
|
||||
const char * sig;
|
||||
void (*func)(const Arg *);
|
||||
} Signal;
|
||||
|
||||
typedef struct {
|
||||
const char *symbol;
|
||||
void (*arrange)(Monitor *);
|
||||
|
|
@ -164,6 +169,7 @@ static void arrange(Monitor *m);
|
|||
static void arrangemon(Monitor *m);
|
||||
static void attach(Client *c);
|
||||
static void attachstack(Client *c);
|
||||
static int fake_signal(void);
|
||||
static void buttonpress(XEvent *e);
|
||||
static void checkotherwm(void);
|
||||
static void cleanup(void);
|
||||
|
|
@ -1023,6 +1029,49 @@ keypress(XEvent *e)
|
|||
keys[i].func(&(keys[i].arg));
|
||||
}
|
||||
|
||||
int
|
||||
fake_signal(void)
|
||||
{
|
||||
char fsignal[256];
|
||||
char indicator[9] = "fsignal:";
|
||||
char str_sig[50];
|
||||
char param[16];
|
||||
int i, len_str_sig, n, paramn;
|
||||
size_t len_fsignal, len_indicator = strlen(indicator);
|
||||
Arg arg;
|
||||
|
||||
// Get root name property
|
||||
if (gettextprop(root, XA_WM_NAME, fsignal, sizeof(fsignal))) {
|
||||
len_fsignal = strlen(fsignal);
|
||||
|
||||
// Check if this is indeed a fake signal
|
||||
if (len_indicator > len_fsignal ? 0 : strncmp(indicator, fsignal, len_indicator) == 0) {
|
||||
paramn = sscanf(fsignal+len_indicator, "%s%n%s%n", str_sig, &len_str_sig, param, &n);
|
||||
|
||||
if (paramn == 1) arg = (Arg) {0};
|
||||
else if (paramn > 2) return 1;
|
||||
else if (strncmp(param, "i", n - len_str_sig) == 0)
|
||||
sscanf(fsignal + len_indicator + n, "%i", &(arg.i));
|
||||
else if (strncmp(param, "ui", n - len_str_sig) == 0)
|
||||
sscanf(fsignal + len_indicator + n, "%u", &(arg.ui));
|
||||
else if (strncmp(param, "f", n - len_str_sig) == 0)
|
||||
sscanf(fsignal + len_indicator + n, "%f", &(arg.f));
|
||||
else return 1;
|
||||
|
||||
// Check if a signal was found, and if so handle it
|
||||
for (i = 0; i < LENGTH(signals); i++)
|
||||
if (strncmp(str_sig, signals[i].sig, len_str_sig) == 0 && signals[i].func)
|
||||
signals[i].func(&(arg));
|
||||
|
||||
// A fake signal was sent
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
// No fake signal was sent, so proceed with update
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
killclient(const Arg *arg)
|
||||
{
|
||||
|
|
@ -1280,6 +1329,7 @@ propertynotify(XEvent *e)
|
|||
XPropertyEvent *ev = &e->xproperty;
|
||||
|
||||
if ((ev->window == root) && (ev->atom == XA_WM_NAME))
|
||||
if (!fake_signal())
|
||||
updatestatus();
|
||||
else if (ev->state == PropertyDelete)
|
||||
return; /* ignore */
|
||||
|
|
|
|||
Loading…
Reference in a new issue