Fluid: restructuring and rejuvenation of the source code.

* Add classes for application and project
* Removed all globals from Fluid.h
* Extracting args and project history into their own classes
* Moving globals into Application class
* Initialize values inside headers for some classes.
* Undo functionality wrapped in a class inside Project.
* File reader and writer are now linked to a project.
* Avoid global project access
* Nodes (former Types) will be managed by a new Tree class.
* Removed static members (hidden globals) form Node/Fl_Type.
* Adding Tree iterator.
* Use nullptr instead of 0, NULL, or 0L
* Renamed Fl_..._Type to ..._Node, FL_OVERRIDE -> override
* Renaming ..._type to ...::prototype
* Splitting Widget Panel into multiple files.
* Moved callback code into widget panel file.
* Cleaning up Fluid_Image -> Image_asset
* Moving Fd_Snap_Action into new namespace fld::app::Snap_Action etc.
* Moved mergeback into proj folder.
* `enum ID` is now `enum class Type`.

1 files changed, 219 insertions, 215 deletions

diff --git a/fluid/panels/settings_panel.cxx b/fluid/panels/settings_panel.cxx
index 358f90c8d..432613623 100644
--- a/fluid/panels/settings_panel.cxx
+++ b/fluid/panels/settings_panel.cxx
@@ -17,8 +17,8 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.0500
 
 #include "settings_panel.h"
-#include "app/project.h"
-#include "app/undo.h"
+#include "Project.h"
+#include "proj/undo.h"
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Tooltip.H>
 #include <FL/fl_ask.H>
@@ -230,7 +230,7 @@ static const unsigned char idata_general_64[] =
 150,102,123,63,248,127,27,97,180,206,27,14,172,151,0,0,0,0,73,69,78,68,174,66,
 96,130};
 static Fl_Image *image_general_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("general_64.png", idata_general_64, 2162);
   return image;
@@ -242,36 +242,40 @@ static void cb_(Fl_Group* o, void* v) {
 
 Fl_Scheme_Choice *scheme_choice=(Fl_Scheme_Choice *)0;
 
+static void cb_scheme_choice(Fl_Scheme_Choice* o, void*) {
+  Fluid.set_scheme(o->text(o->value()));
+}
+
 Fl_Check_Button *tooltips_button=(Fl_Check_Button *)0;
 
 static void cb_tooltips_button(Fl_Check_Button*, void*) {
   Fl_Tooltip::enable(tooltips_button->value());
-  fluid_prefs.set("show_tooltips", tooltips_button->value());
+  Fluid.preferences.set("show_tooltips", tooltips_button->value());
 }
 
 Fl_Check_Button *completion_button=(Fl_Check_Button *)0;
 
 static void cb_completion_button(Fl_Check_Button*, void*) {
-  fluid_prefs.set("show_completion_dialogs", completion_button->value());
+  Fluid.preferences.set("show_completion_dialogs", completion_button->value());
 }
 
 Fl_Check_Button *openlast_button=(Fl_Check_Button *)0;
 
 static void cb_openlast_button(Fl_Check_Button*, void*) {
-  fluid_prefs.set("open_previous_file", openlast_button->value());
+  Fluid.preferences.set("open_previous_file", openlast_button->value());
 }
 
 Fl_Check_Button *prevpos_button=(Fl_Check_Button *)0;
 
 static void cb_prevpos_button(Fl_Check_Button*, void*) {
-  fluid_prefs.set("prev_window_pos", prevpos_button->value());
+  Fluid.preferences.set("prev_window_pos", prevpos_button->value());
 }
 
 Fl_Check_Button *show_comments_button=(Fl_Check_Button *)0;
 
 static void cb_show_comments_button(Fl_Check_Button*, void*) {
-  show_comments = show_comments_button->value();
-  fluid_prefs.set("show_comments", show_comments);
+  Fluid.show_comments = show_comments_button->value();
+  Fluid.preferences.set("Fluid.show_comments", Fluid.show_comments);
   redraw_browser();
 }
 
@@ -282,24 +286,24 @@ static void cb_1(Fl_Group* o, void* v) {
 Fl_Spinner *recent_spinner=(Fl_Spinner *)0;
 
 static void cb_recent_spinner(Fl_Spinner*, void*) {
-  fluid_prefs.set("recent_files", recent_spinner->value());
-  load_history();
+  Fluid.preferences.set("recent_files", recent_spinner->value());
+  Fluid.history.load();
 }
 
 Fl_Check_Button *use_external_editor_button=(Fl_Check_Button *)0;
 
 static void cb_use_external_editor_button(Fl_Check_Button*, void*) {
-  G_use_external_editor = use_external_editor_button->value();
-  fluid_prefs.set("use_external_editor", G_use_external_editor);
+  Fluid.use_external_editor = use_external_editor_button->value();
+  Fluid.preferences.set("use_external_editor", Fluid.use_external_editor);
   redraw_browser();
 }
 
 Fl_Input *editor_command_input=(Fl_Input *)0;
 
 static void cb_editor_command_input(Fl_Input*, void*) {
-  strncpy(G_external_editor_command, editor_command_input->value(), sizeof(G_external_editor_command)-1);
-  G_external_editor_command[sizeof(G_external_editor_command)-1] = 0;
-  fluid_prefs.set("external_editor_command", G_external_editor_command);
+  strncpy(Fluid.external_editor_command, editor_command_input->value(), sizeof(Fluid.external_editor_command)-1);
+  Fluid.external_editor_command[sizeof(Fluid.external_editor_command)-1] = 0;
+  Fluid.preferences.set("external_editor_command", Fluid.external_editor_command);
   redraw_browser();
 }
 
@@ -359,7 +363,7 @@ static const unsigned char idata_document_64[] =
 147,239,104,255,202,153,244,20,250,15,100,60,232,29,230,9,101,148,0,0,0,0,73,69,
 78,68,174,66,96,130};
 static Fl_Image *image_document_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("document_64.png", idata_document_64, 927);
   return image;
@@ -369,11 +373,11 @@ Fl_Input *header_file_input=(Fl_Input *)0;
 
 static void cb_header_file_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.header_file_name.c_str());
+    o->value(Fluid.proj.header_file_name.c_str());
   } else {
-    if (strcmp(g_project.header_file_name.c_str(), o->value())) {
-      g_project.header_file_name = o->value();
-      set_modflag(1);
+    if (strcmp(Fluid.proj.header_file_name.c_str(), o->value())) {
+      Fluid.proj.header_file_name = o->value();
+      Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -382,11 +386,11 @@ Fl_Input *code_file_input=(Fl_Input *)0;
 
 static void cb_code_file_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.code_file_name.c_str());
+    o->value(Fluid.proj.code_file_name.c_str());
   } else {
-    if (strcmp(g_project.code_file_name.c_str(), o->value())) {
-      g_project.code_file_name = o->value();
-      set_modflag(1);
+    if (strcmp(Fluid.proj.code_file_name.c_str(), o->value())) {
+      Fluid.proj.code_file_name = o->value();
+      Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -395,11 +399,11 @@ Fl_Check_Button *include_H_from_C_button=(Fl_Check_Button *)0;
 
 static void cb_include_H_from_C_button(Fl_Check_Button* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.include_H_from_C);
+    o->value(Fluid.proj.include_H_from_C);
   } else {
-    if (g_project.include_H_from_C != o->value()) {
-      set_modflag(1);
-      g_project.include_H_from_C = o->value();
+    if (Fluid.proj.include_H_from_C != o->value()) {
+      Fluid.proj.set_modflag(1);
+      Fluid.proj.include_H_from_C = o->value();
     }
   }
 }
@@ -408,11 +412,11 @@ Fl_Check_Button *use_FL_COMMAND_button=(Fl_Check_Button *)0;
 
 static void cb_use_FL_COMMAND_button(Fl_Check_Button* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.use_FL_COMMAND);
+    o->value(Fluid.proj.use_FL_COMMAND);
   } else {
-    if (g_project.use_FL_COMMAND != o->value()) {
-      set_modflag(1);
-      g_project.use_FL_COMMAND = o->value();
+    if (Fluid.proj.use_FL_COMMAND != o->value()) {
+      Fluid.proj.set_modflag(1);
+      Fluid.proj.use_FL_COMMAND = o->value();
     }
   }
 }
@@ -421,11 +425,11 @@ Fl_Check_Button *utf8_in_src_button=(Fl_Check_Button *)0;
 
 static void cb_utf8_in_src_button(Fl_Check_Button* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.utf8_in_src);
+    o->value(Fluid.proj.utf8_in_src);
   } else {
-    if (g_project.utf8_in_src != o->value()) {
-      set_modflag(1);
-      g_project.utf8_in_src = o->value();
+    if (Fluid.proj.utf8_in_src != o->value()) {
+      Fluid.proj.set_modflag(1);
+      Fluid.proj.utf8_in_src = o->value();
     }
   }
 }
@@ -434,11 +438,11 @@ Fl_Check_Button *avoid_early_includes_button=(Fl_Check_Button *)0;
 
 static void cb_avoid_early_includes_button(Fl_Check_Button* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.avoid_early_includes);
+    o->value(Fluid.proj.avoid_early_includes);
   } else {
-    if (g_project.avoid_early_includes != o->value()) {
-      set_modflag(1);
-      g_project.avoid_early_includes = o->value();
+    if (Fluid.proj.avoid_early_includes != o->value()) {
+      Fluid.proj.set_modflag(1);
+      Fluid.proj.avoid_early_includes = o->value();
     }
   }
 }
@@ -447,11 +451,11 @@ Fl_Check_Button *w_proj_mergeback=(Fl_Check_Button *)0;
 
 static void cb_w_proj_mergeback(Fl_Check_Button* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.write_mergeback_data);
+    o->value(Fluid.proj.write_mergeback_data);
   } else {
-    if (g_project.write_mergeback_data != o->value()) {
-      set_modflag(1);
-      g_project.write_mergeback_data = o->value();
+    if (Fluid.proj.write_mergeback_data != o->value()) {
+      Fluid.proj.set_modflag(1);
+      Fluid.proj.write_mergeback_data = o->value();
     }
   }
 }
@@ -485,7 +489,7 @@ static const unsigned char idata_layout_64[] =
 219,234,153,20,127,159,185,12,250,99,90,14,203,239,127,120,165,154,78,208,47,
 215,15,118,242,56,45,94,1,0,0,0,0,73,69,78,68,174,66,96,130};
 static Fl_Image *image_layout_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("layout_64.png", idata_layout_64, 481);
   return image;
@@ -495,11 +499,11 @@ Fl_Choice *layout_choice=(Fl_Choice *)0;
 
 static void cb_layout_choice(Fl_Choice* o, void* v) {
   if (v == LOAD) {
-      o->value(g_layout_list.current_suite());
+      o->value(Fluid.layout_list.current_suite());
     } else {
       int index = o->value();
-      g_layout_list.current_suite(index);
-      g_layout_list.update_dialogs();
+      Fluid.layout_list.current_suite(index);
+      Fluid.layout_list.update_dialogs();
     }
 }
 
@@ -515,21 +519,21 @@ static void cb_2(Fl_Button*, void* v) {
   if (v == LOAD) return;
 
   std::string old_name = "Copy of ";
-  old_name.append(g_layout_list[g_layout_list.current_suite()].name_);
+  old_name.append(Fluid.layout_list[Fluid.layout_list.current_suite()].name_);
   const char *new_name = fl_input("Enter a name for the new layout:", old_name.c_str());
-  if (new_name == NULL)
+  if (new_name == nullptr)
     return;
 
-  g_layout_list.add(new_name);
-  g_layout_list.update_dialogs();
+  Fluid.layout_list.add(new_name);
+  Fluid.layout_list.update_dialogs();
 }
 
 Fl_Menu_Button *w_layout_menu=(Fl_Menu_Button *)0;
 
 static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
   if (v == LOAD) {
-    Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
-    if (suite.storage_ == FD_STORE_INTERNAL) {
+    fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+    if (suite.storage_ == fld::Tool_Store::INTERNAL) {
       w_layout_menu_rename->deactivate();
       for (int i=1; i<4; i++) w_layout_menu_storage[i]->deactivate();
       w_layout_menu_delete->deactivate();
@@ -538,44 +542,44 @@ static void cb_w_layout_menu(Fl_Menu_Button*, void* v) {
       for (int i=1; i<4; i++) w_layout_menu_storage[i]->activate();
       w_layout_menu_delete->activate();
     }
-    w_layout_menu_storage[suite.storage_]->setonly();
+    w_layout_menu_storage[static_cast<int>(suite.storage_)]->setonly();
   }
 }
 
 static void cb_w_layout_menu_rename(Fl_Menu_*, void*) {
   // Rename the current layout suite
 
-  std::string old_name = g_layout_list[g_layout_list.current_suite()].name_;
+  std::string old_name = Fluid.layout_list[Fluid.layout_list.current_suite()].name_;
   const char *new_name = fl_input("Enter a new name for the layout:", old_name.c_str());
-  if (new_name == NULL)
+  if (new_name == nullptr)
     return;
 
-  g_layout_list.rename(new_name);
-  g_layout_list.update_dialogs();
+  Fluid.layout_list.rename(new_name);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage(Fl_Menu_*, void*) {
-  Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
-  suite.storage(FD_STORE_INTERNAL);
-  g_layout_list.update_dialogs();
+  fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+  suite.storage(fld::Tool_Store::INTERNAL);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage1(Fl_Menu_*, void*) {
-  Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
-  suite.storage(FD_STORE_USER);
-  g_layout_list.update_dialogs();
+  fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+  suite.storage(fld::Tool_Store::USER);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage2(Fl_Menu_*, void*) {
-  Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
-  suite.storage(FD_STORE_PROJECT);
-  g_layout_list.update_dialogs();
+  fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+  suite.storage(fld::Tool_Store::PROJECT);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_storage3(Fl_Menu_*, void*) {
-  Fd_Layout_Suite &suite = g_layout_list[g_layout_list.current_suite()];
-  suite.storage(FD_STORE_FILE);
-  g_layout_list.update_dialogs();
+  fld::app::Layout_Suite &suite = Fluid.layout_list[Fluid.layout_list.current_suite()];
+  suite.storage(fld::Tool_Store::FILE);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_load(Fl_Menu_*, void*) {
@@ -588,9 +592,9 @@ static void cb_w_layout_menu_load(Fl_Menu_*, void*) {
   if (fnfc.show() != 0) return;
   const char *new_filename = fnfc.filename();
   if (!new_filename) return;
-  g_layout_list.load(new_filename);
-  //g_layout_list.current_suite(n);
-  g_layout_list.update_dialogs();
+  Fluid.layout_list.load(new_filename);
+  //Fluid.layout_list.current_suite(n);
+  Fluid.layout_list.update_dialogs();
 }
 
 static void cb_w_layout_menu_save(Fl_Menu_*, void*) {
@@ -600,21 +604,21 @@ static void cb_w_layout_menu_save(Fl_Menu_*, void*) {
     fnfc.type(Fl_Native_File_Chooser::BROWSE_SAVE_FILE);
     fnfc.options(Fl_Native_File_Chooser::SAVEAS_CONFIRM | Fl_Native_File_Chooser::USE_FILTER_EXT);
     fnfc.filter("FLUID Layouts\t*.fll\n");
-    std::string filename = g_layout_list.filename_;
+    std::string filename = Fluid.layout_list.filename_;
     fnfc.directory(fl_filename_path_str(filename).c_str());
     fnfc.preset_file(fl_filename_name_str(filename).c_str());
     if (fnfc.show() != 0) return;
     const char *new_filename = fnfc.filename();
     if (!new_filename) return;
-    g_layout_list.filename_ = new_filename;
-    g_layout_list.save(new_filename);
+    Fluid.layout_list.filename_ = new_filename;
+    Fluid.layout_list.save(new_filename);
 }
 
 static void cb_w_layout_menu_delete(Fl_Menu_*, void*) {
   // remove the current suite
 
-  g_layout_list.remove(g_layout_list.current_suite());
-  g_layout_list.update_dialogs();
+  Fluid.layout_list.remove(Fluid.layout_list.current_suite());
+  Fluid.layout_list.update_dialogs();
 }
 
 Fl_Menu_Item menu_w_layout_menu[] = {
@@ -633,193 +637,193 @@ Fl_Button *preset_choice[3]={(Fl_Button *)0};
 
 static void cb_Left(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->left_window_margin);
+    o->value((double)Fluid.proj.layout->left_window_margin);
   } else {
-    layout->left_window_margin = (int)o->value();
+    Fluid.proj.layout->left_window_margin = (int)o->value();
   }
 }
 
 static void cb_Top(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->top_window_margin);
+    o->value((double)Fluid.proj.layout->top_window_margin);
   } else {
-    layout->top_window_margin = (int)o->value();
+    Fluid.proj.layout->top_window_margin = (int)o->value();
   }
 }
 
 static void cb_Right(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->right_window_margin);
+    o->value((double)Fluid.proj.layout->right_window_margin);
   } else {
-    layout->right_window_margin = (int)o->value();
+    Fluid.proj.layout->right_window_margin = (int)o->value();
   }
 }
 
 static void cb_Bottom(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->bottom_window_margin);
+    o->value((double)Fluid.proj.layout->bottom_window_margin);
   } else {
-    layout->bottom_window_margin = (int)o->value();
+    Fluid.proj.layout->bottom_window_margin = (int)o->value();
   }
 }
 
 static void cb_Horizontal(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->window_grid_x);
+    o->value((double)Fluid.proj.layout->window_grid_x);
   } else {
-    layout->window_grid_x = (int)o->value();
+    Fluid.proj.layout->window_grid_x = (int)o->value();
   }
 }
 
 static void cb_Vertical(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->window_grid_y);
+    o->value((double)Fluid.proj.layout->window_grid_y);
   } else {
-    layout->window_grid_y = (int)o->value();
+    Fluid.proj.layout->window_grid_y = (int)o->value();
   }
 }
 
 static void cb_Left1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->left_group_margin);
+    o->value((double)Fluid.proj.layout->left_group_margin);
   } else {
-    layout->left_group_margin = (int)o->value();
+    Fluid.proj.layout->left_group_margin = (int)o->value();
   }
 }
 
 static void cb_Top1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->top_group_margin);
+    o->value((double)Fluid.proj.layout->top_group_margin);
   } else {
-    layout->top_group_margin = (int)o->value();
+    Fluid.proj.layout->top_group_margin = (int)o->value();
   }
 }
 
 static void cb_Right1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->right_group_margin);
+    o->value((double)Fluid.proj.layout->right_group_margin);
   } else {
-    layout->right_group_margin = (int)o->value();
+    Fluid.proj.layout->right_group_margin = (int)o->value();
   }
 }
 
 static void cb_Bottom1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->bottom_group_margin);
+    o->value((double)Fluid.proj.layout->bottom_group_margin);
   } else {
-    layout->bottom_group_margin = (int)o->value();
+    Fluid.proj.layout->bottom_group_margin = (int)o->value();
   }
 }
 
 static void cb_Horizontal1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->group_grid_x);
+    o->value((double)Fluid.proj.layout->group_grid_x);
   } else {
-    layout->group_grid_x = (int)o->value();
+    Fluid.proj.layout->group_grid_x = (int)o->value();
   }
 }
 
 static void cb_Vertical1(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->group_grid_y);
+    o->value((double)Fluid.proj.layout->group_grid_y);
   } else {
-    layout->group_grid_y = (int)o->value();
+    Fluid.proj.layout->group_grid_y = (int)o->value();
   }
 }
 
 static void cb_Top2(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->top_tabs_margin);
+    o->value((double)Fluid.proj.layout->top_tabs_margin);
   } else {
-    layout->top_tabs_margin = (int)o->value();
+    Fluid.proj.layout->top_tabs_margin = (int)o->value();
   }
 }
 
 static void cb_Bottom2(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->bottom_tabs_margin);
+    o->value((double)Fluid.proj.layout->bottom_tabs_margin);
   } else {
-    layout->bottom_tabs_margin = (int)o->value();
+    Fluid.proj.layout->bottom_tabs_margin = (int)o->value();
   }
 }
 
 static void cb_Minimum(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_min_w);
+    o->value((double)Fluid.proj.layout->widget_min_w);
   } else {
-    layout->widget_min_w = (int)o->value();
+    Fluid.proj.layout->widget_min_w = (int)o->value();
   }
 }
 
 static void cb_Increment(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_inc_w);
+    o->value((double)Fluid.proj.layout->widget_inc_w);
   } else {
-    layout->widget_inc_w = (int)o->value();
+    Fluid.proj.layout->widget_inc_w = (int)o->value();
   }
 }
 
 static void cb_Gap(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_gap_x);
+    o->value((double)Fluid.proj.layout->widget_gap_x);
   } else {
-    layout->widget_gap_x = (int)o->value();
+    Fluid.proj.layout->widget_gap_x = (int)o->value();
   }
 }
 
 static void cb_3(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_min_h);
+    o->value((double)Fluid.proj.layout->widget_min_h);
   } else {
-    layout->widget_min_h = (int)o->value();
+    Fluid.proj.layout->widget_min_h = (int)o->value();
   }
 }
 
 static void cb_4(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_inc_h);
+    o->value((double)Fluid.proj.layout->widget_inc_h);
   } else {
-    layout->widget_inc_h = (int)o->value();
+    Fluid.proj.layout->widget_inc_h = (int)o->value();
   }
 }
 
 static void cb_5(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value((double)layout->widget_gap_y);
+    o->value((double)Fluid.proj.layout->widget_gap_y);
   } else {
-    layout->widget_gap_y = (int)o->value();
+    Fluid.proj.layout->widget_gap_y = (int)o->value();
   }
 }
 
 static void cb_6(Fl_Choice* o, void* v) {
   if (v == LOAD) {
-    o->value(layout->labelfont+1);
+    o->value(Fluid.proj.layout->labelfont+1);
   } else {
-    layout->labelfont = (int)o->value()-1;
+    Fluid.proj.layout->labelfont = (int)o->value()-1;
   }
 }
 
 static void cb_7(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(layout->labelsize);
+    o->value(Fluid.proj.layout->labelsize);
   } else {
-    layout->labelsize = (int)o->value();
+    Fluid.proj.layout->labelsize = (int)o->value();
   }
 }
 
 static void cb_8(Fl_Choice* o, void* v) {
   if (v == LOAD) {
-    o->value(layout->textfont+1);
+    o->value(Fluid.proj.layout->textfont+1);
   } else {
-    layout->textfont = (int)o->value()-1;
+    Fluid.proj.layout->textfont = (int)o->value()-1;
   }
 }
 
 static void cb_9(Fl_Value_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(layout->textsize);
+    o->value(Fluid.proj.layout->textsize);
   } else {
-    layout->textsize = (int)o->value();
+    Fluid.proj.layout->textsize = (int)o->value();
   }
 }
 
@@ -863,7 +867,7 @@ static const unsigned char idata_shell_64[] =
 82,219,229,239,135,114,138,14,109,164,201,83,85,44,126,133,81,55,103,232,191,0,
 145,21,211,195,226,88,204,195,0,0,0,0,73,69,78,68,174,66,96,130};
 static Fl_Image *image_shell_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("shell_64.png", idata_shell_64, 802);
   return image;
@@ -880,9 +884,9 @@ static void cb_w_settings_shell_list(Fl_Browser* o, void* v) {
       for (int i=0; i<g_shell_config->list_size; i++) {
         Fd_Shell_Command *cmd = g_shell_config->list[i];
         o->add(cmd->name.c_str());
-        if (cmd->storage == FD_STORE_USER)
+        if (cmd->storage == fld::Tool_Store::USER)
           o->icon(i+1, w_settings_shell_fd_user->image());
-        else if (cmd->storage == FD_STORE_PROJECT)
+        else if (cmd->storage == fld::Tool_Store::PROJECT)
           o->icon(i+1, w_settings_shell_fd_project->image());
       }
     }
@@ -915,11 +919,11 @@ static void cb_a(Fl_Button*, void* v) {
     w_settings_shell_list->insert(selected+1, cmd->name.c_str());
     w_settings_shell_list->deselect();
     w_settings_shell_list->value(selected+1);
-    if (cmd->storage == FD_STORE_USER) {
+    if (cmd->storage == fld::Tool_Store::USER) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-    } else if (cmd->storage == FD_STORE_PROJECT) {
+    } else if (cmd->storage == fld::Tool_Store::PROJECT) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
-      set_modflag(1);
+      Fluid.proj.set_modflag(1);
     }
     w_settings_shell_list->do_callback();
     w_settings_shell_cmd->do_callback(w_settings_shell_cmd, LOAD);
@@ -945,11 +949,11 @@ static void cb_w_settings_shell_dup(Fl_Button* o, void* v) {
     w_settings_shell_list->insert(selected+1, cmd->name.c_str());
     w_settings_shell_list->deselect();
     w_settings_shell_list->value(selected+1);
-    if (cmd->storage == FD_STORE_USER) {
+    if (cmd->storage == fld::Tool_Store::USER) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_user->image());
-    } else if (cmd->storage == FD_STORE_PROJECT) {
+    } else if (cmd->storage == fld::Tool_Store::PROJECT) {
       w_settings_shell_list->icon(selected+1, w_settings_shell_fd_project->image());
-      set_modflag(1);
+      Fluid.proj.set_modflag(1);
     }
     w_settings_shell_list->do_callback();
     w_settings_shell_cmd->do_callback(w_settings_shell_cmd, LOAD);
@@ -971,9 +975,9 @@ static void cb_w_settings_shell_remove(Fl_Button* o, void* v) {
   } else {
     if (!selected) return;
     int ret = fl_choice("Delete the shell command\n\"%s\"?\n\nThis can not be undone.",
-      "Delete", "Cancel", NULL, g_shell_config->list[selected-1]->name.c_str());
+      "Delete", "Cancel", nullptr, g_shell_config->list[selected-1]->name.c_str());
     if (ret==1) return;
-    if (g_shell_config->at(selected-1)->storage == FD_STORE_PROJECT) set_modflag(1);
+    if (g_shell_config->at(selected-1)->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     g_shell_config->remove(selected-1);
     w_settings_shell_list->remove(selected);
     if (selected <= w_settings_shell_list->size())
@@ -1058,7 +1062,7 @@ static void cb_Name(Fl_Input* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->name = o->value();
       w_settings_shell_list->text(selected, o->value());
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1076,7 +1080,7 @@ static void cb_Menu(Fl_Input* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->label = o->value();
       cmd->update_shell_menu();
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1099,7 +1103,7 @@ static void cb_Shortcut(Fl_Shortcut_Button* o, void* v) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->shortcut = o->value();
       cmd->update_shell_menu();
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1108,30 +1112,30 @@ static void cb_Store(Fl_Choice* o, void* v) {
   int selected = w_settings_shell_list_selected;
   if (v == LOAD) {
     if (selected) {
-      Fd_Tool_Store ts = g_shell_config->list[selected-1]->storage;
+      fld::Tool_Store ts = g_shell_config->list[selected-1]->storage;
       o->value(o->find_item_with_argument((long)ts));
     } else {
-      o->value(o->find_item_with_argument((long)FD_STORE_USER));
+      o->value(o->find_item_with_argument((long)fld::Tool_Store::USER));
     }
   } else {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
-      Fd_Tool_Store ts = (Fd_Tool_Store)(o->mvalue()->argument());
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      fld::Tool_Store ts = (fld::Tool_Store)(o->mvalue()->argument());
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
       cmd->storage = ts;
       //w_settings_shell_list->text(selected, cmd->name.c_str());
-      if (cmd->storage == FD_STORE_USER)
+      if (cmd->storage == fld::Tool_Store::USER)
         w_settings_shell_list->icon(selected, w_settings_shell_fd_user->image());
-      else if (cmd->storage == FD_STORE_PROJECT)
+      else if (cmd->storage == fld::Tool_Store::PROJECT)
         w_settings_shell_list->icon(selected, w_settings_shell_fd_project->image());
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
 
 Fl_Menu_Item menu_Store[] = {
- {"@fd_user User Setting", 0,  0, (void*)(FD_STORE_USER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
- {"@fd_project Project File", 0,  0, (void*)(FD_STORE_PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"@fd_user User Setting", 0,  0, (void*)(fld::Tool_Store::USER), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
+ {"@fd_project Project File", 0,  0, (void*)(fld::Tool_Store::PROJECT), 0, (uchar)FL_NORMAL_LABEL, 0, 11, 0},
  {0,0,0,0,0,0,0,0,0}
 };
 
@@ -1150,7 +1154,7 @@ static void cb_Condition(Fl_Choice* o, void* v) {
       int cond = (int)(o->mvalue()->argument());
       cmd->condition = cond;
       g_shell_config->rebuild_shell_menu();
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1187,7 +1191,7 @@ static void cb_w_settings_shell_command(Fl_Text_Editor* o, void* v) {
     if (selected) {
       Fd_Shell_Command *cmd = g_shell_config->list[selected-1];
       cmd->command = o->buffer()->text();
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1211,7 +1215,7 @@ static void cb_w_settings_shell_text_macros(Fl_Menu_Button* o, void*) {
       int pos = w_settings_shell_command->insert_position();
       w_settings_shell_command->buffer()->insert(pos, word);
     }
-    w_settings_shell_command->do_callback(w_settings_shell_command, (void*)NULL);
+    w_settings_shell_command->do_callback(w_settings_shell_command, (void*)nullptr);
   }
 }
 
@@ -1266,7 +1270,7 @@ static void cb_save(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_PROJECT;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1288,7 +1292,7 @@ static void cb_save1(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_SOURCECODE;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1310,7 +1314,7 @@ static void cb_save2(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::SAVE_STRINGS;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1332,7 +1336,7 @@ static void cb_show(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::DONT_SHOW_TERMINAL;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1354,7 +1358,7 @@ static void cb_clear(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::CLEAR_TERMINAL;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1376,7 +1380,7 @@ static void cb_clear1(Fl_Check_Button* o, void* v) {
       } else {
         cmd->flags &= ~Fd_Shell_Command::CLEAR_HISTORY;
       }
-      if (cmd->storage == FD_STORE_PROJECT) set_modflag(1);
+      if (cmd->storage == fld::Tool_Store::PROJECT) Fluid.proj.set_modflag(1);
     }
   }
 }
@@ -1664,7 +1668,7 @@ static const unsigned char idata_fd_project[] =
 213,122,16,176,223,94,207,73,175,70,249,59,81,177,117,128,158,31,49,127,246,30,
 207,181,170,20,0,0,0,0,73,69,78,68,174,66,96,130};
 static Fl_Image *image_fd_project() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("fd_project.png", idata_fd_project, 6950);
   return image;
@@ -2029,7 +2033,7 @@ static const unsigned char idata_fd_user[] =
 116,89,108,93,41,107,255,5,119,155,194,247,64,241,254,70,0,0,0,0,73,69,78,68,
 174,66,96,130};
 static Fl_Image *image_fd_user() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("fd_user.png", idata_fd_user, 8612);
   return image;
@@ -2108,7 +2112,7 @@ static const unsigned char idata_language_64[] =
 157,33,48,255,61,163,226,212,114,146,206,17,166,130,48,126,136,23,88,161,222,
 205,191,56,75,123,84,202,251,159,166,0,0,0,0,73,69,78,68,174,66,96,130};
 static Fl_Image *image_language_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("language_64.png", idata_language_64, 1450);
   return image;
@@ -2133,11 +2137,11 @@ Fl_Input *i18n_gnu_include_input=(Fl_Input *)0;
 
 static void cb_i18n_gnu_include_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_gnu_include.c_str());
+    o->value(Fluid.proj.i18n_gnu_include.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_gnu_include = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_gnu_include = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2145,11 +2149,11 @@ Fl_Input *i18n_gnu_conditional_input=(Fl_Input *)0;
 
 static void cb_i18n_gnu_conditional_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_gnu_conditional.c_str());
+    o->value(Fluid.proj.i18n_gnu_conditional.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_gnu_conditional = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_gnu_conditional = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2157,11 +2161,11 @@ Fl_Input *i18n_gnu_function_input=(Fl_Input *)0;
 
 static void cb_i18n_gnu_function_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_gnu_function.c_str());
+    o->value(Fluid.proj.i18n_gnu_function.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_gnu_function = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_gnu_function = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2169,11 +2173,11 @@ Fl_Input *i18n_gnu_static_function_input=(Fl_Input *)0;
 
 static void cb_i18n_gnu_static_function_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_gnu_static_function.c_str());
+    o->value(Fluid.proj.i18n_gnu_static_function.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_gnu_static_function = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_gnu_static_function = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2187,11 +2191,11 @@ Fl_Input *i18n_pos_include_input=(Fl_Input *)0;
 
 static void cb_i18n_pos_include_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_pos_include.c_str());
+    o->value(Fluid.proj.i18n_pos_include.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_pos_include = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_pos_include = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2199,11 +2203,11 @@ Fl_Input *i18n_pos_conditional_input=(Fl_Input *)0;
 
 static void cb_i18n_pos_conditional_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_pos_conditional.c_str());
+    o->value(Fluid.proj.i18n_pos_conditional.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_pos_conditional = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_pos_conditional = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2211,11 +2215,11 @@ Fl_Input *i18n_pos_file_input=(Fl_Input *)0;
 
 static void cb_i18n_pos_file_input(Fl_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_pos_file.c_str());
+    o->value(Fluid.proj.i18n_pos_file.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_pos_file = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_pos_file = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2227,11 +2231,11 @@ Fl_Int_Input *i18n_pos_set_input=(Fl_Int_Input *)0;
 
 static void cb_i18n_pos_set_input(Fl_Int_Input* o, void* v) {
   if (v == LOAD) {
-    o->value(g_project.i18n_pos_set.c_str());
+    o->value(Fluid.proj.i18n_pos_set.c_str());
   } else {
-    undo_checkpoint();
-    g_project.i18n_pos_set = o->value();
-    set_modflag(1);
+    Fluid.proj.undo.checkpoint();
+    Fluid.proj.i18n_pos_set = o->value();
+    Fluid.proj.set_modflag(1);
   }
 }
 
@@ -2421,7 +2425,7 @@ static const unsigned char idata_user_circle_64[] =
 252,106,89,247,128,255,3,60,207,245,248,165,38,113,147,0,0,0,0,73,69,78,68,174,
 66,96,130};
 static Fl_Image *image_user_circle_64() {
-  static Fl_Image *image = NULL;
+  static Fl_Image *image = 0L;
   if (!image)
     image = new Fl_PNG_Image("user_circle_64.png", idata_user_circle_64, 3909);
   return image;
@@ -2431,8 +2435,8 @@ Fl_Choice *w_settings_user_commenttext=(Fl_Choice *)0;
 
 static void cb_Close(Fl_Button*, void*) {
   if (g_shell_config)
-    g_shell_config->write(fluid_prefs, FD_STORE_USER);
-  g_layout_list.write(fluid_prefs, FD_STORE_USER);
+    g_shell_config->write(Fluid.preferences, fld::Tool_Store::USER);
+  Fluid.layout_list.write(Fluid.preferences, fld::Tool_Store::USER);
   settings_window->hide();
 }
 
@@ -2459,10 +2463,10 @@ Fl_Double_Window* make_settings_window() {
             scheme_choice->labelfont(1);
             scheme_choice->labelsize(11);
             scheme_choice->labelcolor(FL_FOREGROUND_COLOR);
-            scheme_choice->callback((Fl_Callback*)scheme_cb);
+            scheme_choice->callback((Fl_Callback*)cb_scheme_choice);
             scheme_choice->align(Fl_Align(FL_ALIGN_LEFT));
             scheme_choice->when(FL_WHEN_RELEASE);
-            init_scheme();
+            Fluid.init_scheme();
           } // Fl_Scheme_Choice* scheme_choice
           { Fl_Box* o = new Fl_Box(240, 78, 10, 25);
             o->hide();
@@ -2480,7 +2484,7 @@ Fl_Double_Window* make_settings_window() {
           tooltips_button->labelsize(11);
           tooltips_button->callback((Fl_Callback*)cb_tooltips_button);
           int b;
-          fluid_prefs.get("show_tooltips", b, 1);
+          Fluid.preferences.get("show_tooltips", b, 1);
           tooltips_button->value(b);
           Fl_Tooltip::enable(b);
         } // Fl_Check_Button* tooltips_button
@@ -2489,7 +2493,7 @@ Fl_Double_Window* make_settings_window() {
           completion_button->labelsize(11);
           completion_button->callback((Fl_Callback*)cb_completion_button);
           int b;
-          fluid_prefs.get("show_completion_dialogs", b, 1);
+          Fluid.preferences.get("show_completion_dialogs", b, 1);
           completion_button->value(b);
         } // Fl_Check_Button* completion_button
         { openlast_button = new Fl_Check_Button(120, 155, 200, 20, "Open Previous File on Startup");
@@ -2497,7 +2501,7 @@ Fl_Double_Window* make_settings_window() {
           openlast_button->labelsize(11);
           openlast_button->callback((Fl_Callback*)cb_openlast_button);
           int b;
-          fluid_prefs.get("open_previous_file", b, 0);
+          Fluid.preferences.get("open_previous_file", b, 0);
           openlast_button->value(b);
         } // Fl_Check_Button* openlast_button
         { prevpos_button = new Fl_Check_Button(120, 175, 200, 20, "Remember Window Positions");
@@ -2505,15 +2509,15 @@ Fl_Double_Window* make_settings_window() {
           prevpos_button->labelsize(11);
           prevpos_button->callback((Fl_Callback*)cb_prevpos_button);
           int b;
-          fluid_prefs.get("prev_window_pos", b, 1);
+          Fluid.preferences.get("prev_window_pos", b, 1);
           prevpos_button->value(b);
         } // Fl_Check_Button* prevpos_button
         { show_comments_button = new Fl_Check_Button(120, 195, 200, 20, "Show Comments in Browser");
           show_comments_button->down_box(FL_DOWN_BOX);
           show_comments_button->labelsize(11);
           show_comments_button->callback((Fl_Callback*)cb_show_comments_button);
-          fluid_prefs.get("show_comments", show_comments, 1);
-          show_comments_button->value(show_comments);
+          Fluid.preferences.get("Fluid.show_comments", Fluid.show_comments, 1);
+          show_comments_button->value(Fluid.show_comments);
         } // Fl_Check_Button* show_comments_button
         { Fl_Group* o = new Fl_Group(120, 225, 50, 20);
           o->callback((Fl_Callback*)cb_1);
@@ -2525,7 +2529,7 @@ Fl_Double_Window* make_settings_window() {
             recent_spinner->callback((Fl_Callback*)cb_recent_spinner);
             recent_spinner->when(FL_WHEN_CHANGED);
             int c;
-            fluid_prefs.get("recent_files", c, 5);
+            Fluid.preferences.get("recent_files", c, 5);
             recent_spinner->maximum(10);
             recent_spinner->value(c);
           } // Fl_Spinner* recent_spinner
@@ -2539,8 +2543,8 @@ Fl_Double_Window* make_settings_window() {
           use_external_editor_button->down_box(FL_DOWN_BOX);
           use_external_editor_button->labelsize(11);
           use_external_editor_button->callback((Fl_Callback*)cb_use_external_editor_button);
-          fluid_prefs.get("use_external_editor", G_use_external_editor, 0);
-          use_external_editor_button->value(G_use_external_editor);
+          Fluid.preferences.get("use_external_editor", Fluid.use_external_editor, 0);
+          use_external_editor_button->value(Fluid.use_external_editor);
         } // Fl_Check_Button* use_external_editor_button
         { editor_command_input = new Fl_Input(120, 255, 200, 20, "External Editor:");
           editor_command_input->tooltip("The editor command to open your external text editor.\nInclude any necessary "
@@ -2552,8 +2556,8 @@ Fl_Double_Window* make_settings_window() {
           editor_command_input->textsize(11);
           editor_command_input->callback((Fl_Callback*)cb_editor_command_input);
           editor_command_input->when(FL_WHEN_CHANGED);
-          fluid_prefs.get("external_editor_command", G_external_editor_command, "", sizeof(G_external_editor_command)-1);
-          editor_command_input->value(G_external_editor_command);
+          Fluid.preferences.get("external_editor_command", Fluid.external_editor_command, "", sizeof(Fluid.external_editor_command)-1);
+          editor_command_input->value(Fluid.external_editor_command);
         } // Fl_Input* editor_command_input
         { Fl_Box* o = new Fl_Box(120, 300, 0, 20, "Overlays: ");
           o->labelfont(1);
@@ -2565,7 +2569,7 @@ Fl_Double_Window* make_settings_window() {
           guides_button->down_box(FL_DOWN_BOX);
           guides_button->labelsize(11);
           guides_button->callback((Fl_Callback*)toggle_guides_cb);
-          o->value(show_guides);
+          o->value(Fluid.show_guides);
         } // Fl_Check_Button* guides_button
         { Fl_Check_Button* o = restricted_button = new Fl_Check_Button(120, 320, 200, 20, "Show Restricted Areas");
           restricted_button->tooltip("show overlapping and out of bounds areas, show unfilled areas in Fl_Pack grou"
@@ -2573,7 +2577,7 @@ Fl_Double_Window* make_settings_window() {
           restricted_button->down_box(FL_DOWN_BOX);
           restricted_button->labelsize(11);
           restricted_button->callback((Fl_Callback*)toggle_restricted_cb);
-          o->value(show_restricted);
+          o->value(Fluid.show_restricted);
         } // Fl_Check_Button* restricted_button
         { Fl_Check_Button* o = ghosted_outline_button = new Fl_Check_Button(120, 340, 200, 20, "Show Ghosted Group Outlines");
           ghosted_outline_button->tooltip("groups with no box type or flat boxtypes without contrast will be rendered wi"
@@ -2581,7 +2585,7 @@ Fl_Double_Window* make_settings_window() {
           ghosted_outline_button->down_box(FL_DOWN_BOX);
           ghosted_outline_button->labelsize(11);
           ghosted_outline_button->callback((Fl_Callback*)toggle_ghosted_outline_cb);
-          o->value(show_ghosted_outline);
+          o->value(Fluid.show_ghosted_outline);
         } // Fl_Check_Button* ghosted_outline_button
         { Fl_Box* o = new Fl_Box(120, 530, 200, 10);
           o->hide();
@@ -3517,7 +3521,7 @@ static void cb_Clear(Fl_Button*, void*) {
 Fl_Return_Button *shell_run_button=(Fl_Return_Button *)0;
 
 static void cb_shell_run_button(Fl_Return_Button*, void*) {
-  Fl_Preferences pos(fluid_prefs, "shell_run_Window_pos");
+  Fl_Preferences pos(Fluid.preferences, "shell_run_Window_pos");
   pos.set("x", shell_run_window->x());
   pos.set("y", shell_run_window->y());
   pos.set("w", shell_run_window->w());