From 979ea455f1f35b3285fc07d66440f0839338c827 Mon Sep 17 00:00:00 2001 From: A Frederick Christensen Date: Mon, 1 Jan 2024 22:58:13 -0600 Subject: [PATCH] Move dhruva_sambrani patches in from dwl/dwl wiki --- dim-unfocussed/dim-unfocussed.patch | 133 ++++++++++++++++++++++++++++ winview/winview.patch | 89 +++++++++++++++++++ 2 files changed, 222 insertions(+) create mode 100644 dim-unfocussed/dim-unfocussed.patch create mode 100644 winview/winview.patch diff --git a/dim-unfocussed/dim-unfocussed.patch b/dim-unfocussed/dim-unfocussed.patch new file mode 100644 index 0000000..1839456 --- /dev/null +++ b/dim-unfocussed/dim-unfocussed.patch @@ -0,0 +1,133 @@ +diff --git a/client.h b/client.h +index 71c7d76..749be99 100644 +--- a/client.h ++++ b/client.h +@@ -316,6 +316,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); ++} ++ + static inline void + client_set_fullscreen(Client *c, int fullscreen) + { +diff --git a/config.def.h b/config.def.h +index db0babc..da75950 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -9,6 +9,7 @@ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will + static const unsigned int borderpx = 1; /* border pixel of windows */ + static const float bordercolor[] = COLOR(0x444444ff); + 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 */ +@@ -20,11 +21,11 @@ static const float fullscreen_bg[] = {0.1, 0.1, 0.1, 1.0}; /* You can al + static int log_level = WLR_ERROR; + + static const Rule rules[] = { +- /* app_id title tags mask isfloating monitor */ ++ /* 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 }, + }; + + /* layout(s) */ +diff --git a/dwl.c b/dwl.c +index 69da91d..8e163be 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -103,6 +103,7 @@ typedef struct { + Monitor *mon; + struct wlr_scene_tree *scene; + struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ ++ struct wlr_scene_rect *dimmer; + struct wlr_scene_tree *scene_surface; + struct wl_list link; + struct wl_list flink; +@@ -128,7 +129,7 @@ typedef struct { + #endif + unsigned int bw; + uint32_t tags; +- int isfloating, isurgent, isfullscreen; ++ int isfloating, isurgent, isfullscreen, neverdim; + uint32_t resize; /* configure serial of a pending resize */ + } Client; + +@@ -214,6 +215,7 @@ typedef struct { + const char *title; + uint32_t tags; + int isfloating; ++ int neverdim; + int monitor; + } Rule; + +@@ -433,6 +435,7 @@ applyrules(Client *c) + if ((!r->title || strstr(title, r->title)) + && (!r->id || strstr(appid, r->id))) { + c->isfloating = r->isfloating; ++ c->neverdim = r-> neverdim; + newtags |= r->tags; + i = 0; + wl_list_for_each(m, &mons, link) +@@ -1191,8 +1194,10 @@ focusclient(Client *c, int lift) + + /* Don't change border color if there is an exclusive focus or we are + * handling a drag operation */ +- if (!exclusive_focus && !seat->drag) ++ if (!exclusive_focus && !seat->drag) { + client_set_border_color(c, focuscolor); ++ client_set_dimmer_state(c, 0); ++ } + } + + /* Deactivate old client if focus is changing */ +@@ -1210,7 +1215,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); +- ++ client_set_dimmer_state(old_c, 1); + client_activate_surface(old, 0); + } + } +@@ -1524,6 +1529,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); ++ + /* Initialize client geometry with room for border */ + client_set_tiled(c, WLR_EDGE_TOP | WLR_EDGE_BOTTOM | WLR_EDGE_LEFT | WLR_EDGE_RIGHT); + client_get_geometry(c, &c->geom); +@@ -1927,7 +1936,7 @@ resize(Client *c, struct wlr_box geo, int interact) + c->geom = geo; + applybounds(c, bbox); + +- /* Update scene-graph, including borders */ ++ /* Update scene-graph, including borders and dimmer*/ + 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); +@@ -1937,7 +1946,9 @@ 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); +- ++ wlr_scene_rect_set_size(c->dimmer, c->geom.width, c-> geom.height); ++ wlr_scene_node_set_position(&c->dimmer->node, 0, 0); ++ + /* this is a no-op if size hasn't changed */ + c->resize = client_set_size(c, c->geom.width - 2 * c->bw, + c->geom.height - 2 * c->bw); diff --git a/winview/winview.patch b/winview/winview.patch new file mode 100644 index 0000000..5e8a9db --- /dev/null +++ b/winview/winview.patch @@ -0,0 +1,89 @@ +diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md +index e6278d8..cd9bd8d 100644 +--- a/.github/ISSUE_TEMPLATE/bug_report.md ++++ b/.github/ISSUE_TEMPLATE/bug_report.md +@@ -7,7 +7,11 @@ assignees: '' + + --- + +-### ⚠️ Migrated to Codeberg +- +-This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl). +- ++## Info ++dwl version: ++wlroots version: ++## Description ++ +diff --git a/.github/ISSUE_TEMPLATE/enhancement-idea.md b/.github/ISSUE_TEMPLATE/enhancement-idea.md +index cbfd90f..0ac096d 100644 +--- a/.github/ISSUE_TEMPLATE/enhancement-idea.md ++++ b/.github/ISSUE_TEMPLATE/enhancement-idea.md +@@ -7,7 +7,4 @@ assignees: '' + + --- + +-### ⚠️ Migrated to Codeberg +- +-This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl). + +diff --git a/README.md b/README.md +index e02c9c4..62ae872 100644 +--- a/README.md ++++ b/README.md +@@ -1,10 +1,5 @@ + # dwl - dwm for Wayland + +-> ### ⚠️ Migrated to Codeberg +-> +-> This project has [migrated to Codeberg](https://codeberg.org/dwl/dwl). +- +- + Join us on our IRC channel: [#dwl on Libera Chat] + Or on our [Discord server]. + +diff --git a/config.def.h b/config.def.h +index db0babc..149313c 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -136,6 +136,7 @@ static const Key keys[] = { + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space, togglefloating, {0} }, + { MODKEY, XKB_KEY_e, togglefullscreen, {0} }, + { MODKEY, XKB_KEY_0, view, {.ui = ~0} }, ++ { MODKEY, XKB_KEY_o, winview, {0}}, + { MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag, {.ui = ~0} }, + { MODKEY, XKB_KEY_comma, focusmon, {.i = WLR_DIRECTION_LEFT} }, + { MODKEY, XKB_KEY_period, focusmon, {.i = WLR_DIRECTION_RIGHT} }, +diff --git a/dwl.c b/dwl.c +index ef27a1d..5f287b5 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -323,6 +323,7 @@ static void updatetitle(struct wl_listener *listener, void *data); + static void urgent(struct wl_listener *listener, void *data); + static void view(const Arg *arg); + static void virtualkeyboard(struct wl_listener *listener, void *data); ++static void winview(const Arg *a); + static Monitor *xytomon(double x, double y); + static void xytonode(double x, double y, struct wlr_surface **psurface, + Client **pc, LayerSurface **pl, double *nx, double *ny); +@@ -2676,6 +2677,17 @@ virtualkeyboard(struct wl_listener *listener, void *data) + createkeyboard(&keyboard->keyboard); + } + ++void ++winview(const Arg *a) { ++ Arg b = {0}; ++ Client *sel = focustop(selmon); ++ if(!sel) ++ return; ++ b.ui = sel -> tags; ++ view(&b); ++ return; ++} ++ + Monitor * + xytomon(double x, double y) + {