`7b9c3b8`

fix quit flow

Authored by

espadonne 6 months ago

SHA: 7b9c3b853208ac5d490d9f70a0b33354d5dfe9b9
Parents: baa024d
Tree: ab5036a

2 changed files

Status	File	+	-
M	`src/display_module.f90`	2	2
M	`src/fuss_main.f90`	4	4

src/display_module.f90modified

                           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 | ctrl-q:quit' // 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 | ctrl-c:quit' // 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 | alt-g:git-mode | ctrl-q:quit'
 +            print '(A)', 'Keys: j/k/↑/↓:nav | ←/→:nav tree | space:toggle | .:hide-dots | alt-g:git-mode | ctrl-c:quit'
          end if
          ! Don't free tree - it's owned by interactive_mode

src/fuss_main.f90modified

                  close(99)
              end if
 -            ! Check for ctrl-q to quit (priority over everything)
 -            if (key == achar(17)) then
 +            ! Check for ctrl-c to quit (priority over everything)
 +            if (key == achar(3)) then
                  open(99, file='/tmp/fuss_debug.log', position='append')
 -                write(99, '(A)') 'CTRL-Q detected - quitting!'
 +                write(99, '(A)') 'CTRL-C detected - quitting!'
                  close(99)
                  running = .false.
                  cycle
                      needs_full_redraw = .true.
                  end if
                  ! Note: In normal mode, 'q' is used for fuzzy search
 -                ! Use ctrl-q to quit from normal mode
 +                ! Use ctrl-c to quit from normal mode
              case default
                  ! Unhandled keys - do nothing
                  continue