From 53b1b5556e206c8af520afcd6b8ff71b83170e0e Mon Sep 17 00:00:00 2001 From: 0scar Date: Tue, 1 Oct 2024 13:36:46 +0200 Subject: Revert "Patch: Smart borders" This reverts commit 8c62ba88848c8dc4b0d0471382e9ec4ca139fb60. --- dwl.c | 50 ++++++++++++++++---------------------------------- 1 file changed, 16 insertions(+), 34 deletions(-) (limited to 'dwl.c') diff --git a/dwl.c b/dwl.c index b560f95..afb2366 100644 --- a/dwl.c +++ b/dwl.c @@ -334,7 +334,7 @@ static void rendermon(struct wl_listener *listener, void *data); static void requestdecorationmode(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, int draw_borders); +static void resize(Client *c, struct wlr_box geo, int interact); static void run(char *startup_cmd, uid_t uid); static void setcursor(struct wl_listener *listener, void *data); static void setcursorshape(struct wl_listener *listener, void *data); @@ -828,7 +828,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, 1); + .width = c->geom.width, .height = c->geom.height}, 0); if (c->mon == m) setmon(c, selmon, c->tags); } @@ -875,12 +875,6 @@ void commitnotify(struct wl_listener *listener, void *data) { Client *c = wl_container_of(listener, c, commit); - struct wlr_box box = {0}; - client_get_geometry(c, &box); - - if (c->mon && !wlr_box_empty(&box) && (box.width != c->geom.width - 2 * c->bw - || box.height != c->geom.height - 2 * c->bw)) - c->isfloating ? resize(c, c->geom, 1, 1) : arrange(c->mon); if (c->surface.xdg->initial_commit) { /* @@ -903,7 +897,7 @@ commitnotify(struct wl_listener *listener, void *data) return; } - resize(c, c->geom, (c->isfloating && !c->isfullscreen), 1); + resize(c, c->geom, (c->isfloating && !c->isfullscreen)); /* mark a pending resize as completed */ if (c->resize && c->resize <= c->surface.xdg->current.configure_serial) @@ -2028,7 +2022,8 @@ monocle(Monitor *m) wl_list_for_each(c, &clients, link) { if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) continue; - resize(c, m->w, 0, !smartborders); + resize(c, m->w, 0); + n++; } if (n) snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "[%d]", n); @@ -2119,11 +2114,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 = (int)round(cursor->x) - grabcx, .y = (int)round(cursor->y) - grabcy, - .width = grabc->geom.width, .height = grabc->geom.height}, 1, 1); + .width = grabc->geom.width, .height = grabc->geom.height}, 1); return; } else if (cursor_mode == CurResize) { resize(grabc, (struct wlr_box){.x = grabc->geom.x, .y = grabc->geom.y, - .width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1, 1); + .width = (int)round(cursor->x) - grabc->geom.x, .height = (int)round(cursor->y) - grabc->geom.y}, 1); return; } @@ -2401,7 +2396,7 @@ requestmonstate(struct wl_listener *listener, void *data) } void -resize(Client *c, struct wlr_box geo, int interact, int draw_borders) +resize(Client *c, struct wlr_box geo, int interact) { struct wlr_box *bbox; struct wlr_box clip; @@ -2413,7 +2408,6 @@ resize(Client *c, struct wlr_box geo, int interact, int draw_borders) 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 */ @@ -2544,8 +2538,6 @@ setfloating(Client *c, int floating) wlr_scene_node_reparent(&c->scene->node, layers[c->isfullscreen || (p && p->isfullscreen) ? LyrFS : c->isfloating ? LyrFloat : LyrTile]); - if (c->isfloating && !c->bw) - resize(c, c->mon->m, 0, 1); arrange(c->mon); printstatus(); } @@ -2563,11 +2555,11 @@ setfullscreen(Client *c, int fullscreen) if (fullscreen) { c->prev = c->geom; - resize(c, c->mon->m, 0, 0); + resize(c, c->mon->m, 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, 1); + resize(c, c->prev, 0); } arrange(c->mon); printstatus(); @@ -2604,12 +2596,6 @@ setlayout(const Arg *arg) selmon->sellt ^= 1; if (arg && arg->v) selmon->lt[selmon->sellt] = (Layout *)arg->v; - 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); - } strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, LENGTH(selmon->ltsymbol)); arrange(selmon); printstatus(); @@ -2645,8 +2631,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, 1); - wlr_surface_send_enter(client_surface(c), m->wlr_output); + resize(c, c->geom, 0); 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); @@ -2953,7 +2938,7 @@ tagmon(const Arg *arg) void tile(Monitor *m) { - unsigned int mw, my, ty, draw_borders = 1; + unsigned int mw, my, ty; int i, n = 0, gap = 0; Client *c; @@ -2966,9 +2951,6 @@ tile(Monitor *m) if (n > 1) gap = m->gappx; - if (n == smartborders) - draw_borders = 0; - if (n > m->nmaster) mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0; else @@ -2979,11 +2961,11 @@ tile(Monitor *m) continue; if (i < m->nmaster) { resize(c, (struct wlr_box){.x = m->w.x + gap, .y = m->w.y + my, - .width = mw - gap, .height = (m->w.height - my - gap) / (MIN(n, m->nmaster) - i)}, 0, draw_borders); + .width = mw - gap, .height = (m->w.height - my - gap) / (MIN(n, m->nmaster) - i)}, 0); my += c->geom.height + gap; } else { resize(c, (struct wlr_box){.x = m->w.x + mw + gap, .y = m->w.y + ty, - .width = m->w.width - mw - 2 * gap, .height = (m->w.height - ty) / (n - i) - gap}, 0, draw_borders); + .width = m->w.width - mw - 2 * gap, .height = (m->w.height - ty) / (n - i) - gap}, 0); ty += c->geom.height + gap; } i++; @@ -3210,7 +3192,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, 0); + resize(c, m->m, 0); /* Try to re-set the gamma LUT when updating monitors, * it's only really needed when enabling a disabled output, but meh. */ @@ -3429,7 +3411,7 @@ configurex11(struct wl_listener *listener, void *data) if ((c->isfloating && c != grabc) || !c->mon->lt[c->mon->sellt]->arrange) { resize(c, (struct wlr_box){.x = event->x - c->bw, .y = event->y - c->bw, .width = event->width + c->bw * 2, - .height = event->height + c->bw * 2}, 0, 1); + .height = event->height + c->bw * 2}, 0); } else { arrange(c->mon); } -- cgit v1.3