`d56368f`

color indicators, mixed indicators

Authored by

espadonne 6 months ago

SHA: d56368feb15121cc99dbd0c0add1d2fcd5d8f91d
Parents: 661c81a
Tree: 1a6c67a

2 changed files

Status	File	+	-
M	`fuss.f90`	27	11
M	`src/utils/helper.txt`	1	0

fuss.f90modified

          ! Print help
          print '(A)', ''
 -        print '(A)', '↑=staged ✗=unstaged | j/↓: down | k/↑: up | Space: git add | q: quit'
 +        print '(A)', achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
 +                     achar(27) // '[31m✗' // achar(27) // '[0m=unstaged | ' // &
 +                     'j/↓: down | k/↑: up | Space: git add | q: quit'
          call free_tree(root)
      end subroutine draw_interactive_tree
          character(len=*), parameter :: branch_last = '└──'
          character(len=*), parameter :: branch_mid = '├──'
          character(len=*), parameter :: vertical = '│'
 -        character(len=*), parameter :: mark_unstaged = ' ✗'
 -        character(len=*), parameter :: mark_staged = ' ↑'
          character(len=*), parameter :: highlight_on = achar(27) // '[7m'
          character(len=*), parameter :: highlight_off = achar(27) // '[0m'
 +        character(len=1), parameter :: ESC = achar(27)
++
 +        ! Build colored marks as character arrays
 +        character(len=50) :: mark_unstaged
 +        character(len=50) :: mark_staged
++
 +        ! Initialize colored marks with explicit ESC characters
 +        write(mark_unstaged, '(A,A,A,A,A)') ESC, '[31m', ' ✗', ESC, '[0m'
 +        write(mark_staged, '(A,A,A,A,A)') ESC, '[32m', ' ↑', ESC, '[0m'
          ! Count children first
          n_children = 0
                  line = trim(line) // highlight_on // trim(node%name)
                  ! Show both indicators if file has both staged and unstaged changes
                  if (node%is_staged) then
 -                    line = trim(line) // mark_staged
 +                    line = trim(line) // trim(mark_staged)
                  end if
                  if (node%is_unstaged) then
 -                    line = trim(line) // mark_unstaged
 +                    line = trim(line) // trim(mark_unstaged)
                  end if
                  line = trim(line) // highlight_off
              else
                  line = trim(line) // trim(node%name)
                  ! Show both indicators if file has both staged and unstaged changes
                  if (node%is_staged) then
 -                    line = trim(line) // mark_staged
 +                    line = trim(line) // trim(mark_staged)
                  end if
                  if (node%is_unstaged) then
 -                    line = trim(line) // mark_unstaged
 +                    line = trim(line) // trim(mark_unstaged)
                  end if
              end if
          character(len=*), parameter :: branch_last = '└──'
          character(len=*), parameter :: branch_mid = '├──'
          character(len=*), parameter :: vertical = '│'
 -        character(len=*), parameter :: mark_unstaged = ' ✗'
 -        character(len=*), parameter :: mark_staged = ' ↑'
 +        character(len=1), parameter :: ESC = achar(27)
++
 +        ! Build colored marks as character arrays
 +        character(len=50) :: mark_unstaged
 +        character(len=50) :: mark_staged
++
 +        ! Initialize colored marks with explicit ESC characters
 +        write(mark_unstaged, '(A,A,A,A,A)') ESC, '[31m', ' ✗', ESC, '[0m'
 +        write(mark_staged, '(A,A,A,A,A)') ESC, '[32m', ' ↑', ESC, '[0m'
          ! Count children first
          n_children = 0
              end if
              ! Show both indicators if file has both staged and unstaged changes
              if (node%is_staged) then
 -                line = trim(line) // mark_staged
 +                line = trim(line) // trim(mark_staged)
              end if
              if (node%is_unstaged) then
 -                line = trim(line) // mark_unstaged
 +                line = trim(line) // trim(mark_unstaged)
              end if
              print '(A)', trim(line)
          end if

src/utils/helper.txtmodified

  test
  modified
 +modified