[filter-ui] replace readline with textinput

tstack · Feb 13, 2025 · ab57c05 · ab57c05
1 parent 1459ba4
commit ab57c05
Show file tree

Hide file tree

Showing 28 changed files with 1,216 additions and 550 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -537,6 +537,7 @@ add_library(
         text_format.cc
         text_overlay_menu.cc
         textinput_curses.cc
+        textinput.history.cc
         textfile_highlighters.cc
         textfile_sub_source.cc
         textview_curses.cc
@@ -667,6 +668,7 @@ add_library(
         text_format.hh
         text_overlay_menu.hh
         textinput_curses.hh
+        textinput.history.hh
         textfile_highlighters.hh
         textfile_sub_source.hh
         textfile_sub_source.cfg.hh

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -356,6 +356,7 @@ noinst_HEADERS = \
 	text_format.hh \
 	text_overlay_menu.hh \
 	textinput_curses.hh \
+	textinput.history.hh \
 	textfile_highlighters.hh \
 	textfile_sub_source.hh \
 	textfile_sub_source.cfg.hh \
@@ -523,6 +524,7 @@ libdiag_a_SOURCES = \
 	state-extension-functions.cc \
 	sysclip.cc \
 	textinput_curses.cc \
+	textinput.history.cc \
 	textfile_highlighters.cc \
 	textview_curses.cc \
 	time-extension-functions.cc \

diff --git a/src/base/injector.hh b/src/base/injector.hh
@@ -206,8 +206,12 @@ template<
 T
 get()
 {
-    return singleton_storage<typename T::element_type,
-                             Annotations...>::get_owner();
+    if (singleton_storage<typename T::element_type>::get_scope()
+        == scope::singleton)
+    {
+        return singleton_storage<typename T::element_type>::get_owner();
+    }
+    return std::make_shared<typename T::element_type>();
 }
 
 template<typename T, std::enable_if_t<is_vector<T>::value, bool> = true>