Fix dependencies and whitespace issues

3 files changed, 81 insertions, 158 deletions

diff --git a/test/fullscreen.cxx b/test/fullscreen.cxx
index 9d0d776b2..44fc89a7e 100644
--- a/test/fullscreen.cxx
+++ b/test/fullscreen.cxx
@@ -342,7 +342,7 @@ int main(int argc, char **argv) {
   window.b3 = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"FullScreen");
   window.b3->callback(fullscreen_cb,w);
   y+=30;
-  
+
   window.b3_maxi = new Fl_Toggle_Light_Button(50,y,window.w()-60,30,"Maximize");
   window.b3_maxi->callback(maximize_cb,w);
   y+=30;
diff --git a/test/makedepend b/test/makedepend
index a152cfa0e..2a0a8da55 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -203,11 +203,8 @@ browser.o: ../FL/Fl_Cairo.H
 browser.o: ../FL/fl_casts.H
 browser.o: ../FL/Fl_Choice.H
 browser.o: ../FL/fl_config.h
-browser.o: ../FL/Fl_Device.H
 browser.o: ../FL/Fl_Double_Window.H
-browser.o: ../FL/fl_draw.H
 browser.o: ../FL/Fl_Export.H
-browser.o: ../FL/Fl_Graphics_Driver.H
 browser.o: ../FL/Fl_Group.H
 browser.o: ../FL/Fl_Image.H
 browser.o: ../FL/Fl_Input.H
@@ -215,17 +212,11 @@ browser.o: ../FL/Fl_Input_.H
 browser.o: ../FL/Fl_Int_Input.H
 browser.o: ../FL/Fl_Menu_.H
 browser.o: ../FL/Fl_Menu_Item.H
-browser.o: ../FL/Fl_Pixmap.H
-browser.o: ../FL/Fl_Plugin.H
-browser.o: ../FL/Fl_Preferences.H
 browser.o: ../FL/Fl_Rect.H
-browser.o: ../FL/Fl_RGB_Image.H
 browser.o: ../FL/Fl_Scrollbar.H
 browser.o: ../FL/Fl_Select_Browser.H
-browser.o: ../FL/Fl_Terminal.H
 browser.o: ../FL/Fl_Slider.H
-browser.o: ../FL/Fl_Text_Buffer.H
-browser.o: ../FL/Fl_Text_Display.H
+browser.o: ../FL/Fl_Terminal.H
 browser.o: ../FL/fl_types.h
 browser.o: ../FL/fl_utf8.h
 browser.o: ../FL/Fl_Valuator.H
@@ -236,23 +227,18 @@ button.o: ../FL/Enumerations.H
 button.o: ../FL/Fl.H
 button.o: ../FL/fl_ask.H
 button.o: ../FL/fl_attr.h
-button.o: ../FL/Fl_Bitmap.H
 button.o: ../FL/Fl_Button.H
 button.o: ../FL/Fl_Cairo.H
 button.o: ../FL/fl_casts.H
 button.o: ../FL/fl_config.h
 button.o: ../FL/Fl_Export.H
-button.o: ../FL/Fl_Group.H
-button.o: ../FL/Fl_Image.H
 button.o: ../FL/fl_types.h
 button.o: ../FL/fl_utf8.h
-button.o: ../FL/Fl_Widget.H
 button.o: ../FL/Fl_Window.H
 button.o: ../FL/platform_types.h
 buttons.o: ../FL/Enumerations.H
 buttons.o: ../FL/Fl.H
 buttons.o: ../FL/fl_attr.h
-buttons.o: ../FL/Fl_Bitmap.H
 buttons.o: ../FL/Fl_Button.H
 buttons.o: ../FL/Fl_Cairo.H
 buttons.o: ../FL/fl_casts.H
@@ -260,7 +246,6 @@ buttons.o: ../FL/Fl_Check_Button.H
 buttons.o: ../FL/Fl_Choice.H
 buttons.o: ../FL/fl_config.h
 buttons.o: ../FL/Fl_Export.H
-buttons.o: ../FL/Fl_Group.H
 buttons.o: ../FL/Fl_Image.H
 buttons.o: ../FL/Fl_Light_Button.H
 buttons.o: ../FL/Fl_Menu_.H
@@ -507,10 +492,8 @@ contrast.o: ../FL/Fl_Return_Button.H
 contrast.o: ../FL/Fl_RGB_Image.H
 contrast.o: ../FL/Fl_Round_Button.H
 contrast.o: ../FL/Fl_Scrollbar.H
-contrast.o: ../FL/Fl_Terminal.H
 contrast.o: ../FL/Fl_Slider.H
-contrast.o: ../FL/Fl_Text_Buffer.H
-contrast.o: ../FL/Fl_Text_Display.H
+contrast.o: ../FL/Fl_Terminal.H
 contrast.o: ../FL/fl_types.h
 contrast.o: ../FL/fl_utf8.h
 contrast.o: ../FL/Fl_Valuator.H
@@ -675,31 +658,20 @@ demo.o: ../FL/Fl_Cairo.H
 demo.o: ../FL/fl_casts.H
 demo.o: ../FL/Fl_Choice.H
 demo.o: ../FL/fl_config.h
-demo.o: ../FL/Fl_Device.H
 demo.o: ../FL/Fl_Double_Window.H
-demo.o: ../FL/fl_draw.H
 demo.o: ../FL/Fl_Export.H
-demo.o: ../FL/Fl_Graphics_Driver.H
 demo.o: ../FL/Fl_Group.H
 demo.o: ../FL/Fl_Image.H
 demo.o: ../FL/Fl_Menu_.H
 demo.o: ../FL/Fl_Menu_Button.H
 demo.o: ../FL/Fl_Menu_Item.H
-demo.o: ../FL/Fl_Pixmap.H
-demo.o: ../FL/Fl_Plugin.H
-demo.o: ../FL/Fl_Preferences.H
 demo.o: ../FL/Fl_Rect.H
-demo.o: ../FL/Fl_RGB_Image.H
 demo.o: ../FL/Fl_Scheme.H
 demo.o: ../FL/Fl_Scheme_Choice.H
 demo.o: ../FL/Fl_Scrollbar.H
 demo.o: ../FL/Fl_Terminal.H
-demo.o: ../FL/Fl_Slider.H
-demo.o: ../FL/Fl_Text_Buffer.H
-demo.o: ../FL/Fl_Text_Display.H
 demo.o: ../FL/fl_types.h
 demo.o: ../FL/fl_utf8.h
-demo.o: ../FL/Fl_Valuator.H
 demo.o: ../FL/Fl_Widget.H
 demo.o: ../FL/Fl_Window.H
 demo.o: ../FL/platform.H
@@ -885,15 +857,12 @@ file_chooser.o: ../FL/fl_casts.H
 file_chooser.o: ../FL/Fl_Check_Button.H
 file_chooser.o: ../FL/Fl_Choice.H
 file_chooser.o: ../FL/fl_config.h
-file_chooser.o: ../FL/Fl_Device.H
 file_chooser.o: ../FL/Fl_Double_Window.H
-file_chooser.o: ../FL/fl_draw.H
 file_chooser.o: ../FL/Fl_Export.H
 file_chooser.o: ../FL/Fl_File_Browser.H
 file_chooser.o: ../FL/Fl_File_Chooser.H
 file_chooser.o: ../FL/Fl_File_Icon.H
 file_chooser.o: ../FL/Fl_File_Input.H
-file_chooser.o: ../FL/Fl_Graphics_Driver.H
 file_chooser.o: ../FL/Fl_Group.H
 file_chooser.o: ../FL/Fl_Image.H
 file_chooser.o: ../FL/Fl_Input.H
@@ -902,19 +871,14 @@ file_chooser.o: ../FL/Fl_Light_Button.H
 file_chooser.o: ../FL/Fl_Menu_.H
 file_chooser.o: ../FL/Fl_Menu_Button.H
 file_chooser.o: ../FL/Fl_Menu_Item.H
-file_chooser.o: ../FL/Fl_Pixmap.H
-file_chooser.o: ../FL/Fl_Plugin.H
 file_chooser.o: ../FL/Fl_PNM_Image.H
 file_chooser.o: ../FL/Fl_Preferences.H
 file_chooser.o: ../FL/Fl_Rect.H
 file_chooser.o: ../FL/Fl_Return_Button.H
-file_chooser.o: ../FL/Fl_RGB_Image.H
 file_chooser.o: ../FL/Fl_Scrollbar.H
 file_chooser.o: ../FL/Fl_Shared_Image.H
-file_chooser.o: ../FL/Fl_Terminal.H
 file_chooser.o: ../FL/Fl_Slider.H
-file_chooser.o: ../FL/Fl_Text_Buffer.H
-file_chooser.o: ../FL/Fl_Text_Display.H
+file_chooser.o: ../FL/Fl_Terminal.H
 file_chooser.o: ../FL/Fl_Tile.H
 file_chooser.o: ../FL/fl_types.h
 file_chooser.o: ../FL/fl_utf8.h
@@ -968,17 +932,13 @@ fltk-versions.o: ../FL/Enumerations.H
 fltk-versions.o: ../FL/Fl.H
 fltk-versions.o: ../FL/fl_ask.H
 fltk-versions.o: ../FL/fl_attr.h
-fltk-versions.o: ../FL/Fl_Bitmap.H
 fltk-versions.o: ../FL/Fl_Box.H
 fltk-versions.o: ../FL/Fl_Cairo.H
 fltk-versions.o: ../FL/fl_casts.H
 fltk-versions.o: ../FL/fl_config.h
 fltk-versions.o: ../FL/Fl_Export.H
-fltk-versions.o: ../FL/Fl_Group.H
-fltk-versions.o: ../FL/Fl_Image.H
 fltk-versions.o: ../FL/fl_types.h
 fltk-versions.o: ../FL/fl_utf8.h
-fltk-versions.o: ../FL/Fl_Widget.H
 fltk-versions.o: ../FL/Fl_Window.H
 fltk-versions.o: ../FL/platform_types.h
 fonts.o: ../FL/Enumerations.H
@@ -1235,17 +1195,13 @@ gl_overlay.o: ../FL/platform_types.h
 hello.o: ../FL/Enumerations.H
 hello.o: ../FL/Fl.H
 hello.o: ../FL/fl_attr.h
-hello.o: ../FL/Fl_Bitmap.H
 hello.o: ../FL/Fl_Box.H
 hello.o: ../FL/Fl_Cairo.H
 hello.o: ../FL/fl_casts.H
 hello.o: ../FL/fl_config.h
 hello.o: ../FL/Fl_Export.H
-hello.o: ../FL/Fl_Group.H
-hello.o: ../FL/Fl_Image.H
 hello.o: ../FL/fl_types.h
 hello.o: ../FL/fl_utf8.h
-hello.o: ../FL/Fl_Widget.H
 hello.o: ../FL/Fl_Window.H
 hello.o: ../FL/platform_types.h
 help_dialog.o: ../FL/Enumerations.H
@@ -1306,18 +1262,14 @@ icon.o: ../FL/platform_types.h
 iconize.o: ../FL/Enumerations.H
 iconize.o: ../FL/Fl.H
 iconize.o: ../FL/fl_attr.h
-iconize.o: ../FL/Fl_Bitmap.H
 iconize.o: ../FL/Fl_Box.H
 iconize.o: ../FL/Fl_Button.H
 iconize.o: ../FL/Fl_Cairo.H
 iconize.o: ../FL/fl_casts.H
 iconize.o: ../FL/fl_config.h
 iconize.o: ../FL/Fl_Export.H
-iconize.o: ../FL/Fl_Group.H
-iconize.o: ../FL/Fl_Image.H
 iconize.o: ../FL/fl_types.h
 iconize.o: ../FL/fl_utf8.h
-iconize.o: ../FL/Fl_Widget.H
 iconize.o: ../FL/Fl_Window.H
 iconize.o: ../FL/platform_types.h
 image.o: ../config.h
@@ -1379,7 +1331,6 @@ inactive.o: inactive.h
 input.o: ../FL/Enumerations.H
 input.o: ../FL/Fl.H
 input.o: ../FL/fl_attr.h
-input.o: ../FL/Fl_Bitmap.H
 input.o: ../FL/Fl_Box.H
 input.o: ../FL/Fl_Button.H
 input.o: ../FL/Fl_Cairo.H
@@ -1387,11 +1338,8 @@ input.o: ../FL/fl_casts.H
 input.o: ../FL/Fl_Choice.H
 input.o: ../FL/Fl_Color_Chooser.H
 input.o: ../FL/fl_config.h
-input.o: ../FL/Fl_Device.H
-input.o: ../FL/fl_draw.H
 input.o: ../FL/Fl_Export.H
 input.o: ../FL/Fl_Float_Input.H
-input.o: ../FL/Fl_Graphics_Driver.H
 input.o: ../FL/Fl_Group.H
 input.o: ../FL/Fl_Image.H
 input.o: ../FL/Fl_Input.H
@@ -1401,18 +1349,11 @@ input.o: ../FL/Fl_Light_Button.H
 input.o: ../FL/Fl_Menu_.H
 input.o: ../FL/Fl_Menu_Item.H
 input.o: ../FL/Fl_Multiline_Input.H
-input.o: ../FL/Fl_Pixmap.H
-input.o: ../FL/Fl_Plugin.H
-input.o: ../FL/Fl_Preferences.H
 input.o: ../FL/Fl_Rect.H
 input.o: ../FL/Fl_Return_Button.H
-input.o: ../FL/Fl_RGB_Image.H
 input.o: ../FL/Fl_Scrollbar.H
 input.o: ../FL/Fl_Secret_Input.H
 input.o: ../FL/Fl_Terminal.H
-input.o: ../FL/Fl_Slider.H
-input.o: ../FL/Fl_Text_Buffer.H
-input.o: ../FL/Fl_Text_Display.H
 input.o: ../FL/Fl_Toggle_Button.H
 input.o: ../FL/fl_types.h
 input.o: ../FL/fl_utf8.h
@@ -1429,11 +1370,8 @@ input_choice.o: ../FL/Fl_Button.H
 input_choice.o: ../FL/Fl_Cairo.H
 input_choice.o: ../FL/fl_casts.H
 input_choice.o: ../FL/fl_config.h
-input_choice.o: ../FL/Fl_Device.H
 input_choice.o: ../FL/Fl_Double_Window.H
-input_choice.o: ../FL/fl_draw.H
 input_choice.o: ../FL/Fl_Export.H
-input_choice.o: ../FL/Fl_Graphics_Driver.H
 input_choice.o: ../FL/Fl_Group.H
 input_choice.o: ../FL/Fl_Image.H
 input_choice.o: ../FL/Fl_Input.H
@@ -1442,26 +1380,17 @@ input_choice.o: ../FL/Fl_Input_Choice.H
 input_choice.o: ../FL/Fl_Menu_.H
 input_choice.o: ../FL/Fl_Menu_Button.H
 input_choice.o: ../FL/Fl_Menu_Item.H
-input_choice.o: ../FL/Fl_Pixmap.H
-input_choice.o: ../FL/Fl_Plugin.H
-input_choice.o: ../FL/Fl_Preferences.H
 input_choice.o: ../FL/Fl_Rect.H
-input_choice.o: ../FL/Fl_RGB_Image.H
 input_choice.o: ../FL/Fl_Scrollbar.H
 input_choice.o: ../FL/Fl_Terminal.H
-input_choice.o: ../FL/Fl_Slider.H
-input_choice.o: ../FL/Fl_Text_Buffer.H
-input_choice.o: ../FL/Fl_Text_Display.H
 input_choice.o: ../FL/fl_types.h
 input_choice.o: ../FL/fl_utf8.h
-input_choice.o: ../FL/Fl_Valuator.H
 input_choice.o: ../FL/Fl_Widget.H
 input_choice.o: ../FL/Fl_Window.H
 input_choice.o: ../FL/platform_types.h
 keyboard.o: ../FL/Enumerations.H
 keyboard.o: ../FL/Fl.H
 keyboard.o: ../FL/fl_attr.h
-keyboard.o: ../FL/Fl_Bitmap.H
 keyboard.o: ../FL/Fl_Box.H
 keyboard.o: ../FL/Fl_Button.H
 keyboard.o: ../FL/Fl_Cairo.H
@@ -1469,14 +1398,11 @@ keyboard.o: ../FL/fl_casts.H
 keyboard.o: ../FL/fl_config.h
 keyboard.o: ../FL/Fl_Dial.H
 keyboard.o: ../FL/Fl_Export.H
-keyboard.o: ../FL/Fl_Group.H
-keyboard.o: ../FL/Fl_Image.H
 keyboard.o: ../FL/Fl_Input.H
 keyboard.o: ../FL/Fl_Input_.H
 keyboard.o: ../FL/Fl_Output.H
 keyboard.o: ../FL/fl_types.h
 keyboard.o: ../FL/fl_utf8.h
-keyboard.o: ../FL/Fl_Widget.H
 keyboard.o: ../FL/Fl_Window.H
 keyboard.o: ../FL/platform_types.h
 keyboard.o: keyboard.h
@@ -1626,12 +1552,10 @@ menubar.o: ../FL/Fl_RGB_Image.H
 menubar.o: ../FL/Fl_Scheme.H
 menubar.o: ../FL/Fl_Scheme_Choice.H
 menubar.o: ../FL/Fl_Scrollbar.H
-menubar.o: ../FL/Fl_Terminal.H
 menubar.o: ../FL/Fl_Slider.H
 menubar.o: ../FL/fl_string_functions.h
 menubar.o: ../FL/Fl_Sys_Menu_Bar.H
-menubar.o: ../FL/Fl_Text_Buffer.H
-menubar.o: ../FL/Fl_Text_Display.H
+menubar.o: ../FL/Fl_Terminal.H
 menubar.o: ../FL/Fl_Toggle_Button.H
 menubar.o: ../FL/fl_types.h
 menubar.o: ../FL/fl_utf8.h
@@ -1644,16 +1568,12 @@ message.o: ../FL/Enumerations.H
 message.o: ../FL/Fl.H
 message.o: ../FL/fl_ask.H
 message.o: ../FL/fl_attr.h
-message.o: ../FL/Fl_Bitmap.H
 message.o: ../FL/Fl_Cairo.H
 message.o: ../FL/fl_casts.H
 message.o: ../FL/fl_config.h
 message.o: ../FL/Fl_Export.H
-message.o: ../FL/Fl_Group.H
-message.o: ../FL/Fl_Image.H
 message.o: ../FL/fl_types.h
 message.o: ../FL/fl_utf8.h
-message.o: ../FL/Fl_Widget.H
 message.o: ../FL/Fl_Window.H
 message.o: ../FL/platform_types.h
 minimum.o: ../FL/Enumerations.H
@@ -1719,10 +1639,8 @@ native-filechooser.o: ../FL/Fl_Rect.H
 native-filechooser.o: ../FL/Fl_Return_Button.H
 native-filechooser.o: ../FL/Fl_RGB_Image.H
 native-filechooser.o: ../FL/Fl_Scrollbar.H
-native-filechooser.o: ../FL/Fl_Terminal.H
 native-filechooser.o: ../FL/Fl_Slider.H
-native-filechooser.o: ../FL/Fl_Text_Buffer.H
-native-filechooser.o: ../FL/Fl_Text_Display.H
+native-filechooser.o: ../FL/Fl_Terminal.H
 native-filechooser.o: ../FL/Fl_Tile.H
 native-filechooser.o: ../FL/fl_types.h
 native-filechooser.o: ../FL/fl_utf8.h
@@ -1733,19 +1651,15 @@ native-filechooser.o: ../FL/platform_types.h
 navigation.o: ../FL/Enumerations.H
 navigation.o: ../FL/Fl.H
 navigation.o: ../FL/fl_attr.h
-navigation.o: ../FL/Fl_Bitmap.H
 navigation.o: ../FL/Fl_Cairo.H
 navigation.o: ../FL/fl_casts.H
 navigation.o: ../FL/fl_config.h
 navigation.o: ../FL/Fl_Export.H
-navigation.o: ../FL/Fl_Group.H
-navigation.o: ../FL/Fl_Image.H
 navigation.o: ../FL/Fl_Input.H
 navigation.o: ../FL/Fl_Input_.H
 navigation.o: ../FL/Fl_Light_Button.H
 navigation.o: ../FL/fl_types.h
 navigation.o: ../FL/fl_utf8.h
-navigation.o: ../FL/Fl_Widget.H
 navigation.o: ../FL/Fl_Window.H
 navigation.o: ../FL/platform_types.h
 offscreen.o: ../FL/Enumerations.H
@@ -2322,14 +2236,12 @@ shape.o: ../FL/platform_types.h
 subwindow.o: ../FL/Enumerations.H
 subwindow.o: ../FL/Fl.H
 subwindow.o: ../FL/fl_attr.h
-subwindow.o: ../FL/Fl_Bitmap.H
 subwindow.o: ../FL/Fl_Box.H
 subwindow.o: ../FL/Fl_Button.H
 subwindow.o: ../FL/Fl_Cairo.H
 subwindow.o: ../FL/fl_casts.H
 subwindow.o: ../FL/fl_config.h
 subwindow.o: ../FL/Fl_Export.H
-subwindow.o: ../FL/Fl_Group.H
 subwindow.o: ../FL/Fl_Image.H
 subwindow.o: ../FL/Fl_Input.H
 subwindow.o: ../FL/Fl_Input_.H
@@ -2446,12 +2358,10 @@ table.o: ../FL/Fl_Rect.H
 table.o: ../FL/Fl_RGB_Image.H
 table.o: ../FL/Fl_Scroll.H
 table.o: ../FL/Fl_Scrollbar.H
-table.o: ../FL/Fl_Terminal.H
 table.o: ../FL/Fl_Slider.H
 table.o: ../FL/Fl_Table.H
 table.o: ../FL/Fl_Table_Row.H
-table.o: ../FL/Fl_Text_Buffer.H
-table.o: ../FL/Fl_Text_Display.H
+table.o: ../FL/Fl_Terminal.H
 table.o: ../FL/fl_types.h
 table.o: ../FL/fl_utf8.h
 table.o: ../FL/Fl_Valuator.H
@@ -2487,6 +2397,40 @@ tabs.o: ../FL/Fl_Window.H
 tabs.o: ../FL/Fl_Wizard.H
 tabs.o: ../FL/platform_types.h
 tabs.o: tabs.h
+terminal.o: ../FL/Enumerations.H
+terminal.o: ../FL/Fl.H
+terminal.o: ../FL/fl_ask.H
+terminal.o: ../FL/fl_attr.h
+terminal.o: ../FL/Fl_Bitmap.H
+terminal.o: ../FL/Fl_Box.H
+terminal.o: ../FL/Fl_Button.H
+terminal.o: ../FL/Fl_Cairo.H
+terminal.o: ../FL/fl_casts.H
+terminal.o: ../FL/Fl_Check_Button.H
+terminal.o: ../FL/Fl_Choice.H
+terminal.o: ../FL/fl_config.h
+terminal.o: ../FL/Fl_Double_Window.H
+terminal.o: ../FL/Fl_Export.H
+terminal.o: ../FL/Fl_Group.H
+terminal.o: ../FL/Fl_Image.H
+terminal.o: ../FL/Fl_Input.H
+terminal.o: ../FL/Fl_Input_.H
+terminal.o: ../FL/Fl_Light_Button.H
+terminal.o: ../FL/Fl_Menu_.H
+terminal.o: ../FL/Fl_Menu_Item.H
+terminal.o: ../FL/Fl_Rect.H
+terminal.o: ../FL/Fl_Repeat_Button.H
+terminal.o: ../FL/Fl_Scheme.H
+terminal.o: ../FL/Fl_Scheme_Choice.H
+terminal.o: ../FL/Fl_Scrollbar.H
+terminal.o: ../FL/Fl_Spinner.H
+terminal.o: ../FL/Fl_Terminal.H
+terminal.o: ../FL/fl_types.h
+terminal.o: ../FL/fl_utf8.h
+terminal.o: ../FL/Fl_Widget.H
+terminal.o: ../FL/Fl_Window.H
+terminal.o: ../FL/platform_types.h
+terminal.o: terminal.h
 threads.o: ../config.h
 threads.o: ../FL/Enumerations.H
 threads.o: ../FL/Fl.H
@@ -2595,8 +2539,8 @@ tree.o: ../FL/Fl_Rect.H
 tree.o: ../FL/Fl_Return_Button.H
 tree.o: ../FL/Fl_RGB_Image.H
 tree.o: ../FL/Fl_Scrollbar.H
-tree.o: ../FL/Fl_Terminal.H
 tree.o: ../FL/Fl_Slider.H
+tree.o: ../FL/Fl_Terminal.H
 tree.o: ../FL/Fl_Text_Buffer.H
 tree.o: ../FL/Fl_Text_Display.H
 tree.o: ../FL/Fl_Tile.H
@@ -2660,11 +2604,9 @@ unittests.o: ../FL/Fl_Preferences.H
 unittests.o: ../FL/Fl_Rect.H
 unittests.o: ../FL/Fl_RGB_Image.H
 unittests.o: ../FL/Fl_Scrollbar.H
-unittests.o: ../FL/Fl_Terminal.H
 unittests.o: ../FL/Fl_Slider.H
 unittests.o: ../FL/fl_string_functions.h
-unittests.o: ../FL/Fl_Text_Buffer.H
-unittests.o: ../FL/Fl_Text_Display.H
+unittests.o: ../FL/Fl_Terminal.H
 unittests.o: ../FL/fl_types.h
 unittests.o: ../FL/fl_utf8.h
 unittests.o: ../FL/Fl_Valuator.H
@@ -2775,26 +2717,16 @@ unittest_core.o: ../FL/Fl_Cairo.H
 unittest_core.o: ../FL/fl_callback_macros.H
 unittest_core.o: ../FL/fl_casts.H
 unittest_core.o: ../FL/fl_config.h
-unittest_core.o: ../FL/Fl_Device.H
 unittest_core.o: ../FL/Fl_Double_Window.H
-unittest_core.o: ../FL/fl_draw.H
 unittest_core.o: ../FL/Fl_Export.H
-unittest_core.o: ../FL/Fl_Graphics_Driver.H
 unittest_core.o: ../FL/Fl_Group.H
 unittest_core.o: ../FL/Fl_Image.H
-unittest_core.o: ../FL/Fl_Pixmap.H
-unittest_core.o: ../FL/Fl_Plugin.H
 unittest_core.o: ../FL/Fl_Preferences.H
 unittest_core.o: ../FL/Fl_Rect.H
-unittest_core.o: ../FL/Fl_RGB_Image.H
 unittest_core.o: ../FL/Fl_Scrollbar.H
 unittest_core.o: ../FL/Fl_Terminal.H
-unittest_core.o: ../FL/Fl_Slider.H
-unittest_core.o: ../FL/Fl_Text_Buffer.H
-unittest_core.o: ../FL/Fl_Text_Display.H
 unittest_core.o: ../FL/fl_types.h
 unittest_core.o: ../FL/fl_utf8.h
-unittest_core.o: ../FL/Fl_Valuator.H
 unittest_core.o: ../FL/Fl_Widget.H
 unittest_core.o: ../FL/Fl_Window.H
 unittest_core.o: ../FL/platform_types.h
@@ -2980,26 +2912,6 @@ unittest_scrollbarsize.o: ../FL/Fl_Widget.H
 unittest_scrollbarsize.o: ../FL/Fl_Window.H
 unittest_scrollbarsize.o: ../FL/platform_types.h
 unittest_scrollbarsize.o: unittests.h
-unittest_terminal.o: ../FL/Enumerations.H
-unittest_terminal.o: ../FL/Fl.H
-unittest_terminal.o: ../FL/fl_attr.h
-unittest_terminal.o: ../FL/Fl_Bitmap.H
-unittest_terminal.o: ../FL/Fl_Cairo.H
-unittest_terminal.o: ../FL/fl_casts.H
-unittest_terminal.o: ../FL/fl_config.h
-unittest_terminal.o: ../FL/Fl_Double_Window.H
-unittest_terminal.o: ../FL/Fl_Export.H
-unittest_terminal.o: ../FL/Fl_Group.H
-unittest_terminal.o: ../FL/Fl_Image.H
-unittest_terminal.o: ../FL/Fl_Rect.H
-unittest_terminal.o: ../FL/Fl_Scrollbar.H
-unittest_terminal.o: ../FL/Fl_Terminal.H
-unittest_terminal.o: ../FL/fl_types.h
-unittest_terminal.o: ../FL/fl_utf8.h
-unittest_terminal.o: ../FL/Fl_Widget.H
-unittest_terminal.o: ../FL/Fl_Window.H
-unittest_terminal.o: ../FL/platform_types.h
-unittest_terminal.o: unittests.h
 unittest_symbol.o: ../FL/Enumerations.H
 unittest_symbol.o: ../FL/Fl.H
 unittest_symbol.o: ../FL/fl_attr.h
@@ -3026,6 +2938,26 @@ unittest_symbol.o: ../FL/Fl_Widget.H
 unittest_symbol.o: ../FL/Fl_Window.H
 unittest_symbol.o: ../FL/platform_types.h
 unittest_symbol.o: unittests.h
+unittest_terminal.o: ../FL/Enumerations.H
+unittest_terminal.o: ../FL/Fl.H
+unittest_terminal.o: ../FL/fl_attr.h
+unittest_terminal.o: ../FL/Fl_Bitmap.H
+unittest_terminal.o: ../FL/Fl_Cairo.H
+unittest_terminal.o: ../FL/fl_casts.H
+unittest_terminal.o: ../FL/fl_config.h
+unittest_terminal.o: ../FL/Fl_Double_Window.H
+unittest_terminal.o: ../FL/Fl_Export.H
+unittest_terminal.o: ../FL/Fl_Group.H
+unittest_terminal.o: ../FL/Fl_Image.H
+unittest_terminal.o: ../FL/Fl_Rect.H
+unittest_terminal.o: ../FL/Fl_Scrollbar.H
+unittest_terminal.o: ../FL/Fl_Terminal.H
+unittest_terminal.o: ../FL/fl_types.h
+unittest_terminal.o: ../FL/fl_utf8.h
+unittest_terminal.o: ../FL/Fl_Widget.H
+unittest_terminal.o: ../FL/Fl_Window.H
+unittest_terminal.o: ../FL/platform_types.h
+unittest_terminal.o: unittests.h
 unittest_text.o: ../FL/Enumerations.H
 unittest_text.o: ../FL/Fl.H
 unittest_text.o: ../FL/fl_attr.h
@@ -3174,29 +3106,20 @@ valuators.o: ../FL/Fl_Cairo.H
 valuators.o: ../FL/fl_casts.H
 valuators.o: ../FL/fl_config.h
 valuators.o: ../FL/Fl_Counter.H
-valuators.o: ../FL/Fl_Device.H
 valuators.o: ../FL/Fl_Dial.H
 valuators.o: ../FL/Fl_Double_Window.H
-valuators.o: ../FL/fl_draw.H
 valuators.o: ../FL/Fl_Export.H
-valuators.o: ../FL/Fl_Graphics_Driver.H
 valuators.o: ../FL/Fl_Group.H
 valuators.o: ../FL/Fl_Image.H
 valuators.o: ../FL/Fl_Input.H
 valuators.o: ../FL/Fl_Input_.H
-valuators.o: ../FL/Fl_Pixmap.H
-valuators.o: ../FL/Fl_Plugin.H
-valuators.o: ../FL/Fl_Preferences.H
 valuators.o: ../FL/Fl_Rect.H
 valuators.o: ../FL/Fl_Repeat_Button.H
-valuators.o: ../FL/Fl_RGB_Image.H
 valuators.o: ../FL/Fl_Roller.H
 valuators.o: ../FL/Fl_Scrollbar.H
-valuators.o: ../FL/Fl_Terminal.H
 valuators.o: ../FL/Fl_Slider.H
 valuators.o: ../FL/Fl_Spinner.H
-valuators.o: ../FL/Fl_Text_Buffer.H
-valuators.o: ../FL/Fl_Text_Display.H
+valuators.o: ../FL/Fl_Terminal.H
 valuators.o: ../FL/fl_types.h
 valuators.o: ../FL/fl_utf8.h
 valuators.o: ../FL/Fl_Valuator.H
diff --git a/test/terminal.fl b/test/terminal.fl
index 920bfc0b3..905f5f61f 100644
--- a/test/terminal.fl
+++ b/test/terminal.fl
@@ -198,11 +198,11 @@ debug_tty->append("\\n");
       u8c = u8c_ring_row(hist_srow() + row);
       debug_tty->printf("%3d H[", row);
       for ( int col=0; col<hist_cols(); col++,u8c++ ) {
-	// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
-	debug_tty->textattrib(u8c->attrib());
-	debug_tty->textfgcolor(u8c->fgcolor());
-	debug_tty->textbgcolor(u8c->bgcolor());
-	debug_tty->print_char(u8c->text_utf8()); // print the char in current style
+        // Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
+        debug_tty->textattrib(u8c->attrib());
+        debug_tty->textfgcolor(u8c->fgcolor());
+        debug_tty->textbgcolor(u8c->bgcolor());
+        debug_tty->print_char(u8c->text_utf8()); // print the char in current style
       }
       debug_tty->append("\\033[0m"); // restore default fg/bg/attrib
       debug_tty->printf("]    ");
@@ -216,11 +216,11 @@ debug_tty->append("\\n");
       u8c = u8c_ring_row(disp_srow() + row);
       debug_tty->printf("%3d D[", row);
       for ( int col=0; col<disp_cols(); col++,u8c++ ) {
-	// Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
-	debug_tty->textattrib(u8c->attrib());
-	debug_tty->textfgcolor(u8c->fgcolor());
-	debug_tty->textbgcolor(u8c->bgcolor());
-	debug_tty->print_char(u8c->text_utf8()); // print the char in current style
+        // Get Utf8Char's attrib,fg,bg and make that 'current' to draw the char in that style
+        debug_tty->textattrib(u8c->attrib());
+        debug_tty->textfgcolor(u8c->fgcolor());
+        debug_tty->textbgcolor(u8c->bgcolor());
+        debug_tty->print_char(u8c->text_utf8()); // print the char in current style
       }
       debug_tty->append("\\033[0m"); // restore default fg/bg/attrib
       debug_tty->append("]\\033[K\\n");
@@ -372,13 +372,13 @@ return 1;           // hit end of test, reset} {}
   "\\033[0m\\033[H\\033[2J\\033[3J"    // color/attr reset, home, cls, clear history
   "hello.\\nLine one\\nLine two\\n"
   "\\033[0;0;2m          Dim text:\\033[31m red\\033[32m grn\\033[33m yel"
-			      "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
+                              "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
   "\\033[0;0;0m       Normal text:\\033[31m red\\033[32m grn\\033[33m yel"
-			      "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
+                              "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
   "\\033[0;0;1m         Bold text:\\033[31m red\\033[32m grn\\033[33m yel"
-			      "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
+                              "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
   "\\033[0;1;3m  Bold Italic text:\\033[31m red\\033[32m grn\\033[33m yel"
-			      "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
+                              "\\033[34m blu\\033[35m mag\\033[36m cyn\\033[37m wht\\n"
   "\\033[0m\\n"
   //                             Language                           Language
   //                             Alignment                          Alignment
@@ -1104,7 +1104,7 @@ const char *test[] = {
   "25:456789012345678901234567890123456789012345678901234567890123456789",
   "\\033[12H",                       // to prompt row
   "---> Hit 'e' to test [1/4] DELETE LINE 3 with ESC[M: \\033[K",
-  "\\033[2K",	                     // clear prompt
+  "\\033[2K",                        // clear prompt
   "\\033[3H",                        // move to line 3
   "\\033[M",                         // delete line 3
   "\\033[12H",                       // back to line 12H for prompt
@@ -1259,7 +1259,7 @@ for (int i=0; i<50; i++ ) {
 }
 // leave test with white on black
 G_tty->textfgcolor(0xd0d0d000);
-G_tty->textbgcolor(0xffffffff);	// special see thru color
+G_tty->textbgcolor(0xffffffff); // special see thru color
 // back to rate limited
 G_tty->redraw_style(Fl_Terminal::RATE_LIMITED);
 // Show the Unicode alignment page
@@ -1964,7 +1964,7 @@ decl {////// MAIN //////} {private local
 Function {} {open
 } {
   code {G_tty = NULL;
-Application app;	// sets G_tty
+Application app;        // sets G_tty
 G_app = &app;
 app.show(argc, argv);
 // Run the "firstpage" test