diff options
Diffstat (limited to 'dwl.c')
| -rw-r--r-- | dwl.c | 142 |
1 files changed, 134 insertions, 8 deletions
@@ -146,6 +146,9 @@ typedef struct { unsigned int bw; uint32_t tags; int isfloating, isurgent, isfullscreen; + float opacity; + float opacity_focus; + float opacity_unfocus; uint32_t resize; /* configure serial of a pending resize */ } Client; @@ -219,6 +222,7 @@ struct Monitor { struct wlr_box w; /* window area, layout-relative */ struct wl_list layers[4]; /* LayerSurface.link */ const Layout *lt[2]; + int gaps; unsigned int seltags; unsigned int sellt; uint32_t tagset[2]; @@ -252,6 +256,8 @@ typedef struct { const char *title; uint32_t tags; int isfloating; + float opacity_focus; + float opacity_unfocus; int monitor; } Rule; @@ -334,6 +340,7 @@ static void locksession(struct wl_listener *listener, void *data); static void mapnotify(struct wl_listener *listener, void *data); static void maximizenotify(struct wl_listener *listener, void *data); static void monocle(Monitor *m); +static void movestack(const Arg *arg); static void motionabsolute(struct wl_listener *listener, void *data); static void motionnotify(uint32_t time, struct wlr_input_device *device, double sx, double sy, double sx_unaccel, double sy_unaccel); @@ -352,6 +359,7 @@ static void requeststartdrag(struct wl_listener *listener, void *data); static void requestmonstate(struct wl_listener *listener, void *data); static void resize(Client *c, struct wlr_box geo, int interact); static void run(char *startup_cmd); +static void scenebuffersetopacity(struct wlr_scene_buffer *buffer, int sx, int sy, void *user_data); static void setcursor(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data); static void setfloating(Client *c, int floating); @@ -359,6 +367,8 @@ static void setfullscreen(Client *c, int fullscreen); static void setlayout(const Arg *arg); static void setmfact(const Arg *arg); static void setmon(Client *c, Monitor *m, uint32_t newtags); +static void setopacityunfocus(const Arg *arg); +static void setopacityfocus(const Arg *arg); static void setpsel(struct wl_listener *listener, void *data); static void setsel(struct wl_listener *listener, void *data); static void setup(void); @@ -371,6 +381,7 @@ static void tile(Monitor *m); static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void togglefullscreen(const Arg *arg); +static void togglegaps(const Arg *arg); static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); static void unlocksession(struct wl_listener *listener, void *data); @@ -535,6 +546,8 @@ applyrules(Client *c) if ((!r->title || strstr(title, r->title)) && (!r->id || strstr(appid, r->id))) { c->isfloating = r->isfloating; + c->opacity_unfocus = r->opacity_unfocus; + c->opacity_focus = r->opacity_focus; newtags |= r->tags; i = 0; wl_list_for_each(m, &mons, link) { @@ -1218,6 +1231,8 @@ createmon(struct wl_listener *listener, void *data) wlr_output_state_init(&state); /* Initialize monitor state using configured rules */ + m->gaps = gaps; + m->tagset[0] = m->tagset[1] = 1; for (r = monrules; r < END(monrules); r++) { if (!r->name || strstr(wlr_output->name, r->name)) { @@ -1295,6 +1310,10 @@ createnotify(struct wl_listener *listener, void *data) c = toplevel->base->data = ecalloc(1, sizeof(*c)); c->surface.xdg = toplevel->base; c->bw = borderpx; + /* Set default opacity*/ + c->opacity_unfocus = default_opacity_unfocus; + c->opacity_focus = default_opacity_focus; + c->opacity = default_opacity_unfocus; LISTEN(&toplevel->base->surface->events.commit, &c->commit, commitnotify); LISTEN(&toplevel->base->surface->events.map, &c->map, mapnotify); @@ -1671,6 +1690,7 @@ focusclient(Client *c, int lift) wl_list_insert(&fstack, &c->flink); selmon = c->mon; c->isurgent = 0; + c->opacity = c->opacity_focus; /* Don't change border color if there is an exclusive focus or we are * handling a drag operation */ @@ -1694,6 +1714,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); + old_c->opacity = old_c->opacity_unfocus; } } drawbars(); @@ -2080,6 +2101,48 @@ monocle(Monitor *m) } void +movestack(const Arg *arg) +{ + Client *c, *sel = focustop(selmon); + + if (!sel) { + return; + } + + if (wl_list_length(&clients) <= 1) { + return; + } + + if (arg->i > 0) { + wl_list_for_each(c, &sel->link, link) { + if (&c->link == &clients) { + c = wl_container_of(&clients, c, link); + break; /* wrap past the sentinel node */ + } + if (VISIBLEON(c, selmon) || &c->link == &clients) { + break; /* found it */ + } + } + } else { + wl_list_for_each_reverse(c, &sel->link, link) { + if (&c->link == &clients) { + c = wl_container_of(&clients, c, link); + break; /* wrap past the sentinel node */ + } + if (VISIBLEON(c, selmon) || &c->link == &clients) { + break; /* found it */ + } + } + /* backup one client */ + c = wl_container_of(c->link.prev, c, link); + } + + wl_list_remove(&sel->link); + wl_list_insert(&c->link, &sel->link); + arrange(selmon); +} + +void motionabsolute(struct wl_listener *listener, void *data) { /* This event is forwarded by the cursor when a pointer emits an _absolute_ @@ -2363,6 +2426,7 @@ rendermon(struct wl_listener *listener, void *data) /* Render if no XDG clients have an outstanding resize and are visible on * this monitor. */ wl_list_for_each(c, &clients, link) { + wlr_scene_node_for_each_buffer(&c->scene_surface->node, scenebuffersetopacity, c); if (c->resize && !c->isfloating && client_is_rendered_on_mon(c, m) && !client_is_stopped(c)) goto skip; } @@ -2492,6 +2556,15 @@ run(char *startup_cmd) } void +scenebuffersetopacity(struct wlr_scene_buffer *buffer, int sx, int sy, void *data) +{ + Client *c = data; + /* xdg-popups are children of Client.scene, we do not have to worry about + * messing with them. */ + wlr_scene_buffer_set_opacity(buffer, c->isfullscreen ? 1 : c->opacity); +} + +void setcursor(struct wl_listener *listener, void *data) { /* This event is raised by the seat when a client provides a cursor image */ @@ -2559,6 +2632,7 @@ setfullscreen(Client *c, int fullscreen) * client positions are set by the user and cannot be recalculated */ resize(c, c->prev, 0); } + wlr_scene_node_for_each_buffer(&c->scene_surface->node, scenebuffersetopacity, c); arrange(c->mon); drawbars(); } @@ -2615,6 +2689,44 @@ setmon(Client *c, Monitor *m, uint32_t newtags) focusclient(focustop(selmon), 1); } + +void +setopacityunfocus(const Arg *arg) +{ + Client *sel = focustop(selmon); + if (!sel) + return; + + sel->opacity_unfocus += arg->f; + if (sel->opacity_unfocus > 1.0) + sel->opacity_unfocus = 1.0f; + + if (sel->opacity_unfocus < 0.1) + sel->opacity_unfocus = 0.1f; + + wlr_scene_node_for_each_buffer(&sel->scene_surface->node, scenebuffersetopacity, sel); +} + +void +setopacityfocus(const Arg *arg) +{ + Client *sel = focustop(selmon); + if (!sel) + return; + + sel->opacity_focus += arg->f; + if (sel->opacity_focus > 1.0) + sel->opacity_focus = 1.0f; + + if (sel->opacity_focus < 0.1) + sel->opacity_focus = 0.1f; + + /* Change opacity from current client */ + sel->opacity = sel->opacity_focus; + + wlr_scene_node_for_each_buffer(&sel->scene_surface->node, scenebuffersetopacity, sel); +} + void setpsel(struct wl_listener *listener, void *data) { @@ -2939,7 +3051,7 @@ tagmon(const Arg *arg) void tile(Monitor *m) { - unsigned int mw, my, ty; + unsigned int h, r, e = m->gaps, mw, my, ty; int i, n = 0; Client *c; @@ -2948,23 +3060,30 @@ tile(Monitor *m) n++; if (n == 0) return; + if (smartgaps == n) + e = 0; if (n > m->nmaster) - mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0; + mw = m->nmaster ? (int)roundf((m->w.width + gappx*e) * m->mfact) : 0; else mw = m->w.width; - i = my = ty = 0; + i = 0; + my = ty = gappx*e; wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) continue; if (i < m->nmaster) { - resize(c, (struct wlr_box){.x = m->w.x, .y = m->w.y + my, .width = mw, - .height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0); - my += c->geom.height; + r = MIN(n, m->nmaster) - i; + h = (m->w.height - my - gappx*e - gappx*e * (r - 1)) / r; + resize(c, (struct wlr_box){.x = m->w.x + gappx*e, .y = m->w.y + my, + .width = mw - 2*gappx*e, .height = h}, 0); + my += c->geom.height + gappx*e; } else { + r = n - i; + h = (m->w.height - ty - gappx*e - gappx*e * (r - 1)) / r; resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y + ty, - .width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0); - ty += c->geom.height; + .width = m->w.width - mw - gappx*e, .height = h}, 0); + ty += c->geom.height + gappx*e; } i++; } @@ -2997,6 +3116,13 @@ togglefullscreen(const Arg *arg) } void +togglegaps(const Arg *arg) +{ + selmon->gaps = !selmon->gaps; + arrange(selmon); +} + +void toggletag(const Arg *arg) { uint32_t newtags; |