mirror of
https://codeberg.org/dwl/dwl.git
synced 2025-01-14 21:07:28 -08:00
apply smartborders
This commit is contained in:
korei999
parent
53ecb8ce9a
commit
f49e94f455
1 changed files with 32 additions and 17 deletions
49
dwl.c
49
dwl.c
|
|
@ -320,7 +320,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 setcursor(struct wl_listener *listener, void *data);
|
||||
static void setcursorshape(struct wl_listener *listener, void *data);
|
||||
|
|
@ -772,7 +772,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);
|
||||
}
|
||||
|
|
@ -809,7 +809,7 @@ 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));
|
||||
resize(c, c->geom, (c->isfloating && !c->isfullscreen), 1);
|
||||
|
||||
/* mark a pending resize as completed */
|
||||
if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
|
||||
|
|
@ -1917,7 +1917,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)
|
||||
|
|
@ -1965,11 +1965,11 @@ motionnotify(uint32_t time)
|
|||
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;
|
||||
}
|
||||
|
||||
|
|
@ -2253,12 +2253,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 */
|
||||
|
|
@ -2372,8 +2373,13 @@ setfloating(Client *c, int floating)
|
|||
c->isfloating = floating;
|
||||
if (!c->mon)
|
||||
return;
|
||||
|
||||
wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen
|
||||
? LyrFS : c->isfloating ? LyrFloat : LyrTile]);
|
||||
|
||||
if (c->isfloating && !c->bw)
|
||||
resize(c, c->mon->m, 0, 1);
|
||||
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
}
|
||||
|
|
@ -2391,11 +2397,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);
|
||||
}
|
||||
arrange(c->mon);
|
||||
printstatus();
|
||||
|
|
@ -2420,6 +2426,12 @@ 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));
|
||||
if (!selmon->lt[selmon->sellt]->arrange) {
|
||||
/* floating layout, draw borders around all clients */
|
||||
Client *c;
|
||||
wl_list_for_each(c, &clients, link)
|
||||
resize(c, c->mon->m, 0, 1);
|
||||
}
|
||||
arrange(selmon);
|
||||
printstatus();
|
||||
}
|
||||
|
|
@ -2454,7 +2466,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);
|
||||
|
|
@ -2733,7 +2745,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)
|
||||
|
|
@ -2742,6 +2754,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
|
||||
|
|
@ -2752,11 +2767,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++;
|
||||
|
|
@ -2788,11 +2803,11 @@ vertile(Monitor *m)
|
|||
continue;
|
||||
if (i < m->nmaster) {
|
||||
h = ( mh - my ) / (MIN(n, m->nmaster) - i);
|
||||
resize(c, (struct wlr_box) { .x = m->w.x, .y = m->w.y + my, .width = m->w.width, .height = h }, 0);
|
||||
resize(c, (struct wlr_box) { .x = m->w.x, .y = m->w.y + my, .width = m->w.width, .height = h }, 0, draw_borders);
|
||||
my += c->geom.height;
|
||||
} else {
|
||||
h = ( m->w.height - ty ) / (n - i);
|
||||
resize(c, (struct wlr_box) { .x = m->w.x, .y = m->w.y + ty, .width = m->w.width, .height = h }, 0);
|
||||
resize(c, (struct wlr_box) { .x = m->w.x, .y = m->w.y + ty, .width = m->w.width, .height = h }, 0, draw_borders);
|
||||
ty += c->geom.height;
|
||||
}
|
||||
i++;
|
||||
|
|
@ -2952,7 +2967,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;
|
||||
|
|
@ -3153,7 +3168,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);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue