FLTK: line numbers colours #93

Author: chrisws

ChangeLog

@@ -1,3 +1,6 @@
+2020-06-14 (0.12.19)
+	FLTK: line numbers colours #93
+
 2020-06-06 (0.12.19)
 	COMMON: minor performance tweak
 

configure.ac

@@ -213,7 +213,7 @@ function buildSDL() {
    esac
 
    PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `pkg-config freetype2 --cflags` -fno-exceptions"
-   CXXFLAGS="${CXXFLAGS} -fno-rtti -std=c++11"
+   CXXFLAGS="${CXXFLAGS} -fno-rtti -std=c++14"
 
    dnl preconfigured values for SDL build
    AC_DEFINE(_SDL, 1, [Defined when building SDL version])
@@ -345,7 +345,7 @@ function buildFLTK() {
    esac
 
    FLTK_CXXFLAGS="${PACKAGE_CFLAGS} `fltk-config --cxxflags`"
-   FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++11 -Wno-unknown-pragmas"
+   FLTK_CXXFLAGS="${FLTK_CXXFLAGS} -fno-exceptions -fno-rtti -std=c++14 -Wno-unknown-pragmas"
    PACKAGE_LIBS="${PACKAGE_LIBS} `fltk-config --ldstaticflags --use-images`"
 
    dnl do not depend on cygwin.dll under cygwin build

src/platform/fltk/EditorWidget.h

@@ -56,7 +56,8 @@ enum StyleField {
   st_numbers,
   st_operators,
   st_selection,
-  st_background
+  st_background,
+  st_lineNumbers
 };
 
 enum CommandOpt {

src/platform/fltk/MainWindow.cxx

@@ -973,7 +973,8 @@ MainWindow::MainWindow(int w, int h) :
   m->add("&View/Text Color/_Subs", 0, EditorWidget::set_color_cb, (void *)st_subs);
   m->add("&View/Text Color/Numbers", 0, EditorWidget::set_color_cb, (void *)st_numbers);
   m->add("&View/Text Color/Operators", 0, EditorWidget::set_color_cb, (void *)st_operators);
-  m->add("&View/Text Color/Find Matches", 0, EditorWidget::set_color_cb, (void *)st_findMatches);
+  m->add("&View/Text Color/_Find Matches", 0, EditorWidget::set_color_cb, (void *)st_findMatches);
+  m->add("&View/Text Color/Line Numbers", 0, EditorWidget::set_color_cb, (void *)st_lineNumbers);
   m->add("&View/Text Size/&Increase", FL_CTRL + ']', font_size_incr_cb);
   m->add("&View/Text Size/&Decrease", FL_CTRL + '[', font_size_decr_cb);
 

src/platform/fltk/Profile.cxx

@@ -29,6 +29,8 @@ const char *helpThemeIdKey = "helpThemeId";
 // in BasicEditor.cxx
 extern Fl_Text_Display::Style_Table_Entry styletable[];
 
+static StyleField lastStyle = st_lineNumbers;
+
 //
 // Profile constructor
 //
@@ -74,6 +76,7 @@ void Profile::loadEditTheme(int themeId) {
   styletable[9].color = get_color(_theme._syntax_command); // J - operators
   styletable[10].color = get_color(_theme._selection_background); // K Selection Background
   styletable[11].color = get_color(_theme._background); // L Background
+  styletable[12].color = get_color(_theme._number_color); // M Line numbers
 }
 
 //
@@ -186,6 +189,7 @@ void Profile::updateTheme() {
   _theme._syntax_command = styletable[9].color >> 8;
   _theme._selection_background = styletable[10].color >> 8;
   _theme._background = styletable[11].color >> 8;
+  _theme._number_color = styletable[12].color >> 8;
 }
 
 //
@@ -236,20 +240,18 @@ void Profile::restoreStyles(Properties<String *> *profile) {
     _font = get_font(fontName->c_str());
   }
 
-  for (int i = 0; i <= st_background; i++) {
+  for (int i = 0; i <= lastStyle; i++) {
     char buffer[4];
     sprintf(buffer, "%02d", i);
     String *color = profile->get(buffer);
     if (color) {
       Fl_Color c = get_color(color->c_str(), NO_COLOR);
       if (c != (Fl_Color)NO_COLOR) {
         styletable[i].color = c;
-        if (i == st_background) {
-          _theme._background = c >> 8;
-        }
       }
     }
   }
+  updateTheme();
 }
 
 //
@@ -347,7 +349,7 @@ void Profile::saveStyles(FILE *fp) {
   saveValue(fp, fontSizeKey, (int)styletable[0].size);
   saveValue(fp, fontNameKey, styletable[0].font);
 
-  for (int i = 0; i <= st_background; i++) {
+  for (int i = 0; i <= lastStyle; i++) {
     Fl::get_color(styletable[i].color, r, g, b);
     fprintf(fp, "%02d=#%02x%02x%02x\n", i, r, g, b);
   }