Merge pull request kyoheiu#277 from kyoheiu/develop

v2.12.1

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ## Unreleased
 
+## v2.12.1 (2024-02-04)
+
+### Fixed
+
+- Restore the cursor position properly after exit in a tmux (and possibly in other multiplexers) session.
+
 ## v2.12.0 (2024-01-28)
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "felix"
-version = "2.12.0"
+version = "2.12.1"
 authors = ["Kyohei Uto <[email protected]>"]
 edition = "2021"
 description = "tui file manager with vim-like key mapping"

README.md

@@ -25,6 +25,12 @@ For more detailed document, visit https://kyoheiu.dev/felix.
 
 ## New release
 
+## v2.12.1 (2024-02-04)
+
+### Fixed
+
+- Restore the cursor position properly after exit in a tmux (and possibly in other multiplexers) session.
+
 ## v2.12.0 (2024-01-28)
 
 ### Added

src/run.rs

@@ -8,7 +8,7 @@ use super::session::*;
 use super::state::*;
 use super::term::*;
 
-use crossterm::cursor::RestorePosition;
+use crossterm::cursor::{RestorePosition, SavePosition};
 use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
 use crossterm::execute;
 use crossterm::terminal::{EnterAlternateScreen, LeaveAlternateScreen};
@@ -153,8 +153,9 @@ pub fn run(arg: PathBuf, log: bool) -> Result<(), FxError> {
 
 /// Run the app. (Containing the main loop)
 fn _run(mut state: State, session_path: PathBuf) -> Result<(), FxError> {
-    //Enter the alternate screen with crossterm
+    //Save the current cursor position and enter the alternate screen with crossterm
     let mut screen = stdout();
+    write!(screen, "{}", SavePosition)?;
     enter_raw_mode();
     execute!(screen, EnterAlternateScreen)?;