From 47258482e2854164b7b1bd01e2a763445b690590 Mon Sep 17 00:00:00 2001 From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> Date: Tue, 16 Apr 2024 14:25:52 +0200 Subject: [PATCH] update dim-unfocused to allow temporary toggling --- dim-unfocused/dim-unfocused.patch | 110 +++++++++++++++++++----------- 1 file changed, 71 insertions(+), 39 deletions(-) diff --git a/dim-unfocused/dim-unfocused.patch b/dim-unfocused/dim-unfocused.patch index 091307f..701c450 100644 --- a/dim-unfocused/dim-unfocused.patch +++ b/dim-unfocused/dim-unfocused.patch @@ -1,33 +1,22 @@ -From 83e3bc56d59ac38ce50df1563fcaa1025c1f688a Mon Sep 17 00:00:00 2001 -From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> -Date: Mon, 8 Jan 2024 15:00:21 +0100 -Subject: [PATCH] first dim-unfocused commit - ---- - client.h | 6 ++++++ - config.def.h | 7 ++++--- - dwl.c | 19 +++++++++++++++---- - 3 files changed, 25 insertions(+), 7 deletions(-) - diff --git a/client.h b/client.h -index 1dae434..7e4619c 100644 +index 800b867..4d83248 100644 --- a/client.h +++ b/client.h -@@ -317,6 +317,12 @@ client_set_border_color(Client *c, const float color[static 4]) +@@ -332,6 +332,12 @@ client_set_border_color(Client *c, const float color[static 4]) wlr_scene_rect_set_color(c->border[i], color); } +static inline void +client_set_dimmer_state(Client *c, const int dim) +{ -+ wlr_scene_node_set_enabled(&c->dimmer->node, !c->neverdim && dim); ++ wlr_scene_node_set_enabled(&c->dimmer->node, DIMOPT && !c->neverdim && dim); +} + static inline void client_set_fullscreen(Client *c, int fullscreen) { diff --git a/config.def.h b/config.def.h -index a8ed61d..f53d4a1 100644 +index 8847e58..36ac2a1 100644 --- a/config.def.h +++ b/config.def.h @@ -10,6 +10,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ @@ -36,28 +25,40 @@ index a8ed61d..f53d4a1 100644 static const float focuscolor[] = COLOR(0x005577ff); +static const float unfocuseddim[] = COLOR(0x00000088); static const float urgentcolor[] = COLOR(0xff0000ff); - /* 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}; /* You can also use glsl colors */ -@@ -21,11 +22,11 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al + /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ + static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */ +@@ -21,10 +22,11 @@ static const float fullscreen_bg[] = {0.1f, 0.1f, 0.1f, 1.0f}; /* You ca static int log_level = WLR_ERROR; static const Rule rules[] = { -- /* app_id title tags mask isfloating monitor */ +- /* app_id title tags mask isfloating monitor */ +- /* examples: */ +- { "Gimp_EXAMPLE", NULL, 0, 1, -1 }, /* Start on currently visible tags floating, not tiled */ +- { "firefox_EXAMPLE", NULL, 1 << 8, 0, -1 }, /* Start on ONLY tag "9" */ + /* app_id title tags mask isfloating neverdim monitor */ - /* examples: -- { "Gimp", NULL, 0, 1, -1 }, -+ { "Gimp", NULL, 0, 1, 0, -1 }, - */ -- { "firefox", NULL, 1 << 8, 0, -1 }, -+ { "firefox", NULL, 1 << 8, 0, 1, -1 }, ++ /* examples: ++ { "Gimp_example", NULL, 0, 1, 0, -1 }, ++ */ ++ { "firefox_example", NULL, 1 << 8, 0, 1, -1 }, }; /* layout(s) */ +@@ -135,8 +137,9 @@ static const Key keys[] = { + { MODKEY, XKB_KEY_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XKB_KEY_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XKB_KEY_space, setlayout, {0} }, ++ { MODKEY, XKB_KEY_apostrophe, toggledimming, {0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, +- { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, ++ { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, + { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, diff --git a/dwl.c b/dwl.c -index 632dabf..5569d82 100644 +index bf763df..abd7112 100644 --- a/dwl.c +++ b/dwl.c -@@ -104,6 +104,7 @@ typedef struct { +@@ -109,6 +109,7 @@ typedef struct { Monitor *mon; struct wlr_scene_tree *scene; struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ @@ -65,7 +66,7 @@ index 632dabf..5569d82 100644 struct wlr_scene_tree *scene_surface; struct wl_list link; struct wl_list flink; -@@ -132,7 +133,7 @@ typedef struct { +@@ -137,7 +138,7 @@ typedef struct { #endif unsigned int bw; uint32_t tags; @@ -74,7 +75,7 @@ index 632dabf..5569d82 100644 uint32_t resize; /* configure serial of a pending resize */ } Client; -@@ -217,6 +218,7 @@ typedef struct { +@@ -227,6 +228,7 @@ typedef struct { const char *title; uint32_t tags; int isfloating; @@ -82,7 +83,23 @@ index 632dabf..5569d82 100644 int monitor; } Rule; -@@ -440,6 +442,7 @@ applyrules(Client *c) +@@ -330,6 +332,7 @@ static void startdrag(struct wl_listener *listener, void *data); + static void tag(const Arg *arg); + static void tagmon(const Arg *arg); + static void tile(Monitor *m); ++static void toggledimming(const Arg *arg); + static void togglefloating(const Arg *arg); + static void togglefullscreen(const Arg *arg); + static void toggletag(const Arg *arg); +@@ -404,6 +407,7 @@ static struct wlr_output_layout *output_layout; + static struct wlr_box sgeom; + static struct wl_list mons; + static Monitor *selmon; ++static int DIMOPT = 1; + + #ifdef XWAYLAND + static void activatex11(struct wl_listener *listener, void *data); +@@ -462,6 +466,7 @@ applyrules(Client *c) if ((!r->title || strstr(title, r->title)) && (!r->id || strstr(appid, r->id))) { c->isfloating = r->isfloating; @@ -90,7 +107,7 @@ index 632dabf..5569d82 100644 newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { -@@ -1190,8 +1193,10 @@ focusclient(Client *c, int lift) +@@ -1267,8 +1272,10 @@ focusclient(Client *c, int lift) /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ @@ -102,7 +119,7 @@ index 632dabf..5569d82 100644 } /* Deactivate old client if focus is changing */ -@@ -1209,7 +1214,7 @@ focusclient(Client *c, int lift) +@@ -1286,7 +1293,7 @@ focusclient(Client *c, int lift) * and probably other clients */ } else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) { client_set_border_color(old_c, bordercolor); @@ -111,18 +128,18 @@ index 632dabf..5569d82 100644 client_activate_surface(old, 0); } } -@@ -1522,6 +1527,10 @@ mapnotify(struct wl_listener *listener, void *data) +@@ -1599,6 +1606,10 @@ mapnotify(struct wl_listener *listener, void *data) c->border[i]->node.data = c; } + c->dimmer = wlr_scene_rect_create(c->scene, 0, 0, unfocuseddim); + c->dimmer->node.data = c; -+ client_set_dimmer_state(c, 0); ++ client_set_dimmer_state(c, 1); + /* Initialize client geometry with room for border */ client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); c->geom.width += 2 * c->bw; -@@ -1932,7 +1941,7 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -2040,7 +2051,7 @@ resize(Client *c, struct wlr_box geo, int interact) c->geom = geo; applybounds(c, bbox); @@ -131,7 +148,7 @@ index 632dabf..5569d82 100644 wlr_scene_node_set_position(&c->scene->node, c->geom.x, c->geom.y); wlr_scene_node_set_position(&c->scene_surface->node, c->bw, c->bw); wlr_scene_rect_set_size(c->border[0], c->geom.width, c->bw); -@@ -1942,6 +1951,8 @@ resize(Client *c, struct wlr_box geo, int interact) +@@ -2050,6 +2061,8 @@ resize(Client *c, struct wlr_box geo, int interact) wlr_scene_node_set_position(&c->border[1]->node, 0, c->geom.height - c->bw); wlr_scene_node_set_position(&c->border[2]->node, 0, c->bw); wlr_scene_node_set_position(&c->border[3]->node, c->geom.width - c->bw, c->bw); @@ -140,6 +157,21 @@ index 632dabf..5569d82 100644 /* this is a no-op if size hasn't changed */ c->resize = client_set_size(c, c->geom.width - 2 * c->bw, --- -2.43.0 - +@@ -2603,6 +2616,17 @@ tile(Monitor *m) + } + } + ++void toggledimming(const Arg *arg) ++{ ++ Client *c; ++ DIMOPT ^= 1; ++ wl_list_for_each(c, &clients, link) ++ { ++ client_set_dimmer_state(c, 1); ++ } ++ client_set_dimmer_state(focustop(selmon), 0); ++} ++ + void + togglefloating(const Arg *arg) + {