Unverified Commit 42f77b30 authored by Bruno Sutic's avatar Bruno Sutic Committed by GitHub
Browse files

Merge pull request #233 from woutgg/master

Fix https://github.com/tmux-plugins/tmux-resurrect/issues/176.
parents 7c77c704 2f5394bf
...@@ -244,17 +244,6 @@ dump_windows() { ...@@ -244,17 +244,6 @@ dump_windows() {
if is_session_grouped "$session_name"; then if is_session_grouped "$session_name"; then
continue continue
fi fi
# window_layout is not correct for zoomed windows
if [[ "$window_flags" == *Z* ]]; then
# unmaximize the window
toggle_window_zoom "${session_name}:${window_index}"
# get correct window layout
window_layout="$(tmux display-message -p -t "${session_name}:${window_index}" -F "#{window_layout}")"
# sleep required otherwise vim does not redraw correctly, issue #112
sleep 0.1 || sleep 1 # portability hack
# maximize window again
toggle_window_zoom "${session_name}:${window_index}"
fi
echo "${line_type}${d}${session_name}${d}${window_index}${d}${window_active}${d}${window_flags}${d}${window_layout}" echo "${line_type}${d}${session_name}${d}${window_index}${d}${window_active}${d}${window_flags}${d}${window_layout}"
done done
} }
......
...@@ -4,9 +4,9 @@ pane blue 1 :man 0 :- 0 :/tmp 0 bash : ...@@ -4,9 +4,9 @@ pane blue 1 :man 0 :- 0 :/tmp 0 bash :
pane blue 1 :man 0 :- 1 :/usr/share/man 1 man :man echo pane blue 1 :man 0 :- 1 :/usr/share/man 1 man :man echo
pane blue 2 :bash 1 :* 0 :/tmp 1 bash : pane blue 2 :bash 1 :* 0 :/tmp 1 bash :
pane red 0 :bash 0 : 0 :/tmp 1 bash : pane red 0 :bash 0 : 0 :/tmp 1 bash :
pane red 1 :bash 0 :- 0 :/tmp 0 bash : pane red 1 :bash 0 :-Z 0 :/tmp 0 bash :
pane red 1 :bash 0 :- 1 :/tmp 0 bash : pane red 1 :bash 0 :-Z 1 :/tmp 0 bash :
pane red 1 :bash 0 :- 2 :/tmp 1 bash : pane red 1 :bash 0 :-Z 2 :/tmp 1 bash :
pane red 2 :bash 1 :* 0 :/tmp 0 bash : pane red 2 :bash 1 :* 0 :/tmp 0 bash :
pane red 2 :bash 1 :* 1 :/tmp 1 bash : pane red 2 :bash 1 :* 1 :/tmp 1 bash :
pane yellow 0 :bash 1 :* 0 :/tmp/bar 1 bash : pane yellow 0 :bash 1 :* 0 :/tmp/bar 1 bash :
...@@ -15,7 +15,7 @@ window blue 0 0 : ce9f,200x49,0,0,2 ...@@ -15,7 +15,7 @@ window blue 0 0 : ce9f,200x49,0,0,2
window blue 1 0 :- 178b,200x49,0,0{100x49,0,0,3,99x49,101,0,4} window blue 1 0 :- 178b,200x49,0,0{100x49,0,0,3,99x49,101,0,4}
window blue 2 1 :* cea2,200x49,0,0,5 window blue 2 1 :* cea2,200x49,0,0,5
window red 0 0 : cea3,200x49,0,0,6 window red 0 0 : cea3,200x49,0,0,6
window red 1 0 :- 135b,200x49,0,0[200x24,0,0,7,200x24,0,25{100x24,0,25,8,99x24,101,25,9}] window red 1 0 :-Z 135b,200x49,0,0[200x24,0,0,7,200x24,0,25{100x24,0,25,8,99x24,101,25,9}]
window red 2 1 :* db81,200x49,0,0[200x24,0,0,10,200x24,0,25,11] window red 2 1 :* db81,200x49,0,0[200x24,0,0,10,200x24,0,25,11]
window yellow 0 1 :* 6781,200x49,0,0,12 window yellow 0 1 :* 6781,200x49,0,0,12
state yellow blue state yellow blue
...@@ -4,9 +4,9 @@ pane blue 1 :man 0 :!- 0 :/tmp 0 bash : ...@@ -4,9 +4,9 @@ pane blue 1 :man 0 :!- 0 :/tmp 0 bash :
pane blue 1 :man 0 :!- 1 :/usr/share/man 1 man :man echo pane blue 1 :man 0 :!- 1 :/usr/share/man 1 man :man echo
pane blue 2 :bash 1 :* 0 :/tmp 1 bash : pane blue 2 :bash 1 :* 0 :/tmp 1 bash :
pane red 0 :bash 0 : 0 :/tmp 1 bash : pane red 0 :bash 0 : 0 :/tmp 1 bash :
pane red 1 :bash 0 :- 0 :/tmp 0 bash : pane red 1 :bash 0 :-Z 0 :/tmp 0 bash :
pane red 1 :bash 0 :- 1 :/tmp 0 bash : pane red 1 :bash 0 :-Z 1 :/tmp 0 bash :
pane red 1 :bash 0 :- 2 :/tmp 1 bash : pane red 1 :bash 0 :-Z 2 :/tmp 1 bash :
pane red 2 :bash 1 :* 0 :/tmp 0 bash : pane red 2 :bash 1 :* 0 :/tmp 0 bash :
pane red 2 :bash 1 :* 1 :/tmp 1 bash : pane red 2 :bash 1 :* 1 :/tmp 1 bash :
pane yellow 0 :bash 1 :* 0 :/tmp/bar 1 bash : pane yellow 0 :bash 1 :* 0 :/tmp/bar 1 bash :
...@@ -15,7 +15,7 @@ window blue 0 0 :! cea4,200x49,0,0,7 ...@@ -15,7 +15,7 @@ window blue 0 0 :! cea4,200x49,0,0,7
window blue 1 0 :!- 9797,200x49,0,0{100x49,0,0,8,99x49,101,0,9} window blue 1 0 :!- 9797,200x49,0,0{100x49,0,0,8,99x49,101,0,9}
window blue 2 1 :* 677f,200x49,0,0,10 window blue 2 1 :* 677f,200x49,0,0,10
window red 0 0 : ce9e,200x49,0,0,1 window red 0 0 : ce9e,200x49,0,0,1
window red 1 0 :- 52b7,200x49,0,0[200x24,0,0,2,200x24,0,25{100x24,0,25,3,99x24,101,25,4}] window red 1 0 :-Z 52b7,200x49,0,0[200x24,0,0,2,200x24,0,25{100x24,0,25,3,99x24,101,25,4}]
window red 2 1 :* bd68,200x49,0,0[200x24,0,0,5,200x24,0,25,6] window red 2 1 :* bd68,200x49,0,0[200x24,0,0,5,200x24,0,25,6]
window yellow 0 1 :* 6780,200x49,0,0,11 window yellow 0 1 :* 6780,200x49,0,0,11
state yellow blue state yellow blue
...@@ -16,6 +16,7 @@ new_tmux_session "red" ...@@ -16,6 +16,7 @@ new_tmux_session "red"
new_tmux_window new_tmux_window
horizontal_split horizontal_split
vertical_split vertical_split
toggle_zoom_pane
new_tmux_window new_tmux_window
horizontal_split horizontal_split
......
...@@ -44,6 +44,11 @@ proc vertical_split {} { ...@@ -44,6 +44,11 @@ proc vertical_split {} {
sleep 0.1 sleep 0.1
} }
proc toggle_zoom_pane {} {
send "z"
sleep 0.2
}
proc run_shell_command {command} { proc run_shell_command {command} {
send "$command\r" send "$command\r"
sleep 1 sleep 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment