Progress bar and commit validator updates.

config/keyboard/desktop.conf

@@ -130,4 +130,4 @@ KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=read_all_by_line
 KEY_FENRIR,KEY_CTRL,KEY_PAGEDOWN=read_all_by_page
 KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version
-KEY_F4=cycle_keyboard_layout
+KEY_FENRIR,KEY_LEFTCTRL,KEY_F4=cycle_keyboard_layout

config/keyboard/laptop.conf

@@ -130,4 +130,4 @@ KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=read_all_by_line
 KEY_FENRIR,KEY_CTRL,KEY_PAGEDOWN=read_all_by_page
 KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version
-KEY_F4=cycle_keyboard_layout
+KEY_FENRIR,KEY_LEFTCTRL,KEY_F4=cycle_keyboard_layout

config/keyboard/nvda-desktop.conf

@@ -1,130 +0,0 @@
-KEY_FENRIR,KEY_F1=toggle_tutorial_mode
-KEY_FENRIR,KEY_H=toggle_tutorial_mode
-KEY_CTRL=shut_up
-KEY_SHIFT,KEY_KP9=review_bottom
-KEY_SHIFT,KEY_KP7=review_top
-KEY_KP8=review_curr_line
-KEY_KP7=review_prev_line
-KEY_KP9=review_next_line
-KEY_SHIFT,KEY_KP1=review_line_begin
-KEY_SHIFT,KEY_KP3=review_line_end
-KEY_FENRIR,KEY_KP1=review_line_first_char
-KEY_FENRIR,KEY_KP3=review_line_last_char
-KEY_FENRIR,KEY_ALT,KEY_1=present_first_line
-KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
-KEY_KP5=review_curr_word
-KEY_KP4=review_prev_word
-KEY_KP6=review_next_word
-2,KEY_KP5=review_curr_word_phonetic
-2,KEY_KP4=review_prev_word_phonetic
-2,KEY_KP6=review_next_word_phonetic
-KEY_KP2=review_curr_char
-KEY_KP1=review_prev_char
-KEY_KP3=review_next_char
-2,KEY_KP2=review_curr_char_phonetic
-2,KEY_KP1=review_prev_char_phonetic
-2,KEY_KP3=review_next_char_phonetic
-KEY_FENRIR,KEY_CTRL,KEY_KP8=review_up
-KEY_FENRIR,KEY_CTRL,KEY_KP2=review_down
-KEY_FENRIR,KEY_KPDOT=exit_review
-KEY_KPDOT=cursor_position
-KEY_FENRIR,KEY_I=indent_curr_line
-KEY_FENRIR,KEY_B=curr_screen
-KEY_FENRIR,KEY_KP8=curr_screen_before_cursor
-KEY_FENRIR,KEY_KP2=curr_screen_after_cursor
-KEY_FENRIR,KEY_SHIFT,KEY_PAGEDOWN=cursor_read_to_end_of_line
-#=cursor_column
-#=cursor_lineno
-#=braille_flush
-KEY_FENRIR,KEY_CTRL,KEY_T=braille_return_to_cursor
-#=braille_pan_left
-#=braille_pan_right
-KEY_FENRIR,KEY_CTRL,KEY_1=clear_bookmark_1
-KEY_FENRIR,KEY_SHIFT,KEY_1=set_bookmark_1
-KEY_FENRIR,KEY_1=bookmark_1
-KEY_FENRIR,KEY_K=bookmark_1
-KEY_FENRIR,KEY_CTRL,KEY_2=clear_bookmark_2
-KEY_FENRIR,KEY_SHIFT,KEY_2=set_bookmark_2
-KEY_FENRIR,KEY_2=bookmark_2
-KEY_FENRIR,KEY_CTRL,KEY_3=clear_bookmark_3
-KEY_FENRIR,KEY_SHIFT,KEY_3=set_bookmark_3
-KEY_FENRIR,KEY_3=bookmark_3
-KEY_FENRIR,KEY_CTRL,KEY_4=clear_bookmark_4
-KEY_FENRIR,KEY_SHIFT,KEY_4=set_bookmark_4
-KEY_FENRIR,KEY_4=bookmark_4
-KEY_FENRIR,KEY_CTRL,KEY_5=clear_bookmark_5
-KEY_FENRIR,KEY_SHIFT,KEY_5=set_bookmark_5
-KEY_FENRIR,KEY_5=bookmark_5
-KEY_FENRIR,KEY_CTRL,KEY_6=clear_bookmark_6
-KEY_FENRIR,KEY_SHIFT,KEY_6=set_bookmark_6
-KEY_FENRIR,KEY_6=bookmark_6
-KEY_FENRIR,KEY_CTRL,KEY_7=clear_bookmark_7
-KEY_FENRIR,KEY_SHIFT,KEY_7=set_bookmark_7
-KEY_FENRIR,KEY_7=bookmark_7
-KEY_FENRIR,KEY_CTRL,KEY_8=clear_bookmark_8
-KEY_FENRIR,KEY_SHIFT,KEY_8=set_bookmark_8
-KEY_FENRIR,KEY_8=bookmark_8
-KEY_FENRIR,KEY_CTRL,KEY_9=clear_bookmark_9
-KEY_FENRIR,KEY_SHIFT,KEY_9=set_bookmark_9
-KEY_FENRIR,KEY_9=bookmark_9
-KEY_FENRIR,KEY_CTRL,KEY_0=clear_bookmark_10
-KEY_FENRIR,KEY_SHIFT,KEY_0=set_bookmark_10
-KEY_FENRIR,KEY_0=bookmark_10
-KEY_FENRIR,KEY_KPSLASH=set_window_application
-2,KEY_FENRIR,KEY_KPSLASH=clear_window_application
-KEY_KPPLUS=progress_bar_monitor
-KEY_FENRIR,KEY_KPPLUS=silence_until_prompt
-#=toggle_braille
-KEY_FENRIR,KEY_F3=toggle_sound
-KEY_FENRIR,KEY_F4=toggle_speech
-KEY_KPENTER=temp_disable_speech
-KEY_FENRIR,KEY_P=toggle_punctuation_level
-KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
-KEY_FENRIR,KEY_S=toggle_output
-KEY_FENRIR,KEY_CTRL,KEY_E=toggle_emoticons
-key_FENRIR,KEY_5=toggle_auto_read
-KEY_FENRIR,KEY_CTRL,KEY_T=toggle_auto_time
-KEY_FENRIR,KEY_KPASTERISK=toggle_highlight_tracking
-KEY_FENRIR,KEY_KPMINUS=toggle_barrier
-KEY_FENRIR,KEY_Q=quit_fenrir
-KEY_FENRIR,KEY_T=time
-KEY_FENRIR,KEY_F12=time
-2,KEY_FENRIR,KEY_T=date
-2,KEY_FENRIR,KEY_F12=date
-KEY_KPSLASH=toggle_auto_indent
-KEY_FENRIR,KEY_F=attribute_cursor
-#=toggle_has_attribute
-KEY_FENRIR,KEY_F7=spell_check
-2,KEY_FENRIR,KEY_S=add_word_to_spell_check
-KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
-KEY_FENRIR,KEY_F2=forward_keypress
-KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
-KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
-#=clear_clipboard
-KEY_FENRIR,KEY_HOME=first_clipboard
-KEY_FENRIR,KEY_END=last_clipboard
-KEY_FENRIR,KEY_PAGEUP=prev_clipboard
-KEY_FENRIR,KEY_PAGEDOWN=next_clipboard
-KEY_FENRIR,KEY_SHIFT,KEY_C=curr_clipboard
-KEY_FENRIR,KEY_C=copy_marked_to_clipboard
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=copy_last_echo_to_clipboard
-KEY_FENRIR,KEY_V=paste_clipboard
-KEY_FENRIR,KEY_F5=import_clipboard_from_file
-KEY_FENRIR,KEY_F6=export_clipboard_to_file
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
-KEY_FENRIR,KEY_F9=set_mark
-KEY_FENRIR,KEY_F10=marked_text
-KEY_FENRIR,KEY_F10=toggle_vmenu_mode
-KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_RIGHT=next_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_UP=next_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_LEFT=prev_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_DOWN=prev_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_C=save_settings
-# linux specific
-#=import_clipboard_from_x
-KEY_FENRIR,KEY_F8=export_clipboard_to_x
-KEY_FENRIR,KEY_ALT,KEY_UP=inc_alsa_volume
-KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_alsa_volume
-KEY_F4=cycle_keyboard_layout

config/keyboard/nvda-laptop.conf

@@ -1,129 +0,0 @@
-KEY_FENRIR,KEY_F1=toggle_tutorial_mode
-KEY_FENRIR,KEY_H=toggle_tutorial_mode
-KEY_CTRL=shut_up
-KEY_FENRIR,KEY_CTRL,KEY_END=review_bottom
-KEY_FENRIR,KEY_CTRL,KEY_HOME=review_top
-KEY_FENRIR,KEY_SHIFT,KEY_DOT=review_curr_line
-KEY_FENRIR,KEY_U=review_prev_line
-KEY_FENRIR,KEY_O=review_next_line
-KEY_FENRIR,KEY_HOME=review_line_begin
-KEY_FENRIR,KEY_END=review_line_end
-KEY_FENRIR,KEY_CTRL,KEY_J=review_line_first_char
-KEY_FENRIR,KEY_CTRL,KEY_L=review_line_last_char
-KEY_FENRIR,KEY_ALT,KEY_1=present_first_line
-KEY_FENRIR,KEY_ALT,KEY_2=present_last_line
-KEY_FENRIR,KEY_CTRL,KEY_DOT=review_curr_word
-KEY_FENRIR,KEY_J=review_prev_word
-KEY_FENRIR,KEY_L=review_next_word
-2,KEY_FENRIR,KEY_CTRL,KEY_DOT=review_curr_word_phonetic
-2,KEY_FENRIR,KEY_J=review_prev_word_phonetic
-2,KEY_FENRIR,KEY_L=review_next_word_phonetic
-KEY_FENRIR,KEY_COMMA=review_curr_char
-KEY_FENRIR,KEY_M=review_prev_char
-KEY_FENRIR,KEY_DOT=review_next_char
-2,KEY_FENRIR,KEY_COMMA=curr_char_phonetic
-2,KEY_FENRIR,KEY_M=prev_char_phonetic
-2,KEY_FENRIR,KEY_DOT=next_char_phonetic
-KEY_FENRIR,KEY_CTRL,KEY_I=review_up
-KEY_FENRIR,KEY_CTRL,KEY_COMMA=review_down
-KEY_FENRIR,KEY_SLASH=exit_review
-KEY_FENRIR,KEY_SHIFT,KEY_DOT=cursor_position
-2,KEY_FENRIR,KEY_I=indent_curr_line
-KEY_FENRIR,KEY_B=curr_screen
-KEY_FENRIR,KEY_SHIFT,KEY_I=curr_screen_before_cursor
-KEY_FENRIR,KEY_SHIFT,KEY_COMMA=curr_screen_after_cursor
-KEY_FENRIR,KEY_SHIFT,KEY_PAGEDOWN=cursor_read_to_end_of_line
-#=cursor_column
-#=cursor_lineno
-#=braille_flush
-KEY_FENRIR,KEY_CTRL,KEY_T=braille_return_to_cursor
-#=braille_pan_left
-#=braille_pan_right
-KEY_FENRIR,KEY_CTRL,KEY_1=clear_bookmark_1
-KEY_FENRIR,KEY_SHIFT,KEY_1=set_bookmark_1
-KEY_FENRIR,KEY_1=bookmark_1
-KEY_FENRIR,KEY_K=bookmark_1
-KEY_FENRIR,KEY_CTRL,KEY_2=clear_bookmark_2
-KEY_FENRIR,KEY_SHIFT,KEY_2=set_bookmark_2
-KEY_FENRIR,KEY_2=bookmark_2
-KEY_FENRIR,KEY_CTRL,KEY_3=clear_bookmark_3
-KEY_FENRIR,KEY_SHIFT,KEY_3=set_bookmark_3
-KEY_FENRIR,KEY_3=bookmark_3
-KEY_FENRIR,KEY_CTRL,KEY_4=clear_bookmark_4
-KEY_FENRIR,KEY_SHIFT,KEY_4=set_bookmark_4
-KEY_FENRIR,KEY_4=bookmark_4
-KEY_FENRIR,KEY_CTRL,KEY_5=clear_bookmark_5
-KEY_FENRIR,KEY_SHIFT,KEY_5=set_bookmark_5
-KEY_FENRIR,KEY_5=bookmark_5
-KEY_FENRIR,KEY_CTRL,KEY_6=clear_bookmark_6
-KEY_FENRIR,KEY_SHIFT,KEY_6=set_bookmark_6
-KEY_FENRIR,KEY_6=bookmark_6
-KEY_FENRIR,KEY_CTRL,KEY_7=clear_bookmark_7
-KEY_FENRIR,KEY_SHIFT,KEY_7=set_bookmark_7
-KEY_FENRIR,KEY_7=bookmark_7
-KEY_FENRIR,KEY_CTRL,KEY_8=clear_bookmark_8
-KEY_FENRIR,KEY_SHIFT,KEY_8=set_bookmark_8
-KEY_FENRIR,KEY_8=bookmark_8
-KEY_FENRIR,KEY_CTRL,KEY_9=clear_bookmark_9
-KEY_FENRIR,KEY_SHIFT,KEY_9=set_bookmark_9
-KEY_FENRIR,KEY_9=bookmark_9
-KEY_FENRIR,KEY_CTRL,KEY_0=clear_bookmark_10
-KEY_FENRIR,KEY_SHIFT,KEY_0=set_bookmark_10
-KEY_FENRIR,KEY_0=bookmark_10
-KEY_FENRIR,KEY_CTRL,KEY_8=set_window_application
-2,KEY_FENRIR,KEY_CTRL,KEY_8=clear_window_application
-KEY_FENRIR,KEY_SEMICOLON=last_incoming
-#=toggle_braille
-KEY_FENRIR,KEY_F3=toggle_sound
-KEY_FENRIR,KEY_F4=toggle_speech
-KEY_FENRIR,KEY_ENTER=temp_disable_speech
-KEY_FENRIR,KEY_P=toggle_punctuation_level
-KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
-KEY_FENRIR,KEY_S=toggle_output
-KEY_FENRIR,KEY_SHIFT,KEY_E=toggle_emoticons
-KEY_FENRIR,KEY_5=toggle_auto_read
-KEY_FENRIR,KEY_CTRL,KEY_T=toggle_auto_time
-KEY_FENRIR,KEY_Y=toggle_highlight_tracking
-#=toggle_barrier
-KEY_FENRIR,KEY_Q=quit_fenrir
-KEY_FENRIR,KEY_T=time
-KEY_FENRIR,KEY_F12=time
-2,KEY_FENRIR,KEY_T=date
-2,KEY_FENRIR,KEY_F12=date
-KEY_FENRIR,KEY_BACKSLASH=toggle_auto_indent
-KEY_FENRIR,KEY_F=attribute_cursor
-#=toggle_has_attribute
-KEY_FENRIR,KEY_F7=spell_check
-2,KEY_FENRIR,KEY_S=add_word_to_spell_check
-KEY_FENRIR,KEY_SHIFT,KEY_S=remove_word_from_spell_check
-KEY_FENRIR,KEY_F2=forward_keypress
-KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
-KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
-#=clear_clipboard
-#=first_clipboard
-#=last_clipboard
-KEY_FENRIR,KEY_PAGEUP=prev_clipboard
-KEY_FENRIR,KEY_PAGEDOWN=next_clipboard
-KEY_FENRIR,KEY_SHIFT,KEY_C=curr_clipboard
-KEY_FENRIR,KEY_C=copy_marked_to_clipboard
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=copy_last_echo_to_clipboard
-KEY_FENRIR,KEY_V=paste_clipboard
-KEY_FENRIR,KEY_F5=import_clipboard_from_file
-KEY_FENRIR,KEY_F6=export_clipboard_to_file
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
-KEY_FENRIR,KEY_F9=set_mark
-KEY_FENRIR,KEY_F10=marked_text
-KEY_FENRIR,KEY_SHIFT,KEY_F10=toggle_vmenu_mode
-KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_RIGHT=next_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_UP=next_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_LEFT=prev_quick_menu_entry
-KEY_FENRIR,KEY_CTRL,KEY_DOWN=prev_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_C=save_settings
-# linux specific
-#=import_clipboard_from_x
-KEY_FENRIR,KEY_F8=export_clipboard_to_x
-KEY_FENRIR,KEY_ALT,KEY_UP=inc_alsa_volume
-KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_alsa_volume
-KEY_F4=cycle_keyboard_layout

src/fenrirscreenreader/commands/onScreenUpdate/65000-progress_detector.py

@@ -279,7 +279,7 @@ class command:
             return
 
         # Pattern 6: Claude Code progress indicators
-        claude_progress_match = re.search(r'^[·✶✢✻*]\s+[\w\s-]+[…\.]*\s*\(esc to interrupt\)\s*$', text)
+        claude_progress_match = re.search(r'^[·✶✢✻*]\s+[^(]+[…\.]*\s*\(esc to interrupt[^)]*\)\s*$', text)
         if claude_progress_match:
             if current_time - self.env["commandBuffer"]["lastProgressTime"] >= 1.0:
                 self.play_activity_beep()

src/fenrirscreenreader/fenrirVersion.py

@@ -4,5 +4,5 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributors.
 
-version = "2025.08.23"
-code_name = "testing"
+version = "2025.08.31"
+code_name = "master"

tools/pre-commit-composite

@@ -76,19 +76,19 @@ else
             sed -i "s/version = [\"']\{0,1\}[0-9.]\+[\"']\{0,1\}/version = \"$newVersion\"/" "$versionFile"
         fi
 
-        # Check if codeName exists and isn't "stable"
-        if grep -q "codeName.*=.*\"stable\"" "$versionFile"; then
-            # Don't modify stable codeName
+        # Check if code_name exists and isn't "stable"
+        if grep -q "code_name.*=.*\"stable\"" "$versionFile"; then
+            # Don't modify stable code_name
             :
-        elif grep -q "codeName.*=.*\"$branchName\"" "$versionFile"; then
-            # CodeName already matches branch name, no need to update
+        elif grep -q "code_name.*=.*\"$branchName\"" "$versionFile"; then
+            # code_name already matches branch name, no need to update
             :
-        elif grep -q "codeName" "$versionFile"; then
-            # Update existing codeName
-            sed -i "s/codeName = [\"']\{0,1\}[^\"']*[\"']\{0,1\}/codeName = \"$branchName\"/" "$versionFile"
+        elif grep -q "code_name" "$versionFile"; then
+            # Update existing code_name
+            sed -i "s/code_name = [\"']\{0,1\}[^\"']*[\"']\{0,1\}/code_name = \"$branchName\"/" "$versionFile"
         else
-            # Add codeName after the version line
-            sed -i "/version = / a\codeName = \"$branchName\"" "$versionFile"
+            # Add code_name after the version line
+            sed -i "/version = / a\code_name = \"$branchName\"" "$versionFile"
         fi
 
         # Check if the file was actually modified