From 5e4de143de6c43ab54a5df7cea169674f8ea79a3 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Wed, 27 Oct 2021 18:27:08 +0200 Subject: csd: add support for a visible border MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we’re using CSDs, we’ve up until now rendered a 5px invisible border. This border handles interactive resizing. I.e. hovering it changes the mouse cursor, and mouse button events are used to start an interactive resize. This patch makes it possible to color part of (or the entire) border, with a configurable color. To facilitate this, two new options have been added: * csd.border-width * csd.border-color border-width defaults to 0, resulting in the look we’re used to. border-color defaults to the title bar color. If the title bar color hasn’t been set, it defaults to the default foreground color (just like the title bar color does). This means that, setting border-width but not border-color, results in a border that blends with the title bar. --- render.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 5 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index ddeb72f4..5d93074e 100644 --- a/render.c +++ b/render.c @@ -1508,7 +1508,8 @@ get_csd_data(const struct terminal *term, enum csd_surface surf_idx) /* Only title bar is rendered in maximized mode */ const int border_width = !term->window->is_maximized - ? term->conf->csd.border_width * term->scale : 0; + ? max(term->conf->csd.border_width, + term->conf->csd.border_width_visible) * term->scale : 0; const int title_height = term->window->is_fullscreen ? 0 @@ -1565,12 +1566,12 @@ render_csd_part(struct terminal *term, { xassert(term->window->csd_mode == CSD_YES); - pixman_image_t *src = pixman_image_create_solid_fill(color); + //pixman_image_t *src = pixman_image_create_solid_fill(color); pixman_image_fill_rectangles( PIXMAN_OP_SRC, buf->pix[0], color, 1, &(pixman_rectangle16_t){0, 0, buf->width, buf->height}); - pixman_image_unref(src); + //pixman_image_unref(src); } static void @@ -1729,8 +1730,56 @@ render_csd_border(struct terminal *term, enum csd_surface surf_idx, xassert(info->width % term->scale == 0); xassert(info->height % term->scale == 0); - pixman_color_t color = color_hex_to_pixman_with_alpha(0, 0); - render_csd_part(term, surf, buf, info->width, info->height, &color); + { + pixman_color_t color = color_hex_to_pixman_with_alpha(0, 0); + render_csd_part(term, surf, buf, info->width, info->height, &color); + } + + /* + * The “visible” border. + */ + + int bwidth = term->conf->csd.border_width; /* Full border size */ + int vwidth = term->conf->csd.border_width_visible; /* Visibls size */ + + if (vwidth > 0) { + + const struct config *conf = term->conf; + int x = 0, y = 0, w = 0, h = 0; + + switch (surf_idx) { + case CSD_SURF_TOP: + case CSD_SURF_BOTTOM: + x = bwidth - vwidth; + y = surf_idx == CSD_SURF_TOP ? info->height - vwidth : 0; + w = info->width - 2 * x; + h = vwidth; + break; + + case CSD_SURF_LEFT: + case CSD_SURF_RIGHT: + x = surf_idx == CSD_SURF_LEFT ? bwidth - vwidth : 0; + y = 0; + w = vwidth; + h = info->height; + break; + + default: + break; + } + + uint32_t _color = + conf->csd.color.border_set ? conf->csd.color.border : + conf->csd.color.title_set ? conf->csd.color.title : + 0xffu << 24 | term->conf->colors.fg; + uint16_t alpha = _color >> 24 | (_color >> 24 << 8); + pixman_color_t color = color_hex_to_pixman_with_alpha(_color, alpha); + + pixman_image_fill_rectangles( + PIXMAN_OP_SRC, buf->pix[0], &color, 1, + &(pixman_rectangle16_t){x, y, w, h}); + } + csd_commit(term, surf, buf); } -- cgit v1.3 From e69c3e5b1e87a27c86fb4ca27c0078a00f5727ce Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Fri, 29 Oct 2021 19:31:09 +0200 Subject: render: csd_part: we don’t use the ‘src’ pixman image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- render.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'render.c') diff --git a/render.c b/render.c index 5d93074e..f232c0be 100644 --- a/render.c +++ b/render.c @@ -1566,12 +1566,9 @@ render_csd_part(struct terminal *term, { xassert(term->window->csd_mode == CSD_YES); - //pixman_image_t *src = pixman_image_create_solid_fill(color); - pixman_image_fill_rectangles( PIXMAN_OP_SRC, buf->pix[0], color, 1, &(pixman_rectangle16_t){0, 0, buf->width, buf->height}); - //pixman_image_unref(src); } static void -- cgit v1.3