`d1aed8a`

put git operations behind alt-g, needs redraw fixes

Authored by

espadonne 6 months ago

SHA: d1aed8a98b6dd4313bdf7abeada36d95ef798ec1
Parents: 3a355cb
Tree: d9b6432

3 changed files

Status	File	+	-
M	`src/display_module.f90`	34	13
M	`src/fuss_main.f90`	201	123
M	`src/terminal_module.f90`	11	1

src/display_module.f90modified

      end subroutine print_tree_node
      subroutine draw_interactive_tree(tree_root, items, n_items, selected, &
--                                     repo_name, branch_name, viewport_offset, visible_items, top_padding)
++                                     repo_name, branch_name, viewport_offset, visible_items, top_padding, mode)
          type(tree_node), pointer, intent(in) :: tree_root
          integer, intent(in) :: n_items, selected
          type(selectable_item), intent(in) :: items(:)
--        character(len=*), intent(in) :: repo_name, branch_name
++        character(len=*), intent(in) :: repo_name, branch_name, mode
          integer, intent(in) :: viewport_offset, visible_items, top_padding
          integer :: item_idx, viewport_end, i
          character(len=512) :: status_line
              print '(A)', ''
          end do
--        ! Display repo:branch info at top if available
++        ! Display repo:branch info at top with mode indicator
          if (len_trim(repo_name) > 0 .and. len_trim(branch_name) > 0) then
++            if (mode == 'git') then
++                ! Git mode: show in yellow/orange
++                write(status_line, '(A,A,A,A,A,A,A,A,A,A,A)') &
++                    achar(27) // '[1;36m', trim(repo_name), achar(27) // '[0m', &
++                    ':', &
++                    achar(27) // '[1;33m', trim(branch_name), achar(27) // '[0m', &
++                    ' ', &
++                    achar(27) // '[1;33m[ GIT MODE ]', achar(27) // '[0m'
++            else
++                ! Normal mode
                  write(status_line, '(A,A,A,A,A,A,A)') &
                      achar(27) // '[1;36m', trim(repo_name), achar(27) // '[0m', &
                      ':', &
                      achar(27) // '[1;33m', trim(branch_name), achar(27) // '[0m'
++            end if
              print '(A)', trim(status_line)
              print '(A)', ''
          end if
          call print_interactive_node(tree_root, '', .true., .true., items, selected, &
                                      item_idx, viewport_offset, viewport_end)
--        ! Print help (two rows for better readability)
++        ! Print help (mode-dependent)
          print '(A)', ''
++        if (mode == 'git') then
++            ! Git mode help - show in yellow tint
++            print '(A)', achar(27) // '[33mLegend: ' // achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
++                         achar(27) // '[31m✗' // achar(27) // '[0m=modified ' // &
++                         achar(27) // '[90m✗' // achar(27) // '[0m=untracked ' // &
++                         achar(27) // '[34m↓' // achar(27) // '[0m=incoming' // achar(27) // '[0m'
++            print '(A)', achar(27) // '[33mKeys: j/k/↑/↓:nav | ←/→:nav tree | space:toggle | .:hide-dots | a:stage | u:unstage | S:stage-all | U:unstage-all | x:discard | z:stash | Z:unstash | b:switch | n:new-br | R:del-br | G:merge | O:reset | I:rebase | f:fetch | d:diff | c:view | w:blame | h:history | L:reflog | y:cherry-pick | v:revert | r:delete | l:pull | m:commit | M:amend | p:push | t:tag | s:status | q:exit-mode | ESC:exit-mode' // achar(27) // '[0m'
++        else
++            ! Normal mode help
              print '(A)', 'Legend: ' // achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
                           achar(27) // '[31m✗' // achar(27) // '[0m=modified ' // &
                           achar(27) // '[90m✗' // achar(27) // '[0m=untracked ' // &
                           achar(27) // '[34m↓' // achar(27) // '[0m=incoming'
--        print '(A)', 'Keys: j/k/↑/↓:nav | ←/→:nav tree | space:toggle | .:hide-dots | a:stage | u:unstage | S:stage-all | U:unstage-all | x:discard | z:stash | Z:unstash | b:switch | n:new-br | R:del-br | G:merge | O:reset | I:rebase | f:fetch | d:diff | c:view | w:blame | h:history | L:reflog | y:cherry-pick | v:revert | r:delete | l:pull | m:commit | M:amend | p:push | t:tag | s:status | q:quit'
++            print '(A)', 'Keys: j/k/↑/↓:nav | ←/→:nav tree | space:toggle | .:hide-dots | alt-g:git-mode | q:quit'
++        end if
          ! Don't free tree - it's owned by interactive_mode
      end subroutine draw_interactive_tree

src/fuss_main.f90modified

          integer :: term_height, viewport_offset, visible_items, top_padding
          integer :: prev_selected, prev_viewport
          logical :: needs_full_redraw
++        character(len=10) :: mode  ! "normal" or "git" mode
          type(tree_node), pointer :: tree_root
          ! Initialize tree pointer
          selected = 1
          viewport_offset = 1
          running = .true.
++        mode = 'normal'  ! Start in normal mode
          ! Partial redraw optimization: initialize tracking state
          prev_selected = 0  ! Force initial draw
                  ! Full redraw needed: viewport scrolled or forced refresh
                  call clear_screen()
                  call draw_interactive_tree(tree_root, items, n_items, selected, &
--                                           repo_name, branch_name, viewport_offset, visible_items, top_padding)
++                                           repo_name, branch_name, viewport_offset, visible_items, top_padding, mode)
                  needs_full_redraw = .false.
              else if (selected /= prev_selected) then
                  ! Only selection changed within same viewport - still need full redraw for now
                  ! TODO: Could optimize this with partial line updates in the future
                  call clear_screen()
                  call draw_interactive_tree(tree_root, items, n_items, selected, &
--                                           repo_name, branch_name, viewport_offset, visible_items, top_padding)
++                                           repo_name, branch_name, viewport_offset, visible_items, top_padding, mode)
              end if
              ! Update tracking state
              ! Read key
              call read_key(key)
++            ! Check for alt-g to toggle git mode
++            ! alt-g is encoded as achar(1 + ichar('g') - ichar('a')) = achar(7)
++            if (key == achar(7)) then
++                ! Toggle between normal and git mode
++                if (mode == 'normal') then
++                    mode = 'git'
++                else
++                    mode = 'normal'
++                end if
++                needs_full_redraw = .true.
++                cycle  ! Skip rest of key handling
++            end if
++
++            ! Handle ESC key - exit git mode if active
++            if (key == achar(27)) then
++                if (mode == 'git') then
++                    mode = 'normal'
++                    needs_full_redraw = .true.
++                    cycle
++                end if
++                ! In normal mode, ESC does nothing for now
++                cycle
++            end if
++
              ! Handle input
              select case (key)
              case ('j', 'B')  ! j or down arrow - navigate to next sibling (skip nested items)
                      ! Force full redraw after tree structure change
                      needs_full_redraw = .true.
                  end if
++            ! Git operations - only available in git mode
              case ('a')  ! Stage file or directory (lowercase to avoid conflict with arrow A)
++                if (mode == 'git') then
                      ! Check if it's a directory - stage all files in it
                      if (.not. items(selected)%is_file) then
                          call git_stage_directory(items(selected)%path)
                                                  hide_dotfiles, selected, running, exit_if_empty=.true., force_refresh=.true.)
                          needs_full_redraw = .true.
                      end if
++                end if
              case ('u')  ! Unstage file (lowercase)
--                if (items(selected)%is_file .and. items(selected)%is_staged) then
++                if (mode == 'git' .and. items(selected)%is_file .and. items(selected)%is_staged) then
                      call git_unstage_file(items(selected)%path)
                      ! Refresh files after git unstage
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                      needs_full_redraw = .true.
                  end if
              case ('S')  ! Stage all (Shift+S to avoid conflict with up arrow 'A')
++                if (mode == 'git') then
                      call git_stage_all()
                      ! Refresh files after staging all
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, exit_if_empty=.true., force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('U')  ! Unstage all (Shift+U)
++                if (mode == 'git') then
                      call git_unstage_all()
                      ! Refresh files after unstaging all
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('m')  ! Commit (lowercase)
++                if (mode == 'git') then
                      call commit_prompt()
                      ! Refresh files after commit
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('M')  ! Amend last commit (Shift+m)
++                if (mode == 'git') then
                      call amend_commit_prompt()
                      ! Refresh files after amend commit
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('s')  ! Show git status (lowercase)
++                if (mode == 'git') then
                      call show_status_view()
                      needs_full_redraw = .true.
++                end if
              case ('p')  ! Push (lowercase)
++                if (mode == 'git') then
                      call push_prompt()
                      ! Refresh files after push
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('t')  ! Tag (lowercase)
++                if (mode == 'git') then
                      call tag_prompt()
                      needs_full_redraw = .true.
++                end if
              case ('b')  ! Switch branch
++                if (mode == 'git') then
                      call branch_switch_prompt()
                      ! Refresh files after branch switch
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                          needs_full_redraw = .true.
                      ! Update branch name display
                      call get_repo_info(repo_name, branch_name)
++                end if
              case ('n')  ! Create new branch
++                if (mode == 'git') then
                      call branch_create_prompt()
                      ! Refresh files after branch creation
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                          needs_full_redraw = .true.
                      ! Update branch name display
                      call get_repo_info(repo_name, branch_name)
++                end if
              case ('R')  ! Delete branch (Shift+r, since 'r' is used for delete file)
++                if (mode == 'git') then
                      call branch_delete_prompt()
                      needs_full_redraw = .true.
                      ! No need to refresh files or update branch name (stays on current branch)
++                end if
              case ('f')  ! Git fetch
++                if (mode == 'git') then
                      call git_fetch()
                      ! Refresh files after fetch and include files with incoming changes
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, include_incoming=.true., force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('d')  ! Git diff with less
--                if (items(selected)%is_file) then
++                if (mode == 'git' .and. items(selected)%is_file) then
                      call git_diff_file(items(selected)%path, items(selected)%has_incoming)
                      needs_full_redraw = .true.
                  end if
              case ('c')  ! View file contents (cat/bat/less)
--                if (items(selected)%is_file) then
++                if (mode == 'git' .and. items(selected)%is_file) then
                      call view_file(items(selected)%path)
                      needs_full_redraw = .true.
                  end if
              case ('w')  ! Git blame (who changed this line)
--                if (items(selected)%is_file) then
++                if (mode == 'git' .and. items(selected)%is_file) then
                      call blame_prompt(items(selected)%path)
                      needs_full_redraw = .true.
                  end if
              case ('r')  ! Remove/delete file
--                if (items(selected)%is_file) then
++                if (mode == 'git' .and. items(selected)%is_file) then
                      call delete_prompt(items(selected)%path, items(selected)%is_untracked)
                      ! Refresh files after delete
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                      needs_full_redraw = .true.
                  end if
              case ('x', 'X')  ! Discard changes
--                if (items(selected)%is_file .and. (items(selected)%is_staged .or. items(selected)%is_unstaged .or. items(selected)%is_untracked)) then
++                if (mode == 'git' .and. items(selected)%is_file .and. (items(selected)%is_staged .or. items(selected)%is_unstaged .or. items(selected)%is_untracked)) then
                      call discard_prompt(items(selected)%path, items(selected)%is_staged, items(selected)%is_untracked)
                      ! Refresh files after discard
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                      needs_full_redraw = .true.
                  end if
              case ('l')  ! Git pull
++                if (mode == 'git') then
                      call git_pull()
                      ! Refresh files after pull (incoming indicators will automatically clear)
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                          needs_full_redraw = .true.
                      ! Note: After successful pull, git diff will show no upstream differences
                      ! so has_incoming will be .false. for all files automatically
++                end if
              case ('z')  ! Stash push (save changes)
++                if (mode == 'git') then
                      call stash_push_prompt()
                      ! Refresh files after stash
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, exit_if_empty=.true., force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('Z')  ! Stash pop/apply (restore changes)
++                if (mode == 'git') then
                      call stash_pop_apply_prompt()
                      ! Refresh files after stash pop/apply
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('y')  ! Cherry-pick (yank commit)
++                if (mode == 'git') then
                      call cherry_pick_prompt()
                      ! Refresh files after cherry-pick
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('v')  ! Revert commit
++                if (mode == 'git') then
                      call revert_commit_prompt()
                      ! Refresh files after revert
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('h')  ! Show commit history
++                if (mode == 'git') then
                      call history_browser_prompt()
                      needs_full_redraw = .true.
++                end if
              case ('L')  ! Show reflog (Shift+l)
++                if (mode == 'git') then
                      call reflog_browser_prompt()
                      needs_full_redraw = .true.
++                end if
              case ('G')  ! Merge branch (Shift+g)
++                if (mode == 'git') then
                      call merge_branch_prompt()
                      ! Refresh files after merge
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                          needs_full_redraw = .true.
                      ! Update branch name display in case we merged
                      call get_repo_info(repo_name, branch_name)
++                end if
              case ('O')  ! Reset (Shift+o - "Oh no, undo!")
++                if (mode == 'git') then
                      call reset_prompt()
                      ! Refresh files after reset
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('I')  ! Interactive rebase (Shift+i)
++                if (mode == 'git') then
                      call rebase_prompt()
                      ! Refresh files after rebase
                      call refresh_and_rebuild(show_all, files, n_files, items, n_items, tree_root, &
                                              hide_dotfiles, selected, running, force_refresh=.true.)
                          needs_full_redraw = .true.
++                end if
              case ('.')  ! Toggle hiding dotfiles and gitignored files
                  hide_dotfiles = .not. hide_dotfiles
                  ! Rebuild item list with new filter
                  visible_items = term_height - top_padding - 6
                  if (visible_items < 3) visible_items = 3
                  if (visible_items > n_items) visible_items = n_items
--            case ('q', 'Q')  ! Quit
++            case ('q', 'Q')  ! Quit or exit git mode
++                if (mode == 'git') then
++                    ! In git mode: q exits to normal mode
++                    mode = 'normal'
++                    needs_full_redraw = .true.
++                else
++                    ! In normal mode: q quits the application
                      running = .false.
++                end if
              end select
          end do

src/terminal_module.f90modified

          ! Read one character
          read(tty_unit, '(A1)', iostat=iostat, advance='no') key
--        ! Check for escape sequence (arrow keys)
++        ! Check for escape sequence (arrow keys or alt-key combos)
          if (key == achar(27)) then
              read(tty_unit, '(A2)', iostat=iostat, advance='no') escape_seq
              if (escape_seq(1:1) == '[') then
++                ! Arrow key sequence: ESC[A/B/C/D
                  key = escape_seq(2:2)  ! Return A, B, C, or D
++            else if (escape_seq(1:1) >= 'a' .and. escape_seq(1:1) <= 'z') then
++                ! Alt-letter sequence: ESC followed by letter
++                ! Encode as ASCII control characters (1-26 for alt-a through alt-z)
++                ! This keeps us in valid ASCII range [0-127]
++                ! e.g., alt-g returns achar(7) = ASCII BEL
++                key = achar(1 + ichar(escape_seq(1:1)) - ichar('a'))
++            else if (iostat /= 0) then
++                ! Just ESC key alone (no following character or timeout)
++                key = achar(27)
              end if
          end if