From cd3b5580dbf38f54b54d5bfb6039e0039cbd6b21 Mon Sep 17 00:00:00 2001 From: Dhruva Sambrani <44899822+DhruvaSambrani@users.noreply.github.com> Date: Thu, 16 May 2024 12:26:05 +0200 Subject: [PATCH] clean git history --- client.h | 6 ++++++ config.def.h | 13 ++++++++----- dwl.c | 40 +++++++++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/client.h b/client.h index 800b867..4d83248 100644 --- a/client.h +++ b/client.h @@ -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, 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 8f498d2..d3950f9 100644 --- a/config.def.h +++ b/config.def.h @@ -10,6 +10,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const float rootcolor[] = COLOR(0x222222ff); static const float bordercolor[] = COLOR(0x444444ff); static const float focuscolor[] = COLOR(0x005577ff); +static const float unfocuseddim[] = COLOR(0x00000088); static const float urgentcolor[] = COLOR(0xff0000ff); /* 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 */ - /* 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_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 bf763df..ca88ad0 100644 --- a/dwl.c +++ b/dwl.c @@ -109,6 +109,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; @@ -137,7 +138,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; @@ -227,6 +228,7 @@ typedef struct { const char *title; uint32_t tags; int isfloating; + int neverdim; int monitor; } Rule; @@ -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; + c->neverdim = r-> neverdim; newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { @@ -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 */ - 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 */ @@ -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); - + client_set_dimmer_state(old_c, 1); client_activate_surface(old, 0); } } @@ -1566,7 +1573,7 @@ mapnotify(struct wl_listener *listener, void *data) { /* Called when the surface is mapped, or ready to display on-screen. */ Client *p = NULL; - Client *w, *c = wl_container_of(listener, c, map); + Client *w, *d, *c = wl_container_of(listener, c, map); Monitor *m; int i; @@ -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, 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; @@ -1617,6 +1628,10 @@ mapnotify(struct wl_listener *listener, void *data) setmon(c, p->mon, p->tags); } else { applyrules(c); + d = focustop(selmon); + if (d) { + client_set_dimmer_state(d, 0); + } } printstatus(); @@ -2040,7 +2055,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); @@ -2050,6 +2065,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); + 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, @@ -2603,6 +2620,19 @@ 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); + } + c = focustop(selmon); + if (c) + client_set_dimmer_state(c, 0); +} + void togglefloating(const Arg *arg) { -- 2.45.1