From 79806537720b6f5feb87604d4a8799d57b42d36f Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Fri, 7 Aug 2026 08:55:48 +0200 Subject: [PATCH] [textinput] mv to builtins dir as hard-coded builtin This library was thought as standalone library, and in fact has a separate license from ROOT. It has its own namespace, etc. Make that clearer by moving it to builtins dir as hard-coded builtin such as mathtext or libafterimage This will make the granularity and modularity clearer eg for Debian package maintainers for a future migration. It would allow them to have it as separate package rather than a big monolithic libCore library. And one could consider later replacing it with llvm textinput or other drop in replacements, without having to touch ROOT core folder. Makes clearer what is inside ROOT and what is an independent outside component that can be externalized or changed to other lib. --- CMakeLists.txt | 1 + builtins/textinput/CMakeLists.txt | 31 +++++++++++++++++++ .../src => builtins}/textinput/Callbacks.h | 0 .../src => builtins}/textinput/Color.h | 0 .../src => builtins}/textinput/Display.h | 0 .../src => builtins}/textinput/Editor.cpp | 0 .../src => builtins}/textinput/Editor.h | 0 .../src => builtins}/textinput/History.cpp | 0 .../src => builtins}/textinput/History.h | 0 .../src => builtins}/textinput/InputData.h | 0 .../src => builtins}/textinput/KeyBinding.cpp | 0 .../src => builtins}/textinput/KeyBinding.h | 0 .../src => builtins}/textinput/LICENSE.TXT | 0 .../src => builtins}/textinput/Range.cpp | 0 .../src => builtins}/textinput/Range.h | 0 .../src => builtins}/textinput/Reader.h | 0 .../textinput/SignalHandler.cpp | 0 .../textinput/SignalHandler.h | 0 .../textinput/StreamReader.cpp | 0 .../src => builtins}/textinput/StreamReader.h | 0 .../textinput/StreamReaderUnix.cpp | 0 .../textinput/StreamReaderUnix.h | 0 .../textinput/StreamReaderWin.cpp | 0 .../textinput/StreamReaderWin.h | 0 .../textinput/TerminalConfigUnix.cpp | 0 .../textinput/TerminalConfigUnix.h | 0 .../textinput/TerminalDisplay.cpp | 0 .../textinput/TerminalDisplay.h | 0 .../textinput/TerminalDisplayUnix.cpp | 0 .../textinput/TerminalDisplayUnix.h | 0 .../textinput/TerminalDisplayWin.cpp | 0 .../textinput/TerminalDisplayWin.h | 0 .../src => builtins}/textinput/Text.h | 0 .../src => builtins}/textinput/TextInput.cpp | 0 .../src => builtins}/textinput/TextInput.h | 0 .../textinput/TextInputContext.cpp | 0 .../textinput/TextInputContext.h | 0 .../textinput/doc/examplemain.cpp | 0 .../textinput/doc/textinput.txt | 0 core/textinput/CMakeLists.txt | 14 --------- documentation/doxygen/Doxyfile | 2 +- documentation/doxygen/makeinput.sh | 2 +- 42 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 builtins/textinput/CMakeLists.txt rename {core/textinput/src => builtins}/textinput/Callbacks.h (100%) rename {core/textinput/src => builtins}/textinput/Color.h (100%) rename {core/textinput/src => builtins}/textinput/Display.h (100%) rename {core/textinput/src => builtins}/textinput/Editor.cpp (100%) rename {core/textinput/src => builtins}/textinput/Editor.h (100%) rename {core/textinput/src => builtins}/textinput/History.cpp (100%) rename {core/textinput/src => builtins}/textinput/History.h (100%) rename {core/textinput/src => builtins}/textinput/InputData.h (100%) rename {core/textinput/src => builtins}/textinput/KeyBinding.cpp (100%) rename {core/textinput/src => builtins}/textinput/KeyBinding.h (100%) rename {core/textinput/src => builtins}/textinput/LICENSE.TXT (100%) rename {core/textinput/src => builtins}/textinput/Range.cpp (100%) rename {core/textinput/src => builtins}/textinput/Range.h (100%) rename {core/textinput/src => builtins}/textinput/Reader.h (100%) rename {core/textinput/src => builtins}/textinput/SignalHandler.cpp (100%) rename {core/textinput/src => builtins}/textinput/SignalHandler.h (100%) rename {core/textinput/src => builtins}/textinput/StreamReader.cpp (100%) rename {core/textinput/src => builtins}/textinput/StreamReader.h (100%) rename {core/textinput/src => builtins}/textinput/StreamReaderUnix.cpp (100%) rename {core/textinput/src => builtins}/textinput/StreamReaderUnix.h (100%) rename {core/textinput/src => builtins}/textinput/StreamReaderWin.cpp (100%) rename {core/textinput/src => builtins}/textinput/StreamReaderWin.h (100%) rename {core/textinput/src => builtins}/textinput/TerminalConfigUnix.cpp (100%) rename {core/textinput/src => builtins}/textinput/TerminalConfigUnix.h (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplay.cpp (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplay.h (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplayUnix.cpp (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplayUnix.h (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplayWin.cpp (100%) rename {core/textinput/src => builtins}/textinput/TerminalDisplayWin.h (100%) rename {core/textinput/src => builtins}/textinput/Text.h (100%) rename {core/textinput/src => builtins}/textinput/TextInput.cpp (100%) rename {core/textinput/src => builtins}/textinput/TextInput.h (100%) rename {core/textinput/src => builtins}/textinput/TextInputContext.cpp (100%) rename {core/textinput/src => builtins}/textinput/TextInputContext.h (100%) rename {core/textinput/src => builtins}/textinput/doc/examplemain.cpp (100%) rename {core/textinput/src => builtins}/textinput/doc/textinput.txt (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 43418679c479c..6864106b1a866 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,6 +393,7 @@ install(FILES ${CMAKE_BINARY_DIR}/etc/gitinfo.txt DESTINATION ${CMAKE_INSTALL_SY #---Recurse into the given subdirectories. This does not actually cause another cmake executable # to run. The same process will walk through the project's entire directory structure. add_subdirectory (core) +add_subdirectory (builtins/textinput) # hard coded builtin for core add_subdirectory (math) add_subdirectory (hist) add_subdirectory (tree) diff --git a/builtins/textinput/CMakeLists.txt b/builtins/textinput/CMakeLists.txt new file mode 100644 index 0000000000000..af99811daf765 --- /dev/null +++ b/builtins/textinput/CMakeLists.txt @@ -0,0 +1,31 @@ +# Copyright (C) 1995-2019, Rene Brun and Fons Rademakers. +# All rights reserved. +# +# For the licensing terms see $ROOTSYS/LICENSE. +# For the list of contributors see $ROOTSYS/README/CREDITS. + +############################################################################ +# CMakeLists.txt file for building textinput package for ROOT +############################################################################ + +target_sources(Core PRIVATE + Editor.cpp + History.cpp + KeyBinding.cpp + Range.cpp + SignalHandler.cpp + StreamReader.cpp + StreamReaderUnix.cpp + StreamReaderWin.cpp + TerminalConfigUnix.cpp + TerminalDisplay.cpp + TerminalDisplayUnix.cpp + TerminalDisplayWin.cpp + TextInputContext.cpp + TextInput.cpp +) + +target_include_directories(Core + PRIVATE + ../ # to be able to call #include "textinput/header.h" from ROOT core files +) diff --git a/core/textinput/src/textinput/Callbacks.h b/builtins/textinput/Callbacks.h similarity index 100% rename from core/textinput/src/textinput/Callbacks.h rename to builtins/textinput/Callbacks.h diff --git a/core/textinput/src/textinput/Color.h b/builtins/textinput/Color.h similarity index 100% rename from core/textinput/src/textinput/Color.h rename to builtins/textinput/Color.h diff --git a/core/textinput/src/textinput/Display.h b/builtins/textinput/Display.h similarity index 100% rename from core/textinput/src/textinput/Display.h rename to builtins/textinput/Display.h diff --git a/core/textinput/src/textinput/Editor.cpp b/builtins/textinput/Editor.cpp similarity index 100% rename from core/textinput/src/textinput/Editor.cpp rename to builtins/textinput/Editor.cpp diff --git a/core/textinput/src/textinput/Editor.h b/builtins/textinput/Editor.h similarity index 100% rename from core/textinput/src/textinput/Editor.h rename to builtins/textinput/Editor.h diff --git a/core/textinput/src/textinput/History.cpp b/builtins/textinput/History.cpp similarity index 100% rename from core/textinput/src/textinput/History.cpp rename to builtins/textinput/History.cpp diff --git a/core/textinput/src/textinput/History.h b/builtins/textinput/History.h similarity index 100% rename from core/textinput/src/textinput/History.h rename to builtins/textinput/History.h diff --git a/core/textinput/src/textinput/InputData.h b/builtins/textinput/InputData.h similarity index 100% rename from core/textinput/src/textinput/InputData.h rename to builtins/textinput/InputData.h diff --git a/core/textinput/src/textinput/KeyBinding.cpp b/builtins/textinput/KeyBinding.cpp similarity index 100% rename from core/textinput/src/textinput/KeyBinding.cpp rename to builtins/textinput/KeyBinding.cpp diff --git a/core/textinput/src/textinput/KeyBinding.h b/builtins/textinput/KeyBinding.h similarity index 100% rename from core/textinput/src/textinput/KeyBinding.h rename to builtins/textinput/KeyBinding.h diff --git a/core/textinput/src/textinput/LICENSE.TXT b/builtins/textinput/LICENSE.TXT similarity index 100% rename from core/textinput/src/textinput/LICENSE.TXT rename to builtins/textinput/LICENSE.TXT diff --git a/core/textinput/src/textinput/Range.cpp b/builtins/textinput/Range.cpp similarity index 100% rename from core/textinput/src/textinput/Range.cpp rename to builtins/textinput/Range.cpp diff --git a/core/textinput/src/textinput/Range.h b/builtins/textinput/Range.h similarity index 100% rename from core/textinput/src/textinput/Range.h rename to builtins/textinput/Range.h diff --git a/core/textinput/src/textinput/Reader.h b/builtins/textinput/Reader.h similarity index 100% rename from core/textinput/src/textinput/Reader.h rename to builtins/textinput/Reader.h diff --git a/core/textinput/src/textinput/SignalHandler.cpp b/builtins/textinput/SignalHandler.cpp similarity index 100% rename from core/textinput/src/textinput/SignalHandler.cpp rename to builtins/textinput/SignalHandler.cpp diff --git a/core/textinput/src/textinput/SignalHandler.h b/builtins/textinput/SignalHandler.h similarity index 100% rename from core/textinput/src/textinput/SignalHandler.h rename to builtins/textinput/SignalHandler.h diff --git a/core/textinput/src/textinput/StreamReader.cpp b/builtins/textinput/StreamReader.cpp similarity index 100% rename from core/textinput/src/textinput/StreamReader.cpp rename to builtins/textinput/StreamReader.cpp diff --git a/core/textinput/src/textinput/StreamReader.h b/builtins/textinput/StreamReader.h similarity index 100% rename from core/textinput/src/textinput/StreamReader.h rename to builtins/textinput/StreamReader.h diff --git a/core/textinput/src/textinput/StreamReaderUnix.cpp b/builtins/textinput/StreamReaderUnix.cpp similarity index 100% rename from core/textinput/src/textinput/StreamReaderUnix.cpp rename to builtins/textinput/StreamReaderUnix.cpp diff --git a/core/textinput/src/textinput/StreamReaderUnix.h b/builtins/textinput/StreamReaderUnix.h similarity index 100% rename from core/textinput/src/textinput/StreamReaderUnix.h rename to builtins/textinput/StreamReaderUnix.h diff --git a/core/textinput/src/textinput/StreamReaderWin.cpp b/builtins/textinput/StreamReaderWin.cpp similarity index 100% rename from core/textinput/src/textinput/StreamReaderWin.cpp rename to builtins/textinput/StreamReaderWin.cpp diff --git a/core/textinput/src/textinput/StreamReaderWin.h b/builtins/textinput/StreamReaderWin.h similarity index 100% rename from core/textinput/src/textinput/StreamReaderWin.h rename to builtins/textinput/StreamReaderWin.h diff --git a/core/textinput/src/textinput/TerminalConfigUnix.cpp b/builtins/textinput/TerminalConfigUnix.cpp similarity index 100% rename from core/textinput/src/textinput/TerminalConfigUnix.cpp rename to builtins/textinput/TerminalConfigUnix.cpp diff --git a/core/textinput/src/textinput/TerminalConfigUnix.h b/builtins/textinput/TerminalConfigUnix.h similarity index 100% rename from core/textinput/src/textinput/TerminalConfigUnix.h rename to builtins/textinput/TerminalConfigUnix.h diff --git a/core/textinput/src/textinput/TerminalDisplay.cpp b/builtins/textinput/TerminalDisplay.cpp similarity index 100% rename from core/textinput/src/textinput/TerminalDisplay.cpp rename to builtins/textinput/TerminalDisplay.cpp diff --git a/core/textinput/src/textinput/TerminalDisplay.h b/builtins/textinput/TerminalDisplay.h similarity index 100% rename from core/textinput/src/textinput/TerminalDisplay.h rename to builtins/textinput/TerminalDisplay.h diff --git a/core/textinput/src/textinput/TerminalDisplayUnix.cpp b/builtins/textinput/TerminalDisplayUnix.cpp similarity index 100% rename from core/textinput/src/textinput/TerminalDisplayUnix.cpp rename to builtins/textinput/TerminalDisplayUnix.cpp diff --git a/core/textinput/src/textinput/TerminalDisplayUnix.h b/builtins/textinput/TerminalDisplayUnix.h similarity index 100% rename from core/textinput/src/textinput/TerminalDisplayUnix.h rename to builtins/textinput/TerminalDisplayUnix.h diff --git a/core/textinput/src/textinput/TerminalDisplayWin.cpp b/builtins/textinput/TerminalDisplayWin.cpp similarity index 100% rename from core/textinput/src/textinput/TerminalDisplayWin.cpp rename to builtins/textinput/TerminalDisplayWin.cpp diff --git a/core/textinput/src/textinput/TerminalDisplayWin.h b/builtins/textinput/TerminalDisplayWin.h similarity index 100% rename from core/textinput/src/textinput/TerminalDisplayWin.h rename to builtins/textinput/TerminalDisplayWin.h diff --git a/core/textinput/src/textinput/Text.h b/builtins/textinput/Text.h similarity index 100% rename from core/textinput/src/textinput/Text.h rename to builtins/textinput/Text.h diff --git a/core/textinput/src/textinput/TextInput.cpp b/builtins/textinput/TextInput.cpp similarity index 100% rename from core/textinput/src/textinput/TextInput.cpp rename to builtins/textinput/TextInput.cpp diff --git a/core/textinput/src/textinput/TextInput.h b/builtins/textinput/TextInput.h similarity index 100% rename from core/textinput/src/textinput/TextInput.h rename to builtins/textinput/TextInput.h diff --git a/core/textinput/src/textinput/TextInputContext.cpp b/builtins/textinput/TextInputContext.cpp similarity index 100% rename from core/textinput/src/textinput/TextInputContext.cpp rename to builtins/textinput/TextInputContext.cpp diff --git a/core/textinput/src/textinput/TextInputContext.h b/builtins/textinput/TextInputContext.h similarity index 100% rename from core/textinput/src/textinput/TextInputContext.h rename to builtins/textinput/TextInputContext.h diff --git a/core/textinput/src/textinput/doc/examplemain.cpp b/builtins/textinput/doc/examplemain.cpp similarity index 100% rename from core/textinput/src/textinput/doc/examplemain.cpp rename to builtins/textinput/doc/examplemain.cpp diff --git a/core/textinput/src/textinput/doc/textinput.txt b/builtins/textinput/doc/textinput.txt similarity index 100% rename from core/textinput/src/textinput/doc/textinput.txt rename to builtins/textinput/doc/textinput.txt diff --git a/core/textinput/CMakeLists.txt b/core/textinput/CMakeLists.txt index a06f61d5a0b96..c5c66eb8ebfd5 100644 --- a/core/textinput/CMakeLists.txt +++ b/core/textinput/CMakeLists.txt @@ -13,20 +13,6 @@ set_property(TARGET Core APPEND PROPERTY DICT_HEADERS Getline.h) target_sources(Core PRIVATE src/Getline_color.cxx src/Getline.cxx - src/textinput/Editor.cpp - src/textinput/History.cpp - src/textinput/KeyBinding.cpp - src/textinput/Range.cpp - src/textinput/SignalHandler.cpp - src/textinput/StreamReader.cpp - src/textinput/StreamReaderUnix.cpp - src/textinput/StreamReaderWin.cpp - src/textinput/TerminalConfigUnix.cpp - src/textinput/TerminalDisplay.cpp - src/textinput/TerminalDisplayUnix.cpp - src/textinput/TerminalDisplayWin.cpp - src/textinput/TextInputContext.cpp - src/textinput/TextInput.cpp ) target_include_directories(Core diff --git a/documentation/doxygen/Doxyfile b/documentation/doxygen/Doxyfile index a46142f3c676f..0d8e3cd31a2f2 100644 --- a/documentation/doxygen/Doxyfile +++ b/documentation/doxygen/Doxyfile @@ -1084,7 +1084,7 @@ EXCLUDE = ../../interpreter/ \ ../../core/clib/ \ ../../core/lzma/ \ ../../core/newdelete/ \ - ../../core/textinput/ \ + ../../builtins/textinput/ \ ../../builtins/mathtext/ \ ../../graf3d/ftgl/ \ ../../graf3d/x3d/ \ diff --git a/documentation/doxygen/makeinput.sh b/documentation/doxygen/makeinput.sh index b7c07d953bdf8..dd0ee71333f92 100755 --- a/documentation/doxygen/makeinput.sh +++ b/documentation/doxygen/makeinput.sh @@ -79,7 +79,7 @@ echo " ../../bindings/r/ \\" >> Doxyfile_INPUT # echo " ../../core/clib/ \\" >> Doxyfile_INPUT # echo " ../../core/lzma/ \\" >> Doxyfile_INPUT # echo " ../../core/newdelete/ \\" >> Doxyfile_INPUT -# echo " ../../core/textinput/ \\" >> Doxyfile_INPUT +# echo " ../../builtins/textinput/ \\" >> Doxyfile_INPUT # echo " ../../builtins/mathtext/ \\" >> Doxyfile_INPUT # echo " ../../graf3d/ftgl/ \\" >> Doxyfile_INPUT # echo " ../../graf3d/x3d/ \\" >> Doxyfile_INPUT