~ruther/dwl

86ba4c8526d8b96eb0caaa60f8f42edb51b2b558 — Stivvo 4 years ago fcc869e
Remove goto render (easier merge)
1 files changed, 18 insertions(+), 19 deletions(-)

M dwl.c
M dwl.c => dwl.c +18 -19
@@ 1241,27 1241,26 @@ renderclients(Monitor *m, struct timespec *now)
		ox = c->geom.x, oy = c->geom.y;
		wlr_output_layout_output_coords(output_layout, m->wlr_output,
				&ox, &oy);
		if (c->bw == 0)
			goto render;

		w = surface->current.width;
		h = surface->current.height;
		borders = (struct wlr_box[4]) {
			{ox, oy, w + 2 * c->bw, c->bw},             /* top */
			{ox, oy + c->bw, c->bw, h},                 /* left */
			{ox + c->bw + w, oy + c->bw, c->bw, h},     /* right */
			{ox, oy + c->bw + h, w + 2 * c->bw, c->bw}, /* bottom */
		};

		/* Draw window borders */
		color = (c == sel) ? focuscolor : bordercolor;
		for (i = 0; i < 4; i++) {
			scalebox(&borders[i], m->wlr_output->scale);
			wlr_render_rect(drw, &borders[i], color,
					m->wlr_output->transform_matrix);

		if (c->bw) {
			w = surface->current.width;
			h = surface->current.height;
			borders = (struct wlr_box[4]) {
				{ox, oy, w + 2 * c->bw, c->bw},             /* top */
				{ox, oy + c->bw, c->bw, h},                 /* left */
				{ox + c->bw + w, oy + c->bw, c->bw, h},     /* right */
				{ox, oy + c->bw + h, w + 2 * c->bw, c->bw}, /* bottom */
			};

			/* Draw window borders */
			color = (c == sel) ? focuscolor : bordercolor;
			for (i = 0; i < 4; i++) {
				scalebox(&borders[i], m->wlr_output->scale);
				wlr_render_rect(drw, &borders[i], color,
						m->wlr_output->transform_matrix);
			}
		}

render:
		/* This calls our render function for each surface among the
		 * xdg_surface's toplevel and popups. */
		rdata.output = m->wlr_output;

Do not follow this link