From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 5 Jul 2009 13:53:29 +0000 (+0200)
Subject: Allow escaping _ in menu labels by putting __
X-Git-Tag: release-3.4.8-rc2~1^2~3
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=fa4e09dd7e8b65234e833444f418e890a9185898

Allow escaping _ in menu labels by putting __

Currently you can't mark anything that comes after the __ with _ to make
that a shortcut.
---

diff --git a/openbox/menu.c b/openbox/menu.c
index 23a0527..58b6280 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -232,10 +232,13 @@ static gunichar parse_shortcut(const gchar *label, gboolean allow_shortcut,
             /* you have to use a printable ascii character for shortcuts
                don't allow space either, so you can have like "a _ b"
             */
-            if (VALID_SHORTCUT(*(i+1))) {
-                shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
-                *position = i - *strippedlabel;
-                *always_show = TRUE;
+            if (VALID_SHORTCUT(*(i+1)) || *(i+1) == '_') {
+                /* Allow you to escape the first _ by putting __ */
+                if (*(i+1) != '_') {
+                    shortcut = g_unichar_tolower(g_utf8_get_char(i+1));
+                    *position = i - *strippedlabel;
+                    *always_show = TRUE;
+                }
 
                 /* remove the '_' from the string */
                 for (; *i != '\0'; ++i)