Mercurial > dillo_port1.3

changeset 1973:679657a0e2be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
symbol/shortcut interpretation, comments
author corvid <corvid@lavabit.com>
date Wed, 20 Apr 2011 13:48:57 +0000
parents e4be2e379f81
children 2cfe42568366
files src/dillo.cc
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/dillo.cc	Wed Apr 20 01:55:59 2011 +0000
+++ b/src/dillo.cc	Wed Apr 20 13:48:57 2011 +0000
@@ -170,8 +170,8 @@
 }
 
 /*
- * We'll set FL_NORMAL_LABEL to not interpret special symbols,
- * and FL_FREE_LABELTYPE to interpret them.
+ * Set FL_NORMAL_LABEL to interpret neither symbols (@) nor shortcuts (&),
+ * and FL_FREE_LABELTYPE to interpret shortcuts.
  */
 static void custLabelDraw(const Fl_Label* o, int X, int Y, int W, int H,
                           Fl_Align align)
@@ -206,7 +206,7 @@
 
 static void custMenuLabelMeasure(const Fl_Label* o, int& W, int& H)
 {
-   const int interpret_symbols = 1;
+   const int interpret_symbols = 0;
 
    fl_draw_shortcut = 1;
    fl_font(o->font, o->size);
@@ -365,8 +365,10 @@
    // Sets WM_CLASS hint on X11
    Fl_Window::default_xclass("dillo");
 
-   // Disable '@' interpretation in normal labels
+   // Disable '@' and '&' interpretation in normal labels.
    Fl::set_labeltype(FL_NORMAL_LABEL, custLabelDraw, custLabelMeasure);
+
+   // Use to permit '&' interpretation.
    Fl::set_labeltype(FL_FREE_LABELTYPE,custMenuLabelDraw,custMenuLabelMeasure);
 
 #if 0