Restructuring Fluid source files.

fluid/.gitignore

@@ -6,7 +6,7 @@ fluid
 fluid-shared
 TAGS
 fluid.app
-pixmaps/*.bck
+../pixmaps/*.bck
 
 # local documentation generation
 

fluid/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # CMakeLists.txt to build fluid for the FLTK project using CMake (www.cmake.org)
 #
-# Copyright 1998-2024 by Bill Spitzak and others.
+# Copyright 1998-2025 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this
@@ -18,96 +18,108 @@
 set(TARGETS fluid)
 
 # Source files for 'fluid-lib' = all source files except the main files
-# (fluid.cxx and fluid.h)
-# Note: macOS (Xcode) needs at least one source file (fluid.cxx) to link the main
+# (main.cxx and main.h)
+# Note: macOS (Xcode) needs at least one source file (main.cxx) to link the main
 # program fluid properly
 
 set(CPPFILES
-  CodeEditor.cxx
-  StyleParse.cxx
-  Fd_Snap_Action.cxx
-  Fl_Function_Type.cxx
-  Fl_Grid_Type.cxx
-  Fl_Group_Type.cxx
-  Fl_Menu_Type.cxx
-  Fl_Type.cxx
-  Fl_Widget_Type.cxx
-  Fl_Window_Type.cxx
-  Fl_Button_Type.cxx
-  Fluid_Image.cxx
-  about_panel.cxx
-  align_widget.cxx
-  settings_panel.cxx
-  autodoc.cxx
-  code.cxx
-  custom_widgets.cxx
-  factory.cxx
-  file.cxx
-  fluid_filename.cxx
-  function_panel.cxx
-  mergeback.cxx
-  pixmaps.cxx
-  shell_command.cxx
-  codeview_panel.cxx
-  template_panel.cxx
-  undo.cxx
-  widget_browser.cxx
-  widget_panel.cxx
+  app/align_widget.cxx
+  app/Fd_Snap_Action.cxx
+  app/fluid.cxx
+  app/Fluid_Image.cxx
+  app/mergeback.cxx
+  app/shell_command.cxx
+  app/undo.cxx
+  io/code.cxx
+  io/file.cxx
+  nodes/factory.cxx
+  nodes/Fl_Button_Type.cxx
+  nodes/Fl_Function_Type.cxx
+  nodes/Fl_Grid_Type.cxx
+  nodes/Fl_Group_Type.cxx
+  nodes/Fl_Menu_Type.cxx
+  nodes/Fl_Type.cxx
+  nodes/Fl_Widget_Type.cxx
+  nodes/Fl_Window_Type.cxx
+  panels/about_panel.cxx
+  panels/codeview_panel.cxx
+  panels/function_panel.cxx
+  panels/settings_panel.cxx
+  panels/template_panel.cxx
+  panels/widget_panel.cxx
+  rsrcs/pixmaps.cxx
+  tools/autodoc.cxx
+  tools/fluid_filename.cxx
+  widgets/CodeEditor.cxx
+  widgets/custom_widgets.cxx
+  widgets/StyleParse.cxx
+  widgets/widget_browser.cxx
 )
 
 # List header files in Apple's Xcode IDE
 
 set(HEADERFILES
-  CodeEditor.h
-  Fd_Snap_Action.h
-  Fl_Function_Type.h
-  Fl_Grid_Type.h
-  Fl_Group_Type.h
-  Fl_Menu_Type.h
-  Fl_Type.h
-  Fl_Widget_Type.h
-  Fl_Window_Type.h
-  Fl_Button_Type.h
-  Fluid_Image.h
-  StyleParse.h
-  about_panel.h
-  align_widget.h
-  settings_panel.h
-  autodoc.h
-  code.h
-  comments.h
-  custom_widgets.h
-  factory.h
-  file.h
-  function_panel.h
-  mergeback.h
-  print_panel.h
-  pixmaps.h
-  shell_command.h
-  codeview_panel.h
-  template_panel.h
-  undo.h
-  widget_browser.h
-  widget_panel.h
+  app/align_widget.h
+  app/Fd_Snap_Action.h
+  app/fluid.h
+  app/Fluid_Image.h
+  app/mergeback.h
+  app/shell_command.h
+  app/undo.h
+  io/code.h
+  io/file.h
+  nodes/factory.h
+  nodes/Fl_Button_Type.h
+  nodes/Fl_Function_Type.h
+  nodes/Fl_Grid_Type.h
+  nodes/Fl_Group_Type.h
+  nodes/Fl_Menu_Type.h
+  nodes/Fl_Type.h
+  nodes/Fl_Widget_Type.h
+  nodes/Fl_Window_Type.h
+  panels/about_panel.h
+  panels/codeview_panel.h
+  panels/function_panel.h
+  panels/settings_panel.h
+  panels/template_panel.h
+  panels/widget_panel.h
+  rsrcs/comments.h
+  rsrcs/pixmaps.h
+  tools/autodoc.h
+  tools/fluid_filename.h
+  widgets/CodeEditor.h
+  widgets/custom_widgets.h
+  widgets/StyleParse.h
+  widgets/widget_browser.h
 )
 
 # Add ExternalCodeEditor: platform specific files
 
 if(WIN32)
-  list(APPEND CPPFILES ExternalCodeEditor_WIN32.cxx)
-  list(APPEND HEADERFILES ExternalCodeEditor_WIN32.h)
+  list(APPEND CPPFILES tools/ExternalCodeEditor_WIN32.cxx)
+  list(APPEND HEADERFILES tools/ExternalCodeEditor_WIN32.h)
 else()
-  list(APPEND CPPFILES ExternalCodeEditor_UNIX.cxx)
-  list(APPEND HEADERFILES ExternalCodeEditor_UNIX.h)
+  list(APPEND CPPFILES tools/ExternalCodeEditor_UNIX.cxx)
+  list(APPEND HEADERFILES tools/ExternalCodeEditor_UNIX.h)
 endif(WIN32)
 
-source_group("Header Files" FILES ${HEADERFILES})
+source_group(
+  TREE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+  FILES
+    ${CPPFILES}
+    ${HEADERFILES}
+    main.cxx
+    main.h
+    CMakeLists.txt
+)
 
 # Build a local object library to avoid compiling all source files
 # multiple times for all fluid targets on Windows (fluid + fluid-cmd).
 
 add_library(fluid-lib OBJECT EXCLUDE_FROM_ALL)
 target_sources(fluid-lib PRIVATE ${CPPFILES} ${HEADERFILES})
+target_include_directories(fluid-lib PRIVATE .)
 target_link_libraries(fluid-lib PUBLIC fltk::images)
 
 # Build targets
@@ -117,8 +129,8 @@ if(APPLE AND NOT FLTK_BACKEND_X11)
   # macOS
 
   set(ICON_NAME fluid.icns)
-  set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/icons/${ICON_NAME}")
-  add_executable(fluid MACOSX_BUNDLE fluid.cxx fluid.h ${ICON_PATH})
+  set(ICON_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../icons/${ICON_NAME}")
+  add_executable(fluid MACOSX_BUNDLE main.cxx main.h ${ICON_PATH})
 
   # create macOS bundle wrapper script
 
@@ -135,10 +147,11 @@ if(APPLE AND NOT FLTK_BACKEND_X11)
 else()
 
   # Option 'WIN32' builds a Windows GUI program, ignored on other platforms
-  add_executable(fluid WIN32 fluid.cxx fluid.h)
+  add_executable(fluid WIN32 main.cxx main.h)
 
 endif()
 
+target_include_directories(fluid PRIVATE .)
 target_link_libraries(fluid PRIVATE fluid-lib)
 
 # Build the console app on Windows
@@ -146,7 +159,8 @@ target_link_libraries(fluid PRIVATE fluid-lib)
 
 if(WIN32)
   list(APPEND TARGETS fluid-cmd)
-  add_executable(fluid-cmd fluid.cxx fluid.h)
+  add_executable(fluid-cmd main.cxx main.h)
+  target_include_directories(fluid-cmd PRIVATE .)
   target_link_libraries(fluid-cmd PRIVATE fluid-lib)
   set(FLTK_FLUID_EXECUTABLE fltk::fluid-cmd)
 else()
@@ -207,8 +221,8 @@ if(UNIX)
 
   # Install desktop icons
   foreach(icon 32 48 64 128)
-    install(FILES icons/fluid-${icon}.png
-      DESTINATION ${FLTK_DATADIR}/icons/hicolor/${icon}x${icon}/apps
+    install(FILES ../icons/fluid-${icon}.png
+      DESTINATION ${FLTK_DATADIR}/../icons/hicolor/${icon}x${icon}/apps
       RENAME fluid.png
     )
   endforeach()

fluid/app/Fd_Snap_Action.cxx

@@ -14,11 +14,11 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fd_Snap_Action.h"
+#include "app/Fd_Snap_Action.h"
 
-#include "Fl_Group_Type.h"
-#include "settings_panel.h"
-#include "file.h"
+#include "io/file.h"
+#include "nodes/Fl_Group_Type.h"
+#include "panels/settings_panel.h"
 
 #include <FL/fl_draw.H>
 #include <FL/Fl_Menu_Bar.H>

fluid/app/Fd_Snap_Action.h

@@ -17,8 +17,8 @@
 #ifndef _FLUID_FD_SNAP_ACTION_H
 #define _FLUID_FD_SNAP_ACTION_H
 
-#include "fluid.h"
-#include "Fl_Window_Type.h"
+#include "app/fluid.h"
+#include "nodes/Fl_Window_Type.h"
 
 #include <string>
 

fluid/app/Fluid_Image.cxx

@@ -14,18 +14,18 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fluid_Image.h"
+#include "app/Fluid_Image.h"
 
-#include "fluid.h"
-#include "Fl_Group_Type.h"
-#include "Fl_Window_Type.h"
-#include "file.h"
-#include "code.h"
+#include "app/fluid.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Window_Type.h"
+#include "tools/fluid_filename.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Window.H>
-#include "fluid_filename.h"
 #include <FL/fl_string_functions.h>
 #include <FL/fl_utf8.h>     // fl_fopen()
 #include <FL/Fl_File_Chooser.H>

fluid/app/Fluid_Image.h

@@ -21,9 +21,9 @@
 #ifndef FLUID_IMAGE_H
 #define FLUID_IMAGE_H
 
-#include <FL/Fl_Shared_Image.H>
+#include "io/code.h"
 
-#include "code.h"
+#include <FL/Fl_Shared_Image.H>
 
 class Fluid_Image {
   bool is_animated_gif_;

fluid/app/align_widget.cxx

@@ -14,11 +14,11 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "align_widget.h"
+#include "app/align_widget.h"
 
-#include "fluid.h"
-#include "Fl_Group_Type.h"
-#include "undo.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "nodes/Fl_Group_Type.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>

fluid/app/fluid.cxx

@@ -1,7 +1,7 @@
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -14,27 +14,26 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "fluid.h"
+#include "app/fluid.h"
 
-#include "Fl_Type.h"
-#include "Fl_Function_Type.h"
-#include "Fl_Group_Type.h"
-#include "Fl_Window_Type.h"
-#include "widget_browser.h"
-#include "shell_command.h"
-#include "factory.h"
-#include "pixmaps.h"
-#include "undo.h"
-#include "file.h"
-#include "code.h"
-#include "mergeback.h"
-
-#include "settings_panel.h"
-#include "function_panel.h"
-#include "codeview_panel.h"
-#include "template_panel.h"
-#include "about_panel.h"
-#include "autodoc.h"
+#include "app/mergeback.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Type.h"
+#include "nodes/Fl_Function_Type.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Window_Type.h"
+#include "nodes/factory.h"
+#include "panels/settings_panel.h"
+#include "panels/function_panel.h"
+#include "panels/codeview_panel.h"
+#include "panels/template_panel.h"
+#include "panels/about_panel.h"
+#include "rsrcs/pixmaps.h"
+#include "app/shell_command.h"
+#include "tools/autodoc.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #ifdef __APPLE__
@@ -2195,7 +2194,7 @@ static void sigint(SIGARG) {
     in batch mode. Is that intentional? Does it circumvent issues with Windows'
     stderr and stdout?
  */
-int main(int argc,char **argv) {
+int fluid_main(int argc,char **argv) {
   int i = 1;
 
   setlocale(LC_ALL, "");      // enable multi-language errors in file chooser

fluid/app/fluid.h

@@ -1,7 +1,7 @@
 //
 // FLUID main entry for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -17,7 +17,8 @@
 #ifndef _FLUID_FLUID_H
 #define _FLUID_FLUID_H
 
-#include "fluid_filename.h"
+#include "tools/fluid_filename.h"
+
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Menu_Item.H>
 
@@ -175,6 +176,8 @@ extern Fluid_Project g_project;
 
 // ---- public functions
 
+extern int fluid_main(int argc,char **argv);
+
 extern bool new_project(bool user_must_confirm = true);
 extern void enter_project_dir();
 extern void leave_project_dir();
@@ -202,3 +205,4 @@ inline int fd_max(int a, int b) { return (a > b ? a : b); }
 inline int fd_min(int a, int b, int c) { return fd_min(a, fd_min(b, c)); }
 
 #endif // _FLUID_FLUID_H
+

fluid/app/mergeback.cxx

@@ -17,13 +17,13 @@
 #if 0
 // Matt: disabled
 
-#include "mergeback.h"
+#include "app/mergeback.h"
 
-#include "fluid.h"
-#include "code.h"
-#include "undo.h"
-#include "Fl_Function_Type.h"
-#include "Fl_Widget_Type.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "io/code.h"
+#include "nodes/Fl_Function_Type.h"
+#include "nodes/Fl_Widget_Type.h"
 
 #include <FL/Fl_Window.H>
 #include <FL/fl_ask.H>

fluid/app/shell_command.cxx

@@ -95,11 +95,11 @@
   powershell -c "$wshell = New-Object -ComObject wscript.shell; $wshell.SendKeys('^{ESCAPE}')
  */
 
-#include "shell_command.h"
+#include "app/shell_command.h"
 
-#include "fluid.h"
-#include "file.h"
-#include "settings_panel.h"
+#include "app/fluid.h"
+#include "io/file.h"
+#include "panels/settings_panel.h"
 
 #include <FL/Fl_Double_Window.H>
 #include <FL/Fl_Menu_Bar.H>

fluid/app/shell_command.h

@@ -17,7 +17,7 @@
 #ifndef _FLUID_SHELL_COMMAND_H
 #define _FLUID_SHELL_COMMAND_H
 
-#include "fluid.h"
+#include "app/fluid.h"
 
 #include <FL/Enumerations.H>
 

fluid/app/undo.cxx

@@ -1,7 +1,7 @@
 //
 // FLUID undo support for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -14,20 +14,20 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "undo.h"
+#include "app/undo.h"
 
-#include "fluid.h"
-#include "file.h"
-#include "Fl_Type.h"
-#include "Fl_Widget_Type.h"
-#include "widget_browser.h"
+#include "app/fluid.h"
+#include "io/file.h"
+#include "nodes/Fl_Type.h"
+#include "nodes/Fl_Widget_Type.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Menu_Bar.H>
 #include <FL/fl_ask.H>
-#include "fluid_filename.h"
+#include "tools/fluid_filename.h"
 #include "../src/flstring.h"
 
 #if defined(_WIN32) && !defined(__CYGWIN__)

fluid/app/undo.h

@@ -1,7 +1,7 @@
 //
 // FLUID undo definitions for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this

fluid/documentation/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # CMakeLists.txt to build docs for the FLTK project using CMake (www.cmake.org)
 #
-# Copyright 1998-2024 by Bill Spitzak and others.
+# Copyright 1998-2025 by Bill Spitzak and others.
 #
 # This library is free software. Distribution and use rights are outlined in
 # the file "COPYING" which should have been included with this file.  If this

fluid/io/code.cxx

@@ -1,7 +1,7 @@
 //
 // Code output routines for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -14,19 +14,19 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "code.h"
+#include "io/code.h"
 
-#include "fluid.h"
-#include "Fl_Group_Type.h"
-#include "Fl_Window_Type.h"
-#include "Fl_Function_Type.h"
-#include "file.h"
-#include "undo.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Window_Type.h"
+#include "nodes/Fl_Function_Type.h"
+#include "tools/fluid_filename.h"
 
 #include <FL/Fl.H>
 #include <FL/fl_string_functions.h>
 #include <FL/fl_ask.H>
-#include "fluid_filename.h"
 #include "../src/flstring.h"
 
 #include <stdarg.h>

fluid/io/file.cxx

@@ -19,19 +19,19 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "file.h"
+#include "io/file.h"
 
-#include "fluid.h"
-#include "factory.h"
-#include "Fl_Function_Type.h"
-#include "Fl_Widget_Type.h"
-#include "Fl_Grid_Type.h"
-#include "Fl_Window_Type.h"
-#include "settings_panel.h"
-#include "widget_browser.h"
-#include "shell_command.h"
-#include "code.h"
-#include "undo.h"
+#include "app/fluid.h"
+#include "app/shell_command.h"
+#include "app/undo.h"
+#include "io/code.h"
+#include "nodes/factory.h"
+#include "nodes/Fl_Function_Type.h"
+#include "nodes/Fl_Widget_Type.h"
+#include "nodes/Fl_Grid_Type.h"
+#include "nodes/Fl_Window_Type.h"
+#include "panels/settings_panel.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>

fluid/io/file.h

@@ -17,7 +17,7 @@
 #ifndef _FLUID_FILE_H
 #define _FLUID_FILE_H
 
-#include "Fl_Type.h"
+#include "nodes/Fl_Type.h"
 
 #include <FL/fl_attr.h>
 

fluid/main.cxx

@@ -0,0 +1,23 @@
+//
+// FLUID main entry for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2025 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     https://www.fltk.org/COPYING.php
+//
+// Please see the following page on how to report bugs and issues:
+//
+//     https://www.fltk.org/bugs.php
+//
+
+#include "main.h"
+#include "app/fluid.h"
+
+int main(int argc,char **argv) {
+  return fluid_main(argc, argv);
+}
+

fluid/main.h

@@ -0,0 +1,22 @@
+//
+// FLUID main entry for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 1998-2025 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     https://www.fltk.org/COPYING.php
+//
+// Please see the following page on how to report bugs and issues:
+//
+//     https://www.fltk.org/bugs.php
+//
+
+#ifndef _FLUID_MAIN_H
+#define _FLUID_MAIN_H
+
+extern int main(int argc,char **argv);
+
+#endif // _FLUID_MAIN_H

fluid/nodes/Fl_Button_Type.cxx

@@ -22,10 +22,10 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Button_Type.h"
+#include "nodes/Fl_Button_Type.h"
 
-#include "Fd_Snap_Action.h"
-#include "file.h"
+#include "app/Fd_Snap_Action.h"
+#include "io/file.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Button.H>

fluid/nodes/Fl_Button_Type.h

@@ -17,7 +17,7 @@
 #ifndef _FL_BUTTON_TYPE_H
 #define _FL_BUTTON_TYPE_H
 
-#include "Fl_Widget_Type.h"
+#include "nodes/Fl_Widget_Type.h"
 
 /**
  \brief A handler for the simple push button and a base class for all other buttons.

fluid/nodes/Fl_Function_Type.cxx

@@ -14,18 +14,18 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Function_Type.h"
+#include "nodes/Fl_Function_Type.h"
 
-#include "fluid.h"
-#include "Fl_Window_Type.h"
-#include "Fl_Group_Type.h"
-#include "widget_browser.h"
-#include "file.h"
-#include "code.h"
-#include "function_panel.h"
-#include "comments.h"
-#include "mergeback.h"
-#include "undo.h"
+#include "app/fluid.h"
+#include "app/mergeback.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Window_Type.h"
+#include "nodes/Fl_Group_Type.h"
+#include "panels/function_panel.h"
+#include "rsrcs/comments.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/fl_string_functions.h>
 #include <FL/Fl_File_Chooser.H>

fluid/nodes/Fl_Function_Type.h

@@ -17,13 +17,13 @@
 #ifndef _FLUID_FL_FUNCTION_TYPE_H
 #define _FLUID_FL_FUNCTION_TYPE_H
 
-#include "Fl_Type.h"
+#include "nodes/Fl_Type.h"
 
-#include "Fluid_Image.h"
+#include "app/Fluid_Image.h"
 #ifdef _WIN32
-#include "ExternalCodeEditor_WIN32.h"
+#include "tools/ExternalCodeEditor_WIN32.h"
 #else
-#include "ExternalCodeEditor_UNIX.h"
+#include "tools/ExternalCodeEditor_UNIX.h"
 #endif
 
 #include <FL/Fl_Widget.H>

fluid/nodes/Fl_Grid_Type.cxx

@@ -14,15 +14,15 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Grid_Type.h"
+#include "nodes/Fl_Grid_Type.h"
 
-#include "fluid.h"
-#include "file.h"
-#include "code.h"
-#include "widget_browser.h"
-#include "undo.h"
-#include "Fd_Snap_Action.h"
-#include "custom_widgets.h"
+#include "app/fluid.h"
+#include "app/Fd_Snap_Action.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "widgets/widget_browser.h"
+#include "widgets/custom_widgets.h"
 
 #include <FL/Fl_Grid.H>
 #include <FL/Fl_Value_Input.H>

fluid/nodes/Fl_Grid_Type.h

@@ -17,7 +17,7 @@
 #ifndef _FLUID_FL_GRID_TYPE_H
 #define _FLUID_FL_GRID_TYPE_H
 
-#include "Fl_Group_Type.h"
+#include "nodes/Fl_Group_Type.h"
 #include <FL/Fl_Grid.H>
 
 // ---- Fl_Grid_Type --------------------------------------------------- MARK: -

fluid/nodes/Fl_Group_Type.cxx

@@ -18,14 +18,14 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Group_Type.h"
+#include "nodes/Fl_Group_Type.h"
 
-#include "fluid.h"
-#include "file.h"
-#include "code.h"
-#include "widget_browser.h"
-#include "undo.h"
-#include "Fd_Snap_Action.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "app/Fd_Snap_Action.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>

fluid/nodes/Fl_Group_Type.h

@@ -17,7 +17,7 @@
 #ifndef _FLUID_FL_GROUP_TYPE_H
 #define _FLUID_FL_GROUP_TYPE_H
 
-#include "Fl_Widget_Type.h"
+#include "nodes/Fl_Widget_Type.h"
 
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Pack.H>

fluid/nodes/Fl_Menu_Type.cxx

@@ -20,17 +20,17 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Menu_Type.h"
+#include "nodes/Fl_Menu_Type.h"
 
-#include "fluid.h"
-#include "Fl_Window_Type.h"
-#include "file.h"
-#include "code.h"
-#include "Fluid_Image.h"
-#include "custom_widgets.h"
-#include "mergeback.h"
-#include "undo.h"
-#include "widget_browser.h"
+#include "app/fluid.h"
+#include "app/Fluid_Image.h"
+#include "app/mergeback.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Window_Type.h"
+#include "widgets/custom_widgets.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/fl_message.H>

fluid/nodes/Fl_Menu_Type.h

@@ -21,9 +21,9 @@
 #ifndef _FLUID_FL_MENU_TYPE_H
 #define _FLUID_FL_MENU_TYPE_H
 
-#include "Fl_Button_Type.h"
+#include "nodes/Fl_Button_Type.h"
 
-#include "Fd_Snap_Action.h"
+#include "app/Fd_Snap_Action.h"
 
 #include <FL/Fl_Choice.H>
 #include <FL/Fl_Menu_.H>

fluid/nodes/Fl_Type.cxx

@@ -94,20 +94,20 @@
 
 */
 
-#include "Fl_Type.h"
+#include "nodes/Fl_Type.h"
 
-#include "fluid.h"
-#include "Fd_Snap_Action.h"
-#include "Fl_Function_Type.h"
-#include "Fl_Widget_Type.h"
-#include "Fl_Window_Type.h"
-#include "Fl_Group_Type.h"
-#include "widget_browser.h"
-#include "file.h"
-#include "code.h"
-#include "undo.h"
-#include "pixmaps.h"
-#include "shell_command.h"
+#include "app/fluid.h"
+#include "app/Fd_Snap_Action.h"
+#include "app/shell_command.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Function_Type.h"
+#include "nodes/Fl_Widget_Type.h"
+#include "nodes/Fl_Window_Type.h"
+#include "nodes/Fl_Group_Type.h"
+#include "rsrcs/pixmaps.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Browser_.H>

fluid/nodes/Fl_Type.h

@@ -1,7 +1,7 @@
 //
 // Widget type header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -17,11 +17,11 @@
 #ifndef _FLUID_FL_TYPE_H
 #define _FLUID_FL_TYPE_H
 
+#include "io/code.h"
+
 #include <FL/Fl_Widget.H>
 #include <FL/fl_draw.H>
 
-#include "code.h"
-
 class Fl_Type;
 class Fl_Group_Type;
 class Fl_Window_Type;

fluid/nodes/Fl_Widget_Type.cxx

@@ -1,7 +1,7 @@
 //
 // Widget type code for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -14,20 +14,20 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Widget_Type.h"
+#include "nodes/Fl_Widget_Type.h"
 
-#include "fluid.h"
-#include "Fl_Window_Type.h"
-#include "Fl_Group_Type.h"
-#include "Fl_Menu_Type.h"
-#include "Fl_Function_Type.h"
-#include "file.h"
-#include "code.h"
-#include "Fluid_Image.h"
-#include "settings_panel.h"
-#include "widget_panel.h"
-#include "undo.h"
-#include "mergeback.h"
+#include "app/fluid.h"
+#include "app/Fluid_Image.h"
+#include "app/mergeback.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/Fl_Window_Type.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Menu_Type.h"
+#include "nodes/Fl_Function_Type.h"
+#include "panels/settings_panel.h"
+#include "panels/widget_panel.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>

fluid/nodes/Fl_Widget_Type.h

@@ -21,7 +21,7 @@
 #ifndef _FLUID_FL_WIDGET_TYPE_H
 #define _FLUID_FL_WIDGET_TYPE_H
 
-#include "Fl_Type.h"
+#include "nodes/Fl_Type.h"
 
 #define NUM_EXTRA_CODE 4
 

fluid/nodes/Fl_Window_Type.cxx

@@ -5,7 +5,7 @@
 // for interacting with the overlay, which allows the user to
 // select, move, and resize the children widgets.
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -18,19 +18,19 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "Fl_Window_Type.h"
+#include "nodes/Fl_Window_Type.h"
 
-#include "Fl_Group_Type.h"
-#include "Fl_Grid_Type.h"
-#include "fluid.h"
-#include "widget_browser.h"
-#include "undo.h"
-#include "settings_panel.h"
-#include "file.h"
-#include "code.h"
-#include "widget_panel.h"
-#include "factory.h"
-#include "Fd_Snap_Action.h"
+#include "app/Fd_Snap_Action.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "io/file.h"
+#include "io/code.h"
+#include "nodes/factory.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Grid_Type.h"
+#include "panels/settings_panel.h"
+#include "panels/widget_panel.h"
+#include "widgets/widget_browser.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Overlay_Window.H>

fluid/nodes/Fl_Window_Type.h

@@ -21,7 +21,7 @@
 #ifndef _FLUID_FL_WINDOW_TYPE_H
 #define _FLUID_FL_WINDOW_TYPE_H
 
-#include "Fl_Group_Type.h"
+#include "nodes/Fl_Group_Type.h"
 
 class Fl_Widget_Class_Type;
 

fluid/nodes/factory.cxx

@@ -9,7 +9,7 @@
 // to a factory instance for every class (both the ones defined
 // here and ones in other files)
 //
-// Copyright 1998-2024 by Bill Spitzak and others.
+// Copyright 1998-2025 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -22,15 +22,15 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include "factory.h"
+#include "nodes/factory.h"
 
-#include "fluid.h"
-#include "Fl_Group_Type.h"
-#include "Fl_Grid_Type.h"
-#include "Fl_Menu_Type.h"
-#include "Fd_Snap_Action.h"
-#include "pixmaps.h"
-#include "undo.h"
+#include "app/Fd_Snap_Action.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "nodes/Fl_Group_Type.h"
+#include "nodes/Fl_Grid_Type.h"
+#include "nodes/Fl_Menu_Type.h"
+#include "rsrcs/pixmaps.h"
 
 #include <FL/Fl.H>
 #include <FL/Fl_Adjuster.H>

fluid/nodes/factory.h

@@ -17,7 +17,7 @@
 #ifndef _FLUID_FACTORY_H
 #define _FLUID_FACTORY_H
 
-#include "Fl_Type.h"
+#include "nodes/Fl_Type.h"
 
 struct Fl_Menu_Item;
 

fluid/panels/about_panel.cxx

@@ -201,7 +201,7 @@ Fl_Double_Window* make_about_panel() {
 /**
  Embedded image for internal fluid.html web page.
 */
-unsigned char fluid_flow_chart_800_png[41559] = /* data inlined from documentation/src/fluid_flow_chart_800.png */
+unsigned char fluid_flow_chart_800_png[41559] = /* data inlined from ../documentation/src/fluid_flow_chart_800.png */
 {137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,3,32,0,0,1,41,8,6,0,0,0,
 107,224,70,137,0,0,1,110,105,67,67,80,105,99,99,0,0,40,145,117,145,187,75,195,
 80,20,198,127,173,79,172,226,160,131,136,67,6,149,14,22,124,128,56,106,29,92,

fluid/panels/about_panel.fl

@@ -40,7 +40,7 @@ if (!cbuf[0]) {
     code0 {\#include "../src/flstring.h"} non_modal visible
   } {
     Fl_Box {} {
-      image {icons/fluid.animated.gif} compress_image 1 xywh {10 10 115 120}
+      image {../icons/fluid.animated.gif} compress_image 1 xywh {10 10 115 120}
       code0 {((Fl_Anim_GIF_Image*)(o->image()))->speed(0.5f);}
     }
     Fl_Box {} {
@@ -72,5 +72,5 @@ Version x.x.x}
 }
 
 data fluid_flow_chart_800_png {
-  comment {Embedded image for internal fluid.html web page.} selected public local filename {documentation/src/fluid_flow_chart_800.png}
+  comment {Embedded image for internal fluid.html web page.} selected public local filename {../documentation/src/fluid_flow_chart_800.png}
 }

fluid/panels/codeview_panel.cxx

@@ -17,11 +17,11 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.0500
 
 #include "codeview_panel.h"
-#include "fluid.h"
-#include "file.h"
-#include "../src/flstring.h"
+#include "app/fluid.h"
+#include "io/file.h"
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Button.H>
+#include "../src/flstring.h"
 static char *cv_source_filename = NULL;
 static char *cv_header_filename = NULL;
 static char *cv_design_filename = NULL;

fluid/panels/codeview_panel.fl

@@ -20,13 +20,10 @@ comment {//
 } {in_source in_header
 }
 
-decl {\#include "fluid.h"} {private local
+decl {\#include "app/fluid.h"} {private local
 }
 
-decl {\#include "file.h"} {private local
-}
-
-decl {\#include "../src/flstring.h"} {selected private local
+decl {\#include "io/file.h"} {private local
 }
 
 decl {\#include <FL/Fl_Tabs.H>} {private local
@@ -35,6 +32,9 @@ decl {\#include <FL/Fl_Tabs.H>} {private local
 decl {\#include <FL/Fl_Button.H>} {private local
 }
 
+decl {\#include "../src/flstring.h"} {selected private local
+}
+
 decl {char *cv_source_filename = NULL;} {private local
 }
 
@@ -296,7 +296,7 @@ Function {make_codeview()} {open
       } {
         Fl_Text_Editor cv_source {
           xywh {10 40 500 410} textfont 4 textsize 11 resizable
-          code0 {\#include "CodeEditor.h"}
+          code0 {\#include "widgets/CodeEditor.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
           class CodeViewer
@@ -308,7 +308,7 @@ Function {make_codeview()} {open
       } {
         Fl_Text_Editor cv_header {
           xywh {10 40 500 410} textfont 4 textsize 11 resizable
-          code0 {\#include "CodeEditor.h"}
+          code0 {\#include "widgets/CodeEditor.h"}
           code1 {o->linenumber_width(60);}
           code2 {o->linenumber_size(o->Fl_Text_Display::textsize());}
           class CodeViewer

fluid/panels/codeview_panel.h

@@ -33,7 +33,7 @@ extern Fl_Double_Window *codeview_panel;
 extern Fl_Tabs *cv_tab;
 #include <FL/Fl_Group.H>
 extern Fl_Group *cv_source_tab;
-#include "CodeEditor.h"
+#include "widgets/CodeEditor.h"
 extern CodeViewer *cv_source;
 extern CodeViewer *cv_header;
 extern TextViewer *cv_strings;

fluid/panels/function_panel.cxx

@@ -17,13 +17,13 @@
 // generated by Fast Light User Interface Designer (fluid) version 1.0500
 
 #include "function_panel.h"
-#include "fluid.h"
-#include "custom_widgets.h"
-#include "pixmaps.h"
-#include "factory.h"
-#include "Fl_Type.h"
-#include "widget_browser.h"
-#include "undo.h"
+#include "app/fluid.h"
+#include "app/undo.h"
+#include "nodes/Fl_Type.h"
+#include "nodes/factory.h"
+#include "rsrcs/pixmaps.h"
+#include "widgets/custom_widgets.h"
+#include "widgets/widget_browser.h"
 
 /**
  Allow widget navigation on text fields with Tab.

fluid/panels/function_panel.fl

@@ -25,25 +25,25 @@ comment {//
 } {in_source in_header
 }
 
-decl {\#include "fluid.h"} {private local
+decl {\#include "app/fluid.h"} {private local
 }
 
-decl {\#include "custom_widgets.h"} {private global
+decl {\#include "app/undo.h"} {selected private local
 }
 
-decl {\#include "pixmaps.h"} {private local
+decl {\#include "nodes/Fl_Type.h"} {private local
 }
 
-decl {\#include "factory.h"} {private local
+decl {\#include "nodes/factory.h"} {private local
 }
 
-decl {\#include "Fl_Type.h"} {private local
+decl {\#include "rsrcs/pixmaps.h"} {private local
 }
 
-decl {\#include "widget_browser.h"} {private local
+decl {\#include "widgets/custom_widgets.h"} {private global
 }
 
-decl {\#include "undo.h"} {private local
+decl {\#include "widgets/widget_browser.h"} {private local
 }
 
 Function {use_tab_navigation(int, Fl_Text_Editor*)} {
@@ -152,7 +152,7 @@ code_panel->hide(); // otherwise hide..}
     Fl_Text_Editor code_input {
       xywh {10 10 520 130} box DOWN_BOX labelsize 11 textfont 4 textsize 11 resizable
       code0 {o->when(FL_WHEN_ENTER_KEY_CHANGED|FL_WHEN_RELEASE);}
-      code1 {\#include "CodeEditor.h"}
+      code1 {\#include "widgets/CodeEditor.h"}
       class CodeEditor
     }
     Fl_Group {} {open
@@ -343,7 +343,7 @@ Function {make_decl_panel()} {open
         Fl_Text_Editor decl_input {
           label {This can be any declaration, like "int x;", an external symbol like "extern int foo();", a \#directive like "\#include <foo.h>", a comment like "//foo" or "/*foo*/", or typedef like "typedef char byte;" or "using std::list;".}
           xywh {10 40 320 45} labelsize 11 align 134 resizable
-          code0 {\#include "CodeEditor.h"}
+          code0 {\#include "widgets/CodeEditor.h"}
           class CodeEditor
         }
         Fl_Box {} {
@@ -591,8 +591,7 @@ Function {type_make_cb(Fl_Widget*,void*d)} {open return_type void
 if (Fl_Type::current && Fl_Type::current->can_have_children())
   add_new_widget_from_user(type_name, Strategy::AS_LAST_CHILD);
 else
-  add_new_widget_from_user(type_name, Strategy::AFTER_CURRENT);} {selected
-  }
+  add_new_widget_from_user(type_name, Strategy::AFTER_CURRENT);} {}
 }
 
 Function {make_widgetbin()} {open

fluid/panels/function_panel.h

@@ -41,7 +41,7 @@ Fl_Double_Window* make_function_panel();
 extern Fl_Menu_Item menu_f_public_member_choice[];
 extern Fl_Menu_Item menu_f_public_choice[];
 extern Fl_Double_Window *code_panel;
-#include "CodeEditor.h"
+#include "widgets/CodeEditor.h"
 extern CodeEditor *code_input;
 extern Fl_Return_Button *code_panel_ok;
 extern Fl_Button *code_panel_cancel;