diff --git a/config.def.h b/config.def.h index 5dc490a..83e8cc6 100644 --- a/config.def.h +++ b/config.def.h @@ -12,12 +12,17 @@ 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] = { +static const char *colorsdark[][3] = { /* fg bg border */ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, [SchemeSel] = { col_gray4, col_cyan, col_cyan }, [SchemeHid] = { col_cyan, col_gray1, col_cyan }, }; +static const char *colorslight[][3] = { + /* fg bg border */ + [SchemeNorm] = { col_gray1, col_gray3, col_gray2 }, + [SchemeSel] = { col_cyan, col_gray4, col_cyan }, +}; /* tagging */ static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; @@ -58,14 +63,15 @@ static const Layout layouts[] = { #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } /* commands */ -static char dmenumon[8]; /* 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 char dmenumon[8] = "0"; /* component of dmenu{dark,light}, manipulated in spawndmenu() */ +static const char *dmenudark[] = { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *dmenulight[] = { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray3, "-nf", col_gray1, "-sb", col_cyan, "-sf", col_gray4, NULL }; static const char *termcmd[] = { "st", NULL }; #include "exitdwm.c" static const Key keys[] = { /* modifier key function argument */ - { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY, XK_p, spawndmenu, {0} }, { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, { MODKEY, XK_b, togglebar, {0} }, { MODKEY, XK_j, focusstackvis, {.i = +1 } }, diff --git a/config.h--wip2 b/config.h--wip2 new file mode 100644 index 0000000..767288f --- /dev/null +++ b/config.h--wip2 @@ -0,0 +1,124 @@ +/* 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] = { + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_cyan, col_cyan }, +}; + +/* tagging */ +static const char *tags[] = { "q", "w", "e", "r", "t", "a", "s", "d", "f", "g", "z", "x", "c", "v", "b" }; + +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 */ +static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ +static const int refreshrate = 120; /* refresh rate (per second) for client move/resize */ + +static const Layout layouts[] = { + /* symbol arrange function */ + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, +}; + +/* key definitions */ +#define MODKEY Mod4Mask +#define TAGKEYS(KEY,TAG) \ + &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \ + &((Keychord){1, {{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[8]; /* 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 *termcmd[] = { "alacritty", NULL }; + +static Keychord *keychords[] = { + /* Keys function argument */ + &((Keychord){1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {0, XK_e}}, spawn, {.v = termcmd } }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {0, XK_b}}, togglebar, {0} }), + &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }), + &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }), + &((Keychord){1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }), + &((Keychord){1, {{MODKEY, XK_u}}, incnmaster, {.i = -1 } }), + &((Keychord){1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }), + &((Keychord){1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }), + &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }), + &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {0, XK_t}}, setlayout, {.v = &layouts[0]} }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {0, XK_f}}, setlayout, {.v = &layouts[1]} }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {0, XK_m}}, setlayout, {.v = &layouts[2]} }), + &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }), + &((Keychord){1, {{MODKEY, XK_y}}, view, {.ui = ~0 } }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }), + &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }), + &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }), + &((Keychord){1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }), + &((Keychord){2, {{MODKEY, XK_semicolon}, {MODKEY|ShiftMask, XK_q}}, quit, {0} }), + TAGKEYS( XK_q, 0) + TAGKEYS( XK_w, 1) + TAGKEYS( XK_e, 2) + TAGKEYS( XK_r, 3) + TAGKEYS( XK_t, 4) + TAGKEYS( XK_a, 5) + TAGKEYS( XK_s, 6) + TAGKEYS( XK_d, 7) + TAGKEYS( XK_f, 8) + TAGKEYS( XK_g, 9) + TAGKEYS( XK_z, 10) + TAGKEYS( XK_x, 11) + TAGKEYS( XK_c, 12) + TAGKEYS( XK_v, 13) + TAGKEYS( XK_b, 14) +}; + +/* 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]} }, + { 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} }, +}; + diff --git a/drw.o b/drw.o new file mode 100644 index 0000000..565bbe6 Binary files /dev/null and b/drw.o differ diff --git a/dwm b/dwm new file mode 100755 index 0000000..3df0092 Binary files /dev/null and b/dwm differ diff --git a/dwm-keychord-20260717-f63cde9.diff b/dwm-keychord-20260717-f63cde9.diff new file mode 100644 index 0000000..45e8fd5 --- /dev/null +++ b/dwm-keychord-20260717-f63cde9.diff @@ -0,0 +1,272 @@ +From 9c020a20a2e1091e8b47edfea5e8795d8b451bc9 Mon Sep 17 00:00:00 2001 +From: Lukasz Kasprzak +Date: Fri, 17 Jul 2026 15:45:22 +0200 +Subject: [PATCH] keychord: bind a sequence of keys, and dispatch events while + waiting + +Original keychord patch by Hai Nguyen , updated for +dwm 6.4+ grabkeys() by Aaron Zueger . This +revision rebases onto dwm 6.8 and fixes an event-loss bug in the chord +wait loop. + +The wait loop used to discard every event that was not a KeyPress: + + while (running && !XNextEvent(dpy, &event) && !ran) + if(event.type == KeyPress) + break; + +Two consequences, both reproduced on Xephyr: + +1. Unrecoverable input freeze. grabbuttons() grabs unfocused clients + GrabModeSync/GrabModeSync, so clicking one freezes pointer AND + keyboard until the grabbing client calls XAllowEvents. dwm does that + in buttonpress() -- but if the ButtonPress is discarded here, + buttonpress() never runs. The grab stays frozen forever and the loop + can never exit, because a frozen keyboard cannot deliver the KeyPress + it is waiting for. Only killing dwm ends it; XSendEvent is discarded + by this same loop and XTEST queues behind the frozen device. + Repro: press a chord prefix, then click any unfocused client. + Observed: XGrabKeyboard -> GrabFrozen, XQueryPointer -> Button1 held. + +2. Orphaned windows. A MapRequest arriving mid-chord is dropped, so a + window opening during a chord is never managed. DestroyNotify, + Expose and ConfigureRequest are lost the same way. + +Dispatch through handler[] as run() does, breaking on KeyPress before +dispatch so keypress() cannot recurse. The `&& !ran` term is dropped: +ran is always 0 on entry and nothing in the body can set it. +--- + config.def.h | 81 ++++++++++++++++++++++++++-------------------------- + dwm.c | 79 +++++++++++++++++++++++++++++++++++++++++--------- + 2 files changed, 106 insertions(+), 54 deletions(-) + +diff --git a/config.def.h b/config.def.h +index 81c3fc0..7c7ec36 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -47,11 +47,11 @@ static const Layout layouts[] = { + + /* key definitions */ + #define MODKEY Mod1Mask +-#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} }, ++#define TAGKEYS(KEY,TAG) \ ++ &((Keychord){1, {{MODKEY, KEY}}, view, {.ui = 1 << TAG} }), \ ++ &((Keychord){1, {{MODKEY|ControlMask, KEY}}, toggleview, {.ui = 1 << TAG} }), \ ++ &((Keychord){1, {{MODKEY|ShiftMask, KEY}}, tag, {.ui = 1 << TAG} }), \ ++ &((Keychord){1, {{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 } } +@@ -61,41 +61,42 @@ 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 *termcmd[] = { "st", NULL }; + +-static const Key keys[] = { +- /* modifier key function argument */ +- { MODKEY, XK_p, spawn, {.v = dmenucmd } }, +- { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, +- { MODKEY, XK_b, togglebar, {0} }, +- { MODKEY, XK_j, 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_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, 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_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|ShiftMask, XK_q, quit, {0} }, ++static Keychord *keychords[] = { ++ /* Keys function argument */ ++ &((Keychord){1, {{MODKEY, XK_p}}, spawn, {.v = dmenucmd } }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_Return}}, spawn, {.v = termcmd } }), ++ &((Keychord){2, {{MODKEY, XK_e}, {MODKEY, XK_e}}, spawn, {.v = termcmd } }), ++ &((Keychord){1, {{MODKEY, XK_b}}, togglebar, {0} }), ++ &((Keychord){1, {{MODKEY, XK_j}}, focusstack, {.i = +1 } }), ++ &((Keychord){1, {{MODKEY, XK_k}}, focusstack, {.i = -1 } }), ++ &((Keychord){1, {{MODKEY, XK_i}}, incnmaster, {.i = +1 } }), ++ &((Keychord){1, {{MODKEY, XK_d}}, incnmaster, {.i = -1 } }), ++ &((Keychord){1, {{MODKEY, XK_h}}, setmfact, {.f = -0.05} }), ++ &((Keychord){1, {{MODKEY, XK_l}}, setmfact, {.f = +0.05} }), ++ &((Keychord){1, {{MODKEY, XK_Return}}, zoom, {0} }), ++ &((Keychord){1, {{MODKEY, XK_Tab}}, view, {0} }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_c}}, killclient, {0} }), ++ &((Keychord){1, {{MODKEY, XK_t}}, setlayout, {.v = &layouts[0]} }), ++ &((Keychord){1, {{MODKEY, XK_f}}, setlayout, {.v = &layouts[1]} }), ++ &((Keychord){1, {{MODKEY, XK_m}}, setlayout, {.v = &layouts[2]} }), ++ &((Keychord){1, {{MODKEY, XK_space}}, setlayout, {0} }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_space}}, togglefloating, {0} }), ++ &((Keychord){1, {{MODKEY, XK_0}}, view, {.ui = ~0 } }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_0}}, tag, {.ui = ~0 } }), ++ &((Keychord){1, {{MODKEY, XK_comma}}, focusmon, {.i = -1 } }), ++ &((Keychord){1, {{MODKEY, XK_period}}, focusmon, {.i = +1 } }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_comma}}, tagmon, {.i = -1 } }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_period}}, tagmon, {.i = +1 } }), ++ &((Keychord){1, {{MODKEY|ShiftMask, XK_q}}, quit, {0} }), ++ 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 */ +diff --git a/dwm.c b/dwm.c +index 53b393e..243b12c 100644 +--- a/dwm.c ++++ b/dwm.c +@@ -101,9 +101,14 @@ struct Client { + typedef struct { + unsigned int mod; + KeySym keysym; ++} Key; ++ ++typedef struct { ++ unsigned int n; ++ const Key keys[5]; + void (*func)(const Arg *); + const Arg arg; +-} Key; ++} Keychord; + + typedef struct { + const char *symbol; +@@ -266,6 +271,7 @@ static Display *dpy; + static Drw *drw; + static Monitor *mons, *selmon; + static Window root, wmcheckwin; ++unsigned int currentkey = 0; + + /* configuration, allows nested code to access above variables */ + #include "config.h" +@@ -954,7 +960,8 @@ grabkeys(void) + { + updatenumlockmask(); + { +- unsigned int i, j, k; ++ /* unsigned int i, j, k; */ ++ unsigned int i, c, k; + unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask }; + int start, end, skip; + KeySym *syms; +@@ -964,15 +971,18 @@ grabkeys(void) + syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip); + if (!syms) + return; ++ + for (k = start; k <= end; k++) +- for (i = 0; i < LENGTH(keys); i++) ++ for (i = 0; i < LENGTH(keychords); i++) + /* skip modifier codes, we do that ourselves */ +- if (keys[i].keysym == syms[(k - start) * skip]) +- for (j = 0; j < LENGTH(modifiers); j++) ++ if (keychords[i]->keys[currentkey].keysym == syms[(k - start) * skip]) ++ for (c = 0; c < LENGTH(modifiers); c++) + XGrabKey(dpy, k, +- keys[i].mod | modifiers[j], ++ keychords[i]->keys[currentkey].mod | modifiers[c], + root, True, + GrabModeAsync, GrabModeAsync); ++ if(currentkey > 0) ++ XGrabKey(dpy, XKeysymToKeycode(dpy, XK_Escape), AnyModifier, root, True, GrabModeAsync, GrabModeAsync); + XFree(syms); + } + } +@@ -999,17 +1009,58 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) + void + keypress(XEvent *e) + { +- unsigned int i; ++ /* unsigned int i; */ ++ XEvent event = *e; ++ unsigned int ran = 0; + KeySym keysym; + XKeyEvent *ev; + +- ev = &e->xkey; +- keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); +- for (i = 0; i < LENGTH(keys); i++) +- if (keysym == keys[i].keysym +- && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) +- && keys[i].func) +- keys[i].func(&(keys[i].arg)); ++ Keychord *arr1[sizeof(keychords) / sizeof(Keychord*)]; ++ Keychord *arr2[sizeof(keychords) / sizeof(Keychord*)]; ++ memcpy(arr1, keychords, sizeof(keychords)); ++ Keychord **rpointer = arr1; ++ Keychord **wpointer = arr2; ++ ++ size_t r = sizeof(keychords)/ sizeof(Keychord*); ++ ++ while(1){ ++ ev = &event.xkey; ++ keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); ++ size_t w = 0; ++ for (int i = 0; i < r; i++){ ++ if(keysym == (*(rpointer + i))->keys[currentkey].keysym ++ && CLEANMASK((*(rpointer + i))->keys[currentkey].mod) == CLEANMASK(ev->state) ++ && (*(rpointer + i))->func){ ++ if((*(rpointer + i))->n == currentkey +1){ ++ (*(rpointer + i))->func(&((*(rpointer + i))->arg)); ++ ran = 1; ++ }else{ ++ *(wpointer + w) = *(rpointer + i); ++ w++; ++ } ++ } ++ } ++ currentkey++; ++ if(w == 0 || ran == 1) ++ break; ++ grabkeys(); ++ /* Events arriving mid-chord must be dispatched, not dropped: ++ * discarding a ButtonPress that activated the GrabModeSync grab ++ * from grabbuttons() freezes pointer and keyboard permanently, ++ * since only buttonpress()'s XAllowEvents can release it. */ ++ while (running && !XNextEvent(dpy, &event)) { ++ if (event.type == KeyPress) ++ break; ++ if (handler[event.type]) ++ handler[event.type](&event); /* call handler */ ++ } ++ r = w; ++ Keychord **holder = rpointer; ++ rpointer = wpointer; ++ wpointer = holder; ++ } ++ currentkey = 0; ++ grabkeys(); + } + + void +-- +2.47.3 + diff --git a/dwm.c b/dwm.c index 87f68a6..f549942 100644 --- a/dwm.c +++ b/dwm.c @@ -156,6 +156,7 @@ static void checkotherwm(void); static void cleanup(void); static void cleanupmon(Monitor *mon); static void clientmessage(XEvent *e); +static void colormodehandler(int sig); static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); @@ -206,6 +207,7 @@ static int sendevent(Client *c, Atom proto); static void sendmon(Client *c, Monitor *m); static void setclientstate(Client *c, long state); static void setclienttagprop(Client *c); +static void setcolormode(void); static void setfocus(Client *c); static void setfullscreen(Client *c, int fullscreen); static void setlayout(const Arg *arg); @@ -220,6 +222,7 @@ static void sigchld(int unused); static void sighup(int unused); static void sigterm(int unused); static void spawn(const Arg *arg); +static void spawndmenu(const Arg *arg); static void tag(const Arg *arg); static void tagmon(const Arg *arg); static void tile(Monitor *m); @@ -278,11 +281,13 @@ static Atom wmatom[WMLast], netatom[NetLast]; static int restart = 0; static int running = 1; static Cur *cursor[CurLast]; -static Clr **scheme; +static Clr **scheme, **schemedark, **schemelight; static Display *dpy; static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; +static const char **dmenucmd; +static int colormodechanged; /* configuration, allows nested code to access above variables */ #include "config.h" @@ -518,9 +523,12 @@ cleanup(void) cleanupmon(mons); for (i = 0; i < CurLast; i++) drw_cur_free(drw, cursor[i]); - for (i = 0; i < LENGTH(colors); i++) - drw_scm_free(drw, scheme[i], 3); - free(scheme); + for (i = 0; i < LENGTH(colorsdark); i++) { + drw_scm_free(drw, schemedark[i], 3); + drw_scm_free(drw, schemelight[i], 3); + } + free(schemedark); + free(schemelight); XDestroyWindow(dpy, wmcheckwin); drw_free(drw); XSync(dpy, False); @@ -563,6 +571,12 @@ clientmessage(XEvent *e) } } +void +colormodehandler(int sig) +{ + colormodechanged = 1; +} + void configure(Client *c) { @@ -1369,6 +1383,10 @@ propertynotify(XEvent *e) Window trans; XPropertyEvent *ev = &e->xproperty; + if (colormodechanged) { + setcolormode(); + colormodechanged = 0; + } if ((ev->window == root) && (ev->atom == XA_WM_NAME)) updatestatus(); else if (ev->state == PropertyDelete) @@ -1598,6 +1616,32 @@ setclientstate(Client *c, long state) PropModeReplace, (unsigned char *)data, 2); } +void +setcolormode(void) +{ + static const char *file = ".lightmode"; + static char *path = NULL; + const char *home; + size_t size; + + if (!path && (home = getenv("HOME"))) { + size = strlen(home) + 1 + strlen(file) + 1; + path = malloc(size); + if (!path) + die("dwm: malloc failed"); + + snprintf(path, size, "%s/%s", home, file); + } + + if (access(path, F_OK) == 0) { + scheme = schemelight; + dmenucmd = dmenulight; + } else { + scheme = schemedark; + dmenucmd = dmenudark; + } +} + int sendevent(Client *c, Atom proto) { @@ -1704,6 +1748,11 @@ setup(void) sa.sa_handler = SIG_IGN; sigaction(SIGCHLD, &sa, NULL); + /* set color mode on SIGHUP */ + sigemptyset(&sa.sa_mask); + sa.sa_handler = colormodehandler; + sigaction(SIGHUP, &sa, NULL); + /* clean up any zombies (inherited from .xinitrc etc) immediately */ while (waitpid(-1, NULL, WNOHANG) > 0); @@ -1742,9 +1791,13 @@ setup(void) cursor[CurResize] = drw_cur_create(drw, XC_sizing); cursor[CurMove] = drw_cur_create(drw, XC_fleur); /* init appearance */ - scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); - for (i = 0; i < LENGTH(colors); i++) - scheme[i] = drw_scm_create(drw, colors[i], 3); + schemedark = ecalloc(LENGTH(colorsdark), sizeof(Clr *)); + schemelight = ecalloc(LENGTH(colorslight), sizeof(Clr *)); + for (i = 0; i < LENGTH(colorsdark); i++) { + schemedark[i] = drw_scm_create(drw, colorsdark[i], 3); + schemelight[i] = drw_scm_create(drw, colorslight[i], 3); + } + setcolormode(); /* init bars */ updatebars(); updatestatus(); @@ -1897,6 +1950,13 @@ setclienttagprop(Client *c) PropModeReplace, (unsigned char *) data, 2); } +void +spawndmenu(const Arg *arg) +{ + dmenumon[0] = '0' + selmon->num; + spawn(&(const Arg){.v = dmenucmd}); +} + void tag(const Arg *arg) { diff --git a/dwm.o b/dwm.o new file mode 100644 index 0000000..372358e Binary files /dev/null and b/dwm.o differ diff --git a/util.o b/util.o new file mode 100644 index 0000000..3a67742 Binary files /dev/null and b/util.o differ