fortrangoingonforty/fuss / b17907a

Browse files

better menu dialog for rename, other things I forget

Authored by espadonne
SHA
b17907af0a4fbc68769da37115142e6a5bade530
Parents
cf10667
Tree
ee6422d

2 changed files

StatusFile+-
M src/display_module.f90 1 1
M src/terminal_module.f90 38 60
src/display_module.f90modified
@@ -180,7 +180,7 @@ contains
180180
         print '(A)', ''
181181
         if (in_rename_mode) then
182182
             ! Rename mode help - show in cyan
183
-            print '(A)', achar(27) // '[36mRENAME MODE: Type name (all letters/numbers ok) | ←/→:cursor | Backspace:del | Tab:save | ESC:cancel' // achar(27) // '[0m'
183
+            print '(A)', achar(27) // '[36mRENAME MODE: [a-zA-Z0-9._- ] | ←/→:cursor | Backspace:del | Tab:save | ESC:cancel' // achar(27) // '[0m'
184184
         else if (mode == 'git') then
185185
             ! Git mode help - show in yellow tint
186186
             print '(A)', achar(27) // '[33mLegend: ' // achar(27) // '[32m↑' // achar(27) // '[0m=staged ' // &
src/terminal_module.f90modified
@@ -132,82 +132,60 @@ contains
132132
133133
     subroutine read_key(key)
134134
         character(len=1), intent(out) :: key
135
-        integer :: status, unit_num, iostat
136
-        character(len=256) :: cmd
137
-
138
-        ! Use bash with timeout to read a character (avoids blocking on ESC)
139
-        ! This prevents the ESC key from requiring a second keypress
140
-        write(cmd, '(A)') 'bash -c "read -t 0.1 -n 1 -s key < /dev/tty && echo -n $key" > ' // FUSS_TEMP // ' 2>/dev/null'
141
-        call execute_command_line(trim(cmd), exitstat=status)
135
+        character(len=1) :: next_char
136
+        integer :: iostat, tty_unit
142137
143
-        if (status /= 0) then
144
-            ! Timeout or error - treat as quit
145
-            key = 'q'
146
-            return
147
-        end if
148
-
149
-        ! Read the character from temp file
150
-        open(newunit=unit_num, file=FUSS_TEMP, status='old', action='read', iostat=iostat)
138
+        ! Open /dev/tty for reading
139
+        open(newunit=tty_unit, file='/dev/tty', status='old', action='read', iostat=iostat)
151140
         if (iostat /= 0) then
152
-            key = 'q'
141
+            key = 'q'  ! If we can't open tty, quit
153142
             return
154143
         end if
155
-        read(unit_num, '(A1)', iostat=iostat) key
156
-        close(unit_num, status='delete')
157144
158
-        if (iostat /= 0) then
159
-            key = 'q'
160
-            return
161
-        end if
145
+        ! Read one character
146
+        read(tty_unit, '(A1)', iostat=iostat, advance='no') key
162147
163148
         ! Check for escape sequence (arrow keys or alt-key combos)
164149
         if (key == achar(27)) then
165
-            ! Detected ESC - try to read next char quickly with timeout
166
-            write(cmd, '(A)') 'bash -c "read -t 0.05 -n 1 -s key < /dev/tty && echo -n $key" > ' // &
167
-                              FUSS_TEMP // ' 2>/dev/null'
168
-            call execute_command_line(trim(cmd), exitstat=status)
150
+            ! Detected ESC - try to read next char (non-blocking check)
151
+            read(tty_unit, '(A1)', iostat=iostat, advance='no') next_char
169152
170
-            if (status == 0) then
171
-                ! Got a following character - check what it is
172
-                open(newunit=unit_num, file=FUSS_TEMP, status='old', action='read', iostat=iostat)
173
-                if (iostat == 0) then
174
-                    read(unit_num, '(A1)', iostat=iostat) key
175
-                    close(unit_num, status='delete')
176
-
177
-                    ! Check for arrow keys (ESC [ A/B/C/D) or alt-keys (ESC letter)
178
-                    if (key == '[') then
179
-                        ! Arrow key sequence - read final character
180
-                        write(cmd, '(A)') 'bash -c "read -t 0.05 -n 1 -s key < /dev/tty && echo -n $key" > ' // &
181
-                                          FUSS_TEMP // ' 2>/dev/null'
182
-                        call execute_command_line(trim(cmd), exitstat=status)
183
-                        if (status == 0) then
184
-                            open(newunit=unit_num, file=FUSS_TEMP, status='old', action='read', iostat=iostat)
185
-                            if (iostat == 0) then
186
-                                read(unit_num, '(A1)', iostat=iostat) key
187
-                                close(unit_num, status='delete')
188
-                                ! Encode arrow keys as unique control codes to avoid conflict with uppercase letters
189
-                                ! Up=28, Down=29, Right=30, Left=31
190
-                                if (key == 'A') then
191
-                                    key = achar(28)  ! Up arrow
192
-                                else if (key == 'B') then
193
-                                    key = achar(29)  ! Down arrow
194
-                                else if (key == 'C') then
195
-                                    key = achar(30)  ! Right arrow
196
-                                else if (key == 'D') then
197
-                                    key = achar(31)  ! Left arrow
198
-                                end if
199
-                            end if
153
+            if (iostat == 0) then
154
+                ! Got a character after ESC
155
+                if (next_char == '[') then
156
+                    ! Arrow key sequence: ESC[A/B/C/D - read final character
157
+                    read(tty_unit, '(A1)', iostat=iostat, advance='no') next_char
158
+                    if (iostat == 0) then
159
+                        ! Encode arrow keys as unique control codes to avoid conflict with uppercase letters
160
+                        ! Up=28, Down=29, Right=30, Left=31
161
+                        if (next_char == 'A') then
162
+                            key = achar(28)  ! Up arrow
163
+                        else if (next_char == 'B') then
164
+                            key = achar(29)  ! Down arrow
165
+                        else if (next_char == 'C') then
166
+                            key = achar(30)  ! Right arrow
167
+                        else if (next_char == 'D') then
168
+                            key = achar(31)  ! Left arrow
169
+                        else
170
+                            ! Unknown escape sequence, return ESC
171
+                            key = achar(27)
200172
                         end if
201
-                    else if (key >= 'a' .and. key <= 'z') then
202
-                        ! Alt-letter: encode as control char (1-26 for alt-a through alt-z)
203
-                        key = achar(1 + ichar(key) - ichar('a'))
204173
                     end if
174
+                else if (next_char >= 'a' .and. next_char <= 'z') then
175
+                    ! Alt-letter sequence: ESC followed by lowercase letter
176
+                    ! Encode as ASCII control characters (1-26 for alt-a through alt-z)
177
+                    key = achar(1 + ichar(next_char) - ichar('a'))
178
+                else
179
+                    ! Unknown sequence after ESC, return ESC
180
+                    key = achar(27)
205181
                 end if
206182
             else
207
-                ! Just ESC alone (timeout, no following character)
183
+                ! No character available after ESC - it's just ESC key alone
208184
                 key = achar(27)
209185
             end if
210186
         end if
187
+
188
+        close(tty_unit)
211189
     end subroutine read_key
212190
213191
     subroutine read_line(prompt, line)