From 0bc06e8f1a73e3df7f4173de90faaf5ecbd05297 Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Thu, 18 Nov 2021 13:44:41 +0100
Subject: [PATCH] Reformat and move clipboard demo from examples to test folder

The clipboard demo is more a test program than an example and very
useful even if the examples are not built.

Also update dependencies.
---
 examples/.gitignore              |   1 -
 examples/CMakeLists.txt          |   1 -
 examples/Makefile                |   1 -
 fluid/makedepend                 |  17 +++++
 src/makedepend                   |  38 +++++++++++
 test/.gitignore                  |   1 +
 test/CMakeLists.txt              |   1 +
 test/Makefile                    |   7 ++
 {examples => test}/clipboard.cxx | 108 ++++++++++++++++++-------------
 test/demo.menu                   |   3 +-
 test/makedepend                  |  90 ++++++++++++++++++++------
 11 files changed, 199 insertions(+), 69 deletions(-)
 rename {examples => test}/clipboard.cxx (54%)

diff --git a/examples/.gitignore b/examples/.gitignore
index a3e97348c..bf8efbd8b 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -4,7 +4,6 @@
 # Note: *.exe will be ignored by means of ../.gitignore
 #
 browser-simple
-clipboard
 chart-simple
 draggable-group
 howto-add_fd-and-popen
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index fc6c13237..351aa5424 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -79,7 +79,6 @@ set (FLUID_SOURCES
 ############################################################
 
 set (IMAGE_SOURCES
-  clipboard
   howto-simple-svg
 )
 
diff --git a/examples/Makefile b/examples/Makefile
index a4ffc12f5..0ef85508b 100644
--- a/examples/Makefile
+++ b/examples/Makefile
@@ -7,7 +7,6 @@ SHELL = /bin/sh
 # Executables
 ALL = browser-simple$(EXEEXT) \
       chart-simple$(EXEEXT) \
-      clipboard$(EXEEXT) \
       draggable-group$(EXEEXT) \
       howto-add_fd-and-popen$(EXEEXT) \
       howto-browser-with-icons$(EXEEXT) \
diff --git a/fluid/makedepend b/fluid/makedepend
index 7875a5c42..a83f84201 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -46,6 +46,7 @@ alignment_panel.o: ../FL/Fl_Menu_Item.H
 alignment_panel.o: ../FL/Fl_Pixmap.H
 alignment_panel.o: ../FL/Fl_Plugin.H
 alignment_panel.o: ../FL/Fl_Preferences.H
+alignment_panel.o: ../FL/Fl_Rect.H
 alignment_panel.o: ../FL/Fl_Repeat_Button.H
 alignment_panel.o: ../FL/Fl_Return_Button.H
 alignment_panel.o: ../FL/Fl_RGB_Image.H
@@ -90,6 +91,7 @@ align_widget.o: ../FL/Fl_Pack.H
 align_widget.o: ../FL/Fl_Pixmap.H
 align_widget.o: ../FL/Fl_Plugin.H
 align_widget.o: ../FL/Fl_Preferences.H
+align_widget.o: ../FL/Fl_Rect.H
 align_widget.o: ../FL/Fl_RGB_Image.H
 align_widget.o: ../FL/Fl_Shared_Image.H
 align_widget.o: ../FL/Fl_Tabs.H
@@ -137,6 +139,7 @@ code.o: ../FL/Fl_Pack.H
 code.o: ../FL/Fl_Pixmap.H
 code.o: ../FL/Fl_Plugin.H
 code.o: ../FL/Fl_Preferences.H
+code.o: ../FL/Fl_Rect.H
 code.o: ../FL/Fl_Repeat_Button.H
 code.o: ../FL/Fl_Return_Button.H
 code.o: ../FL/Fl_RGB_Image.H
@@ -177,6 +180,7 @@ CodeEditor.o: ../FL/Fl_Image.H
 CodeEditor.o: ../FL/Fl_Pixmap.H
 CodeEditor.o: ../FL/Fl_Plugin.H
 CodeEditor.o: ../FL/Fl_Preferences.H
+CodeEditor.o: ../FL/Fl_Rect.H
 CodeEditor.o: ../FL/Fl_RGB_Image.H
 CodeEditor.o: ../FL/Fl_Scrollbar.H
 CodeEditor.o: ../FL/Fl_Slider.H
@@ -247,6 +251,7 @@ factory.o: ../FL/Fl_Pixmap.H
 factory.o: ../FL/Fl_Plugin.H
 factory.o: ../FL/Fl_Preferences.H
 factory.o: ../FL/Fl_Progress.H
+factory.o: ../FL/Fl_Rect.H
 factory.o: ../FL/Fl_Repeat_Button.H
 factory.o: ../FL/Fl_Return_Button.H
 factory.o: ../FL/Fl_RGB_Image.H
@@ -316,6 +321,7 @@ file.o: ../FL/Fl_Pack.H
 file.o: ../FL/Fl_Pixmap.H
 file.o: ../FL/Fl_Plugin.H
 file.o: ../FL/Fl_Preferences.H
+file.o: ../FL/Fl_Rect.H
 file.o: ../FL/Fl_Repeat_Button.H
 file.o: ../FL/Fl_Return_Button.H
 file.o: ../FL/Fl_RGB_Image.H
@@ -391,6 +397,7 @@ fluid.o: ../FL/Fl_Plugin.H
 fluid.o: ../FL/Fl_PNG_Image.H
 fluid.o: ../FL/Fl_Preferences.H
 fluid.o: ../FL/Fl_Printer.H
+fluid.o: ../FL/Fl_Rect.H
 fluid.o: ../FL/Fl_Repeat_Button.H
 fluid.o: ../FL/Fl_Return_Button.H
 fluid.o: ../FL/Fl_RGB_Image.H
@@ -465,6 +472,7 @@ Fluid_Image.o: ../FL/Fl_Pack.H
 Fluid_Image.o: ../FL/Fl_Pixmap.H
 Fluid_Image.o: ../FL/Fl_Plugin.H
 Fluid_Image.o: ../FL/Fl_Preferences.H
+Fluid_Image.o: ../FL/Fl_Rect.H
 Fluid_Image.o: ../FL/Fl_Return_Button.H
 Fluid_Image.o: ../FL/Fl_RGB_Image.H
 Fluid_Image.o: ../FL/Fl_Scrollbar.H
@@ -524,6 +532,7 @@ Fl_Function_Type.o: ../FL/Fl_Pack.H
 Fl_Function_Type.o: ../FL/Fl_Pixmap.H
 Fl_Function_Type.o: ../FL/Fl_Plugin.H
 Fl_Function_Type.o: ../FL/Fl_Preferences.H
+Fl_Function_Type.o: ../FL/Fl_Rect.H
 Fl_Function_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Function_Type.o: ../FL/Fl_Return_Button.H
 Fl_Function_Type.o: ../FL/Fl_RGB_Image.H
@@ -585,6 +594,7 @@ Fl_Group_Type.o: ../FL/Fl_Pack.H
 Fl_Group_Type.o: ../FL/Fl_Pixmap.H
 Fl_Group_Type.o: ../FL/Fl_Plugin.H
 Fl_Group_Type.o: ../FL/Fl_Preferences.H
+Fl_Group_Type.o: ../FL/Fl_Rect.H
 Fl_Group_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Group_Type.o: ../FL/Fl_Scroll.H
 Fl_Group_Type.o: ../FL/Fl_Scrollbar.H
@@ -640,6 +650,7 @@ Fl_Menu_Type.o: ../FL/Fl_Pack.H
 Fl_Menu_Type.o: ../FL/Fl_Pixmap.H
 Fl_Menu_Type.o: ../FL/Fl_Plugin.H
 Fl_Menu_Type.o: ../FL/Fl_Preferences.H
+Fl_Menu_Type.o: ../FL/Fl_Rect.H
 Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
 Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
@@ -695,6 +706,7 @@ Fl_Type.o: ../FL/Fl_Pack.H
 Fl_Type.o: ../FL/Fl_Pixmap.H
 Fl_Type.o: ../FL/Fl_Plugin.H
 Fl_Type.o: ../FL/Fl_Preferences.H
+Fl_Type.o: ../FL/Fl_Rect.H
 Fl_Type.o: ../FL/Fl_RGB_Image.H
 Fl_Type.o: ../FL/Fl_Scrollbar.H
 Fl_Type.o: ../FL/Fl_Shared_Image.H
@@ -802,6 +814,7 @@ Fl_Widget_Type.o: ../FL/Fl_Pack.H
 Fl_Widget_Type.o: ../FL/Fl_Pixmap.H
 Fl_Widget_Type.o: ../FL/Fl_Plugin.H
 Fl_Widget_Type.o: ../FL/Fl_Preferences.H
+Fl_Widget_Type.o: ../FL/Fl_Rect.H
 Fl_Widget_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Return_Button.H
 Fl_Widget_Type.o: ../FL/Fl_RGB_Image.H
@@ -874,6 +887,7 @@ Fl_Window_Type.o: ../FL/Fl_Pack.H
 Fl_Window_Type.o: ../FL/Fl_Pixmap.H
 Fl_Window_Type.o: ../FL/Fl_Plugin.H
 Fl_Window_Type.o: ../FL/Fl_Preferences.H
+Fl_Window_Type.o: ../FL/Fl_Rect.H
 Fl_Window_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Window_Type.o: ../FL/Fl_Return_Button.H
 Fl_Window_Type.o: ../FL/Fl_RGB_Image.H
@@ -939,6 +953,7 @@ function_panel.o: ../FL/Fl_Pack.H
 function_panel.o: ../FL/Fl_Pixmap.H
 function_panel.o: ../FL/Fl_Plugin.H
 function_panel.o: ../FL/Fl_Preferences.H
+function_panel.o: ../FL/Fl_Rect.H
 function_panel.o: ../FL/Fl_Return_Button.H
 function_panel.o: ../FL/Fl_RGB_Image.H
 function_panel.o: ../FL/Fl_Scrollbar.H
@@ -1022,6 +1037,7 @@ undo.o: ../FL/Fl_Pack.H
 undo.o: ../FL/Fl_Pixmap.H
 undo.o: ../FL/Fl_Plugin.H
 undo.o: ../FL/Fl_Preferences.H
+undo.o: ../FL/Fl_Rect.H
 undo.o: ../FL/Fl_RGB_Image.H
 undo.o: ../FL/Fl_Shared_Image.H
 undo.o: ../FL/Fl_Tabs.H
@@ -1059,6 +1075,7 @@ widget_panel.o: ../FL/Fl_Menu_Item.H
 widget_panel.o: ../FL/Fl_Pixmap.H
 widget_panel.o: ../FL/Fl_Plugin.H
 widget_panel.o: ../FL/Fl_Preferences.H
+widget_panel.o: ../FL/Fl_Rect.H
 widget_panel.o: ../FL/Fl_Return_Button.H
 widget_panel.o: ../FL/Fl_RGB_Image.H
 widget_panel.o: ../FL/Fl_Scrollbar.H
diff --git a/src/makedepend b/src/makedepend
index 137bc943d..3161fa458 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -19,6 +19,7 @@ drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Overlay_Window.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Pixmap.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Plugin.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Preferences.H
+drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Rect.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_RGB_Image.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Scrollbar.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Slider.H
@@ -349,6 +350,7 @@ drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Overlay_Window.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Pixmap.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Plugin.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Preferences.H
+drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Rect.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Scrollbar.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Slider.H
@@ -390,6 +392,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Overlay_Window.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Pixmap.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Plugin.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Preferences.H
+drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Rect.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Scrollbar.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Shared_Image.H
@@ -455,6 +458,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Overlay_Window.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Pixmap.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Plugin.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Preferences.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Rect.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Scrollbar.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Single_Window.H
@@ -491,6 +495,7 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Image.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Pixmap.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Plugin.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Preferences.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Rect.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Scrollbar.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Slider.H
@@ -611,6 +616,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Overlay_Window.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Pixmap.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Plugin.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Preferences.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Rect.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_RGB_Image.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Scrollbar.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Shared_Image.H
@@ -712,6 +718,7 @@ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Image_Surface.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Pixmap.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Plugin.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Preferences.H
+drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Rect.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Scrollbar.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Shared_Image.H
@@ -817,6 +824,7 @@ Fl.o: ../FL/Fl_Overlay_Window.H
 Fl.o: ../FL/Fl_Pixmap.H
 Fl.o: ../FL/Fl_Plugin.H
 Fl.o: ../FL/Fl_Preferences.H
+Fl.o: ../FL/Fl_Rect.H
 Fl.o: ../FL/Fl_RGB_Image.H
 Fl.o: ../FL/Fl_Scrollbar.H
 Fl.o: ../FL/Fl_Slider.H
@@ -920,6 +928,7 @@ fl_ask.o: ../FL/Fl_Input_.H
 fl_ask.o: ../FL/Fl_Pixmap.H
 fl_ask.o: ../FL/Fl_Plugin.H
 fl_ask.o: ../FL/Fl_Preferences.H
+fl_ask.o: ../FL/Fl_Rect.H
 fl_ask.o: ../FL/Fl_Return_Button.H
 fl_ask.o: ../FL/Fl_RGB_Image.H
 fl_ask.o: ../FL/Fl_Scrollbar.H
@@ -1183,6 +1192,7 @@ Fl_compose.o: ../FL/Fl_Image.H
 Fl_compose.o: ../FL/Fl_Pixmap.H
 Fl_compose.o: ../FL/Fl_Plugin.H
 Fl_compose.o: ../FL/Fl_Preferences.H
+Fl_compose.o: ../FL/Fl_Rect.H
 Fl_compose.o: ../FL/Fl_RGB_Image.H
 Fl_compose.o: ../FL/Fl_Scrollbar.H
 Fl_compose.o: ../FL/Fl_Slider.H
@@ -1306,6 +1316,7 @@ Fl_display.o: ../FL/Fl_Image.H
 Fl_display.o: ../FL/Fl_Pixmap.H
 Fl_display.o: ../FL/Fl_Plugin.H
 Fl_display.o: ../FL/Fl_Preferences.H
+Fl_display.o: ../FL/Fl_Rect.H
 Fl_display.o: ../FL/Fl_RGB_Image.H
 Fl_display.o: ../FL/Fl_Scrollbar.H
 Fl_display.o: ../FL/Fl_Slider.H
@@ -1335,6 +1346,7 @@ fl_dnd_x.o: ../FL/Fl_Overlay_Window.H
 fl_dnd_x.o: ../FL/Fl_Pixmap.H
 fl_dnd_x.o: ../FL/Fl_Plugin.H
 fl_dnd_x.o: ../FL/Fl_Preferences.H
+fl_dnd_x.o: ../FL/Fl_Rect.H
 fl_dnd_x.o: ../FL/Fl_RGB_Image.H
 fl_dnd_x.o: ../FL/Fl_Scrollbar.H
 fl_dnd_x.o: ../FL/Fl_Slider.H
@@ -1656,6 +1668,7 @@ Fl_get_system_colors.o: ../FL/Fl_Image.H
 Fl_get_system_colors.o: ../FL/Fl_Pixmap.H
 Fl_get_system_colors.o: ../FL/Fl_Plugin.H
 Fl_get_system_colors.o: ../FL/Fl_Preferences.H
+Fl_get_system_colors.o: ../FL/Fl_Rect.H
 Fl_get_system_colors.o: ../FL/Fl_RGB_Image.H
 Fl_get_system_colors.o: ../FL/Fl_Scrollbar.H
 Fl_get_system_colors.o: ../FL/Fl_Slider.H
@@ -1778,6 +1791,7 @@ Fl_grab.o: ../FL/Fl_Image.H
 Fl_grab.o: ../FL/Fl_Pixmap.H
 Fl_grab.o: ../FL/Fl_Plugin.H
 Fl_grab.o: ../FL/Fl_Preferences.H
+Fl_grab.o: ../FL/Fl_Rect.H
 Fl_grab.o: ../FL/Fl_RGB_Image.H
 Fl_grab.o: ../FL/Fl_Scrollbar.H
 Fl_grab.o: ../FL/Fl_Slider.H
@@ -1806,6 +1820,7 @@ Fl_Graphics_Driver.o: ../FL/Fl_Image_Surface.H
 Fl_Graphics_Driver.o: ../FL/Fl_Pixmap.H
 Fl_Graphics_Driver.o: ../FL/Fl_Plugin.H
 Fl_Graphics_Driver.o: ../FL/Fl_Preferences.H
+Fl_Graphics_Driver.o: ../FL/Fl_Rect.H
 Fl_Graphics_Driver.o: ../FL/Fl_RGB_Image.H
 Fl_Graphics_Driver.o: ../FL/Fl_Scrollbar.H
 Fl_Graphics_Driver.o: ../FL/Fl_Shared_Image.H
@@ -1875,6 +1890,7 @@ Fl_Help_Dialog.o: ../FL/Fl_Input_.H
 Fl_Help_Dialog.o: ../FL/Fl_Pixmap.H
 Fl_Help_Dialog.o: ../FL/Fl_Plugin.H
 Fl_Help_Dialog.o: ../FL/Fl_Preferences.H
+Fl_Help_Dialog.o: ../FL/Fl_Rect.H
 Fl_Help_Dialog.o: ../FL/Fl_RGB_Image.H
 Fl_Help_Dialog.o: ../FL/Fl_Scrollbar.H
 Fl_Help_Dialog.o: ../FL/Fl_Shared_Image.H
@@ -1903,6 +1919,7 @@ Fl_Help_View.o: ../FL/Fl_Image.H
 Fl_Help_View.o: ../FL/Fl_Pixmap.H
 Fl_Help_View.o: ../FL/Fl_Plugin.H
 Fl_Help_View.o: ../FL/Fl_Preferences.H
+Fl_Help_View.o: ../FL/Fl_Rect.H
 Fl_Help_View.o: ../FL/Fl_RGB_Image.H
 Fl_Help_View.o: ../FL/Fl_Scrollbar.H
 Fl_Help_View.o: ../FL/Fl_Shared_Image.H
@@ -1998,6 +2015,7 @@ Fl_Input.o: ../FL/Fl_Output.H
 Fl_Input.o: ../FL/Fl_Pixmap.H
 Fl_Input.o: ../FL/Fl_Plugin.H
 Fl_Input.o: ../FL/Fl_Preferences.H
+Fl_Input.o: ../FL/Fl_Rect.H
 Fl_Input.o: ../FL/Fl_RGB_Image.H
 Fl_Input.o: ../FL/Fl_Scrollbar.H
 Fl_Input.o: ../FL/Fl_Secret_Input.H
@@ -2033,6 +2051,7 @@ Fl_Input_.o: ../FL/Fl_Input_.H
 Fl_Input_.o: ../FL/Fl_Pixmap.H
 Fl_Input_.o: ../FL/Fl_Plugin.H
 Fl_Input_.o: ../FL/Fl_Preferences.H
+Fl_Input_.o: ../FL/Fl_Rect.H
 Fl_Input_.o: ../FL/Fl_RGB_Image.H
 Fl_Input_.o: ../FL/Fl_Scrollbar.H
 Fl_Input_.o: ../FL/Fl_Slider.H
@@ -2389,6 +2408,7 @@ fl_overlay.o: ../FL/Fl_Image.H
 fl_overlay.o: ../FL/Fl_Pixmap.H
 fl_overlay.o: ../FL/Fl_Plugin.H
 fl_overlay.o: ../FL/Fl_Preferences.H
+fl_overlay.o: ../FL/Fl_Rect.H
 fl_overlay.o: ../FL/Fl_RGB_Image.H
 fl_overlay.o: ../FL/Fl_Scrollbar.H
 fl_overlay.o: ../FL/Fl_Slider.H
@@ -2585,6 +2605,7 @@ fl_read_image.o: ../FL/Fl_Image.H
 fl_read_image.o: ../FL/Fl_Pixmap.H
 fl_read_image.o: ../FL/Fl_Plugin.H
 fl_read_image.o: ../FL/Fl_Preferences.H
+fl_read_image.o: ../FL/Fl_Rect.H
 fl_read_image.o: ../FL/Fl_RGB_Image.H
 fl_read_image.o: ../FL/Fl_Scrollbar.H
 fl_read_image.o: ../FL/Fl_Slider.H
@@ -2696,6 +2717,7 @@ Fl_Screen_Driver.o: ../FL/Fl_Overlay_Window.H
 Fl_Screen_Driver.o: ../FL/Fl_Pixmap.H
 Fl_Screen_Driver.o: ../FL/Fl_Plugin.H
 Fl_Screen_Driver.o: ../FL/Fl_Preferences.H
+Fl_Screen_Driver.o: ../FL/Fl_Rect.H
 Fl_Screen_Driver.o: ../FL/Fl_RGB_Image.H
 Fl_Screen_Driver.o: ../FL/Fl_Scrollbar.H
 Fl_Screen_Driver.o: ../FL/Fl_Shared_Image.H
@@ -2776,6 +2798,7 @@ fl_set_font.o: ../FL/Fl_Image.H
 fl_set_font.o: ../FL/Fl_Pixmap.H
 fl_set_font.o: ../FL/Fl_Plugin.H
 fl_set_font.o: ../FL/Fl_Preferences.H
+fl_set_font.o: ../FL/Fl_Rect.H
 fl_set_font.o: ../FL/Fl_RGB_Image.H
 fl_set_font.o: ../FL/Fl_Scrollbar.H
 fl_set_font.o: ../FL/Fl_Slider.H
@@ -2862,6 +2885,7 @@ Fl_Simple_Terminal.o: ../FL/Fl_Image.H
 Fl_Simple_Terminal.o: ../FL/Fl_Pixmap.H
 Fl_Simple_Terminal.o: ../FL/Fl_Plugin.H
 Fl_Simple_Terminal.o: ../FL/Fl_Preferences.H
+Fl_Simple_Terminal.o: ../FL/Fl_Rect.H
 Fl_Simple_Terminal.o: ../FL/Fl_RGB_Image.H
 Fl_Simple_Terminal.o: ../FL/Fl_Scrollbar.H
 Fl_Simple_Terminal.o: ../FL/Fl_Simple_Terminal.H
@@ -2929,6 +2953,7 @@ Fl_SVG_Image.o: ../FL/Fl_Image.H
 Fl_SVG_Image.o: ../FL/Fl_Pixmap.H
 Fl_SVG_Image.o: ../FL/Fl_Plugin.H
 Fl_SVG_Image.o: ../FL/Fl_Preferences.H
+Fl_SVG_Image.o: ../FL/Fl_Rect.H
 Fl_SVG_Image.o: ../FL/Fl_RGB_Image.H
 Fl_SVG_Image.o: ../FL/Fl_Scrollbar.H
 Fl_SVG_Image.o: ../FL/Fl_Slider.H
@@ -3066,6 +3091,7 @@ Fl_Text_Display.o: ../FL/Fl_Image.H
 Fl_Text_Display.o: ../FL/Fl_Pixmap.H
 Fl_Text_Display.o: ../FL/Fl_Plugin.H
 Fl_Text_Display.o: ../FL/Fl_Preferences.H
+Fl_Text_Display.o: ../FL/Fl_Rect.H
 Fl_Text_Display.o: ../FL/Fl_RGB_Image.H
 Fl_Text_Display.o: ../FL/Fl_Scrollbar.H
 Fl_Text_Display.o: ../FL/Fl_Slider.H
@@ -3099,6 +3125,7 @@ Fl_Text_Editor.o: ../FL/Fl_Image.H
 Fl_Text_Editor.o: ../FL/Fl_Pixmap.H
 Fl_Text_Editor.o: ../FL/Fl_Plugin.H
 Fl_Text_Editor.o: ../FL/Fl_Preferences.H
+Fl_Text_Editor.o: ../FL/Fl_Rect.H
 Fl_Text_Editor.o: ../FL/Fl_RGB_Image.H
 Fl_Text_Editor.o: ../FL/Fl_Scrollbar.H
 Fl_Text_Editor.o: ../FL/Fl_Slider.H
@@ -3327,6 +3354,7 @@ Fl_visual.o: ../FL/Fl_Image.H
 Fl_visual.o: ../FL/Fl_Pixmap.H
 Fl_visual.o: ../FL/Fl_Plugin.H
 Fl_visual.o: ../FL/Fl_Preferences.H
+Fl_visual.o: ../FL/Fl_Rect.H
 Fl_visual.o: ../FL/Fl_RGB_Image.H
 Fl_visual.o: ../FL/Fl_Scrollbar.H
 Fl_visual.o: ../FL/Fl_Slider.H
@@ -3370,6 +3398,7 @@ Fl_Widget_Surface.o: ../FL/Fl_Overlay_Window.H
 Fl_Widget_Surface.o: ../FL/Fl_Pixmap.H
 Fl_Widget_Surface.o: ../FL/Fl_Plugin.H
 Fl_Widget_Surface.o: ../FL/Fl_Preferences.H
+Fl_Widget_Surface.o: ../FL/Fl_Rect.H
 Fl_Widget_Surface.o: ../FL/Fl_RGB_Image.H
 Fl_Widget_Surface.o: ../FL/Fl_Scrollbar.H
 Fl_Widget_Surface.o: ../FL/Fl_Slider.H
@@ -3403,6 +3432,7 @@ Fl_Window.o: ../FL/Fl_Overlay_Window.H
 Fl_Window.o: ../FL/Fl_Pixmap.H
 Fl_Window.o: ../FL/Fl_Plugin.H
 Fl_Window.o: ../FL/Fl_Preferences.H
+Fl_Window.o: ../FL/Fl_Rect.H
 Fl_Window.o: ../FL/Fl_RGB_Image.H
 Fl_Window.o: ../FL/Fl_Scrollbar.H
 Fl_Window.o: ../FL/Fl_Slider.H
@@ -3531,6 +3561,7 @@ Fl_x.o: ../FL/Fl_Paged_Device.H
 Fl_x.o: ../FL/Fl_Pixmap.H
 Fl_x.o: ../FL/Fl_Plugin.H
 Fl_x.o: ../FL/Fl_Preferences.H
+Fl_x.o: ../FL/Fl_Rect.H
 Fl_x.o: ../FL/Fl_RGB_Image.H
 Fl_x.o: ../FL/Fl_Scrollbar.H
 Fl_x.o: ../FL/Fl_Shared_Image.H
@@ -3625,6 +3656,7 @@ forms_bitmap.o: ../FL/Fl_Pixmap.H
 forms_bitmap.o: ../FL/Fl_Plugin.H
 forms_bitmap.o: ../FL/Fl_Positioner.H
 forms_bitmap.o: ../FL/Fl_Preferences.H
+forms_bitmap.o: ../FL/Fl_Rect.H
 forms_bitmap.o: ../FL/Fl_Return_Button.H
 forms_bitmap.o: ../FL/Fl_RGB_Image.H
 forms_bitmap.o: ../FL/Fl_Round_Button.H
@@ -3681,6 +3713,7 @@ forms_compatibility.o: ../FL/Fl_Pixmap.H
 forms_compatibility.o: ../FL/Fl_Plugin.H
 forms_compatibility.o: ../FL/Fl_Positioner.H
 forms_compatibility.o: ../FL/Fl_Preferences.H
+forms_compatibility.o: ../FL/Fl_Rect.H
 forms_compatibility.o: ../FL/Fl_Repeat_Button.H
 forms_compatibility.o: ../FL/Fl_Return_Button.H
 forms_compatibility.o: ../FL/Fl_RGB_Image.H
@@ -3749,6 +3782,7 @@ forms_fselect.o: ../FL/Fl_Pixmap.H
 forms_fselect.o: ../FL/Fl_Plugin.H
 forms_fselect.o: ../FL/Fl_Positioner.H
 forms_fselect.o: ../FL/Fl_Preferences.H
+forms_fselect.o: ../FL/Fl_Rect.H
 forms_fselect.o: ../FL/Fl_Return_Button.H
 forms_fselect.o: ../FL/Fl_RGB_Image.H
 forms_fselect.o: ../FL/Fl_Round_Button.H
@@ -3806,6 +3840,7 @@ forms_pixmap.o: ../FL/Fl_Pixmap.H
 forms_pixmap.o: ../FL/Fl_Plugin.H
 forms_pixmap.o: ../FL/Fl_Positioner.H
 forms_pixmap.o: ../FL/Fl_Preferences.H
+forms_pixmap.o: ../FL/Fl_Rect.H
 forms_pixmap.o: ../FL/Fl_Return_Button.H
 forms_pixmap.o: ../FL/Fl_RGB_Image.H
 forms_pixmap.o: ../FL/Fl_Round_Button.H
@@ -3862,6 +3897,7 @@ forms_timer.o: ../FL/Fl_Pixmap.H
 forms_timer.o: ../FL/Fl_Plugin.H
 forms_timer.o: ../FL/Fl_Positioner.H
 forms_timer.o: ../FL/Fl_Preferences.H
+forms_timer.o: ../FL/Fl_Rect.H
 forms_timer.o: ../FL/Fl_Return_Button.H
 forms_timer.o: ../FL/Fl_RGB_Image.H
 forms_timer.o: ../FL/Fl_Round_Button.H
@@ -3937,6 +3973,7 @@ glut_compatibility.o: ../FL/Fl_Menu_Item.H
 glut_compatibility.o: ../FL/Fl_Pixmap.H
 glut_compatibility.o: ../FL/Fl_Plugin.H
 glut_compatibility.o: ../FL/Fl_Preferences.H
+glut_compatibility.o: ../FL/Fl_Rect.H
 glut_compatibility.o: ../FL/Fl_RGB_Image.H
 glut_compatibility.o: ../FL/Fl_Scrollbar.H
 glut_compatibility.o: ../FL/Fl_Slider.H
@@ -4030,6 +4067,7 @@ screen_xywh.o: ../FL/Fl_Image.H
 screen_xywh.o: ../FL/Fl_Pixmap.H
 screen_xywh.o: ../FL/Fl_Plugin.H
 screen_xywh.o: ../FL/Fl_Preferences.H
+screen_xywh.o: ../FL/Fl_Rect.H
 screen_xywh.o: ../FL/Fl_RGB_Image.H
 screen_xywh.o: ../FL/Fl_Scrollbar.H
 screen_xywh.o: ../FL/Fl_Slider.H
diff --git a/test/.gitignore b/test/.gitignore
index d208f2a7c..53dc8498a 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -29,6 +29,7 @@ cairo_test
 checkers
 checkers_pieces.cxx
 checkers_pieces.h
+clipboard
 clock
 colbrowser
 color_chooser
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ae931910..13a5f76f4 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -72,6 +72,7 @@ CREATE_EXAMPLE (browser browser.cxx fltk ANDROID_OK)
 CREATE_EXAMPLE (button button.cxx fltk ANDROID_OK)
 CREATE_EXAMPLE (buttons buttons.cxx fltk ANDROID_OK)
 CREATE_EXAMPLE (checkers "checkers.cxx;checkers_pieces.fl;checkers.icns" "fltk_images;fltk" ANDROID_OK)
+CREATE_EXAMPLE (clipboard clipboard.cxx "fltk_images;fltk")
 CREATE_EXAMPLE (clock clock.cxx fltk ANDROID_OK)
 CREATE_EXAMPLE (colbrowser colbrowser.cxx fltk)
 CREATE_EXAMPLE (color_chooser color_chooser.cxx fltk ANDROID_OK)
diff --git a/test/Makefile b/test/Makefile
index b222b6b4f..c08446af8 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -29,6 +29,7 @@ CPPFILES =\
 	buttons.cxx \
 	cairo_test.cxx \
 	checkers.cxx \
+	clipboard.cxx \
 	clock.cxx \
 	colbrowser.cxx \
 	color_chooser.cxx \
@@ -121,6 +122,7 @@ ALL =	\
 	buttons$(EXEEXT) \
 	cairo_test$(EXEEXT) \
 	checkers$(EXEEXT) \
+	clipboard$(EXEEXT) \
 	clock$(EXEEXT) \
 	colbrowser$(EXEEXT) \
 	color_chooser$(EXEEXT) \
@@ -344,6 +346,11 @@ checkers_pieces.o:	checkers_pieces.h
 checkers_pieces.h:	checkers_pieces.fl
 checkers_pieces.cxx:	checkers_pieces.fl ../fluid/fluid$(EXEEXT)
 
+clipboard$(EXEEXT): clipboard.o $(IMGLIBNAME)
+	echo Linking $@...
+	$(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) clipboard.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
+	$(OSX_ONLY) ../fltk-config --post $@
+
 clock$(EXEEXT): clock.o
 
 colbrowser$(EXEEXT): colbrowser.o
diff --git a/examples/clipboard.cxx b/test/clipboard.cxx
similarity index 54%
rename from examples/clipboard.cxx
rename to test/clipboard.cxx
index e3aa322c1..50e1f25ab 100644
--- a/examples/clipboard.cxx
+++ b/test/clipboard.cxx
@@ -1,7 +1,7 @@
 //
 // Clipboard display test application for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2014 by Bill Spitzak and others.
+// Copyright 1998-2021 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,6 +14,7 @@
 //     https://www.fltk.org/bugs.php
 //
 
+#include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Image.H>
@@ -22,7 +23,6 @@
 #include <FL/Fl_Text_Display.H>
 #include <FL/Fl_Tabs.H>
 #include <FL/Fl_Button.H>
-#include <FL/Fl.H>
 #include <FL/fl_draw.H>
 #ifdef _WIN32
 #include <windows.h>
@@ -35,27 +35,31 @@ Fl_Box *image_box;
 Fl_Box *image_size;
 Fl_Text_Display *display;
 
-inline int fl_min(int a, int b) { return (a < b ? a : b); }
+inline int fl_min(int a, int b) {
+  return (a < b ? a : b);
+}
 
-
-class chess : public Fl_Box { // a box with a chess-like pattern below its image
+// a box with a chess-like pattern below its image
+class chess : public Fl_Box {
 public:
-  chess(int x, int y, int w, int h) : Fl_Box(FL_FLAT_BOX,x,y,w,h,0) {
+  chess(int x, int y, int w, int h)
+    : Fl_Box(FL_FLAT_BOX, x, y, w, h, 0) {
     align(FL_ALIGN_CENTER | FL_ALIGN_CLIP);
   }
   void draw() {
     draw_box();
     Fl_Image *im = image();
     if (im) { // draw the chess pattern below the box centered image
-      int X = x() + (w()-im->w())/2, Y = y() + (h()-im->h())/2, W = im->w(), H = im->h();
-      fl_push_clip(X,Y,W,H);
-      fl_push_clip(x(),y(),w(),h());
-      fl_color(FL_WHITE); fl_rectf(X,Y,W,H);
+      int X = x() + (w() - im->w()) / 2, Y = y() + (h() - im->h()) / 2, W = im->w(), H = im->h();
+      fl_push_clip(X, Y, W, H);
+      fl_push_clip(x(), y(), w(), h());
+      fl_color(FL_WHITE);
+      fl_rectf(X, Y, W, H);
       fl_color(FL_LIGHT2);
-      const int side = 4, side2 = 2*side;
-      for (int j=Y; j<Y+H; j+=side) {
-        for (int i=X + (j-Y)%side2; i<X+W; i+=side2) {
-          fl_rectf(i,j,side,side);
+      const int side = 4, side2 = 2 * side;
+      for (int j = Y; j < Y + H; j += side) {
+        for (int i = X + (j - Y) % side2; i < X + W; i += side2) {
+          fl_rectf(i, j, side, side);
         }
       }
       fl_pop_clip();
@@ -63,74 +67,89 @@ public:
     }
     draw_label(); // draw the box image
   }
-} *chess_obj;
+};
 
 #define TAB_COLOR FL_DARK3
 
-class clipboard_viewer : public Fl_Tabs { // use tabs to display as appropriate the image or textual content of the clipboard
+// use tabs to display either the image or textual content of the clipboard
+class clipboard_viewer : public Fl_Tabs {
 public:
-  clipboard_viewer(int x, int y, int w, int h) : Fl_Tabs(x,y,w,h) {}
+  clipboard_viewer(int x, int y, int w, int h)
+    : Fl_Tabs(x, y, w, h) {}
   virtual int handle(int event) {
-    if (event != FL_PASTE) return Fl_Tabs::handle(event);
+    if (event != FL_PASTE)
+      return Fl_Tabs::handle(event);
     if (strcmp(Fl::event_clipboard_type(), Fl::clipboard_image) == 0) { // an image is being pasted
-      Fl_RGB_Image *im = (Fl_RGB_Image*)Fl::event_clipboard(); // get it as an Fl_RGB_Image object
-      if (!im) return 1;
+      Fl_RGB_Image *im = (Fl_RGB_Image *)Fl::event_clipboard();         // get it as an Fl_RGB_Image object
+      if (!im)
+        return 1;
       char title[300];
-      sprintf(title, "%dx%d",im->w(), im->h()); // display the image original size
+      sprintf(title, "%dx%d", im->w(), im->h()); // display the image original size
 #ifdef _WIN32
       OpenClipboard(NULL); // display extra technical info about clipboard content
-      char *p=title + strlen(title);
+      char *p = title + strlen(title);
       int format = EnumClipboardFormats(0);
-      if (format && format < CF_MAX) { sprintf(p, " %d",format); p += strlen(p); }
+      if (format && format < CF_MAX) {
+        sprintf(p, " %d", format);
+        p += strlen(p);
+      }
       while (format) {
         format = EnumClipboardFormats(format);
-        if (format && format < CF_MAX) { sprintf(p, " %d",format); p += strlen(p); }
+        if (format && format < CF_MAX) {
+          sprintf(p, " %d", format);
+          p += strlen(p);
+        }
       }
       HANDLE h;
       if ((h = GetClipboardData(CF_DIB))) {
         LPBITMAPINFO lpBI = (LPBITMAPINFO)GlobalLock(h);
-        sprintf(p, " biBitCount=%d biCompression=%d biClrUsed=%d",
-                lpBI->bmiHeader.biBitCount, (int)lpBI->bmiHeader.biCompression, (int)lpBI->bmiHeader.biClrUsed);
+        sprintf(p, " biBitCount=%d biCompression=%d biClrUsed=%d", lpBI->bmiHeader.biBitCount,
+                (int)lpBI->bmiHeader.biCompression, (int)lpBI->bmiHeader.biClrUsed);
       }
       CloseClipboard();
 #endif
       Fl_Image *oldimg = image_box->image();
       delete oldimg;
-      if (im->w() > image_box->w() || im->h() > image_box->h()) im->scale(image_box->w(), image_box->h());
+      if (im->w() > image_box->w() || im->h() > image_box->h())
+        im->scale(image_box->w(), image_box->h());
       image_box->image(im); // show the scaled image
       image_size->copy_label(title);
       value(image_box->parent());
       window()->redraw();
-    }
-    else { // text is being pasted
+    } else { // text is being pasted
       display->buffer()->text(Fl::event_text());
       value(display);
       display->redraw();
     }
     return 1;
   }
-} *tabs;
+};
+
+// global variables
+// chess *chess_obj;
+
+clipboard_viewer *tabs;
 
 
-void cb(Fl_Widget *wid, clipboard_viewer *tabs)
-{
+void cb(Fl_Widget *wid, clipboard_viewer *tabs) {
   if (Fl::clipboard_contains(Fl::clipboard_image)) {
     Fl::paste(*tabs, 1, Fl::clipboard_image); // try to find image in the clipboard
     return;
   }
-  if (Fl::clipboard_contains(Fl::clipboard_plain_text)) Fl::paste(*tabs, 1, Fl::clipboard_plain_text); // also try to find text
+  if (Fl::clipboard_contains(Fl::clipboard_plain_text))
+    Fl::paste(*tabs, 1, Fl::clipboard_plain_text); // also try to find text
 }
 
 void clip_callback(int source, void *data) { // called after clipboard was changed or at application activation
-  if ( source == 1 ) cb(NULL, (clipboard_viewer *)data);
+  if (source == 1)
+    cb(NULL, (clipboard_viewer *)data);
 }
 
-int main(int argc, char **argv)
-{
+int main(int argc, char **argv) {
   fl_register_images(); // required for the X11 platform to allow pasting of images
-  Fl_Window* win = new Fl_Window(500, 550, "clipboard viewer");
+  Fl_Window *win = new Fl_Window(500, 550, "clipboard viewer");
   tabs = new clipboard_viewer(0, 0, 500, 500);
-  Fl_Group *g = new Fl_Group( 5, 30, 490, 460, Fl::clipboard_image); // g will display the image form
+  Fl_Group *g = new Fl_Group(5, 30, 490, 460, Fl::clipboard_image); // g will display the image form
   g->box(FL_FLAT_BOX);
   image_box = new chess(5, 30, 490, 450);
   image_size = new Fl_Box(FL_NO_BOX, 5, 485, 490, 10, 0);
@@ -138,22 +157,23 @@ int main(int argc, char **argv)
   g->selection_color(TAB_COLOR);
 
   Fl_Text_Buffer *buffer = new Fl_Text_Buffer();
-  display = new Fl_Text_Display(5,30,490, 460, Fl::clipboard_plain_text); // display will display the text form
+  display = new Fl_Text_Display(5, 30, 490, 460, Fl::clipboard_plain_text); // display will display the text form
   display->buffer(buffer);
   display->selection_color(TAB_COLOR);
   tabs->end();
   tabs->resizable(display);
 
-  Fl_Group *g2 = new Fl_Group( 10,510,200,25);
-  Fl_Button *refresh = new Fl_Button(10,510,200,25, "Refresh from clipboard");
-  refresh->callback((Fl_Callback*)cb, tabs);
+  Fl_Group *g2 = new Fl_Group(10, 510, 200, 25);
+  Fl_Button *refresh = new Fl_Button(10, 510, 200, 25, "Refresh from clipboard");
+  refresh->callback((Fl_Callback *)cb, tabs);
   g2->end();
   g2->resizable(NULL);
   win->end();
   win->resizable(tabs);
-  win->show(argc,argv);
+  win->show(argc, argv);
   clip_callback(1, tabs); // use clipboard content at start
-  Fl::add_clipboard_notify(clip_callback, tabs); // will update with new clipboard content immediately or at application activation
+  Fl::add_clipboard_notify(clip_callback,
+                           tabs); // will update with new clipboard content immediately or at application activation
 
   Fl_Image::RGB_scaling(FL_RGB_SCALING_BILINEAR); // set bilinear image scaling method
   return Fl::run();
diff --git a/test/demo.menu b/test/demo.menu
index c865fe5d4..2d5750634 100644
--- a/test/demo.menu
+++ b/test/demo.menu
@@ -68,7 +68,8 @@
 	@e:Block\nAttack!:blocks
 	@e:Checkers:checkers
 	@e:Sudoku:sudoku
-	@e:Print\nsupport:device
+	@e:Print\nSupport:device
+	@e:Clipboard\nViewer:clipboard
 
 @main:Other\nTests...:@o
 	@o:Color Choosers:color_chooser
diff --git a/test/makedepend b/test/makedepend
index 4876c8e7e..3af6eb7af 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -33,6 +33,7 @@ animated.o: ../FL/Fl_Image.H
 animated.o: ../FL/Fl_Pixmap.H
 animated.o: ../FL/Fl_Plugin.H
 animated.o: ../FL/Fl_Preferences.H
+animated.o: ../FL/Fl_Rect.H
 animated.o: ../FL/Fl_RGB_Image.H
 animated.o: ../FL/fl_types.h
 animated.o: ../FL/fl_utf8.h
@@ -56,6 +57,7 @@ arc.o: ../FL/Fl_Image.H
 arc.o: ../FL/Fl_Pixmap.H
 arc.o: ../FL/Fl_Plugin.H
 arc.o: ../FL/Fl_Preferences.H
+arc.o: ../FL/Fl_Rect.H
 arc.o: ../FL/Fl_RGB_Image.H
 arc.o: ../FL/Fl_Slider.H
 arc.o: ../FL/fl_types.h
@@ -120,6 +122,7 @@ blocks.o: ../FL/Fl_Image.H
 blocks.o: ../FL/Fl_Pixmap.H
 blocks.o: ../FL/Fl_Plugin.H
 blocks.o: ../FL/Fl_Preferences.H
+blocks.o: ../FL/Fl_Rect.H
 blocks.o: ../FL/Fl_RGB_Image.H
 blocks.o: ../FL/Fl_Tiled_Image.H
 blocks.o: ../FL/fl_types.h
@@ -161,6 +164,7 @@ boxtype.o: ../FL/Fl_Image.H
 boxtype.o: ../FL/Fl_Pixmap.H
 boxtype.o: ../FL/Fl_Plugin.H
 boxtype.o: ../FL/Fl_Preferences.H
+boxtype.o: ../FL/Fl_Rect.H
 boxtype.o: ../FL/Fl_RGB_Image.H
 boxtype.o: ../FL/fl_types.h
 boxtype.o: ../FL/fl_utf8.h
@@ -193,6 +197,7 @@ 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
@@ -245,28 +250,10 @@ buttons.o: ../FL/platform_types.h
 cairo_test.o: ../config.h
 cairo_test.o: ../FL/abi-version.h
 cairo_test.o: ../FL/Enumerations.H
-cairo_test.o: ../FL/Fl.H
-cairo_test.o: ../FL/Fl_Bitmap.H
-cairo_test.o: ../FL/Fl_Box.H
-cairo_test.o: ../FL/Fl_Cairo_Window.H
-cairo_test.o: ../FL/fl_casts.H
-cairo_test.o: ../FL/Fl_Device.H
-cairo_test.o: ../FL/Fl_Double_Window.H
-cairo_test.o: ../FL/fl_draw.H
+cairo_test.o: ../FL/fl_ask.H
+cairo_test.o: ../FL/fl_attr.h
 cairo_test.o: ../FL/Fl_Export.H
-cairo_test.o: ../FL/Fl_Graphics_Driver.H
-cairo_test.o: ../FL/Fl_Group.H
-cairo_test.o: ../FL/Fl_Image.H
-cairo_test.o: ../FL/Fl_Pixmap.H
-cairo_test.o: ../FL/Fl_Plugin.H
-cairo_test.o: ../FL/Fl_Preferences.H
-cairo_test.o: ../FL/Fl_RGB_Image.H
 cairo_test.o: ../FL/fl_types.h
-cairo_test.o: ../FL/fl_utf8.h
-cairo_test.o: ../FL/Fl_Widget.H
-cairo_test.o: ../FL/Fl_Window.H
-cairo_test.o: ../FL/math.h
-cairo_test.o: ../FL/platform.H
 cairo_test.o: ../FL/platform_types.h
 checkers.o: ../FL/abi-version.h
 checkers.o: ../FL/Enumerations.H
@@ -288,6 +275,7 @@ checkers.o: ../FL/Fl_Pixmap.H
 checkers.o: ../FL/Fl_Plugin.H
 checkers.o: ../FL/Fl_PNG_Image.H
 checkers.o: ../FL/Fl_Preferences.H
+checkers.o: ../FL/Fl_Rect.H
 checkers.o: ../FL/Fl_RGB_Image.H
 checkers.o: ../FL/Fl_Slider.H
 checkers.o: ../FL/fl_types.h
@@ -298,6 +286,36 @@ checkers.o: ../FL/Fl_Widget.H
 checkers.o: ../FL/Fl_Window.H
 checkers.o: ../FL/platform_types.h
 checkers.o: checkers_pieces.h
+clipboard.o: ../FL/abi-version.h
+clipboard.o: ../FL/Enumerations.H
+clipboard.o: ../FL/Fl.H
+clipboard.o: ../FL/Fl_Bitmap.H
+clipboard.o: ../FL/Fl_Box.H
+clipboard.o: ../FL/Fl_Button.H
+clipboard.o: ../FL/fl_casts.H
+clipboard.o: ../FL/Fl_Device.H
+clipboard.o: ../FL/fl_draw.H
+clipboard.o: ../FL/Fl_Export.H
+clipboard.o: ../FL/Fl_Graphics_Driver.H
+clipboard.o: ../FL/Fl_Group.H
+clipboard.o: ../FL/Fl_Image.H
+clipboard.o: ../FL/Fl_Pixmap.H
+clipboard.o: ../FL/Fl_Plugin.H
+clipboard.o: ../FL/Fl_Preferences.H
+clipboard.o: ../FL/Fl_Rect.H
+clipboard.o: ../FL/Fl_RGB_Image.H
+clipboard.o: ../FL/Fl_Scrollbar.H
+clipboard.o: ../FL/Fl_Shared_Image.H
+clipboard.o: ../FL/Fl_Slider.H
+clipboard.o: ../FL/Fl_Tabs.H
+clipboard.o: ../FL/Fl_Text_Buffer.H
+clipboard.o: ../FL/Fl_Text_Display.H
+clipboard.o: ../FL/fl_types.h
+clipboard.o: ../FL/fl_utf8.h
+clipboard.o: ../FL/Fl_Valuator.H
+clipboard.o: ../FL/Fl_Widget.H
+clipboard.o: ../FL/Fl_Window.H
+clipboard.o: ../FL/platform_types.h
 clock.o: ../FL/abi-version.h
 clock.o: ../FL/Enumerations.H
 clock.o: ../FL/Fl.H
@@ -363,6 +381,7 @@ color_chooser.o: ../FL/Fl_Menu_Item.H
 color_chooser.o: ../FL/Fl_Pixmap.H
 color_chooser.o: ../FL/Fl_Plugin.H
 color_chooser.o: ../FL/Fl_Preferences.H
+color_chooser.o: ../FL/Fl_Rect.H
 color_chooser.o: ../FL/Fl_Return_Button.H
 color_chooser.o: ../FL/Fl_RGB_Image.H
 color_chooser.o: ../FL/fl_show_colormap.H
@@ -468,6 +487,7 @@ cursor.o: ../FL/Fl_Menu_Item.H
 cursor.o: ../FL/Fl_Pixmap.H
 cursor.o: ../FL/Fl_Plugin.H
 cursor.o: ../FL/Fl_Preferences.H
+cursor.o: ../FL/Fl_Rect.H
 cursor.o: ../FL/Fl_RGB_Image.H
 cursor.o: ../FL/Fl_Slider.H
 cursor.o: ../FL/fl_types.h
@@ -494,6 +514,7 @@ curve.o: ../FL/Fl_Image.H
 curve.o: ../FL/Fl_Pixmap.H
 curve.o: ../FL/Fl_Plugin.H
 curve.o: ../FL/Fl_Preferences.H
+curve.o: ../FL/Fl_Rect.H
 curve.o: ../FL/Fl_RGB_Image.H
 curve.o: ../FL/Fl_Slider.H
 curve.o: ../FL/Fl_Toggle_Button.H
@@ -528,6 +549,7 @@ 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_Scrollbar.H
 demo.o: ../FL/Fl_Simple_Terminal.H
@@ -576,7 +598,6 @@ device.o: ../FL/Fl_Menu_.H
 device.o: ../FL/Fl_Menu_Button.H
 device.o: ../FL/Fl_Menu_Item.H
 device.o: ../FL/Fl_Native_File_Chooser.H
-device.o: ../FL/Fl_Overlay_Window.H
 device.o: ../FL/Fl_Paged_Device.H
 device.o: ../FL/Fl_Pixmap.H
 device.o: ../FL/Fl_Plugin.H
@@ -584,6 +605,7 @@ device.o: ../FL/Fl_PostScript.H
 device.o: ../FL/Fl_Preferences.H
 device.o: ../FL/Fl_Printer.H
 device.o: ../FL/Fl_Radio_Round_Button.H
+device.o: ../FL/Fl_Rect.H
 device.o: ../FL/Fl_Return_Button.H
 device.o: ../FL/Fl_RGB_Image.H
 device.o: ../FL/Fl_Round_Button.H
@@ -618,6 +640,7 @@ doublebuffer.o: ../FL/Fl_Image.H
 doublebuffer.o: ../FL/Fl_Pixmap.H
 doublebuffer.o: ../FL/Fl_Plugin.H
 doublebuffer.o: ../FL/Fl_Preferences.H
+doublebuffer.o: ../FL/Fl_Rect.H
 doublebuffer.o: ../FL/Fl_RGB_Image.H
 doublebuffer.o: ../FL/Fl_Single_Window.H
 doublebuffer.o: ../FL/Fl_Slider.H
@@ -664,6 +687,7 @@ editor.o: ../FL/Fl_Native_File_Chooser.H
 editor.o: ../FL/Fl_Pixmap.H
 editor.o: ../FL/Fl_Plugin.H
 editor.o: ../FL/Fl_Preferences.H
+editor.o: ../FL/Fl_Rect.H
 editor.o: ../FL/Fl_Return_Button.H
 editor.o: ../FL/Fl_RGB_Image.H
 editor.o: ../FL/Fl_Scrollbar.H
@@ -732,6 +756,7 @@ 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
@@ -798,6 +823,7 @@ fonts.o: ../FL/Fl_Menu_Item.H
 fonts.o: ../FL/Fl_Pixmap.H
 fonts.o: ../FL/Fl_Plugin.H
 fonts.o: ../FL/Fl_Preferences.H
+fonts.o: ../FL/Fl_Rect.H
 fonts.o: ../FL/Fl_Return_Button.H
 fonts.o: ../FL/Fl_RGB_Image.H
 fonts.o: ../FL/Fl_Scrollbar.H
@@ -851,6 +877,7 @@ forms.o: ../FL/Fl_Pixmap.H
 forms.o: ../FL/Fl_Plugin.H
 forms.o: ../FL/Fl_Positioner.H
 forms.o: ../FL/Fl_Preferences.H
+forms.o: ../FL/Fl_Rect.H
 forms.o: ../FL/Fl_Return_Button.H
 forms.o: ../FL/Fl_RGB_Image.H
 forms.o: ../FL/Fl_Round_Button.H
@@ -1019,6 +1046,7 @@ help_dialog.o: ../FL/Fl_Input_.H
 help_dialog.o: ../FL/Fl_Pixmap.H
 help_dialog.o: ../FL/Fl_Plugin.H
 help_dialog.o: ../FL/Fl_Preferences.H
+help_dialog.o: ../FL/Fl_Rect.H
 help_dialog.o: ../FL/Fl_RGB_Image.H
 help_dialog.o: ../FL/Fl_Scrollbar.H
 help_dialog.o: ../FL/Fl_Slider.H
@@ -1138,6 +1166,7 @@ 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
@@ -1176,6 +1205,7 @@ 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_Simple_Terminal.H
@@ -1232,6 +1262,7 @@ label.o: ../FL/Fl_Menu_Item.H
 label.o: ../FL/Fl_Pixmap.H
 label.o: ../FL/Fl_Plugin.H
 label.o: ../FL/Fl_Preferences.H
+label.o: ../FL/Fl_Rect.H
 label.o: ../FL/Fl_RGB_Image.H
 label.o: ../FL/Fl_Slider.H
 label.o: ../FL/Fl_Toggle_Button.H
@@ -1265,6 +1296,7 @@ line_style.o: ../FL/Fl_Menu_Item.H
 line_style.o: ../FL/Fl_Pixmap.H
 line_style.o: ../FL/Fl_Plugin.H
 line_style.o: ../FL/Fl_Preferences.H
+line_style.o: ../FL/Fl_Rect.H
 line_style.o: ../FL/Fl_RGB_Image.H
 line_style.o: ../FL/Fl_Slider.H
 line_style.o: ../FL/fl_types.h
@@ -1302,6 +1334,7 @@ mandelbrot.o: ../FL/Fl_Pixmap.H
 mandelbrot.o: ../FL/Fl_Plugin.H
 mandelbrot.o: ../FL/Fl_Preferences.H
 mandelbrot.o: ../FL/Fl_Printer.H
+mandelbrot.o: ../FL/Fl_Rect.H
 mandelbrot.o: ../FL/Fl_RGB_Image.H
 mandelbrot.o: ../FL/Fl_Slider.H
 mandelbrot.o: ../FL/fl_types.h
@@ -1337,6 +1370,7 @@ menubar.o: ../FL/Fl_Menu_Item.H
 menubar.o: ../FL/Fl_Pixmap.H
 menubar.o: ../FL/Fl_Plugin.H
 menubar.o: ../FL/Fl_Preferences.H
+menubar.o: ../FL/Fl_Rect.H
 menubar.o: ../FL/Fl_RGB_Image.H
 menubar.o: ../FL/Fl_Scrollbar.H
 menubar.o: ../FL/Fl_Simple_Terminal.H
@@ -1424,6 +1458,7 @@ native-filechooser.o: ../FL/Fl_Native_File_Chooser.H
 native-filechooser.o: ../FL/Fl_Pixmap.H
 native-filechooser.o: ../FL/Fl_Plugin.H
 native-filechooser.o: ../FL/Fl_Preferences.H
+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
@@ -1470,6 +1505,7 @@ offscreen.o: ../FL/Fl_Image.H
 offscreen.o: ../FL/Fl_Pixmap.H
 offscreen.o: ../FL/Fl_Plugin.H
 offscreen.o: ../FL/Fl_Preferences.H
+offscreen.o: ../FL/Fl_Rect.H
 offscreen.o: ../FL/Fl_RGB_Image.H
 offscreen.o: ../FL/fl_types.h
 offscreen.o: ../FL/fl_utf8.h
@@ -1499,6 +1535,7 @@ output.o: ../FL/Fl_Output.H
 output.o: ../FL/Fl_Pixmap.H
 output.o: ../FL/Fl_Plugin.H
 output.o: ../FL/Fl_Preferences.H
+output.o: ../FL/Fl_Rect.H
 output.o: ../FL/Fl_RGB_Image.H
 output.o: ../FL/Fl_Slider.H
 output.o: ../FL/Fl_Toggle_Button.H
@@ -1527,6 +1564,7 @@ overlay.o: ../FL/Fl_Overlay_Window.H
 overlay.o: ../FL/Fl_Pixmap.H
 overlay.o: ../FL/Fl_Plugin.H
 overlay.o: ../FL/Fl_Preferences.H
+overlay.o: ../FL/Fl_Rect.H
 overlay.o: ../FL/Fl_RGB_Image.H
 overlay.o: ../FL/fl_types.h
 overlay.o: ../FL/fl_utf8.h
@@ -1880,6 +1918,7 @@ resizebox.o: ../FL/Fl_Pixmap.H
 resizebox.o: ../FL/Fl_Plugin.H
 resizebox.o: ../FL/Fl_Preferences.H
 resizebox.o: ../FL/Fl_Radio_Button.H
+resizebox.o: ../FL/Fl_Rect.H
 resizebox.o: ../FL/Fl_RGB_Image.H
 resizebox.o: ../FL/fl_types.h
 resizebox.o: ../FL/fl_utf8.h
@@ -1909,6 +1948,7 @@ rotated_text.o: ../FL/Fl_Menu_Item.H
 rotated_text.o: ../FL/Fl_Pixmap.H
 rotated_text.o: ../FL/Fl_Plugin.H
 rotated_text.o: ../FL/Fl_Preferences.H
+rotated_text.o: ../FL/Fl_Rect.H
 rotated_text.o: ../FL/Fl_RGB_Image.H
 rotated_text.o: ../FL/Fl_Slider.H
 rotated_text.o: ../FL/Fl_Toggle_Button.H
@@ -1939,6 +1979,7 @@ scroll.o: ../FL/Fl_Menu_Item.H
 scroll.o: ../FL/Fl_Pixmap.H
 scroll.o: ../FL/Fl_Plugin.H
 scroll.o: ../FL/Fl_Preferences.H
+scroll.o: ../FL/Fl_Rect.H
 scroll.o: ../FL/Fl_RGB_Image.H
 scroll.o: ../FL/Fl_Scroll.H
 scroll.o: ../FL/Fl_Scrollbar.H
@@ -2020,6 +2061,7 @@ sudoku.o: ../FL/Fl_Menu_Item.H
 sudoku.o: ../FL/Fl_Pixmap.H
 sudoku.o: ../FL/Fl_Plugin.H
 sudoku.o: ../FL/Fl_Preferences.H
+sudoku.o: ../FL/Fl_Rect.H
 sudoku.o: ../FL/Fl_RGB_Image.H
 sudoku.o: ../FL/Fl_Scrollbar.H
 sudoku.o: ../FL/Fl_Shared_Image.H
@@ -2051,6 +2093,7 @@ symbols.o: ../FL/Fl_Image.H
 symbols.o: ../FL/Fl_Pixmap.H
 symbols.o: ../FL/Fl_Plugin.H
 symbols.o: ../FL/Fl_Preferences.H
+symbols.o: ../FL/Fl_Rect.H
 symbols.o: ../FL/Fl_RGB_Image.H
 symbols.o: ../FL/Fl_Slider.H
 symbols.o: ../FL/fl_types.h
@@ -2084,6 +2127,7 @@ table.o: ../FL/Fl_Menu_Item.H
 table.o: ../FL/Fl_Pixmap.H
 table.o: ../FL/Fl_Plugin.H
 table.o: ../FL/Fl_Preferences.H
+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
@@ -2221,6 +2265,7 @@ tree.o: ../FL/fl_message.H
 tree.o: ../FL/Fl_Pixmap.H
 tree.o: ../FL/Fl_Plugin.H
 tree.o: ../FL/Fl_Preferences.H
+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
@@ -2297,6 +2342,7 @@ unittests.o: ../FL/Fl_Preferences.H
 unittests.o: ../FL/Fl_Progress.H
 unittests.o: ../FL/Fl_Radio_Button.H
 unittests.o: ../FL/Fl_Radio_Round_Button.H
+unittests.o: ../FL/Fl_Rect.H
 unittests.o: ../FL/Fl_RGB_Image.H
 unittests.o: ../FL/Fl_Roller.H
 unittests.o: ../FL/Fl_Round_Button.H
@@ -2363,6 +2409,7 @@ utf8.o: ../FL/Fl_Output.H
 utf8.o: ../FL/Fl_Pixmap.H
 utf8.o: ../FL/Fl_Plugin.H
 utf8.o: ../FL/Fl_Preferences.H
+utf8.o: ../FL/Fl_Rect.H
 utf8.o: ../FL/Fl_RGB_Image.H
 utf8.o: ../FL/Fl_Scroll.H
 utf8.o: ../FL/Fl_Scrollbar.H
@@ -2398,6 +2445,7 @@ 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