[dwl, somebar] add gaps

also allow dwl to match on empty titles

4 files changed, 233 insertions, 9 deletions

diff --git a/dwl-0.4/config.h b/dwl-0.4/config.h
new file mode 100644
index 0000000..319b74b
--- /dev/null
+++ b/dwl-0.4/config.h
@@ -0,0 +1,187 @@
+/* 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 unsigned int gap                       = 10; /* inner gap between windows */
+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
+/* To conform the xdg-protocol, set the alpha to zero to restore the old behavior */
+static const float        fullscreen_bg[]           = {0.1, 0.1, 0.1, 1.0};
+
+/* tagging */
+static const char *tags[] = { "F", "U", "H", ".", "V", "L", "O", "M" };
+
+static const Rule rules[] = {
+    /* app_id     title       tags mask     isfloating   monitor */
+    { "firefox",  "DWL_EMPTY_TITLE",             0, 1, -1 },
+    { "firefox",  "Firefox — Sharing Indicator", 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 */
+    { "DP-1",     0.6,  1,      1,    &layouts[2], WL_OUTPUT_TRANSFORM_90 },
+    { "DP-3",     0.6,  1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
+    /* defaults */
+    { NULL,       0.6,  1,      1,    &layouts[0], WL_OUTPUT_TRANSFORM_NORMAL },
+};
+
+/* keyboard */
+static const struct xkb_rule_names xkb_rules = {
+    /* can specify fields: rules, model, layout, variant, options */
+    /* example:
+    .options = "ctrl:nocaps",
+    */
+    .options = NULL,
+};
+
+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", "-5%", NULL };
+static const char *vol_up[] = { "pactl", "set-sink-volume", "0", "+5%", NULL };
+static const char *vol_mt[] = { "pactl", "set-sink-mute", "0", "toggle", 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,                                      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 } },
+
+    // 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,                    XKB_KEY_Tab,       view,           {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_0,         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 } },
+    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} },
+};
diff --git a/dwl-0.4/dwl.c b/dwl-0.4/dwl.c
index 5bcf768..3aa0415 100644
--- a/dwl-0.4/dwl.c
+++ b/dwl-0.4/dwl.c
@@ -462,6 +462,8 @@ applyrules(Client *c)
     if (!(title = client_get_title(c)))
         title = broken;
 
+    if (strnlen(title, 1) == 0) title="DWL_EMPTY_TITLE";
+
     for (r = rules; r < END(rules); r++) {
         if ((!r->title || strstr(title, r->title))
                 && (!r->id || strstr(appid, r->id))) {
@@ -1816,7 +1818,7 @@ printstatus(void)
                 urg |= c->tags;
         }
         if ((c = focustop(m))) {
-            printf("%s title %s\n", m->wlr_output->name, client_get_title(c));
+            printf("%s title %s (%s)\n", m->wlr_output->name, client_get_title(c), client_get_appid(c));
             printf("%s fullscreen %u\n", m->wlr_output->name, c->isfullscreen);
             printf("%s floating %u\n", m->wlr_output->name, c->isfloating);
             sel = c->tags;
@@ -2326,7 +2328,7 @@ tagmon(const Arg *arg)
 void
 tile(Monitor *m)
 {
-    unsigned int i, n = 0, mw, my, ty;
+    unsigned int i, n = 0, mw, my, ty, r, h;
     Client *c;
 
     wl_list_for_each(c, &clients, link)
@@ -2344,21 +2346,25 @@ tile(Monitor *m)
         if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
             continue;
         if (i < m->nmaster) {
+            r = MIN(n, m->nmaster) - i;
+            h = (m->w.height - my - gap * (r - 1)) / r;
             resize(c, (struct wlr_box){
                 .x = m->w.x + m->w.width - mw,
                 .y = m->w.y + my,
-                .height = (m->w.height - my) / (MIN(n, m->nmaster) - i),
-                .width = mw
+                .width = mw - gap,
+                .height = h
               }, 0);
-            my += c->geom.height;
+            my += c->geom.height + gap;
         } else {
+            r = n - i;
+            h = (m->w.height - ty - gap * (r-1)) / r;
             resize(c, (struct wlr_box){
                 .x = m->w.x,
                 .y = m->w.y + ty,
-                .width = m->w.width - mw,
-                .height = (m->w.height - ty) / (n - i)
+                .width = m->w.width - mw - gap,
+                .height = h
               }, 0);
-            ty += c->geom.height;
+            ty += c->geom.height + gap;
         }
         i++;
     }
diff --git a/somebar/src/bar.cpp b/somebar/src/bar.cpp
index 3866dbb..38164cd 100644
--- a/somebar/src/bar.cpp
+++ b/somebar/src/bar.cpp
@@ -120,7 +120,7 @@ void Bar::show(wl_output* output)
 
 	auto barSize = barfont.height + paddingY * 2;
 	zwlr_layer_surface_v1_set_size(_layerSurface.get(), 0, barSize);
-	zwlr_layer_surface_v1_set_exclusive_zone(_layerSurface.get(), barSize);
+	zwlr_layer_surface_v1_set_exclusive_zone(_layerSurface.get(), barSize + gapY);
 	wl_surface_commit(_surface.get());
 }
 
diff --git a/somebar/src/config.hpp b/somebar/src/config.hpp
new file mode 100644
index 0000000..caf0178
--- /dev/null
+++ b/somebar/src/config.hpp
@@ -0,0 +1,31 @@
+// somebar - dwl bar
+// See LICENSE file for copyright and license details.
+
+#pragma once
+#include "common.hpp"
+
+constexpr bool topbar = false;
+
+constexpr int paddingX = 10;
+constexpr int paddingY = 3;
+constexpr int gapY = 3;
+
+// See https://docs.gtk.org/Pango/type_func.FontDescription.from_string.html
+constexpr const char* font = "BmPlus IBM VGA 9x16 8";
+
+constexpr Color orange = Color(0xff, 0x8c, 0x00);
+constexpr Color gray2 = Color(0x00, 0x00, 0x00);
+
+constexpr ColorScheme colorInactive = {orange, gray2};
+constexpr ColorScheme colorActive = {gray2, orange};
+constexpr const char* termcmd[] = {"foot", nullptr};
+
+static std::vector<std::string> tagNames = {
+    "F", "U", "H",
+    ".", "V", "L",
+    "O", "M"
+};
+
+constexpr Button buttons[] = {
+    { ClkStatusText,   BTN_RIGHT,  spawn,      {.v = termcmd} },
+};