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

menu: create a separate function for unescaping underscores

Browse source
This commit is contained in:
Alex Chernika 2026-05-08 00:07:05 +02:00
parent f8796c97ba
commit 91efa30d56
No known key found for this signature in database
GPG key ID: 6029FAD8ABFB076A
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/menu/menu.c
View file

@ -156,7 +156,7 @@ get_unicode_char_lowercase(const char *first_byte, size_t *out_bytes)
return (uint32_t)g_unichar_tolower(codepoint); return (uint32_t)g_unichar_tolower(codepoint);
} }
/* Retrieve an accelerator from an item label, remove doubled underscores */ /* Retrieve the accelerator from an item label, remove doubled underscores */
static void static void
item_parse_accelerator(struct menuitem *item, const char *text) item_parse_accelerator(struct menuitem *item, const char *text)
{ {
@ -178,7 +178,7 @@ item_parse_accelerator(struct menuitem *item, const char *text)
size_t bytes = 0; size_t bytes = 0;
if (!accel_ptr) { if (!accel_ptr) {
/* Defaulting to the first char */ /* Default to the first char */
item->text = xstrdup(text); item->text = xstrdup(text);
item->accelerator = get_unicode_char_lowercase(text, &bytes); item->accelerator = get_unicode_char_lowercase(text, &bytes);
} else { } else {
@ -193,10 +193,18 @@ item_parse_accelerator(struct menuitem *item, const char *text)
/* Remainder */ /* Remainder */
accel_ptr + bytes); accel_ptr + bytes);
} }
}
/* Remove undescores used for escaping */ /* Remove underscores used for escaping from a string */
char *src = item->text; static void
char *dst = item->text; unescape_underscores(char *text)
{
if (!text) {
return;
}
char *src = text;
char *dst = text;
while (*src) { while (*src) {
if (*src == '_' && *(src + 1) == '_') { if (*src == '_' && *(src + 1) == '_') {
*dst++ = '_'; *dst++ = '_';
@ -221,6 +229,7 @@ item_create(struct menu *menu, const char *text, const char *icon_name, bool sho
menuitem->type = LAB_MENU_ITEM; menuitem->type = LAB_MENU_ITEM;
menuitem->arrow = show_arrow ? "›" : NULL; menuitem->arrow = show_arrow ? "›" : NULL;
item_parse_accelerator(menuitem, text); item_parse_accelerator(menuitem, text);
unescape_underscores(menuitem->text);
#if HAVE_LIBSFDO #if HAVE_LIBSFDO
if (rc.menu_show_icons && !string_null_or_empty(icon_name)) { if (rc.menu_show_icons && !string_null_or_empty(icon_name)) {