[contour] Ensure inserting happens right next to the currently active…

… tab

Signed-off-by: Christian Parpart <christian@parpart.family>

metainfo.xml

@@ -107,7 +107,9 @@
     <release version="0.6.2" urgency="medium" type="development">
       <description>
         <ul>
+          <li>Fixes `CreateTab` to sometimes spawn more than one tab (#1695)</li>
           <li>Adds `MoveTabToLeft` and `MoveTabToRight` actions to move tabs around (#1695)</li>
+          <li>Ensure inserting new tabs happens right next to the currently active tab (#1695)</li>
         </ul>
       </description>
     </release>

src/contour/TerminalSession.cpp

@@ -1434,7 +1434,7 @@ bool TerminalSession::operator()(actions::WriteScreen const& event)
 
 bool TerminalSession::operator()(actions::CreateNewTab)
 {
-    emit createNewTab();
+    _manager->createSession();
     return true;
 }
 

src/contour/TerminalSessionManager.cpp

@@ -79,7 +79,11 @@ TerminalSession* TerminalSessionManager::createSessionInBackground()
     auto* session = new TerminalSession(this, createPty(ptyPath), _app);
     managerLog()("Create new session with ID {} at index {}", session->id(), _sessions.size());
 
-    _sessions.push_back(session);
+    auto const currentSessionIterator = std::ranges::find(_sessions, _activeSession);
+    auto const insertPoint = currentSessionIterator != _sessions.end() ? std::next(currentSessionIterator)
+                                                                       : currentSessionIterator;
+
+    _sessions.insert(insertPoint, session);
 
     connect(session, &TerminalSession::sessionClosed, [this, session]() { removeSession(*session); });