mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-07 08:21:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start on texture on the main title bar segment

Browse source
This commit is contained in:
Jack Zeal 2026-04-03 23:17:28 -07:00
parent 1c79213470
commit 59c37bc91b
6 changed files with 92 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/common/borderset.h
View file

@ -48,6 +48,8 @@ struct bufferset * generateBufferset(struct wlr_scene_tree * tree, struct border
void renderBufferset(struct bufferset *, int width, int height, int y); void renderBufferset(struct bufferset *, int width, int height, int y);
void renderBuffersetXY(struct bufferset *, int width, int height, int x, int y);
void clearBorderCache(struct borderset *borderset); void clearBorderCache(struct borderset *borderset);
#endif /* LABWC_LAB_SCENE_RECT_H */ #endif /* LABWC_LAB_SCENE_RECT_H */

1
include/ssd-internal.h
View file

@ -106,6 +106,7 @@ struct ssd {
struct scaled_font_buffer *title; struct scaled_font_buffer *title;
struct wl_list buttons_left; /* ssd_button.link */ struct wl_list buttons_left; /* ssd_button.link */
struct wl_list buttons_right; /* ssd_button.link */ struct wl_list buttons_right; /* ssd_button.link */
struct bufferset * texturedBorders;
} subtrees[2]; /* indexed by enum ssd_active_state */ } subtrees[2]; /* indexed by enum ssd_active_state */
} titlebar; } titlebar;

5
include/theme.h
View file

@ -57,6 +57,11 @@ struct theme_background {
float color_split_to[4]; float color_split_to[4];
float color_to[4]; float color_to[4];
float color_to_split_to[4]; float color_to_split_to[4];
enum border_type border_type;
int border_width;
int bevel_width;
bool exclusive;
}; };
struct theme { struct theme {

21
src/common/borderset.c
View file

@ -307,50 +307,55 @@ struct bufferset * generateBufferset(struct wlr_scene_tree * tree, struct border
} }
void renderBufferset(struct bufferset *bufferset, int width, int height, int y) void renderBufferset(struct bufferset *bufferset, int width, int height, int y)
{
renderBuffersetXY(bufferset, width, height, 0, y);
}
void renderBuffersetXY(struct bufferset *bufferset, int width, int height, int x, int y)
{ {
wlr_scene_buffer_set_dest_size(bufferset->top, wlr_scene_buffer_set_dest_size(bufferset->top,
width - 2 * bufferset->border_width, bufferset->border_width); width - 2 * bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->top->node, wlr_scene_node_set_position(&bufferset->top->node,
bufferset->border_width,y); x+bufferset->border_width,y);
wlr_scene_buffer_set_dest_size(bufferset->bottom, wlr_scene_buffer_set_dest_size(bufferset->bottom,
width - 2 * bufferset->border_width, bufferset->border_width); width - 2 * bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->bottom->node, wlr_scene_node_set_position(&bufferset->bottom->node,
bufferset->border_width, y+height - bufferset->border_width); x+bufferset->border_width, y+height - bufferset->border_width);
wlr_scene_buffer_set_dest_size(bufferset->left, wlr_scene_buffer_set_dest_size(bufferset->left,
bufferset->border_width, height - bufferset->border_width * 2); bufferset->border_width, height - bufferset->border_width * 2);
wlr_scene_node_set_position(&bufferset->left->node, wlr_scene_node_set_position(&bufferset->left->node,
0, bufferset->border_width+y); x, bufferset->border_width+y);
wlr_scene_buffer_set_dest_size(bufferset->right, wlr_scene_buffer_set_dest_size(bufferset->right,
bufferset->border_width, height - bufferset->border_width * 2); bufferset->border_width, height - bufferset->border_width * 2);
wlr_scene_node_set_position(&bufferset->right->node, wlr_scene_node_set_position(&bufferset->right->node,
width - bufferset->border_width, y+ bufferset->border_width); x+width - bufferset->border_width, y+ bufferset->border_width);
wlr_scene_buffer_set_dest_size(bufferset->tl, wlr_scene_buffer_set_dest_size(bufferset->tl,
bufferset->border_width, bufferset->border_width); bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->tl->node, wlr_scene_node_set_position(&bufferset->tl->node,
0,y); x,y);
wlr_scene_buffer_set_dest_size(bufferset->tr, wlr_scene_buffer_set_dest_size(bufferset->tr,
bufferset->border_width, bufferset->border_width); bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->tr->node, wlr_scene_node_set_position(&bufferset->tr->node,
width-bufferset->border_width, y); x+width-bufferset->border_width, y);
wlr_scene_buffer_set_dest_size(bufferset->br, wlr_scene_buffer_set_dest_size(bufferset->br,
bufferset->border_width, bufferset->border_width); bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->br->node, wlr_scene_node_set_position(&bufferset->br->node,
width-bufferset->border_width , y+height-bufferset->border_width); x+width-bufferset->border_width , y+height-bufferset->border_width);
wlr_scene_buffer_set_dest_size(bufferset->bl, wlr_scene_buffer_set_dest_size(bufferset->bl,
bufferset->border_width, bufferset->border_width); bufferset->border_width, bufferset->border_width);
wlr_scene_node_set_position(&bufferset->bl->node, wlr_scene_node_set_position(&bufferset->bl->node,
0, height-bufferset->border_width+y); x, height-bufferset->border_width+y);
} }

33
src/ssd/ssd-titlebar.c
View file

@ -18,6 +18,7 @@
#include "ssd-internal.h" #include "ssd-internal.h"
#include "theme.h" #include "theme.h"
#include "view.h" #include "view.h"
#include "common/borderset.h"
static void set_squared_corners(struct ssd *ssd, bool enable); static void set_squared_corners(struct ssd *ssd, bool enable);
static void set_alt_button_icon(struct ssd *ssd, enum lab_node_type type, bool enable); static void set_alt_button_icon(struct ssd *ssd, enum lab_node_type type, bool enable);
@ -52,6 +53,19 @@ ssd_titlebar_create(struct ssd *ssd)
/* Background */ /* Background */
subtree->bar = lab_wlr_scene_buffer_create(parent, titlebar_fill); subtree->bar = lab_wlr_scene_buffer_create(parent, titlebar_fill);
if (theme->window[active].title_bg.border_type) {
/* Beveled Titlebar */
float *color = theme->window[active].title_bg.color;
float r = color[0];
float g = color[1];
float b = color[2];
float a = color[3];
uint32_t colour32 = (uint32_t)(a*255) << 24 | (uint32_t)(r*255) << 16 | (uint32_t)(g*255) << 8 | (uint32_t)(b*255);
struct borderset * renderedborders = getBorders(colour32, theme->window[active].title_bg.border_width, theme->window[active].title_bg.border_type, theme->window[active].title_bg.bevel_width);
subtree->texturedBorders = generateBufferset(subtree->tree, renderedborders, theme->window[active].title_bg.border_width);
}
/* /*
* Work around the wlroots/pixman bug that widened 1px buffer * Work around the wlroots/pixman bug that widened 1px buffer
* becomes translucent when bilinear filtering is used. * becomes translucent when bilinear filtering is used.
@ -318,10 +332,16 @@ ssd_titlebar_update(struct ssd *ssd)
x = theme->window_titlebar_padding_width; x = theme->window_titlebar_padding_width;
struct ssd_button *button; struct ssd_button *button;
int button_count = 0;
wl_list_for_each(button, &subtree->buttons_left, link) { wl_list_for_each(button, &subtree->buttons_left, link) {
wlr_scene_node_set_position(button->node, x, y); wlr_scene_node_set_position(button->node, x, y);
x += theme->window_button_width + theme->window_button_spacing; x += theme->window_button_width + theme->window_button_spacing;
button_count++;
} }
int exclusive_x = x;
x = width - corner_width; x = width - corner_width;
wlr_scene_node_set_position(&subtree->corner_right->node, wlr_scene_node_set_position(&subtree->corner_right->node,
@ -331,7 +351,20 @@ ssd_titlebar_update(struct ssd *ssd)
wl_list_for_each(button, &subtree->buttons_right, link) { wl_list_for_each(button, &subtree->buttons_right, link) {
x -= theme->window_button_width + theme->window_button_spacing; x -= theme->window_button_width + theme->window_button_spacing;
wlr_scene_node_set_position(button->node, x, y); wlr_scene_node_set_position(button->node, x, y);
button_count++;
} }
if (theme->window[active].title_bg.border_type) {
int titlebar_x = 0;
int titlebar_width = MAX(width, 0);
if (theme->window[active].title_bg.exclusive) {
titlebar_x = exclusive_x+theme->window_titlebar_padding_width;
titlebar_width = MAX((theme->window_button_width + theme->window_button_spacing)* button_count, titlebar_width - (theme->window_button_width + theme->window_button_spacing)* button_count);
}
renderBuffersetXY(subtree->texturedBorders, titlebar_width, theme->titlebar_height, titlebar_x, 0);
}
} }
ssd_update_title(ssd); ssd_update_title(ssd);

40
src/theme.c
View file

@ -457,9 +457,6 @@ static enum border_type parse_border_type(const char *str) {
if (strstr(lower, "doubleraised")) return BORDER_DOUBLE; if (strstr(lower, "doubleraised")) return BORDER_DOUBLE;
if (strstr(lower, "raised")) return BORDER_SINGLE; if (strstr(lower, "raised")) return BORDER_SINGLE;
return BORDER_FLAT; return BORDER_FLAT;
} }
static void static void
@ -564,8 +561,16 @@ theme_builtin(struct theme *theme)
theme->window[SSD_INACTIVE].title_bg.color_to_split_to[0] = FLT_MIN; theme->window[SSD_INACTIVE].title_bg.color_to_split_to[0] = FLT_MIN;
theme->window[SSD_ACTIVE].bevel_width = 0; theme->window[SSD_ACTIVE].bevel_width = 0;
theme->window[SSD_ACTIVE].border_type = BORDER_FLAT; theme->window[SSD_ACTIVE].border_type = BORDER_FLAT;
theme->window[SSD_ACTIVE].title_bg.bevel_width = 0;
theme->window[SSD_ACTIVE].title_bg.border_width = 0;
theme->window[SSD_ACTIVE].title_bg.exclusive = FALSE;
theme->window[SSD_ACTIVE].title_bg.border_type = BORDER_FLAT;
theme->window[SSD_INACTIVE].bevel_width = 0; theme->window[SSD_INACTIVE].bevel_width = 0;
theme->window[SSD_INACTIVE].border_type = BORDER_FLAT; theme->window[SSD_INACTIVE].border_type = BORDER_FLAT;
theme->window[SSD_INACTIVE].title_bg.bevel_width = 0;
theme->window[SSD_INACTIVE].title_bg.border_width = 0;
theme->window[SSD_INACTIVE].title_bg.exclusive = FALSE;
theme->window[SSD_INACTIVE].title_bg.border_type = BORDER_FLAT;
parse_hexstr("#000000", theme->window[SSD_ACTIVE].label_text_color); parse_hexstr("#000000", theme->window[SSD_ACTIVE].label_text_color);
parse_hexstr("#000000", theme->window[SSD_INACTIVE].label_text_color); parse_hexstr("#000000", theme->window[SSD_INACTIVE].label_text_color);
@ -737,6 +742,19 @@ entry(struct theme *theme, const char *key, const char *value)
wlr_log(WLR_INFO, "padding.height is no longer supported"); wlr_log(WLR_INFO, "padding.height is no longer supported");
} }
if (match_glob(key, "window.active.title.bg") && parse_border_type(value)) {
theme->window[SSD_ACTIVE].title_bg.border_type= parse_border_type(value);
}
if (match_glob(key, "window.active.title.bg.width")) {
theme->window[SSD_ACTIVE].title_bg.border_width = get_int_if_positive(value, "window.active.title.bg.width");
}
if (match_glob(key, "window.active.title.bg.exclusive")) {
set_bool(value, &theme->window[SSD_ACTIVE].title_bg.exclusive);
}
if (match_glob(key, "window.active.title.bg.bevel-width")) {
theme->window[SSD_ACTIVE].title_bg.bevel_width = get_int_if_positive(value, "window.active.title.bg.bevel-width");
}
if (match_glob(key, "window.active.border.color")) { if (match_glob(key, "window.active.border.color")) {
parse_color(value, theme->window[SSD_ACTIVE].border_color); parse_color(value, theme->window[SSD_ACTIVE].border_color);
} }
@ -772,6 +790,22 @@ entry(struct theme *theme, const char *key, const char *value)
if (match_glob(key, "window.active.title.bg")) { if (match_glob(key, "window.active.title.bg")) {
theme->window[SSD_ACTIVE].title_bg.gradient = parse_gradient(value); theme->window[SSD_ACTIVE].title_bg.gradient = parse_gradient(value);
} }
if (match_glob(key, "window.inactive.title.bg") && parse_border_type(value)) {
theme->window[SSD_INACTIVE].title_bg.border_type= parse_border_type(value);
}
if (match_glob(key, "window.inactive.title.bg.width")) {
theme->window[SSD_INACTIVE].title_bg.border_width = get_int_if_positive(value, "window.inactive.title.bg.width");
}
if (match_glob(key, "window.inactive.title.bg.bevel-width")) {
theme->window[SSD_INACTIVE].title_bg.bevel_width = get_int_if_positive(value, "window.inactive.title.bg.bevel-width");
}
if (match_glob(key, "window.inactive.title.bg.exclusive")) {
set_bool(value, &theme->window[SSD_INACTIVE].title_bg.exclusive);
}
if (match_glob(key, "window.inactive.title.bg")) { if (match_glob(key, "window.inactive.title.bg")) {
theme->window[SSD_INACTIVE].title_bg.gradient = parse_gradient(value); theme->window[SSD_INACTIVE].title_bg.gradient = parse_gradient(value);
} }