pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(reconnect): do not clear terminal state when entering alternate screen (#2750)

Browse source 
* debug

* refactor(reconnect): articular reconnection logic
This commit is contained in:
Aram Drevekenin 2023-08-30 09:58:48 +02:00 • committed by GitHub
parent 90875b0c00
commit 2081a2e64f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/commands.rs
View file

@ -340,6 +340,7 @@ pub(crate) fn start_client(opts: CliArgs) {
let layout = layout.clone();
let mut config_options = config_options.clone();
let mut opts = opts.clone();
let mut is_a_reconnect = false;
if let Some(reconnect_to_session) = &reconnect_to_session {
// this is integration code to make session reconnects work with this existing,
@ -358,6 +359,7 @@ pub(crate) fn start_client(opts: CliArgs) {
opts.session = None;
config_options.attach_to_session = None;
}
is_a_reconnect = true;
}
let start_client_plan = |session_name: std::string::String| {
@ -417,6 +419,7 @@ pub(crate) fn start_client(opts: CliArgs) {
attach_layout,
tab_position_to_focus,
pane_id_to_focus,
is_a_reconnect,
);
} else {
if let Some(session_name) = opts.session.clone() {
@ -430,6 +433,7 @@ pub(crate) fn start_client(opts: CliArgs) {
Some(layout),
None,
None,
is_a_reconnect,
);
} else {
if let Some(session_name) = config_options.session_name.as_ref() {
@ -466,6 +470,7 @@ pub(crate) fn start_client(opts: CliArgs) {
attach_layout,
None,
None,
is_a_reconnect,
);
},
_ => {
@ -479,6 +484,7 @@ pub(crate) fn start_client(opts: CliArgs) {
Some(layout),
None,
None,
is_a_reconnect,
);
},
}
@ -501,6 +507,7 @@ pub(crate) fn start_client(opts: CliArgs) {
Some(layout),
None,
None,
is_a_reconnect,
);
}
}

25
zellij-client/src/lib.rs
View file

@ -147,6 +147,7 @@ pub fn start_client(
layout: Option<Layout>,
tab_position_to_focus: Option<usize>,
pane_id_to_focus: Option<(u32, bool)>, // (pane_id, is_plugin)
is_a_reconnect: bool,
) -> Option<ConnectToSession> {
info!("Starting Zellij client!");
@ -156,14 +157,19 @@ pub fn start_client(
let bracketed_paste = "\u{1b}[?2004h";
os_input.unset_raw_mode(0).unwrap();
let _ = os_input
.get_stdout_writer()
.write(take_snapshot.as_bytes())
.unwrap();
let _ = os_input
.get_stdout_writer()
.write(clear_client_terminal_attributes.as_bytes())
.unwrap();
if !is_a_reconnect {
// we don't do this for a reconnect because our controlling terminal already has the
// attributes we want from it, and some terminals don't treat these atomically (looking at
// your Windows Terminal...)
let _ = os_input
.get_stdout_writer()
.write(take_snapshot.as_bytes())
.unwrap();
let _ = os_input
.get_stdout_writer()
.write(clear_client_terminal_attributes.as_bytes())
.unwrap();
}
envs::set_zellij("0".to_string());
config.env.set_vars();
@ -172,6 +178,7 @@ pub fn start_client(
.unwrap_or_else(|| os_input.load_palette());
let full_screen_ws = os_input.get_terminal_size_using_fd(0);
log::info!("full_screen_ws: {:?}", full_screen_ws);
let client_attributes = ClientAttributes {
size: full_screen_ws,
style: Style {
@ -375,7 +382,7 @@ pub fn start_client(
let mut stdout = os_input.get_stdout_writer();
stdout
.write_all("\u{1b}[1mLoading Zellij\u{1b}[m\n\r".as_bytes())
.write_all("\u{1b}[1m\u{1b}[HLoading Zellij\u{1b}[m\n\r".as_bytes())
.expect("cannot write to stdout");
stdout.flush().expect("could not flush");