Fluid: Rebuilding most of the widget directory.

One file per logical unit.
Namespaces.
Non-static data member initializers to never
get an uninitialized field again.

3 files changed, 34 insertions, 34 deletions

diff --git a/fluid/nodes/Fl_Grid_Type.cxx b/fluid/nodes/Fl_Grid_Type.cxx
index 2ae05a0ce..ea2232305 100644
--- a/fluid/nodes/Fl_Grid_Type.cxx
+++ b/fluid/nodes/Fl_Grid_Type.cxx
@@ -22,7 +22,7 @@
 #include "io/file.h"
 #include "io/code.h"
 #include "widgets/widget_browser.h"
-#include "widgets/custom_widgets.h"
+#include "widgets/Formula_Input.h"
 
 #include <FL/Fl_Grid.H>
 #include <FL/Fl_Value_Input.H>
@@ -777,11 +777,11 @@ void Fl_Grid_Type::layout_widget() {
 // TODO: ways to resize rows and columns, add and delete them in the project window, pulldown menu?
 // TODO: alignment can be FL_GRID_LEFT|FL_GRID_VERTICAL?
 
-extern Fluid_Coord_Input *widget_grid_row_input, *widget_grid_col_input,
+extern fld::widget::Formula_Input *widget_grid_row_input, *widget_grid_col_input,
 *widget_grid_rowspan_input, *widget_grid_colspan_input;
 extern Fl_Group *widget_tab_grid_child;
 
-void grid_child_cb(Fluid_Coord_Input* i, void* v, int what) {
+void grid_child_cb(fld::widget::Formula_Input* i, void* v, int what) {
   if (   !current_widget
       || !current_widget->parent
       || !current_widget->parent->is_a(ID_Grid))
@@ -850,7 +850,7 @@ void grid_child_cb(Fluid_Coord_Input* i, void* v, int what) {
     }
   }
 }
-void grid_set_row_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_row_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 8);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
@@ -866,7 +866,7 @@ void grid_inc_row_cb(Fl_Button* i, void* v) {
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_set_col_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_col_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 9);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
@@ -882,7 +882,7 @@ void grid_inc_col_cb(Fl_Button* i, void* v) {
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_set_rowspan_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_rowspan_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 10);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
@@ -898,7 +898,7 @@ void grid_inc_rowspan_cb(Fl_Button* i, void* v) {
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_set_colspan_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_colspan_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 11);
   if (v!=LOAD) widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
 }
@@ -914,10 +914,10 @@ void grid_inc_colspan_cb(Fl_Button* i, void* v) {
     widget_tab_grid_child->do_callback(widget_tab_grid_child, LOAD);
   }
 }
-void grid_set_min_wdt_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_min_wdt_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 12);
 }
-void grid_set_min_hgt_cb(Fluid_Coord_Input* i, void* v) {
+void grid_set_min_hgt_cb(fld::widget::Formula_Input* i, void* v) {
   grid_child_cb(i, v, 13);
 }
 
diff --git a/fluid/nodes/Fl_Menu_Type.cxx b/fluid/nodes/Fl_Menu_Type.cxx
index 684d765f8..2fb80fec2 100644
--- a/fluid/nodes/Fl_Menu_Type.cxx
+++ b/fluid/nodes/Fl_Menu_Type.cxx
@@ -29,7 +29,7 @@
 #include "io/file.h"
 #include "io/code.h"
 #include "nodes/Fl_Window_Type.h"
-#include "widgets/custom_widgets.h"
+#include "widgets/Formula_Input.h"
 #include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
diff --git a/fluid/nodes/Fl_Widget_Type.cxx b/fluid/nodes/Fl_Widget_Type.cxx
index 27e309cbe..2ed31f0d8 100644
--- a/fluid/nodes/Fl_Widget_Type.cxx
+++ b/fluid/nodes/Fl_Widget_Type.cxx
@@ -627,92 +627,92 @@ void tooltip_cb(Fl_Input* i, void *v) {
   }
 }
 
-Fluid_Coord_Input *x_input, *y_input, *w_input, *h_input;
+fld::widget::Formula_Input *x_input, *y_input, *w_input, *h_input;
 
 static int widget_i = 0;
 
-static int vars_i_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_i_cb(const fld::widget::Formula_Input*, void *v) {
   return widget_i;
 }
 
-static int vars_x_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_x_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = (Fl_Type*)v;
   if (t->is_widget())
     return ((Fl_Widget_Type*)t)->o->x();
   return 0;
 }
 
-static int vars_y_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_y_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = (Fl_Type*)v;
   if (t->is_widget())
     return ((Fl_Widget_Type*)t)->o->y();
   return 0;
 }
 
-static int vars_w_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_w_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = (Fl_Type*)v;
   if (t->is_widget())
     return ((Fl_Widget_Type*)t)->o->w();
   return 0;
 }
 
-static int vars_h_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_h_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = (Fl_Type*)v;
   if (t->is_widget())
     return ((Fl_Widget_Type*)t)->o->h();
   return 0;
 }
 
-static int vars_px_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_px_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->parent;
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->x();
   return 0;
 }
 
-static int vars_py_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_py_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->parent;
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->y();
   return 0;
 }
 
-static int vars_pw_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_pw_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->parent;
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->w();
   return 0;
 }
 
-static int vars_ph_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_ph_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->parent;
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->h();
   return 0;
 }
 
-static int vars_sx_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_sx_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->x();
   return 0;
 }
 
-static int vars_sy_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_sy_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->y();
   return 0;
 }
 
-static int vars_sw_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_sw_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->w();
   return 0;
 }
 
-static int vars_sh_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_sh_cb(const fld::widget::Formula_Input*, void *v) {
   Fl_Type *t = ((Fl_Type*)v)->prev_sibling();
   if (t && t->is_widget())
     return ((Fl_Widget_Type*)t)->o->h();
@@ -743,27 +743,27 @@ static void calculate_bbox(Fl_Type *p) {
   }
 }
 
-static int vars_cx_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_cx_cb(const fld::widget::Formula_Input*, void *v) {
   calculate_bbox((Fl_Type*)v);
   return bbox_x;
 }
 
-static int vars_cy_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_cy_cb(const fld::widget::Formula_Input*, void *v) {
   calculate_bbox((Fl_Type*)v);
   return bbox_y;
 }
 
-static int vars_cw_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_cw_cb(const fld::widget::Formula_Input*, void *v) {
   calculate_bbox((Fl_Type*)v);
   return bbox_r - bbox_x;
 }
 
-static int vars_ch_cb(const Fluid_Coord_Input*, void *v) {
+static int vars_ch_cb(const fld::widget::Formula_Input*, void *v) {
   calculate_bbox((Fl_Type*)v);
   return bbox_b - bbox_y;
 }
 
-Fluid_Coord_Input_Vars widget_vars[] = {
+fld::widget::Formula_Input_Vars widget_vars[] = {
   { "i", vars_i_cb },   // zero based counter of selected widgets
   { "x", vars_x_cb },   // position and size of current widget
   { "y", vars_y_cb },
@@ -784,7 +784,7 @@ Fluid_Coord_Input_Vars widget_vars[] = {
   { 0 }
 };
 
-void x_cb(Fluid_Coord_Input *i, void *v) {
+void x_cb(fld::widget::Formula_Input *i, void *v) {
   if (v == LOAD) {
     x_input = i;
     if (current_widget->is_true_widget()) {
@@ -815,7 +815,7 @@ void x_cb(Fluid_Coord_Input *i, void *v) {
   }
 }
 
-void y_cb(Fluid_Coord_Input *i, void *v) {
+void y_cb(fld::widget::Formula_Input *i, void *v) {
   if (v == LOAD) {
     y_input = i;
     if (current_widget->is_true_widget()) {
@@ -845,7 +845,7 @@ void y_cb(Fluid_Coord_Input *i, void *v) {
   }
 }
 
-void w_cb(Fluid_Coord_Input *i, void *v) {
+void w_cb(fld::widget::Formula_Input *i, void *v) {
   if (v == LOAD) {
     w_input = i;
     if (current_widget->is_true_widget()) {
@@ -875,7 +875,7 @@ void w_cb(Fluid_Coord_Input *i, void *v) {
   }
 }
 
-void h_cb(Fluid_Coord_Input *i, void *v) {
+void h_cb(fld::widget::Formula_Input *i, void *v) {
   if (v == LOAD) {
     h_input = i;
     if (current_widget->is_true_widget()) {
@@ -1739,7 +1739,7 @@ void align_text_image_cb(Fl_Choice *i, void *v) {
 
 ////////////////////////////////////////////////////////////////
 
-void callback_cb(CodeEditor* i, void *v) {
+void callback_cb(fld::widget::Code_Editor* i, void *v) {
   if (v == LOAD) {
     const char *cbtext = current_widget->callback();
     i->buffer()->text( cbtext ? cbtext : "" );