M openbox/menuframe.c → openbox/menuframe.c

@@ -319,12 +319,13 @@ self->a_text_selected :
                    self->a_text_normal));
         text_a->texture[0].data.text.string = self->entry->data.normal.label;
         if (self->frame->menu->show_all_shortcuts ||
-            self->entry->data.normal.shortcut_position > 0)
+            self->entry->data.normal.shortcut > 0)
         {
-            text_a->texture[0].data.text.shortcut =
-                self->entry->data.normal.shortcut;
+            text_a->texture[0].data.text.shortcut = TRUE;
+            text_a->texture[0].data.text.shortcut_pos =
+                self->entry->data.normal.shortcut_position;
         } else
-            text_a->texture[0].data.text.shortcut = 0;
+            text_a->texture[0].data.text.shortcut = FALSE;
         break;
     case OB_MENU_ENTRY_TYPE_SUBMENU:
         text_a = (self == self->frame->selected ?
@@ -332,11 +333,11 @@ self->a_text_selected :
                   self->a_text_normal);
         sub = self->entry->data.submenu.submenu;
         text_a->texture[0].data.text.string = sub ? sub->title : "";
-        if (self->frame->menu->show_all_shortcuts ||
-            sub->shortcut_position > 0) {
-            text_a->texture[0].data.text.shortcut = sub->shortcut;
+        if (self->frame->menu->show_all_shortcuts || sub->shortcut > 0) {
+            text_a->texture[0].data.text.shortcut = TRUE;
+            text_a->texture[0].data.text.shortcut_pos = sub->shortcut_position;
         } else
-            text_a->texture[0].data.text.shortcut = 0;
+            text_a->texture[0].data.text.shortcut = FALSE;
         break;
     case OB_MENU_ENTRY_TYPE_SEPARATOR:
         if (self->entry->data.separator.label != NULL)

M render/font.c → render/font.c

@@ -58,12 +58,21 @@ {
     RrFont *out;
     PangoWeight pweight;
     PangoStyle pstyle;
+    PangoAttrList *attrlist;
 
     out = g_new(RrFont, 1);
     out->inst = inst;
     out->ref = 1;
     out->font_desc = pango_font_description_new();
     out->layout = pango_layout_new(inst->pango);
+    out->shortcut_underline = pango_attr_underline_new(PANGO_UNDERLINE_LOW);
+
+    attrlist = pango_attr_list_new();
+    /* shortcut_underline is owned by the attrlist */
+    pango_attr_list_insert(attrlist, out->shortcut_underline);
+    /* the attributes are owned by the layout */
+    pango_layout_set_attributes(out->layout, attrlist);
+    pango_attr_list_unref(attrlist);
 
     switch (weight) {
     case RR_FONTWEIGHT_LIGHT:     pweight = PANGO_WEIGHT_LIGHT;     break;
@@ -175,7 +184,7 @@ gint x,y,w,h;
     XftColor c;
     gint mw;
     PangoRectangle rect;
-    PangoAttrList* attrs = NULL;
+    PangoAttrList *attrlist;
 
     /* center the text vertically
        We do this centering based on the 'baseline' since different fonts have
@@ -189,28 +198,6 @@ x = area->x + 2;
     w = area->width - 4;
     h = area->height;
 
-    /* * * set up the layout * * */
-
-    if (t->shortcut) {
-        gchar *i;
-        gchar *lowertext;
-
-        lowertext = g_utf8_strdown(t->string, -1);
-        i = g_utf8_strchr(lowertext, -1, t->shortcut);
-        if (i != NULL) {
-            PangoAttribute *a;
-
-            a = pango_attr_underline_new(PANGO_UNDERLINE_LOW);
-            a->start_index = i - lowertext;
-            a->end_index = i - lowertext +
-                g_unichar_to_utf8(t->shortcut, NULL);
-
-            attrs = pango_attr_list_new();
-            pango_attr_list_insert(attrs, a);
-        }
-        g_free(lowertext);
-    }
-
     pango_layout_set_text(t->font->layout, t->string, -1);
     pango_layout_set_width(t->font->layout, w * PANGO_SCALE);
 
@@ -231,6 +218,9 @@ case RR_JUSTIFY_CENTER:
         x += (w - mw) / 2;
         break;
     }
+
+    t->font->shortcut_underline->start_index = 0;
+    t->font->shortcut_underline->end_index = 0;
 
     if (t->shadow_offset_x || t->shadow_offset_y) {
         c.color.red = t->shadow_color->r | t->shadow_color->r << 8;
@@ -239,7 +229,13 @@ c.color.blue = t->shadow_color->b | t->shadow_color->b << 8;
         c.color.alpha = 0xffff * t->shadow_alpha / 255;
         c.pixel = t->shadow_color->pixel;
 
-        pango_layout_set_attributes(t->font->layout, NULL);
+        /* the attributes are owned by the layout.
+           re-add the attributes to the layout after changing the
+           start and end index */
+        attrlist = pango_layout_get_attributes(t->font->layout);
+        pango_attr_list_ref(attrlist);
+        pango_layout_set_attributes(t->font->layout, attrlist);
+        pango_attr_list_unref(attrlist);
 
         /* see below... */
         pango_xft_render_layout_line
@@ -254,8 +250,23 @@ c.color.blue = t->color->b | t->color->b << 8;
     c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */
     c.pixel = t->color->pixel;
 
-    pango_layout_set_attributes(t->font->layout, attrs);
-    if (attrs != NULL) pango_attr_list_unref(attrs);
+    if (t->shortcut) {
+        const gchar *c = t->string + t->shortcut_pos;
+
+        if (g_utf8_validate(c, -1, NULL)) {
+            t->font->shortcut_underline->start_index = t->shortcut_pos;
+            t->font->shortcut_underline->end_index = t->shortcut_pos +
+                (g_utf8_next_char(c) - c);
+
+            /* the attributes are owned by the layout.
+               re-add the attributes to the layout after changing the
+               start and end index */
+            attrlist = pango_layout_get_attributes(t->font->layout);
+            pango_attr_list_ref(attrlist);
+            pango_layout_set_attributes(t->font->layout, attrlist);
+            pango_attr_list_unref(attrlist);
+        }
+    }
 
     /* layout_line() uses y to specify the baseline
        The line doesn't need to be freed, it's a part of the layout */

M render/font.h → render/font.h

@@ -28,6 +28,7 @@ const RrInstance *inst;
     gint ref;
     PangoFontDescription *font_desc; 
     PangoLayout *layout; /*!< Used for measuring and rendering strings */
+    PangoAttribute *shortcut_underline; /*< For underlining the shortcut key */
     gint ascent; /*!< The font's ascent in pango-units */
     gint descent; /*!< The font's descent in pango-units */
 };

M render/render.h → render/render.h

@@ -126,7 +126,8 @@ gint shadow_offset_x;
     gint shadow_offset_y;
     RrColor *shadow_color;
     gchar shadow_alpha;
-    gunichar shortcut; /*!< Underline this character */
+    gboolean shortcut; /*!< Underline a character */
+    guint shortcut_pos; /*!< Position in bytes of the character to underline */
 };
 
 struct _RrPixmapMask {