diff options
Diffstat (limited to 'dwl.c')
| -rw-r--r-- | dwl.c | 55 |
1 files changed, 50 insertions, 5 deletions
@@ -90,6 +90,7 @@ enum { CurNormal, CurPressed, CurMove, CurResize }; /* cursor */ enum { XDGShell, LayerShell, X11 }; /* client types */ enum { LyrBg, LyrBottom, LyrTile, LyrFloat, LyrTop, LyrFS, LyrOverlay, LyrBlock, NUM_LAYERS }; /* scene layers */ enum { SWIPE_LEFT, SWIPE_RIGHT, SWIPE_DOWN, SWIPE_UP }; +enum { BrdOriginal, BrdStart, BrdEnd, BrdStartEnd }; typedef struct ForceTearingRule { const char* title; @@ -127,6 +128,8 @@ struct Client { Monitor *mon; struct wlr_scene_tree *scene; struct wlr_scene_rect *border[4]; /* top, bottom, left, right */ + struct wlr_scene_rect *borders[4]; /* top, bottom, left, right */ + struct wlr_scene_rect *bordere[4]; /* top, bottom, left, right */ struct wlr_scene_tree *scene_surface; struct wl_list link; struct wl_list flink; @@ -156,6 +159,8 @@ struct Client { struct wl_listener set_hints; #endif unsigned int bw; + unsigned int bws; + unsigned int bwe; uint32_t tags; int isfloating, isurgent, isfullscreen, isterm, noswallow; uint32_t resize; /* configure serial of a pending resize */ @@ -1421,6 +1426,8 @@ createnotify(struct wl_listener *listener, void *data) c = toplevel->base->data = ecalloc(1, sizeof(*c)); c->surface.xdg = toplevel->base; c->bw = borderpx; + c->bws = borders_only_floating ? 0 : borderspx; + c->bwe = borders_only_floating ? 0 : borderepx; LISTEN(&toplevel->base->surface->events.commit, &c->commit, commitnotify); LISTEN(&toplevel->base->surface->events.map, &c->map, mapnotify); @@ -1911,7 +1918,7 @@ focusclient(Client *c, int lift) selmon = c->mon; c->isurgent = 0; - client_set_border_color(c, focuscolor); + client_set_border_color(c, focuscolor, borderscolor, borderecolor); } /* Deactivate old client if focus is changing */ @@ -1928,7 +1935,7 @@ focusclient(Client *c, int lift) /* Don't deactivate old client if the new one wants focus, as this causes issues with winecfg * 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_border_color(old_c, bordercolor, borderscolor, borderecolor); client_activate_surface(old, 0); } @@ -2452,6 +2459,12 @@ mapnotify(struct wl_listener *listener, void *data) c->border[i] = wlr_scene_rect_create(c->scene, 0, 0, c->isurgent ? urgentcolor : bordercolor); c->border[i]->node.data = c; + + c->borders[i] = wlr_scene_rect_create(c->scene, 0, 0, borderscolor); + c->borders[i]->node.data = c; + + c->bordere[i] = wlr_scene_rect_create(c->scene, 0, 0, borderecolor); + c->bordere[i]->node.data = c; } /* Initialize client geometry with room for border */ @@ -2473,6 +2486,12 @@ mapnotify(struct wl_listener *listener, void *data) } else { applyrules(c); } + + if (borders_only_floating) { + c->bws = c->isfloating ? borderspx : 0; + c->bwe = c->isfloating ? borderepx : 0; + } + printstatus(); unset_fullscreen: @@ -2600,7 +2619,7 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d if (sloppyfocus) selmon = xytomon(cursor->x, cursor->y); } - client_set_border_color(focustop(selmon), focuscolor); + client_set_border_color(focustop(selmon), focuscolor, borderscolor, borderecolor); /* Update drag icon's position */ wlr_scene_node_set_position(&drag_icon->node, (int)round(cursor->x), (int)round(cursor->y)); @@ -2908,6 +2927,24 @@ resize(Client *c, struct wlr_box geo, int interact) 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->borders[0], c->geom.width - 2 * borderspx_offset, c->bws); + wlr_scene_rect_set_size(c->borders[1], c->geom.width - 2 * borderspx_offset, c->bws); + wlr_scene_rect_set_size(c->borders[2], c->bws, c->geom.height - 2 * c->bws - 2 * borderspx_offset); + wlr_scene_rect_set_size(c->borders[3], c->bws, c->geom.height - 2 * c->bws - 2 * borderspx_offset); + wlr_scene_node_set_position(&c->borders[0]->node, borderspx_offset, borderspx_offset); + wlr_scene_node_set_position(&c->borders[1]->node, borderspx_offset, c->geom.height - c->bws - borderspx_offset); + wlr_scene_node_set_position(&c->borders[2]->node, borderspx_offset, c->bws + borderspx_offset); + wlr_scene_node_set_position(&c->borders[3]->node, c->geom.width - c->bws - borderspx_offset, c->bws + borderspx_offset); + + wlr_scene_rect_set_size(c->bordere[0], c->geom.width - (c->bw - c->bwe) * 2 + borderepx_negative_offset * 2, c->bwe); + wlr_scene_rect_set_size(c->bordere[1], c->geom.width - (c->bw - c->bwe) * 2 + borderepx_negative_offset * 2, c->bwe); + wlr_scene_rect_set_size(c->bordere[2], c->bwe, c->geom.height - 2 * c->bw + 2 * borderepx_negative_offset); + wlr_scene_rect_set_size(c->bordere[3], c->bwe, c->geom.height - 2 * c->bw + 2 * borderepx_negative_offset); + wlr_scene_node_set_position(&c->bordere[0]->node, c->bw - c->bwe - borderepx_negative_offset, c->bw - c->bwe - borderepx_negative_offset); + wlr_scene_node_set_position(&c->bordere[1]->node, c->bw - c->bwe - borderepx_negative_offset, c->geom.height - c->bw + borderepx_negative_offset); + wlr_scene_node_set_position(&c->bordere[2]->node, c->bw - c->bwe - borderepx_negative_offset, c->bw - borderepx_negative_offset); + wlr_scene_node_set_position(&c->bordere[3]->node, c->geom.width - c->bw + borderepx_negative_offset, c->bw - borderepx_negative_offset); + /* 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); @@ -3026,6 +3063,12 @@ setfloating(Client *c, int floating) /* If in floating layout do not change the client's layer */ if (!c->mon || !client_surface(c)->mapped || !c->mon->lt[c->mon->sellt]->arrange) return; + + if (borders_only_floating) { + c->bws = c->isfloating ? borderspx : 0; + c->bwe = c->isfloating ? borderepx : 0; + } + wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || (p && p->isfullscreen) ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); @@ -3040,6 +3083,8 @@ setfullscreen(Client *c, int fullscreen) if (!c->mon || !client_surface(c)->mapped) return; c->bw = fullscreen ? 0 : borderpx; + c->bws = fullscreen ? 0 : borderspx; + c->bwe = fullscreen ? 0 : borderepx; client_set_fullscreen(c, fullscreen); wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); @@ -3735,7 +3780,7 @@ urgent(struct wl_listener *listener, void *data) printstatus(); if (client_surface(c)->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, urgentcolor, borderscolor, borderecolor); } void @@ -3964,7 +4009,7 @@ sethints(struct wl_listener *listener, void *data) printstatus(); if (c->isurgent && surface && surface->mapped) - client_set_border_color(c, urgentcolor); + client_set_border_color(c, urgentcolor, borderscolor, borderecolor); } void |