From ae78cecaf24d7012ca9623ec39d755a9afa2b683 Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Sat, 31 Aug 2024 22:14:02 +0200
Subject: [PATCH] Update for tmux 3.4

---
 install_tmux.sh            |  2 +-
 misc/update/tmux/run.php   | 28 ++++++++++++++--------------
 misc/update/tmux/tmux.conf | 36 +++++++++++-------------------------
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/install_tmux.sh b/install_tmux.sh
index c325b2736..47bc5e56d 100755
--- a/install_tmux.sh
+++ b/install_tmux.sh
@@ -25,7 +25,7 @@ cd /tmp/tmux
 
 git fetch --all --tags --prune
 
-git checkout 3.3a
+git checkout 3.4
 
 sh autogen.sh
 
diff --git a/misc/update/tmux/run.php b/misc/update/tmux/run.php
index 2ed8403b7..87584af0e 100644
--- a/misc/update/tmux/run.php
+++ b/misc/update/tmux/run.php
@@ -98,15 +98,15 @@ function start_apps($tmux_session): void
 function window_utilities($tmux_session)
 {
     Process::run("tmux new-window -t $tmux_session -n utils 'printf \"\033]2;fixReleaseNames\033\"'");
-    Process::run("tmux splitw -t $tmux_session:1 -v -p 50 'printf \"\033]2;updateTVandTheaters\033\"'");
-    Process::run("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;removeCrapReleases\033\"'");
-    Process::run("tmux selectp -t $tmux_session:1.2; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;decryptHashes\033\"'");
+    Process::run("tmux splitw -t $tmux_session:1 -v -l 50% 'printf \"\033]2;updateTVandTheaters\033\"'");
+    Process::run("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -l 50% 'printf \"\033]2;removeCrapReleases\033\"'");
+    Process::run("tmux selectp -t $tmux_session:1.2; tmux splitw -t $tmux_session:1 -h -l 50% 'printf \"\033]2;decryptHashes\033\"'");
 }
 
 function window_stripped_utilities($tmux_session)
 {
     Process::run("tmux new-window -t $tmux_session -n utils 'printf \"\033]2;updateTVandTheaters\033\"'");
-    Process::run("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -p 50 'printf \"\033]2;postprocessing_amazon\033\"'");
+    Process::run("tmux selectp -t $tmux_session:1.0; tmux splitw -t $tmux_session:1 -h -l 50% 'printf \"\033]2;postprocessing_amazon\033\"'");
 }
 
 function window_ircscraper($tmux_session)
@@ -117,8 +117,8 @@ function window_ircscraper($tmux_session)
 function window_post($tmux_session)
 {
     Process::run("tmux new-window -t $tmux_session -n post 'printf \"\033]2;postprocessing_additional\033\"'");
-    Process::run("tmux splitw -t $tmux_session:2 -v -p 67 'printf \"\033]2;postprocessing_non_amazon\033\"'");
-    Process::run("tmux splitw -t $tmux_session:2 -v -p 50 'printf \"\033]2;postprocessing_amazon\033\"'");
+    Process::run("tmux splitw -t $tmux_session:2 -v -l 67% 'printf \"\033]2;postprocessing_non_amazon\033\"'");
+    Process::run("tmux splitw -t $tmux_session:2 -v -l 50% 'printf \"\033]2;postprocessing_amazon\033\"'");
 }
 
 function attach($tmuxPath, $tmux_session): void
@@ -133,23 +133,23 @@ $tmuxConfig = $tmuxPath.'tmux.conf';
 
 if ((int) $seq === 1) {
     Process::run("cd {$tmuxPath}; tmux -f $tmuxConfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;\"Monitor\"\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;update_releases\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -l 67% 'printf \"\033]2;update_releases\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -l 25% 'printf \"\033]2;nzb-import\033\"'");
 
     window_utilities($tmux_session);
     window_post($tmux_session);
 } elseif ((int) $seq === 2) {
     Process::run("cd {$tmuxPath}; tmux -f $tmuxConfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;\"Monitor\"\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;sequential\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -l 67% 'printf \"\033]2;sequential\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -l 25% 'printf \"\033]2;nzb-import\033\"'");
 
     window_stripped_utilities($tmux_session);
 } else {
     Process::run("cd {$tmuxPath}; tmux -f $tmuxConfig new-session -d -s $tmux_session -n Monitor 'printf \"\033]2;Monitor\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -p 67 'printf \"\033]2;update_binaries\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -p 25 'printf \"\033]2;nzb-import\033\"'");
-    Process::run("tmux selectp -t $tmux_session:0.2; tmux splitw -t $tmux_session:0 -v -p 67 'printf \"\033]2;backfill\033\"'");
-    Process::run("tmux splitw -t $tmux_session -v -p 50 'printf \"\033]2;update_releases\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -h -l 67% 'printf \"\033]2;update_binaries\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.0; tmux splitw -t $tmux_session:0 -v -l 25% 'printf \"\033]2;nzb-import\033\"'");
+    Process::run("tmux selectp -t $tmux_session:0.2; tmux splitw -t $tmux_session:0 -v -l 67% 'printf \"\033]2;backfill\033\"'");
+    Process::run("tmux splitw -t $tmux_session -v -l 50% 'printf \"\033]2;update_releases\033\"'");
 
     window_utilities($tmux_session);
     window_post($tmux_session);
diff --git a/misc/update/tmux/tmux.conf b/misc/update/tmux/tmux.conf
index dbf0eff46..a4813df04 100644
--- a/misc/update/tmux/tmux.conf
+++ b/misc/update/tmux/tmux.conf
@@ -1,8 +1,8 @@
 # Common tmux.conf file for NNTmux
 
 # By default NNTmux uses C-a as the control prefix
-set-option -g prefix C-a
-bind-key C-a last-window
+set -g prefix2 C-a                        # GNU-Screen compatible prefix
+bind C-a send-prefix -2
 
 # Set copy mode to use VI keys - Activates PgUp/PgDn buttons
 setw -g mode-keys vi
@@ -39,7 +39,7 @@ set -g status-right "#[fg=yellow]#(free -h | grep 'Mem' | awk '{ print \"RAM Use
 set-window-option -g window-status-current-bg red
 
 # Scrollback line buffer per pane
-set -g history-limit 3000   # reduce for memory limited systems (say <=8Gb)
+set -g history-limit 6000 # 6000 lines of scrollback history
 
 # Keep pane open after process ends - monitor.php requires this for re-spawns (the only config param nZEDB really needs)
 set -g remain-on-exit on
@@ -63,45 +63,31 @@ set-option -g bell-action none
 
 #  modes
 setw -g clock-mode-colour colour5
-setw -g mode-attr bold
-setw -g mode-fg colour1
-setw -g mode-bg colour18
+setw -g mode-style "fg=colour1,bg=colour18,bold"
 
 # panes
-set -g pane-border-bg colour0
-set -g pane-border-fg colour19
-set -g pane-active-border-bg colour0
-set -g pane-active-border-fg colour9
+set -g pane-border-style "fg=colour19,bg=colour0"
+set -g pane-active-border-style "fg=colour9,bg=colour0"
 
 # statusbar
 set -g status-position bottom
 set -g status-justify left
-set -g status-bg colour18
-set -g status-fg colour137
-set -g status-attr dim
+set -g status-style "fg=colour137,bg=colour18,dim"
 set -g status-left ''
 set -g status-right "#[fg=yellow]#(free -h | grep 'Mem' | awk '{ print \"RAM Used: \"$3\", Cached: \"$6\", \";}')#(free -m | grep 'Swap' | awk '{ print \"Swapped: \"$3;}')M #[fg=cyan,bold] #(uptime | cut -d ',' -f 4-)"
 set -g status-right-length 200
 set -g status-left-length 10
 
-setw -g window-status-current-fg colour1
-setw -g window-status-current-bg colour19
-setw -g window-status-current-attr bold
+setw -g window-status-current-style "fg=colour1,bg=colour19,bold"
 setw -g window-status-current-format ' #I#[fg=colour249]:#[fg=colour255]#W#[fg=colour249]#F '
 
-setw -g window-status-fg colour9
-setw -g window-status-bg colour18
-setw -g window-status-attr none
+setw -g window-status-style "fg=colour9,bg=colour18"
 setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F '
 
-setw -g window-status-bell-attr bold
-setw -g window-status-bell-fg colour255
-setw -g window-status-bell-bg colour1
+setw -g window-status-bell-style "fg=colour255,bg=colour1,bold"
 
 # messages
-set -g message-attr bold
-set -g message-fg colour232
-set -g message-bg colour16
+set -g message-style "fg=colour232,bg=colour16,bold"
 
 # Add powerline to tmux
 source '/usr/share/powerline/bindings/tmux/powerline.conf'