`8bd51f7`

alacritty fixes needs testing on other terms

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 6 months ago

SHA: 8bd51f7eb2af283f579183b353ba3bf6cdf756d1
Parents: 3e78f26
Tree: e05e2c7

4 changed files

Status	File	+	-
M	`app/main.f90`	8	3
A	`check_alacritty.sh`	11	0
M	`src/terminal/term_control.f90`	43	1
M	`src/ui/display.f90`	9	1

app/main.f90modified

          ! Get terminal size
          call get_term_size(rows, cols)
--        visible_height = rows - 3
++        visible_height = rows - 6  ! Account for 2 pre-spacing + header + 2 post-spacing + footer
          ! Handle navigation signals from previous iteration
          if (selected == -1) then
                  ! Check if we have disjoint selections
                  call check_disjoint_selection(is_selected, current_count, has_disjoint_selection)
              end if
++        case(69, 101)  ! 'E' or 'e' - exit/clear multi-select mode
++            if (selection_count > 0) then
++                call clear_all_selections(is_selected, selection_count, in_selection_mode)
++                selection_anchor = -1
++            end if
          case(86, 118)  ! 'V' or 'v' - enter move mode OR confirm move
              if (move_mode) then
                  ! Confirm move - execute the move to the white-highlighted directory
          call execute_command_line("rm -f ~/.fortress_fav_temp ~/.fortress_fav_select 2>/dev/null")
          ! Re-enable raw mode
--        call execute_command_line("stty -icanon -echo min 1 time 0 2>/dev/null", wait=.true.)
++        call setup_raw_mode()
      end subroutine add_favorite_with_replacement
      subroutine mark_favorites_in_lists(current_dir, files, count, is_dir, favs, fav_count, is_fav)
          call execute_command_line("rm -f ~/.fortress_fav_picker ~/.fortress_fav_selected 2>/dev/null")
          ! Re-enable raw mode
--        call execute_command_line("stty -icanon -echo min 1 time 0 2>/dev/null", wait=.true.)
++        call setup_raw_mode()
      end subroutine open_favorites_picker
  end program fortress

check_alacritty.shadded

++#!/bin/bash
++# Script to check alacritty environment variables
++
++echo "=== Terminal Environment Check ==="
++echo "TERM=$TERM"
++echo "ALACRITTY_SOCKET=$ALACRITTY_SOCKET"
++echo "ALACRITTY_LOG=$ALACRITTY_LOG"
++echo "ALACRITTY_WINDOW_ID=$ALACRITTY_WINDOW_ID"
++echo ""
++echo "All environment variables containing 'alacritty' or 'ALACRITTY':"
++env | grep -i alacritty

src/terminal/term_control.f90modified

      private
      public :: get_term_size, setup_raw_mode, restore_terminal, read_arrow_key, read_arrow_key_with_shift
++    public :: enable_read_timeout, disable_read_timeout
++    public :: needs_extra_spacing
      public :: ESC, CLEAR, BOLD, DIM, REVERSE, RESET
      public :: BLUE, GREEN, RED, GREY, WHITE, YELLOW
      public :: invalidate_term_cache
      end subroutine get_term_size
      subroutine setup_raw_mode()
--        call execute_command_line("stty -icanon -echo min 1 time 0 2>/dev/null")
++        ! Blocking mode for stable operation
++        call execute_command_line("stty -icanon -echo min 1 time 0 2>/dev/null", wait=.true.)
      end subroutine setup_raw_mode
++    subroutine enable_read_timeout()
++        ! No-op for now
++    end subroutine enable_read_timeout
++
++    subroutine disable_read_timeout()
++        ! No-op for now
++    end subroutine disable_read_timeout
++
      subroutine restore_terminal()
          call execute_command_line("stty icanon echo 2>/dev/null")
      end subroutine restore_terminal
++    function needs_extra_spacing() result(needs_spacing)
++        logical :: needs_spacing
++        character(len=256) :: term_var, alacritty_var
++        integer :: stat
++
++        needs_spacing = .false.
++
++        ! Check TERM environment variable
++        call get_environment_variable("TERM", term_var, status=stat)
++        if (stat == 0) then
++            ! Check if TERM contains "alacritty" or other terminals that need spacing
++            if (index(term_var, "alacritty") > 0) then
++                needs_spacing = .true.
++                return
++            end if
++        end if
++
++        ! Also check for ALACRITTY_SOCKET or ALACRITTY_LOG to detect alacritty
++        call get_environment_variable("ALACRITTY_SOCKET", alacritty_var, status=stat)
++        if (stat == 0 .and. len_trim(alacritty_var) > 0) then
++            needs_spacing = .true.
++            return
++        end if
++
++        call get_environment_variable("ALACRITTY_LOG", alacritty_var, status=stat)
++        if (stat == 0 .and. len_trim(alacritty_var) > 0) then
++            needs_spacing = .true.
++            return
++        end if
++    end function needs_extra_spacing
++
      subroutine read_arrow_key(k)
          character(len=1), intent(out) :: k
          character(len=1) :: ch

src/ui/display.f90modified

          character(len=20) :: color_code
          left_w = c * 3 / 10
--        vis_h = r - 3  ! Visible height
++        vis_h = r - 6  ! Visible height (2 pre-spacing + header + 2 post-spacing + footer)
++
++        ! Add spacing at the very top to prevent terminal cutoff
++        write(output_unit, *)
++        write(output_unit, *)
          ! Header
          if (move_mode) then
              write(output_unit, '(a)') BOLD // "FORTRESS" // RESET // " - " // trim(current_dir)
          end if
++        ! Add extra spacing - many terminals need this to prevent header overlap
++        write(output_unit, *)
++        write(output_unit, *)
++
          ! Files (render based on scroll offsets)
          do i = 1, vis_h
              parent_idx = i + parent_scroll_offset