[dwl] another patch, laptop config

2 files changed, 234 insertions, 0 deletions

diff --git a/dwl/correctly-match-blank-rule-strings.patch b/dwl/correctly-match-blank-rule-strings.patch
new file mode 100644
index 0000000..f9b3144
--- /dev/null
+++ b/dwl/correctly-match-blank-rule-strings.patch
@@ -0,0 +1,35 @@
+From 7cc541eb1092ba17bfe3d5afa77e609cda832016 Mon Sep 17 00:00:00 2001
+From: tslil clingman <>
+Date: Sat, 2 Dec 2023 10:57:35 +0100
+Subject: [PATCH 1/1] correctly match blank rule strings
+
+The bug before-hand was that specifying a blank rule string would
+match against any string (strstr(foo, "") is always true apparently),
+even though we already had a special case for !r->title and !r->id.
+
+This patch now sets the behaviour to r->title/r->id == NULL means
+match all, blank means match blank
+---
+ dwl.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/dwl.c b/dwl.c
+index 03e999e..5a2a538 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -442,9 +442,10 @@ applyrules(Client *c)
+ 	if (!(title = client_get_title(c)))
+ 		title = broken;
+ 
++#define MATCH(str1, str2) ((str2[0]==0 && str1[0]==0) || (str2[0] != 0 && strstr(str1, str2)))
+ 	for (r = rules; r < END(rules); r++) {
+-		if ((!r->title || strstr(title, r->title))
+-				&& (!r->id || strstr(appid, r->id))) {
++		if ((!r->title || MATCH(title, r->title))
++				&& (!r->id || MATCH(appid, r->id))) {
+ 			c->isfloating = r->isfloating;
+ 			newtags |= r->tags;
+ 			i = 0;
+-- 
+2.43.0
+
diff --git a/dwl/laptop_config.h b/dwl/laptop_config.h
new file mode 100644
index 0000000..fcce62e
--- /dev/null
+++ b/dwl/laptop_config.h
@@ -0,0 +1,199 @@
+static int log_level = WLR_ERROR;
+
+/* Taken from https://github.com/djpohly/dwl/issues/466 */
+#define COLOR(hex)    { ((hex >> 24) & 0xFF) / 255.0f, \
+                        ((hex >> 16) & 0xFF) / 255.0f, \
+                        ((hex >> 8) & 0xFF) / 255.0f, \
+                        (hex & 0xFF) / 255.0f }
+
+/* appearance */
+static const int          sloppyfocus               = 1; /* focus follows mouse */
+static const int          bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
+static const unsigned int borderpx                  = 2; /* border pixel of windows */
+static const float        rootcolor[]               = {0.3, 0.3, 0.3, 1.0};
+static const float        bordercolor[]             = {0.266, 0.266, 0.266, 1.0}; // 44 44 44
+static const float        focuscolor[]              = {1.000, 0.549, 0.000, 1.0}; // ff 8c 00
+static const float        urgentcolor[]             = COLOR(0xff0000ff);
+static const float        fullscreen_bg[]           = {0.1, 0.1, 0.1, 1.0};
+
+/* tagging */
+#define TAGCOUNT 8
+
+static const Rule rules[] = {
+    /* app_id     title       tags mask     isfloating   monitor */
+    { "firefox",  "",         0,            1,           -1 }
+};
+
+/* layout(s) */
+static const Layout layouts[] = {
+    /* symbol     arrange function */
+    { "[]=",      tile },
+    { "[M]",      monocle },
+    { "===",      bstackhoriz },
+    { "TTT",      bstack },
+    { "><>",      NULL },    /* no layout function means floating behavior */
+};
+
+/* monitors */
+static const MonitorRule monrules[] = {
+    /* name       mfact nmaster scale layout       rotate/reflect               x   y*/
+    { NULL,       0.6,  1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL, -1, -1 },
+};
+
+/* keyboard */
+static const struct xkb_rule_names xkb_rules = {
+    /* can specify fields: rules, model, layout, variant, options */
+    /* example:
+    .options = "ctrl:nocaps",
+    */
+    .model = "pc105awide",
+    .layout = "vlom",
+    .options = "ctrl:nocaps,ctrl:swap_lalt_lctl_lwin,ctrl:swap_rwin_rctl",
+};
+
+static const int repeat_rate = 25;
+static const int repeat_delay = 600;
+
+/* Trackpad */
+static const int tap_to_click = 1;
+static const int tap_and_drag = 1;
+static const int drag_lock = 1;
+static const int natural_scrolling = 0;
+static const int disable_while_typing = 1;
+static const int left_handed = 0;
+static const int middle_button_emulation = 0;
+/* You can choose between:
+LIBINPUT_CONFIG_SCROLL_NO_SCROLL
+LIBINPUT_CONFIG_SCROLL_2FG
+LIBINPUT_CONFIG_SCROLL_EDGE
+LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN
+*/
+static const enum libinput_config_scroll_method scroll_method = LIBINPUT_CONFIG_SCROLL_2FG;
+
+/* You can choose between:
+LIBINPUT_CONFIG_CLICK_METHOD_NONE
+LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS
+LIBINPUT_CONFIG_CLICK_METHOD_CLICKFINGER
+*/
+static const enum libinput_config_click_method click_method = LIBINPUT_CONFIG_CLICK_METHOD_BUTTON_AREAS;
+
+/* You can choose between:
+LIBINPUT_CONFIG_SEND_EVENTS_ENABLED
+LIBINPUT_CONFIG_SEND_EVENTS_DISABLED
+LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE
+*/
+static const uint32_t send_events_mode = LIBINPUT_CONFIG_SEND_EVENTS_ENABLED;
+
+/* You can choose between:
+LIBINPUT_CONFIG_ACCEL_PROFILE_FLAT
+LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE
+*/
+static const enum libinput_config_accel_profile accel_profile = LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE;
+static const double accel_speed = 0.0;
+/* You can choose between:
+LIBINPUT_CONFIG_TAP_MAP_LRM -- 1/2/3 finger tap maps to left/right/middle
+LIBINPUT_CONFIG_TAP_MAP_LMR -- 1/2/3 finger tap maps to left/middle/right
+*/
+static const enum libinput_config_tap_button_map button_map = LIBINPUT_CONFIG_TAP_MAP_LRM;
+
+/* If you want to use the windows key for MODKEY, use WLR_MODIFIER_LOGO */
+#define MODKEY WLR_MODIFIER_LOGO
+
+#define TAGKEYS(KEY,SKEY,TAG) \
+    { MODKEY,                    KEY,            view,            {.ui = 1 << TAG} }, \
+    { MODKEY|WLR_MODIFIER_CTRL,  KEY,            toggleview,      {.ui = 1 << TAG} }, \
+    { MODKEY|WLR_MODIFIER_SHIFT, SKEY,           tag,             {.ui = 1 << TAG} }, \
+    { MODKEY|WLR_MODIFIER_CTRL|WLR_MODIFIER_SHIFT,SKEY,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 const char *termcmd[]     = { "foot",             NULL };
+static const char *menucmd[]     = { "run",              NULL };
+static const char *now_playing[] = { "now_playing",      NULL };
+static const char *albumbler[]   = { "albumbler.py",     NULL };
+static const char *mpc_toggle[]  = { "mpc", "toggle",    NULL };
+static const char *mpc_next[]    = { "mpc", "next",      NULL };
+static const char *mpc_prev[]    = { "mpc", "prev",      NULL };
+static const char *mpc_stop[]    = { "mpc", "stop",      NULL };
+static const char *slock[]       = { "lock",             NULL };
+static const char *flameshot[]   = { "grim_slurp",       NULL };
+
+static const char *vol_dn[] = { "pactl", "set-sink-volume", "0", "-2%", NULL };
+static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+2%", NULL };
+static const char *vol_mt[] = { "pactl", "set-sink-mute", "0", "toggle", NULL };
+
+static const char *light_up[] = { "light", "-A", "5", NULL };
+static const char *light_dn[] = { "light", "-U", "5", NULL };
+
+static const Key keys[] = {
+    /* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
+    { MODKEY,                                      XKB_KEY_t,         spawn,    {.v = termcmd} },
+    { MODKEY,                                      XKB_KEY_d,         spawn,    {.v = menucmd} },
+    { MODKEY|WLR_MODIFIER_SHIFT,                   XKB_KEY_space,     spawn,    {.v = albumbler } },
+    { MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_space,     spawn,    {.v = now_playing } },
+    { MODKEY|WLR_MODIFIER_SHIFT,                   XKB_KEY_X,         spawn,    {.v = slock } },
+    { MODKEY,                                      XKB_KEY_p,         spawn,    {.v = flameshot } },
+    { MODKEY|WLR_MODIFIER_SHIFT|WLR_MODIFIER_CTRL, XKB_KEY_Q,         quit,     {0} },
+
+    // Multimedia
+    { 0,                  XKB_KEY_XF86AudioLowerVolume,   spawn,      {.v = vol_dn } },
+    { 0,                  XKB_KEY_XF86AudioMute,          spawn,      {.v = vol_mt } },
+    { 0,                  XKB_KEY_XF86AudioRaiseVolume,   spawn,      {.v = vol_up } },
+    { 0,                  XKB_KEY_XF86AudioPlay,          spawn,      {.v = mpc_toggle } },
+    { 0,                  XKB_KEY_XF86AudioStop,          spawn,      {.v = mpc_stop } },
+    { 0,                  XKB_KEY_XF86AudioPrev,          spawn,      {.v = mpc_prev } },
+    { 0,                  XKB_KEY_XF86AudioNext,          spawn,      {.v = mpc_next } },
+
+    // Brightness
+    { 0,                  XKB_KEY_XF86MonBrightnessUp,     spawn,      {.v = light_up }},
+    { 0,                  XKB_KEY_XF86MonBrightnessDown,   spawn,      {.v = light_dn }},
+
+    // Windows
+    { MODKEY,                    XKB_KEY_c,         focusstack,     {.i = +1 } },
+    { MODKEY,                    XKB_KEY_i,         focusstack,     {.i = -1 } },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_C,         incnmaster,     {.i = +1 } },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_I,         incnmaster,     {.i = -1 } },
+    { MODKEY,                    XKB_KEY_e,         setmfact,       {.f = -0.05} },
+    { MODKEY,                    XKB_KEY_n,         setmfact,       {.f = +0.05} },
+    { MODKEY,                    XKB_KEY_Return,    zoom,           {0} },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K,         killclient,     {0} },
+
+    // Layout
+    { MODKEY,                    XKB_KEY_s,         setlayout,      {.v = &layouts[0]} },
+    { MODKEY,                    XKB_KEY_r,         setlayout,      {.v = &layouts[1]} },
+    { MODKEY,                    XKB_KEY_a,         setlayout,      {.v = &layouts[2]} },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_S,         setlayout,      {.v = &layouts[3]} },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_R,         setlayout,      {.v = &layouts[4]} },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,         togglefloating, {0} },
+    { MODKEY,                    XKB_KEY_comma,     focusmon,       {.i = WLR_DIRECTION_RIGHT } },
+    { MODKEY,                    XKB_KEY_b,         focusmon,       {.i = WLR_DIRECTION_LEFT } },
+
+    // Tags
+    { MODKEY,                    XKB_KEY_0,         view,           {.ui = ~0 } },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright,tag,            {.ui = ~0 } },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,      tagmon,         {.i = WLR_DIRECTION_RIGHT } },
+    { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_B,         tagmon,         {.i = WLR_DIRECTION_LEFT } },
+    { MODKEY,                    XKB_KEY_Tab,       view,           {.ui = 0 } },
+    TAGKEYS(                     XKB_KEY_f,      XKB_KEY_F,                      0),
+    TAGKEYS(                     XKB_KEY_u,      XKB_KEY_U,                      1),
+    TAGKEYS(                     XKB_KEY_h,      XKB_KEY_H,                      2),
+    TAGKEYS(                     XKB_KEY_period, XKB_KEY_greater,                3),
+    TAGKEYS(                     XKB_KEY_v,      XKB_KEY_V,                      4),
+    TAGKEYS(                     XKB_KEY_l,      XKB_KEY_L,                      5),
+    TAGKEYS(                     XKB_KEY_o,      XKB_KEY_O,                      6),
+    TAGKEYS(                     XKB_KEY_m,      XKB_KEY_M,                      7),
+
+    /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
+    { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },
+#define CHVT(n) { WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_XF86Switch_VT_##n, chvt, {.ui = (n)} }
+    CHVT(1), CHVT(2), CHVT(3), CHVT(4), CHVT(5), CHVT(6),
+    CHVT(7), CHVT(8), CHVT(9), CHVT(10), CHVT(11), CHVT(12),
+};
+
+static const Button buttons[] = {
+    { MODKEY, BTN_LEFT,   moveresize,     {.ui = CurMove} },
+    { MODKEY, BTN_MIDDLE, togglefloating, {0} },
+    { MODKEY, BTN_RIGHT,  moveresize,     {.ui = CurResize} },
+};