From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:19:20 +0000 (+0100)
Subject: src/menu: add global config for menu.showIcons
X-Git-Url: https://git.mdlowis.com/?a=commitdiff_plain;h=ed4553fc7e36175fa160fd50914224da00fb1181;p=proto%2Flabwc.git

src/menu: add global config for menu.showIcons
---

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index 8742dd6a..23b5df37 100644
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -1121,6 +1121,7 @@ situation.
 ```
 <menu>
   <ignoreButtonReleasePeriod>250</ignoreButtonReleasePeriod>
+  <showIcons>yes</showIcons>
 </menu>
 ```
 
@@ -1134,6 +1135,11 @@ situation.
 	option has been exposed for unusual use-cases. It is equivalent to
 	Openbox's `<hideDelay>`. Default is 250 ms.
 
+*<menu><showIcons>*
+	Show menu icons based on the `icon` attribute of menu label elements.
+	Default is yes. Requires libsfdo. If labwc is built without it, no
+	icons will be shown.
+
 ## MAGNIFIER
 
 ```
diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 16f5c212..8ea2710b 100644
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -676,6 +676,7 @@
 
   <menu>
     <ignoreButtonReleasePeriod>250</ignoreButtonReleasePeriod>
+    <showIcons>yes</showIcons>
   </menu>
 
   <!--
diff --git a/include/config/rcxml.h b/include/config/rcxml.h
index 9aa6c9ba..208b73e0 100644
--- a/include/config/rcxml.h
+++ b/include/config/rcxml.h
@@ -175,6 +175,7 @@ struct rcxml {
 
 	/* Menu */
 	unsigned int menu_ignore_button_release_period;
+	bool menu_show_icons;
 
 	/* Magnifier */
 	int mag_width;
diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 90fcfe15..4a60b73b 100644
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -1252,6 +1252,8 @@ entry(xmlNode *node, char *nodename, char *content)
 			tablet_get_dbl_if_positive(content, "relativeMotionSensitivity");
 	} else if (!strcasecmp(nodename, "ignoreButtonReleasePeriod.menu")) {
 		rc.menu_ignore_button_release_period = atoi(content);
+	} else if (!strcasecmp(nodename, "showIcons.menu")) {
+		set_bool(content, &rc.menu_show_icons);
 	} else if (!strcasecmp(nodename, "width.magnifier")) {
 		rc.mag_width = atoi(content);
 	} else if (!strcasecmp(nodename, "height.magnifier")) {
@@ -1497,6 +1499,7 @@ rcxml_init(void)
 	rc.workspace_config.min_nr_workspaces = 1;
 
 	rc.menu_ignore_button_release_period = 250;
+	rc.menu_show_icons = true;
 
 	rc.mag_width = 400;
 	rc.mag_height = 400;
diff --git a/src/menu/menu.c b/src/menu/menu.c
index 554c369c..a774842c 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -459,8 +459,7 @@ fill_item(char *nodename, char *content)
 			"nodename: '%s' content: '%s'", nodename, content);
 	} else if (!strcmp(nodename, "icon")) {
 #if HAVE_LIBSFDO
-		// TODO: add some rc.menu_icons bool
-		if (true && !string_null_or_empty(content)) {
+		if (rc.menu_show_icons && !string_null_or_empty(content)) {
 			xstrdup_replace(current_item->icon_name, content);
 			current_menu->has_icons = true;
 		}