`6d71706`

Implement deferred wrap to fix ZSH prompt marker issue

Add pending_wrap flag for deferred line wrapping - cursor stays at EOL
until next character is written, then wraps. This matches xterm behavior
and fixes the ZSH PROMPT_EOL_MARK (%) appearing incorrectly.

Also update DA1/DA2 responses to identify as VT220 with ANSI color support.

Authored by

espadonne 4 months ago

SHA: 6d71706b48f467b4c30aea87e5574d8a349cbaba
Parents: 3ab4723
Tree: 7da6c43

2 changed files

Status	File	+	-
M	`src/terminal/parser.f90`	10	2
M	`src/terminal/terminal.f90`	22	3

src/terminal/parser.f90modified

        return
      end if
 +    ! Handle DA2 (CSI > c) - Secondary Device Attributes
 +    if (p%has_private .and. p%private_marker == '>' .and. cmd == 99) then
 +      ! Respond: CSI > 0 ; 10 ; 0 c (xterm-compatible: type=0, version=10, rom=0)
 +      call terminal_queue_response(term, char(27) // '[>0;10;0c')
 +      return
 +    end if
++
      ! Handle DECSCUSR (CSI Ps SP q) - Set Cursor Style
      if (p%has_intermediate .and. p%intermediate == ' ' .and. cmd == 113) then
        ! Ps=0,1: blinking block, Ps=2: steady block
          end if
        case (99)  ! 'c' - DA1 (Primary Device Attributes)
 -        ! Respond with VT102 identification: ESC [ ? 6 c
 +        ! Respond as VT220 with ANSI color support
 +        ! 62=VT220, 22=ANSI color
          if (p%param_count == 0 .or. (p%param_count == 1 .and. p%params(1) == 0)) then
 -          call terminal_queue_response(term, char(27) // '[?6c')
 +          call terminal_queue_response(term, char(27) // '[?62;22c')
          end if
        case (110)  ! 'n' - DSR (Device Status Report)

src/terminal/terminal.f90modified

      logical :: mode_autowrap = .true.   ! Auto-wrap at end of line
      logical :: mode_origin = .false.    ! Origin mode (cursor relative to scroll region)
      logical :: mode_insert = .false.    ! Insert mode
 +    logical :: pending_wrap = .false.   ! Deferred wrap: cursor at EOL, wrap on next char
      ! Tab stops
      logical, allocatable :: tabstops(:)
      ! Skip zero-width characters (combining marks, etc.)
      if (width == 0) return
 +    ! Handle deferred wrap: if pending, execute wrap now before writing new char
 +    if (term%pending_wrap) then
 +      call terminal_newline(term)
 +      term%cursor%col = 1
 +      term%pending_wrap = .false.
 +    end if
++
      ! Check if wide character fits before line end
      if (width == 2 .and. term%cursor%col + 1 > term%cols) then
        if (term%mode_autowrap) then
      ! Advance cursor by character width
      term%cursor%col = term%cursor%col + width
 -    ! Handle wrap at end of line
 +    ! Handle wrap at end of line - use deferred wrap
      if (term%cursor%col > term%cols) then
        if (term%mode_autowrap) then
 -        call terminal_newline(term)
 -        term%cursor%col = 1
 +        ! Don't wrap yet - set pending flag, wrap on next char
 +        term%cursor%col = term%cols  ! Keep cursor at last column
 +        term%pending_wrap = .true.
        else
          term%cursor%col = term%cols  ! Stay at edge
        end if
      type(terminal_t), intent(inout) :: term
      term%cursor%col = 1
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
    end subroutine terminal_carriage_return
    ! Move to next tab stop
      type(terminal_t), intent(inout) :: term
      integer :: col
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
++
      do col = term%cursor%col + 1, term%cols
        if (term%tabstops(col)) then
          term%cursor%col = col
    subroutine terminal_backspace(term)
      type(terminal_t), intent(inout) :: term
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      if (term%cursor%col > 1) then
        term%cursor%col = term%cursor%col - 1
      end if
      type(terminal_t), intent(inout) :: term
      integer, intent(in) :: row, col
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      term%cursor%row = max(1, min(row, term%rows))
      term%cursor%col = max(1, min(col, term%cols))
    end subroutine terminal_cursor_move
      type(terminal_t), intent(inout) :: term
      integer, intent(in) :: n
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      term%cursor%row = max(1, term%cursor%row - n)
    end subroutine terminal_cursor_up
      type(terminal_t), intent(inout) :: term
      integer, intent(in) :: n
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      term%cursor%row = min(term%rows, term%cursor%row + n)
    end subroutine terminal_cursor_down
      type(terminal_t), intent(inout) :: term
      integer, intent(in) :: n
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      term%cursor%col = min(term%cols, term%cursor%col + n)
    end subroutine terminal_cursor_forward
      type(terminal_t), intent(inout) :: term
      integer, intent(in) :: n
 +    term%pending_wrap = .false.  ! Cancel deferred wrap
      term%cursor%col = max(1, term%cursor%col - n)
    end subroutine terminal_cursor_backward
      term%mode_autowrap = .true.
      term%mode_origin = .false.
      term%mode_insert = .false.
 +    term%pending_wrap = .false.
      ! Reset cursor
      term%cursor%row = 1