From 7897807941a92141226084f6649c4f26e6bf2810 Mon Sep 17 00:00:00 2001 From: Jack Zeal Date: Mon, 23 Mar 2026 20:43:26 -0700 Subject: [PATCH] Draw beveled windowed borders, inspired by jlindgren https://github.com/labwc/labwc/pull/3382/files --- include/ssd-internal.h | 1 + src/ssd/ssd-border.c | 204 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 187 insertions(+), 18 deletions(-) diff --git a/include/ssd-internal.h b/include/ssd-internal.h index 600b9076..de91d558 100644 --- a/include/ssd-internal.h +++ b/include/ssd-internal.h @@ -115,6 +115,7 @@ struct ssd { struct ssd_border_subtree { struct wlr_scene_tree *tree; struct wlr_scene_rect *top, *bottom, *left, *right; + struct wlr_scene_buffer *tlcorner, *trcorner, *blcorner, *brcorner, *ttexture, *btexture, *ltexture, *rtexture; } subtrees[2]; /* indexed by enum ssd_active_state */ } border; diff --git a/src/ssd/ssd-border.c b/src/ssd/ssd-border.c index c2c99f8d..5083c0be 100644 --- a/src/ssd/ssd-border.c +++ b/src/ssd/ssd-border.c @@ -2,14 +2,16 @@ #include #include +#include "buffer.h" #include "common/macros.h" +#include "common/mem.h" #include "common/scene-helpers.h" #include "config/rcxml.h" #include "ssd.h" #include "ssd-internal.h" #include "theme.h" #include "view.h" - +#include "stdio.h" void ssd_border_create(struct ssd *ssd) { @@ -18,6 +20,7 @@ ssd_border_create(struct ssd *ssd) struct view *view = ssd->view; struct theme *theme = rc.theme; + int bw = theme->border_width; int width = view->current.width; int height = view_effective_height(view, /* use_pending */ false); int full_width = width + 2 * theme->border_width; @@ -26,6 +29,7 @@ ssd_border_create(struct ssd *ssd) ssd->border.tree = lab_wlr_scene_tree_create(ssd->tree); wlr_scene_node_set_position(&ssd->border.tree->node, -theme->border_width, 0); +printf("At 32\n"); enum ssd_active_state active; FOR_EACH_ACTIVE_STATE(active) { struct ssd_border_subtree *subtree = &ssd->border.subtrees[active]; @@ -34,6 +38,90 @@ ssd_border_create(struct ssd *ssd) wlr_scene_node_set_enabled(&parent->node, active); float *color = theme->window[active].border_color; + /* From Pull request 3382 */ + uint8_t r = color[0] * 255; + uint8_t g = color[1] * 255; + uint8_t b = color[2] * 255; + uint8_t a = color[3] * 255; + + /* highlight */ + uint8_t r1 = MIN(r * 5 / 4, a); + uint8_t g1 = MIN(g * 5 / 4, a); + uint8_t b1 = MIN(b * 5 / 4, a); + + /* darker outline */ + uint8_t r0 = r / 2; + uint8_t g0 = g / 2; + uint8_t b0 = b / 2; + + uint32_t col = ((uint32_t)a << 24) | ((uint32_t)r << 16) + | ((uint32_t)g << 8) | b; + uint32_t col0 = ((uint32_t)a << 24) | ((uint32_t)r0 << 16) + | ((uint32_t)g0 << 8) | b0; + uint32_t col1 = ((uint32_t)a << 24) | ((uint32_t)r1 << 16) + | ((uint32_t)g1 << 8) | b1; + + + uint32_t *left_data = znew_n(uint32_t, bw); + uint32_t *top_data = znew_n(uint32_t, bw); + left_data[0] = top_data[0] = col1; + left_data[1] = top_data[1] = col1; + for (int i = 2; i < bw; i++) { + left_data[i] = col; + top_data[i] = col; + } + left_data[bw-1] = top_data[bw-1] = col0; + left_data[bw-2] = top_data[bw-2] = col0; + + + + uint32_t *tl_data = znew_n(uint32_t, bw*bw); + uint32_t *tr_data = znew_n(uint32_t, bw*bw); + uint32_t *bl_data = znew_n(uint32_t, bw*bw); + uint32_t *br_data = znew_n(uint32_t, bw*bw); + for (int i=0; ibw -3) { + bl_data[i*bw + j] = col0; + br_data[i*bw + j] = col0; + } + if (j<2) { + tl_data[i*bw + j] = col1; + bl_data[i*bw + j] = col1; + } + if (j>bw -3) { + tr_data[i*bw + j] = col0; + br_data[i*bw + j] = col0; + } + } + } + tl_data[bw*bw -1] = col0; + tr_data[(bw-1)*bw + (0)] = col0; + bl_data[(0)*bw + (bw-1)] = col1; + br_data[(0)*bw + (0)] = col1; + + + /* bottom and right are identical */ + uint32_t *right_data = znew_n(uint32_t, theme->border_width); + uint32_t *bottom_data = znew_n(uint32_t, theme->border_width); + right_data[0]=bottom_data[0]=col1; + right_data[1]=bottom_data[1]=col1; + for (int i = 2; i < theme->border_width - 1; i++) { + right_data[i] = col; + bottom_data[i] = col; + } + right_data[theme->border_width - 1] = bottom_data[theme->border_width - 1] = col0; + right_data[theme->border_width - 2] = bottom_data[theme->border_width - 2] = col0; + + subtree->left = lab_wlr_scene_rect_create(parent, theme->border_width, height, color); wlr_scene_node_set_position(&subtree->left->node, 0, 0); @@ -53,7 +141,61 @@ ssd_border_create(struct ssd *ssd) wlr_scene_node_set_position(&subtree->top->node, theme->border_width + corner_width, -(ssd->titlebar.height + theme->border_width)); + + + struct lab_data_buffer *ttexture_buffer = + buffer_create_from_data(top_data, 1,theme->border_width, + 4); + subtree->ttexture = wlr_scene_buffer_create(parent, &ttexture_buffer->base); + wlr_buffer_drop(&ttexture_buffer->base); + + struct lab_data_buffer *btexture_buffer = + buffer_create_from_data(bottom_data, 1,theme->border_width, + 4); + subtree->btexture = wlr_scene_buffer_create(parent, &btexture_buffer->base); + wlr_buffer_drop(&btexture_buffer->base); + + struct lab_data_buffer *ltexture_buffer = + buffer_create_from_data(left_data, theme->border_width, 1, + 4*theme->border_width); + subtree->ltexture = wlr_scene_buffer_create(parent, <exture_buffer->base); + wlr_buffer_drop(<exture_buffer->base); + struct lab_data_buffer *rtexture_buffer = + buffer_create_from_data(right_data, theme->border_width, 1, + 4*theme->border_width); + subtree->rtexture = wlr_scene_buffer_create(parent, &rtexture_buffer->base); + wlr_buffer_drop(&rtexture_buffer->base); + + + struct lab_data_buffer *tltexture_buffer = + buffer_create_from_data(tl_data, theme->border_width, theme->border_width, + 4*theme->border_width); + subtree->tlcorner = wlr_scene_buffer_create(parent, &tltexture_buffer->base); + wlr_buffer_drop(&tltexture_buffer->base); + + struct lab_data_buffer *trtexture_buffer = + buffer_create_from_data(tr_data, theme->border_width, theme->border_width, + 4*theme->border_width); + subtree->trcorner = wlr_scene_buffer_create(parent, &trtexture_buffer->base); + wlr_buffer_drop(&trtexture_buffer->base); + + + struct lab_data_buffer *bltexture_buffer = + buffer_create_from_data(bl_data, theme->border_width, theme->border_width, + 4*theme->border_width); + subtree->blcorner = wlr_scene_buffer_create(parent, &bltexture_buffer->base); + wlr_buffer_drop(&bltexture_buffer->base); + + struct lab_data_buffer *brtexture_buffer = + buffer_create_from_data(br_data, theme->border_width, theme->border_width, + 4*theme->border_width); + subtree->brcorner = wlr_scene_buffer_create(parent, &brtexture_buffer->base); + wlr_buffer_drop(&brtexture_buffer->base); + } + + + if (view->maximized == VIEW_AXIS_BOTH) { wlr_scene_node_set_enabled(&ssd->border.tree->node, false); @@ -132,26 +274,52 @@ ssd_border_update(struct ssd *ssd) enum ssd_active_state active; FOR_EACH_ACTIVE_STATE(active) { struct ssd_border_subtree *subtree = &ssd->border.subtrees[active]; + + wlr_scene_buffer_set_dest_size(subtree->ttexture, + full_width, theme->border_width); + wlr_scene_node_set_position(&subtree->ttexture->node, + 0, -(ssd->titlebar.height + theme->border_width)); + + wlr_scene_buffer_set_dest_size(subtree->rtexture, + theme->border_width, side_height+(ssd->titlebar.height + theme->border_width)); + wlr_scene_node_set_position(&subtree->rtexture->node, + theme->border_width + width, -(ssd->titlebar.height + theme->border_width)); - wlr_scene_rect_set_size(subtree->left, - theme->border_width, side_height); - wlr_scene_node_set_position(&subtree->left->node, - 0, side_y); - - wlr_scene_rect_set_size(subtree->right, - theme->border_width, side_height); - wlr_scene_node_set_position(&subtree->right->node, - theme->border_width + width, side_y); - - wlr_scene_rect_set_size(subtree->bottom, - full_width, theme->border_width); - wlr_scene_node_set_position(&subtree->bottom->node, + wlr_scene_buffer_set_dest_size(subtree->btexture, + full_width, theme->border_width); + wlr_scene_node_set_position(&subtree->btexture->node, 0, height); + + wlr_scene_buffer_set_dest_size(subtree->ltexture, + theme->border_width, side_height+(ssd->titlebar.height + theme->border_width)); + wlr_scene_node_set_position(&subtree->ltexture->node, + 0, -(ssd->titlebar.height + theme->border_width)); + + wlr_scene_buffer_set_dest_size(subtree->tlcorner, + theme->border_width, theme->border_width); + wlr_scene_node_set_position(&subtree->tlcorner->node, + 0, -(ssd->titlebar.height + theme->border_width)); - wlr_scene_rect_set_size(subtree->top, - top_width, theme->border_width); - wlr_scene_node_set_position(&subtree->top->node, - top_x, -(ssd->titlebar.height + theme->border_width)); + wlr_scene_buffer_set_dest_size(subtree->trcorner, + theme->border_width, theme->border_width); + wlr_scene_node_set_position(&subtree->trcorner->node, + theme->border_width + width, -(ssd->titlebar.height + theme->border_width)); + + + wlr_scene_buffer_set_dest_size(subtree->brcorner, + theme->border_width, theme->border_width); + wlr_scene_node_set_position(&subtree->brcorner->node, + theme->border_width + width, height); + + + wlr_scene_buffer_set_dest_size(subtree->blcorner, + theme->border_width, theme->border_width); + wlr_scene_node_set_position(&subtree->blcorner->node, + 0, height); + + + + } }