From 2bf1f80f775fefb4bc2ce9498d8b219c84f22e13 Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Fri, 19 Jul 2024 07:20:13 -0400
Subject: [PATCH 1/2] bash: add primary and secondary marks to PS1 and PS2

These OSC 133 semantic prompt sequences mark the primary and secondary
parts of the prompt strings.

PS1 is marked as the primary (initial) prompt. This is the default, so
we could skip emitting these sequences, but they're added here for now
to be explicit and consistent with what other terminal emulators do in
their shell integrations.

If PS1 is a multiline prompt (i.e. it contains a newline), we mark the
last line as a secondary prompt (k=s). bash doesn't redraw the leading
lines of a multiline prompt on its own, so we can use this information
at runtime to prevent the preceding lines from being erased by ghostty
after a resize.

PS2 is always marked as a secondary prompt.
---
 src/shell-integration/bash/ghostty.bash | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index 8557e82f9..aa65445f5 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -98,8 +98,19 @@ function __ghostty_precmd() {
       _GHOSTTY_SAVE_PS2="$PS2"
 
       # Marks
-      PS1=$PS1'\[\e]133;B\a\]'
-      PS2=$PS2'\[\e]133;B\a\]'
+      PS1='\[\e]133;P;k=i\a\]'$PS1'\[\e]133;B\a\]'
+      PS2='\[\e]133;P;k=s\a\]'$PS2'\[\e]133;B\a\]'
+
+      if [[ "${PS1}" == *"\n"* || "${PS1}" == *$'\n'* ]]; then
+        # bash doesn't redraw the leading lines in a multiline prompt so
+        # mark the last line as a secondary prompt (k=s) to prevent the
+        # preceding lines from being erased by ghostty after a resize.
+        builtin local oldval
+        oldval=$(builtin shopt -p extglob)
+        builtin shopt -s extglob
+        PS1=${PS1%@('\n'|$'\n')*}'\n\[\e]133;P;k=s\a\]'${PS1##*@('\n'|$'\n')}
+        builtin eval "$oldval"
+      fi
 
       # Cursor
       if test "$GHOSTTY_SHELL_INTEGRATION_NO_CURSOR" != "1"; then

From aa47047a6e9008fe0b2f5fbc7f8716800472c40a Mon Sep 17 00:00:00 2001
From: Jon Parise <jon@indelible.org>
Date: Mon, 22 Jul 2024 10:53:50 -0400
Subject: [PATCH 2/2] bash: ghostty doesn't support OSC 133;P

Remove OSC 133;P marks in the basic prompts, and use OSC 133;A in the
multiline case.
---
 src/shell-integration/bash/ghostty.bash | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/shell-integration/bash/ghostty.bash b/src/shell-integration/bash/ghostty.bash
index aa65445f5..6a5da35cc 100644
--- a/src/shell-integration/bash/ghostty.bash
+++ b/src/shell-integration/bash/ghostty.bash
@@ -98,8 +98,8 @@ function __ghostty_precmd() {
       _GHOSTTY_SAVE_PS2="$PS2"
 
       # Marks
-      PS1='\[\e]133;P;k=i\a\]'$PS1'\[\e]133;B\a\]'
-      PS2='\[\e]133;P;k=s\a\]'$PS2'\[\e]133;B\a\]'
+      PS1=$PS1'\[\e]133;B\a\]'
+      PS2=$PS2'\[\e]133;B\a\]'
 
       if [[ "${PS1}" == *"\n"* || "${PS1}" == *$'\n'* ]]; then
         # bash doesn't redraw the leading lines in a multiline prompt so
@@ -108,7 +108,7 @@ function __ghostty_precmd() {
         builtin local oldval
         oldval=$(builtin shopt -p extglob)
         builtin shopt -s extglob
-        PS1=${PS1%@('\n'|$'\n')*}'\n\[\e]133;P;k=s\a\]'${PS1##*@('\n'|$'\n')}
+        PS1=${PS1%@('\n'|$'\n')*}'\n\[\e]133;A;k=s\a\]'${PS1##*@('\n'|$'\n')}
         builtin eval "$oldval"
       fi