Support 2.4 sintax when binding and unbinding keys

Author: thalesmello

scripts/copycat_mode_bindings.sh

@@ -11,12 +11,19 @@ extend_key() {
 	local key="$1"
 	local script="$2"
 
-	# 1. 'key' is sent to tmux. This ensures the default key action is done.
-	# 2. Script is executed.
-	# 3. `true` command ensures an exit status 0 is returned. This ensures a
-	#	 user never gets an error msg - even if the script file from step 2 is
-	#	 deleted.
-	tmux bind-key -n "$key" run-shell "tmux send-keys '$key'; $script; true"
+	if tmux_is_at_least 2.4; then
+		# We save the previous mapping to a file in order to be able to recover
+		# the previous mapping when we unbind
+		tmux list-keys -T copy-mode-$(tmux_copy_mode) | grep -F "$key" >> /tmp/copycat_$(whoami)_recover_keys
+		tmux bind-key -T copy-mode-$(tmux_copy_mode) "$key" run-shell "$script"
+	else
+		# 1. 'key' is sent to tmux. This ensures the default key action is done.
+		# 2. Script is executed.
+		# 3. `true` command ensures an exit status 0 is returned. This ensures a
+		#	 user never gets an error msg - even if the script file from step 2 is
+		#	 deleted.
+		tmux bind-key -n "$key" run-shell "tmux send-keys '$key'; $script; true"
+	fi
 }
 
 copycat_cancel_bindings() {

scripts/copycat_mode_quit.sh

@@ -18,8 +18,15 @@ unbind_prev_next_bindings() {
 }
 
 unbind_all_bindings() {
-	unbind_cancel_bindings
-	unbind_prev_next_bindings
+	if tmux_is_at_least 2.4; then
+		while read key_cmd; do
+			tmux $key_cmd
+		done < /tmp/copycat_$(whoami)_recover_keys
+		rm /tmp/copycat_$(whoami)_recover_keys
+	else
+		unbind_cancel_bindings
+		unbind_prev_next_bindings
+	fi
 }
 
 main() {

scripts/helpers.sh

@@ -150,14 +150,26 @@ copycat_prev_key() {
 
 # function expected output: 'C-c Enter q'
 copycat_quit_copy_mode_keys() {
-	local commands_that_quit_copy_mode="cancel\|copy-selection\|copy-pipe"
-	local copy_mode="$(tmux_copy_mode)-copy"
-	tmux list-keys -t "$copy_mode" |
-		\grep "$commands_that_quit_copy_mode" |
-		$AWK_CMD '{ print $4}' |
-		sort -u |
-		sed 's/C-j//g' |
-		xargs echo
+	if tmux_is_at_least 2.4; then
+		local commands_that_quit_copy_mode="cancel"
+		local copy_mode="copy-mode-$(tmux_copy_mode)"
+		tmux list-keys -T "$copy_mode" |
+			\grep "$commands_that_quit_copy_mode" |
+			$AWK_CMD '{ print $4 }' |
+			sort -u |
+			sed 's/C-j//g' |
+			xargs echo
+
+	else
+		local commands_that_quit_copy_mode="cancel\|copy-selection\|copy-pipe"
+		local copy_mode="$(tmux_copy_mode)-copy"
+		tmux list-keys -t "$copy_mode" |
+			\grep "$commands_that_quit_copy_mode" |
+			$AWK_CMD '{ print $4 }' |
+			sort -u |
+			sed 's/C-j//g' |
+			xargs echo
+	fi
 }
 
 # === 'private' functions ===