diff options
| author | corvid <corvid@lavabit.com> | 2011-04-20 13:48:57 +0000 |
|---|---|---|
| committer | corvid <corvid@lavabit.com> | 2011-04-20 13:48:57 +0000 |
| commit | d85682a6441876ae1a39b8d8abe1ec7bef39cc6d (patch) | |
| tree | a9f5dcbdb1ed5224485fa8189e930c37e3e7547e /src | |
| parent | 7a526530784731fd19f2ec313cb0c82beed944dd (diff) | |
symbol/shortcut interpretation, comments
Diffstat (limited to 'src')
| -rw-r--r-- | src/dillo.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/dillo.cc b/src/dillo.cc index 0e76411b..937385cb 100644 --- a/src/dillo.cc +++ b/src/dillo.cc @@ -170,8 +170,8 @@ static OptID getCmdOption(const CLI_options *options, int argc, char **argv, } /* - * 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 custMenuLabelDraw(const Fl_Label* o, int X, int Y, int W, int H, 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 @@ int main(int argc, char **argv) // 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 |