mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-17 06:46:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tree-wide: use markup only when an accelerator is defined with _

Browse source
This commit is contained in:
Alex Chernika 2026-04-15 00:15:12 +02:00
parent 58fa089749
commit c6681876b5
No known key found for this signature in database
GPG key ID: 6029FAD8ABFB076A
8 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/menu/menu.h
View file

@ -27,6 +27,7 @@ struct menuitem {
struct menu *parent; struct menu *parent;
struct menu *submenu; struct menu *submenu;
bool selectable; bool selectable;
bool use_markup;
enum menuitem_type type; enum menuitem_type type;
int native_width; int native_width;
struct wlr_scene_tree *tree; struct wlr_scene_tree *tree;

3
include/scaled-buffer/scaled-font-buffer.h
View file

@ -15,6 +15,7 @@ struct scaled_font_buffer {
/* Private */ /* Private */
char *text; char *text;
bool use_markup;
int max_width; int max_width;
float color[4]; float color[4];
float bg_color[4]; float bg_color[4];
@ -71,6 +72,6 @@ scaled_font_buffer_create_for_titlebar(struct wlr_scene_tree *parent,
*/ */
void scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text, void scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text,
int max_width, struct font *font, const float *color, int max_width, struct font *font, const float *color,
const float *bg_color); const float *bg_color, bool use_markup);
#endif /* LABWC_SCALED_FONT_BUFFER_H */ #endif /* LABWC_SCALED_FONT_BUFFER_H */

6
src/cycle/osd-classic.c
View file

@ -58,8 +58,8 @@ create_fields_scene(struct view *view,
struct scaled_font_buffer *font_buffer = struct scaled_font_buffer *font_buffer =
scaled_font_buffer_create(parent); scaled_font_buffer_create(parent);
scaled_font_buffer_update(font_buffer, scaled_font_buffer_update(font_buffer,
buf.data, field_width, buf.data, field_width, &rc.font_osd,
&rc.font_osd, text_color, bg_color); text_color, bg_color, false);
node = &font_buffer->scene_buffer->node; node = &font_buffer->scene_buffer->node;
height = font_height(&rc.font_osd); height = font_height(&rc.font_osd);
} }
@ -143,7 +143,7 @@ cycle_osd_classic_init(struct cycle_osd_output *osd_output)
wlr_scene_node_set_position(&font_buffer->scene_buffer->node, wlr_scene_node_set_position(&font_buffer->scene_buffer->node,
x, y + (switcher_theme->item_height - font_height(&font)) / 2); x, y + (switcher_theme->item_height - font_height(&font)) / 2);
scaled_font_buffer_update(font_buffer, workspace_name, 0, scaled_font_buffer_update(font_buffer, workspace_name, 0,
&font, text_color, bg_color); &font, text_color, bg_color, false);
y += switcher_theme->item_height; y += switcher_theme->item_height;
} }

2
src/cycle/osd-thumbnail.c
View file

@ -112,7 +112,7 @@ create_label(struct wlr_scene_tree *parent, struct view *view,
scaled_font_buffer_create(parent); scaled_font_buffer_create(parent);
scaled_font_buffer_update(buffer, buf.data, scaled_font_buffer_update(buffer, buf.data,
switcher_theme->item_width - 2 * switcher_theme->item_padding, switcher_theme->item_width - 2 * switcher_theme->item_padding,
&rc.font_osd, text_color, bg_color); &rc.font_osd, text_color, bg_color, false);
buf_reset(&buf); buf_reset(&buf);
wlr_scene_node_set_position(&buffer->scene_buffer->node, wlr_scene_node_set_position(&buffer->scene_buffer->node,
(switcher_theme->item_width - buffer->width) / 2, y); (switcher_theme->item_width - buffer->width) / 2, y);

24
src/menu/menu.c
View file

@ -155,22 +155,16 @@ item_create(struct menu *menu, char *text, const char *icon_name, bool show_arro
size_t bytes = mbrtoc32(&codepoint, it + 1, size_t bytes = mbrtoc32(&codepoint, it + 1,
MB_CUR_MAX, &state); MB_CUR_MAX, &state);
if (bytes > 0 && bytes <= 4) { if (bytes > 0 && bytes <= 4) {
accelerator = accelerator = (uint32_t)towlower((wint_t)codepoint);
(uint32_t)towlower((wint_t)codepoint);
} }
if (*(it + 1) != '\0') { if (*(it + 1) != '\0') {
int underscore_index = it - text; int underscore_index = it - text;
new_text = malloc(strlen(text) + 8); new_text = strdup_printf("%.*s<u>%.*s</u>%s",
if (!new_text) { underscore_index, text, (int)bytes,
break; it + 1, it + 1 + bytes);
} break;
memcpy(new_text, text, underscore_index);
sprintf(new_text + underscore_index, "<u>%c</u>%s",
*(it + 1), it + 2);
} }
break;
} }
it++; it++;
} }
@ -189,8 +183,10 @@ item_create(struct menu *menu, char *text, const char *icon_name, bool show_arro
menuitem->accelerator = accelerator; menuitem->accelerator = accelerator;
if (new_text) { if (new_text) {
menuitem->text = xstrdup(new_text); menuitem->text = xstrdup(new_text);
menuitem->use_markup = true;
} else { } else {
menuitem->text = xstrdup(text); menuitem->text = xstrdup(text);
menuitem->use_markup = false;
} }
#if HAVE_LIBSFDO #if HAVE_LIBSFDO
@ -263,7 +259,7 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
struct scaled_font_buffer *label_buffer = scaled_font_buffer_create(tree); struct scaled_font_buffer *label_buffer = scaled_font_buffer_create(tree);
assert(label_buffer); assert(label_buffer);
scaled_font_buffer_update(label_buffer, item->text, label_max_width, scaled_font_buffer_update(label_buffer, item->text, label_max_width,
&rc.font_menuitem, text_color, bg_color); &rc.font_menuitem, text_color, bg_color, item->use_markup);
/* Vertically center and left-align label */ /* Vertically center and left-align label */
int x = theme->menu_items_padding_x + icon_width; int x = theme->menu_items_padding_x + icon_width;
int y = (theme->menu_item_height - label_buffer->height) / 2; int y = (theme->menu_item_height - label_buffer->height) / 2;
@ -277,7 +273,7 @@ item_create_scene_for_state(struct menuitem *item, float *text_color,
struct scaled_font_buffer *arrow_buffer = scaled_font_buffer_create(tree); struct scaled_font_buffer *arrow_buffer = scaled_font_buffer_create(tree);
assert(arrow_buffer); assert(arrow_buffer);
scaled_font_buffer_update(arrow_buffer, item->arrow, -1, scaled_font_buffer_update(arrow_buffer, item->arrow, -1,
&rc.font_menuitem, text_color, bg_color); &rc.font_menuitem, text_color, bg_color, false);
/* Vertically center and right-align arrow */ /* Vertically center and right-align arrow */
x += label_max_width + theme->menu_items_padding_x; x += label_max_width + theme->menu_items_padding_x;
y = (theme->menu_item_height - label_buffer->height) / 2; y = (theme->menu_item_height - label_buffer->height) / 2;
@ -416,7 +412,7 @@ title_create_scene(struct menuitem *menuitem, int *item_y)
scaled_font_buffer_create(menuitem->normal_tree); scaled_font_buffer_create(menuitem->normal_tree);
assert(title_font_buffer); assert(title_font_buffer);
scaled_font_buffer_update(title_font_buffer, menuitem->text, scaled_font_buffer_update(title_font_buffer, menuitem->text,
text_width, &rc.font_menuheader, text_color, bg_color); text_width, &rc.font_menuheader, text_color, bg_color, false);
int title_x = 0; int title_x = 0;
switch (theme->menu_title_text_justify) { switch (theme->menu_title_text_justify) {

6
src/scaled-buffer/scaled-font-buffer.c
View file

@ -26,7 +26,7 @@ _create_buffer(struct scaled_buffer *scaled_buffer, double scale)
/* Buffer gets free'd automatically along the backing wlr_buffer */ /* Buffer gets free'd automatically along the backing wlr_buffer */
font_buffer_create(&buffer, self->max_width, self->height, self->text, font_buffer_create(&buffer, self->max_width, self->height, self->text,
&self->font, self->color, bg_pattern, scale, true); &self->font, self->color, bg_pattern, scale, self->use_markup);
if (!buffer) { if (!buffer) {
wlr_log(WLR_ERROR, "font_buffer_create() failed"); wlr_log(WLR_ERROR, "font_buffer_create() failed");
@ -56,6 +56,7 @@ _equal(struct scaled_buffer *scaled_buffer_a,
struct scaled_font_buffer *b = scaled_buffer_b->data; struct scaled_font_buffer *b = scaled_buffer_b->data;
return str_equal(a->text, b->text) return str_equal(a->text, b->text)
&& a->use_markup == b->use_markup
&& a->max_width == b->max_width && a->max_width == b->max_width
&& str_equal(a->font.name, b->font.name) && str_equal(a->font.name, b->font.name)
&& a->font.size == b->font.size && a->font.size == b->font.size
@ -107,7 +108,7 @@ scaled_font_buffer_create_for_titlebar(struct wlr_scene_tree *parent,
void void
scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text, scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text,
int max_width, struct font *font, const float *color, int max_width, struct font *font, const float *color,
const float *bg_color) const float *bg_color, bool use_markup)
{ {
assert(self); assert(self);
assert(text); assert(text);
@ -120,6 +121,7 @@ scaled_font_buffer_update(struct scaled_font_buffer *self, const char *text,
/* Update internal state */ /* Update internal state */
self->text = xstrdup(text); self->text = xstrdup(text);
self->use_markup = use_markup;
self->max_width = max_width; self->max_width = max_width;
if (font->name) { if (font->name) {
self->font.name = xstrdup(font->name); self->font.name = xstrdup(font->name);

2
src/ssd/resize-indicator.c
View file

@ -202,7 +202,7 @@ resize_indicator_update(struct view *view)
wlr_scene_node_set_position(&indicator->tree->node, x, y); wlr_scene_node_set_position(&indicator->tree->node, x, y);
scaled_font_buffer_update(indicator->text, text, width, &rc.font_osd, scaled_font_buffer_update(indicator->text, text, width, &rc.font_osd,
rc.theme->osd_label_text_color, rc.theme->osd_bg_color); rc.theme->osd_label_text_color, rc.theme->osd_bg_color, false);
} }
void void

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

@ -473,7 +473,7 @@ ssd_update_title(struct ssd *ssd)
const float bg_color[4] = {0, 0, 0, 0}; /* ignored */ const float bg_color[4] = {0, 0, 0, 0}; /* ignored */
scaled_font_buffer_update(subtree->title, view->title, scaled_font_buffer_update(subtree->title, view->title,
title_bg_width, font, title_bg_width, font,
text_color, bg_color); text_color, bg_color, false);
/* And finally update the cache */ /* And finally update the cache */
dstate->width = subtree->title->width; dstate->width = subtree->title->width;