numerous changes

This commit is contained in:
Xory 2026-03-15 19:00:37 +02:00
parent c3212e8624
commit e1b4f73d4a
3 changed files with 81 additions and 19 deletions

View file

@ -1,6 +1,3 @@
tr*
* See LICENSE file for copyright and license details.
*/
#include <fcntl.h>
#include <getopt.h>
#include <libinput.h>
@ -117,6 +114,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;
@ -146,7 +144,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;
@ -254,6 +252,7 @@ typedef struct {
const char *title;
uint32_t tags;
int isfloating;
int neverdim;
int monitor;
} Rule;
@ -456,6 +455,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;
static char stext[256];
static struct wl_event_source *status_event_source;
@ -553,6 +553,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) {
@ -1725,8 +1726,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, (float[])COLOR(colors[SchemeSel][ColBorder]));
client_set_dimmer_state(c, 0);
}
}
/* Deactivate old client if focus is changing */
@ -1745,6 +1748,7 @@ focusclient(Client *c, int lift)
} else if (old_c && !client_is_unmanaged(old_c) && (!c || !client_wants_focus(c))) {
client_set_border_color(old_c, (float[])COLOR(colors[SchemeNorm][ColBorder]));
client_activate_surface(old, 0);
client_set_dimmer_state(old_c, 1);
}
}
drawbars();
@ -2071,8 +2075,7 @@ void
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 *p, *w, *d, *c = wl_container_of(listener, c, map);
Monitor *m;
int i;
@ -2106,6 +2109,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;
@ -2124,6 +2131,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);
}
}
drawbars();
@ -2555,7 +2566,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);
@ -2565,6 +2576,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 - 2*c->bw, c-> geom.height - 2*c->bw);
wlr_scene_node_set_position(&c->dimmer->node, c->bw, c->bw);
/* this is a no-op if size hasn't changed */
c->resize = client_set_size(c, c->geom.width - 2 * c->bw,
@ -3137,6 +3150,27 @@ togglebar(const Arg *arg)
drawbars();
}
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
toggledimmingclient(const Arg *arg)
{
Client *sel = focustop(selmon);
if (sel)
sel -> neverdim ^= 1;
}
void
togglefloating(const Arg *arg)
{