Merge pull request #679 from contour-terminal/fix/cli

Trying to fix CLI.
contour-terminal · May 5, 2022 · 259768a · 259768a
2 parents 95c8561 + f11e0e3
commit 259768a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/scripts/ci/Xvfb-contour-run.sh b/scripts/ci/Xvfb-contour-run.sh
@@ -24,6 +24,8 @@ ldd `which contour`
 LOG="config,pty,gui.session,gui.display,vt.renderer,font.locator"
 #LOG="all"
 
+CONTOUR_PREFIX=gdb --batch --command=./scripts/test.gdb --args
+
 $CONTOUR_PREFIX \
     contour terminal \
         debug "$LOG" \

diff --git a/src/contour/Config.cpp b/src/contour/Config.cpp
@@ -1163,6 +1163,7 @@ TerminalProfile loadTerminalProfile(UsedKeys& _usedKeys,
 
     if (auto colors = _profile["colors"]; colors) // {{{
     {
+        _usedKeys.emplace(fmt::format("{}.{}.colors", _parentPath, _profileName));
         auto const path = fmt::format("{}.{}.{}", _parentPath, _profileName, "colors");
         if (colors.IsMap())
             profile.colors = loadColorScheme(_usedKeys, path, colors);
@@ -1516,7 +1517,10 @@ TerminalProfile loadTerminalProfile(UsedKeys& _usedKeys,
 
     if (optional<config::CursorConfig> cursorOpt =
             parseCursorConfig(_profile["cursor"], _usedKeys, basePath + ".cursor"))
+    {
+        _usedKeys.emplace(basePath + ".cursor");
         profile.inputModes.insert.cursor = cursorOpt.value();
+    }
 
     if (auto normalModeNode = _profile["normal_mode"])
     {

diff --git a/src/contour/ContourGuiApp.cpp b/src/contour/ContourGuiApp.cpp
@@ -136,7 +136,7 @@ crispy::cli::Command ContourGuiApp::parameterDefinition() const
 #endif
                 CLI::Option {
                     CLI::OptionName { 'e', "execute" },
-                    CLI::Value { "" },
+                    CLI::Value { ""s },
                     "DEPRECATED: Program to execute instead of running the shell as configured.",
                     "PROGRAM",
                     CLI::Presence::Optional,

diff --git a/src/contour/TerminalSession.cpp b/src/contour/TerminalSession.cpp
@@ -221,7 +221,8 @@ void TerminalSession::bufferChanged(terminal::ScreenType _type)
 
 void TerminalSession::screenUpdated()
 {
-    if (profile_.autoScrollOnUpdate && terminal().viewport().scrolled() && terminal().inputHandler().mode() == ViMode::Insert)
+    if (profile_.autoScrollOnUpdate && terminal().viewport().scrolled()
+        && terminal().inputHandler().mode() == ViMode::Insert)
         terminal().viewport().scrollToBottom();
 
     if (terminal().hasInput())

diff --git a/src/crispy/CLI.cpp b/src/crispy/CLI.cpp
@@ -519,7 +519,8 @@ optional<FlagStore> parse(Command const& _command, int _argc, char const* const*
 }
 
 } // namespace crispy::cli
-namespace crispy::cli // {{{ Help output
+
+namespace crispy::cli
 {
 
 namespace // {{{ helpers
@@ -876,6 +877,7 @@ namespace // {{{ helpers
         detailedDescription(_os, _command, _style, _margin, parents);
     }
 } // namespace
+// }}}
 
 HelpStyle::ColorMap HelpStyle::defaultColors()
 {

diff --git a/src/terminal/ViInputHandler.cpp b/src/terminal/ViInputHandler.cpp
@@ -30,6 +30,8 @@ namespace terminal
 // [ ] motion %
 // [ ] motion to jump marks up/down
 // [ ] add timer to disable selection (needs timer API inside of libterminal)
+// [ ] show cursor if it was hidden and restore it when going back to insert mode
+// [ ] remember initial cursor shae and restore it when going back to insert mode
 
 namespace
 {