mirror/dwl
1
0
Fork 1
mirror of https://codeberg.org/dwl/dwl.git synced 2025-01-30 04:37:28 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't draw borders if there is only one window

Browse source 
Co-authored-by: Andrey Proskurin <andreyproskurin@protonmail.com>
This commit is contained in:
Leonardo Hernández Hernández 2022-08-16 15:28:00 -05:00 committed by Leonardo Hernández Hernández
parent 519ef45428
commit feca3a9810
No known key found for this signature in database
GPG key ID: E538897EE11B9624
2 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config.def.h
View file

@ -6,6 +6,7 @@
/* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const int smartborders = 1;
static const unsigned int borderpx = 1; /* border pixel of windows */
static const float bordercolor[] = COLOR(0x444444ff);
static const float focuscolor[] = COLOR(0x005577ff);

47
dwl.c
View file

@ -315,7 +315,7 @@ static void quit(const Arg *arg);
static void rendermon(struct wl_listener *listener, void *data);
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 resize(Client *c, struct wlr_box geo, int interact, int draw_borders);
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);
@ -767,7 +767,7 @@ closemon(Monitor *m)
wl_list_for_each(c, &clients, link) {
if (c->isfloating && c->geom.x > m->m.width)
resize(c, (struct wlr_box){.x = c->geom.x - m->w.width, .y = c->geom.y,
.width = c->geom.width, .height = c->geom.height}, 0);
.width = c->geom.width, .height = c->geom.height}, 0, 1);
if (c->mon == m)
setmon(c, selmon, c->tags);
}
@ -811,8 +811,12 @@ commitnotify(struct wl_listener *listener, void *data)
{
Client *c = wl_container_of(listener, c, commit);
if (client_surface(c)->mapped)
resize(c, c->geom, (c->isfloating && !c->isfullscreen));
if (client_surface(c)->mapped) {
if (c->mon && c->mon->lt[c->mon->sellt]->arrange && !c->isfullscreen && !c->isfloating)
c->mon->lt[c->mon->sellt]->arrange(c->mon);
else
resize(c, c->geom, (c->isfloating && !c->isfullscreen), (c->isfloating && !c->isfullscreen));
}
motionnotify(0, NULL, 0, 0, 0, 0);
/* mark a pending resize as completed */
@ -1789,7 +1793,7 @@ monocle(Monitor *m)
wl_list_for_each(c, &clients, link) {
if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
continue;
resize(c, m->w, 0);
resize(c, m->w, 0, !smartborders);
n++;
}
if (n)
@ -1877,11 +1881,11 @@ motionnotify(uint32_t time, struct wlr_input_device *device, double dx, double d
if (cursor_mode == CurMove) {
/* Move the grabbed client to the new position. */
resize(grabc, (struct wlr_box){.x = cursor->x - grabcx, .y = cursor->y - grabcy,
.width = grabc->geom.width, .height = grabc->geom.height}, 1);
.width = grabc->geom.width, .height = grabc->geom.height}, 1, 1);
return;
} else if (cursor_mode == CurResize) {
resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y,
.width = cursor->x - grabc->geom.x, .height = cursor->y - grabc->geom.y}, 1);
.width = cursor->x - grabc->geom.x, .height = cursor->y - grabc->geom.y}, 1, 1);
return;
}
@ -2162,12 +2166,13 @@ requestmonstate(struct wl_listener *listener, void *data)
}
void
resize(Client *c, struct wlr_box geo, int interact)
resize(Client *c, struct wlr_box geo, int interact, int draw_borders)
{
struct wlr_box *bbox = interact ? &sgeom : &c->mon->w;
struct wlr_box clip;
client_set_bounds(c, geo.width, geo.height);
c->geom = geo;
c->bw = draw_borders ? borderpx : 0;
applybounds(c, bbox);
/* Update scene-graph, including borders */
@ -2291,6 +2296,8 @@ setfloating(Client *c, int floating)
return;
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
if (c->isfloating && !c->bw)
resize(c, c->geom, 0, 1);
arrange(c->mon);
printstatus();
}
@ -2308,11 +2315,11 @@ setfullscreen(Client *c, int fullscreen)
if (fullscreen) {
c->prev = c->geom;
resize(c, c->mon->m, 0);
resize(c, c->mon->m, 0, 0);
} else {
/* restore previous size instead of arrange for floating windows since
* client positions are set by the user and cannot be recalculated */
resize(c, c->prev, 0);
resize(c, c->prev, 0, 1);
}
wlr_scene_node_for_each_buffer(&c->scene_surface->node, scenebuffersetopacity, c);
arrange(c->mon);
@ -2331,6 +2338,7 @@ setgamma(struct wl_listener *listener, void *data)
void
setlayout(const Arg *arg)
{
Client *c;
if (!selmon)
return;
if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
@ -2338,6 +2346,10 @@ setlayout(const Arg *arg)
if (arg && arg->v)
selmon->lt[selmon->sellt] = (Layout *)arg->v;
strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol));
/* floating layout, draw borders around all clients */
if (!selmon->lt[selmon->sellt]->arrange)
wl_list_for_each(c, &clients, link)
resize(c, c->geom, 0, 1);
arrange(selmon);
printstatus();
}
@ -2372,7 +2384,7 @@ setmon(Client *c, Monitor *m, uint32_t newtags)
arrange(oldmon);
if (m) {
/* Make sure window actually overlaps with the monitor */
resize(c, c->geom, 0);
resize(c, c->geom, 0, 1);
c->tags = newtags ? newtags : m->tagset[m->seltags]; /* assign tags of target monitor */
setfullscreen(c, c->isfullscreen); /* This will call arrange(c->mon) */
setfloating(c, c->isfloating);
@ -2669,7 +2681,7 @@ tagmon(const Arg *arg)
void
tile(Monitor *m)
{
unsigned int i, n = 0, mw, my, ty;
unsigned int i, n = 0, mw, my, ty, draw_borders = 1;
Client *c;
wl_list_for_each(c, &clients, link)
@ -2678,6 +2690,9 @@ tile(Monitor *m)
if (n == 0)
return;
if (n == smartborders)
draw_borders = 0;
if (n > m->nmaster)
mw = m->nmaster ? m->w.width * m->mfact : 0;
else
@ -2688,11 +2703,11 @@ tile(Monitor *m)
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);
.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)}, 0, draw_borders);
my += c->geom.height;
} else {
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);
.width = m->w.width - mw, .height = (m->w.height - ty) / (n - i)}, 0, draw_borders);
ty += c->geom.height;
}
i++;
@ -2864,7 +2879,7 @@ updatemons(struct wl_listener *listener, void *data)
arrange(m);
/* make sure fullscreen clients have the right size */
if ((c = focustop(m)) && c->isfullscreen)
resize(c, m->m, 0);
resize(c, m->m, 0, 0);
m->gamma_lut_changed = 1;
config_head->state.enabled = 1;
@ -3037,7 +3052,7 @@ configurex11(struct wl_listener *listener, void *data)
return;
if (c->isfloating || c->type == X11Unmanaged)
resize(c, (struct wlr_box){.x = event->x, .y = event->y,
.width = event->width, .height = event->height}, 0);
.width = event->width, .height = event->height}, 0, 1);
else
arrange(c->mon);
}