Table mode fixes and improvements to application detection.

?

.gitignore

@@ -6,3 +6,4 @@ dist/
 build/
 *.kate-swp
 .directory
+CLAUDE.md

CREDITS

@@ -1,18 +1,30 @@
-# Fenrir screen reader
+# Fenrir Screen Reader Credits
 
 
-## Developers
+## Current Maintainer
 
-* Storm Dragon: Project leader
+* **Storm Dragon** - Project leader and maintainer
-* Jeremiah: Coder.
+
+
+## Current Contributors
+
+* **Jeremiah** - Developer
 
 
 ## Previous Developers
 
-* Chrys: coder.
+* **Chrys** - Original creator and main developer
 
 
-## Special thanks to:
+## Special Thanks
 
-* F123 Consulting for suggestions, some funding, and endless testing.
+* **F123 Consulting** - Suggestions, funding, and extensive testing
-* Stormux for continuation of the project.
+* **Stormux Community** - Continuation of the project and ongoing support
+* **All contributors** - Bug reports, feature requests, and community support
+
+
+## Community
+
+* IRC: irc.stormux.org #stormux
+* Email list: stormux+subscribe@groups.io  
+* Wiki: https://git.stormux.org/storm/fenrir/wiki

README.md

@@ -1,69 +1,97 @@
 # Fenrir
 
-A modern, modular, flexible and fast console screenreader.
+A modern, modular, flexible and fast console screen reader.
 It should run on any operating system. If you want to help, or write drivers to make it work on other systems, just let me know. 
 This software is licensed under the LGPL v3.
 
+**Current maintainer:** Storm Dragon  
+**Previous developer:** Chrys
+
+## Key Features
+
+- **Multiple Interface Support**: Works in Linux TTY, and terminal emulators
+- **Flexible Driver System**: Modular architecture with multiple drivers for speech, sound, input, and screen
+- **Review Mode**: Navigate and review screen content without moving the edit cursor
+- **Multiple Clipboard Support**: Manage multiple clipboard entries
+- **Configurable Key Bindings**: Desktop and laptop keyboard layouts
+- **Sound Icons**: Audio feedback for various events
+- **Spell Checking**: Built-in spell checker with word management
+- **Language Support**: Multiple speech synthesis languages and voices
+- **Bookmark System**: Quick access to specific screen areas
+- **Auto-announcement**: Automatic reading of incoming text and time announcements
+- **Tutorial Mode**: Built-in help system for learning keyboard shortcuts
+
 
 ## OS Requirements
 
-- Linux (ptyDriver, vcsaDriver, evdevDriver)
+- Linux (ptyDriver, vcsaDriver, evdevDriver) - Primary platform with full support
-- macOS (ptyDriver)
+- macOS (ptyDriver) - Limited support
-- BSD (ptyDriver)
+- BSD (ptyDriver) - Limited support  
-- Windows (ptyDriver)
+- Windows (ptyDriver) - Limited support
 
 
 ## Core Requirements
 
-- python3 >= 3.3
+- Python 3 >= 3.9 (recommended 3.13+)
-- screen, input, speech, sound drivers dependencies see "Features, Drivers, Extras".
+- Screen, input, speech, sound driver dependencies (see "Features, Drivers, Extras" section)
+- For full functionality on Linux: evdev, speech-dispatcher, sox
 
 
 ## Features, Drivers, Extras, Dependencies
 
 ### Input Drivers:
-1. "evdevDriver" input driver for linux evdev
+1. **evdevDriver** - Linux evdev input driver (recommended for Linux)
-  - python-evdev >=0.6.3 (This is commonly referred to as python3-evdev by your distribution)
+   - python-evdev >=0.6.3 (This is commonly referred to as python3-evdev by your distribution)
-  - python-pyudev
+   - python-pyudev
-  - loaded uinput kernel module
+   - loaded uinput kernel module
-  - ReadWrite permission 
+   - ReadWrite permission:
-    - /dev/input
+     - /dev/input
-    - /dev/uinput
+     - /dev/uinput
-2. "ptyDriver" terminal emulation input driver
+2. **ptyDriver** - Terminal emulation input driver (cross-platform)
-  - python-pyte
+   - python-pyte
+3. **atspiDriver** - AT-SPI input driver for desktop environments
+   - python-pyatspi2
+
+### Remote Drivers:
+1. **unixDriver** - Unix socket remote control (default)
+   - socat (for command-line interaction)
+2. **tcpDriver** - TCP socket remote control (localhost only)
+   - netcat or telnet (for command-line interaction)
 
 
 ### Screen Drivers:
 
-1. "vcsaDriver" screen driver for linux VCSA devices
+1. **vcsaDriver** - Linux VCSA devices driver (recommended for Linux TTY)
-  - python-dbus
+   - python-dbus
-  - Read permission to the following files and services:
+   - Read permission to the following files and services:
-    - /sys/devices/virtual/tty/tty0/active
+     - /sys/devices/virtual/tty/tty0/active
-    - /dev/tty[1-64]
+     - /dev/tty[1-64]
-    - /dev/vcsa[1-64]
+     - /dev/vcsa[1-64]
-    - read logind DBUS
+     - read logind DBUS
-2. "ptyDriver" terminal emulation driver
+2. **ptyDriver** - Terminal emulation driver (cross-platform)
-  - python-pyte
+   - python-pyte
   
 
 ### Speech Drivers:
 
-1. "genericDriver" (default) speech driver for sound as subprocess:
+1. **speechdDriver** - Speech-dispatcher driver (recommended)
-  - espeak or espeak-ng
+   - Speech-dispatcher
-2. "speechdDriver" speech driver for Speech-dispatcher:
+   - python-speechd
-  - Speech-dispatcher
+2. **genericDriver** - Generic subprocess speech driver
-  - python-speechd
+   - espeak or espeak-ng (or any TTS command)
-3. "emacspeakDriver" speech driver for emacspeak
+3. **debugDriver** - Debug speech driver for testing
-  - emacspeak
+   - No dependencies
 
 
 ### Sound Drivers:
 
-1. "genericDriver" (default) sound driver for sound as subprocess:
+1. **genericDriver** (default) - Generic subprocess sound driver
-  - Sox
+   - Sox with opus support (recommended)
-2. "gstreamerDriver" sound driver for gstreamer
+2. **gstreamerDriver** - GStreamer sound driver
-  - gstreamer >=1.0
+   - gstreamer >=1.0
-  - GLib
+   - GLib
+3. **debugDriver** - Debug sound driver for testing
+   - No dependencies
 
 
 ## Extras:
@@ -91,16 +119,353 @@ If there is a package for your distrobution of choice, please let us know so we
 - You can also just run it from Git without installing:
 Requires root privileges
 
-    cd src/fenrir/
+    cd src/
     sudo ./fenrir
 
-Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir/settings.
+Settings are located in:
-Take care to use drivers from the config matching your installed drivers. 
+- **After installation**: `/etc/fenrir/settings/settings.conf`
-By default it uses:
+- **Development**: `config/settings/settings.conf`
-- sound driver: genericDriver (via sox, could configured in settings.conf)
-- speech driver: genericDriver (via espeak or espeak-ng, could configured in settings.conf)
-- input driver: evdevDriver
 
+By default Fenrir uses:
+- **Sound driver**: genericDriver (via sox)
+- **Speech driver**: speechdDriver (via speech-dispatcher) 
+- **Input driver**: evdevDriver (Linux) or ptyDriver (other platforms)
+- **Screen driver**: vcsaDriver (Linux TTY) or ptyDriver (terminal emulation)
+
+## Getting Started
+
+### Basic Usage
+
+1. **Start Fenrir**:
+   ```bash
+   sudo systemctl start fenrir  # If installed as service
+   # OR
+   sudo fenrir                  # Run directly
+   ```
+
+2. **Basic Navigation**:
+   - **Fenrir Key**: By default `Insert`, `Keypad Insert`, or `Meta/Super` key
+   - **Tutorial Mode**: `Fenrir + H` to learn all commands interactively
+   - **Quit Fenrir**: `Fenrir + Q`
+
+3. **Essential Commands**:
+   - `Ctrl` - Stop speech (shut up)
+   - `Fenrir + Keypad 5` - Read current screen
+   - `Keypad 8` - Read current line
+   - `Keypad 5` - Read current word
+   - `Keypad 2` - Read current character
+   - `Fenrir + T` - Announce time
+   - `Fenrir + S` - Spell check current word
+
+### Keyboard Layouts
+
+Fenrir supports two main keyboard layouts:
+
+- **Desktop Layout**: Uses numeric keypad for navigation (recommended for desktop users)
+- **Laptop Layout**: Alternative bindings for keyboards without numeric keypad
+
+Configure in `/etc/fenrir/settings/settings.conf`:
+```ini
+[keyboard]
+keyboardLayout=desktop  # or 'laptop'
+```
+
+### First Time Setup
+
+1. **Enable Fenrir at boot**:
+   ```bash
+   sudo systemctl enable fenrir
+   ```
+
+2. **Configure audio** (if needed):
+   - For PulseAudio: Run configure_pulse.sh script (see below)
+   - For PipeWire: Run configure_pipewire.sh script (see below)
+
+3. **Test speech**:
+   ```bash
+   # Test speech-dispatcher directly
+   sudo spd-say "Hello World"
+   ```
+
+## Remote Control
+
+Fenrir includes a powerful remote control system that allows external applications and scripts to control Fenrir through Unix sockets or TCP connections. This is particularly useful for automation, integration with other applications, or providing alternative control methods.
+
+### Configuration
+
+Enable remote control in `/etc/fenrir/settings/settings.conf`:
+
+```ini
+[remote]
+enable=True
+driver=unixDriver              # or tcpDriver
+port=22447                     # for TCP driver
+socketFile=                    # custom socket path (optional)
+enableSettingsRemote=True      # allow settings changes
+enableCommandRemote=True       # allow command execution
+```
+
+### Remote Drivers
+
+1. **unixDriver** (recommended): Uses Unix domain sockets
+   - Socket location: `/tmp/fenrirscreenreader-deamon.sock` (TTY mode) or `/tmp/fenrirscreenreader-<pid>.sock`
+   - More secure, local-only access
+   - Works with `socat`
+
+2. **tcpDriver**: Uses TCP sockets on localhost
+   - Default port: 22447
+   - Works with `netcat`, `telnet`, or any TCP client
+   - Local connections only (127.0.0.1)
+
+### Using socat with Unix Sockets
+
+The `socat` command provides the easiest way to send commands to Fenrir:
+
+#### Basic Speech Control
+```bash
+# Interrupt current speech
+echo "command interrupt" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Speak custom text
+echo "command say Hello, this is a test message" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Temporarily disable speech (until next keystroke)
+echo "command tempdisablespeech" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+#### Settings Control
+```bash
+# Enable highlight tracking mode
+echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Change speech parameters
+echo "setting set speech#rate=0.8" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set speech#pitch=0.6" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set speech#volume=0.9" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Change punctuation level (none/some/most/all)
+echo "setting set general#punctuationLevel=all" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set general#punctuationLevel=none" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Voice and TTS engine control
+echo "setting set speech#voice=en-us+f3" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set speech#module=espeak-ng" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Disable sound temporarily
+echo "setting set sound#enabled=False" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set sound#volume=0.5" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Keyboard and input settings
+echo "setting set keyboard#charEchoMode=1" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting set keyboard#wordEcho=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Screen control (ignore specific TTYs)
+echo "setting set screen#ignoreScreen=1,2,3" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Multiple settings at once
+echo "setting set speech#rate=0.8;sound#volume=0.7;general#punctuationLevel=most" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Reset all settings to defaults
+echo "setting reset" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Save current settings
+echo "setting save" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+echo "setting saveas /tmp/my-fenrir-settings.conf" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+#### Clipboard Operations
+```bash
+# Place text into clipboard
+echo "command clipboard This text will be copied to clipboard" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Export clipboard to file
+echo "command exportclipboard" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+#### Window Management
+```bash
+# Define a window area (x1 y1 x2 y2)
+echo "command window 0 0 80 24" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Reset window to full screen
+echo "command resetwindow" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+#### VMenu Control
+```bash
+# Set virtual menu context
+echo "command vmenu nano/file" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Reset virtual menu
+echo "command resetvmenu" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+#### Application Control
+```bash
+# Quit Fenrir
+echo "command quitapplication" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+```
+
+### Using TCP Driver
+
+If using the TCP driver, replace socat commands with netcat:
+
+```bash
+# Using netcat
+echo "command say Hello from TCP" | nc localhost 22447
+
+# Using telnet
+echo "command interrupt" | telnet localhost 22447
+```
+
+### Remote Command Reference
+
+#### Command Format
+```
+command <action> [parameters]
+setting <action> [parameters]
+```
+
+#### Available Commands
+
+**Speech Commands:**
+- `command say <text>` - Speak the specified text
+- `command interrupt` - Stop current speech
+- `command tempdisablespeech` - Disable speech until next key press
+
+**Clipboard Commands:**
+- `command clipboard <text>` - Add text to clipboard
+- `command exportclipboard` - Export clipboard to file
+
+**Window Commands:**
+- `command window <x1> <y1> <x2> <y2>` - Define window area
+- `command resetwindow` - Reset to full screen
+
+**VMenu Commands:**
+- `command vmenu <menu_path>` - Set vmenu context
+- `command resetvmenu` - Reset vmenu
+
+**Application Commands:**
+- `command quitapplication` - Quit Fenrir
+
+#### Available Settings
+
+**Settings Commands:**
+- `setting set <section>#<key>=<value>` - Set configuration value
+- `setting reset` - Reset all settings to defaults
+- `setting save [path]` - Save current settings
+- `setting saveas <path>` - Save settings to specific file
+
+**Common Settings:**
+
+*Speech Settings:*
+- `speech#enabled=True/False` - Enable/disable speech
+- `speech#rate=0.1-1.0` - Speech rate (speed)
+- `speech#pitch=0.1-1.0` - Speech pitch (tone)
+- `speech#volume=0.1-1.0` - Speech volume
+- `speech#voice=voice_name` - Voice selection (e.g., "en-us+f3")
+- `speech#module=module_name` - TTS module (e.g., "espeak-ng")
+- `speech#driver=driver_name` - Speech driver (speechdDriver/genericDriver)
+- `speech#autoReadIncoming=True/False` - Auto-read new text
+
+*Sound Settings:*
+- `sound#enabled=True/False` - Enable/disable sound
+- `sound#volume=0.1-1.0` - Sound volume
+- `sound#driver=driver_name` - Sound driver (genericDriver/gstreamerDriver)
+- `sound#theme=theme_name` - Sound theme
+
+*General Settings:*
+- `general#punctuationLevel=none/some/most/all` - Punctuation verbosity
+- `general#debugLevel=0-3` - Debug level
+- `general#emoticons=True/False` - Enable emoticon replacement
+- `general#autoSpellCheck=True/False` - Automatic spell checking
+
+*Focus Settings:*
+- `focus#cursor=True/False` - Follow text cursor
+- `focus#highlight=True/False` - Follow text highlighting
+
+*Keyboard Settings:*
+- `keyboard#charEchoMode=0-2` - Character echo (0=none, 1=always, 2=capslock only)
+- `keyboard#wordEcho=True/False` - Echo complete words
+- `keyboard#charDeleteEcho=True/False` - Echo deleted characters
+- `keyboard#interruptOnKeyPress=True/False` - Interrupt speech on key press
+
+*Screen Settings:*
+- `screen#ignoreScreen=1,2,3` - TTY screens to ignore
+- `screen#autodetectIgnoreScreen=True/False` - Auto-detect screens to ignore
+- `screen#screenUpdateDelay=float` - Screen update delay
+
+*Time Settings:*
+- `time#enabled=True/False` - Enable time announcements
+- `time#presentTime=True/False` - Announce time
+- `time#presentDate=True/False` - Announce date changes
+- `time#delaySec=seconds` - Announcement interval
+- `time#onMinutes=00,30` - Specific minutes to announce
+
+### Scripting Examples
+
+#### Bash Script for Speech Notifications
+```bash
+#!/bin/bash
+# notify_fenrir.sh - Send notifications to Fenrir
+
+SOCKET="/tmp/fenrirscreenreader-deamon.sock"
+
+fenrir_say() {
+    echo "command say $1" | socat - UNIX-CLIENT:$SOCKET
+}
+
+fenrir_interrupt() {
+    echo "command interrupt" | socat - UNIX-CLIENT:$SOCKET
+}
+
+# Usage examples
+fenrir_say "Build completed successfully"
+fenrir_interrupt
+```
+
+#### Python Integration
+```python
+#!/usr/bin/env python3
+import socket
+import os
+
+def send_fenrir_command(command):
+    """Send command to Fenrir via Unix socket"""
+    socket_path = "/tmp/fenrirscreenreader-deamon.sock"
+    if os.path.exists(socket_path):
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        try:
+            sock.connect(socket_path)
+            sock.send(command.encode('utf-8'))
+        finally:
+            sock.close()
+
+# Examples
+send_fenrir_command("command say Processing complete")
+send_fenrir_command("setting set speech#rate=0.9")
+```
+
+### Security Considerations
+
+- Unix sockets are accessible only to the user running Fenrir
+- TCP driver binds only to localhost (127.0.0.1)
+- Socket file permissions are set to write-only (0o222)
+- Commands are processed with Fenrir's privileges
+- Settings changes can be disabled via `enableSettingsRemote=False`
+- Command execution can be disabled via `enableCommandRemote=False`
+
+### Troubleshooting
+
+**Socket not found:**
+- Verify Fenrir is running: `ps aux | grep fenrir`
+- Check socket location: `/tmp/fenrirscreenreader-*`
+- Ensure remote driver is enabled in settings
+
+**Commands not working:**
+- Verify `enableCommandRemote=True` in settings
+- Check Fenrir debug logs: `/var/log/fenrir.log`
+- Test with simple command: `echo "command interrupt" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock`
 
 ## Configure pulseaudio
 
@@ -127,12 +492,64 @@ just run the configuration script twice (once as user, once as root):
 
 The script is also located in the tools directory in git
 
-## localization
+## Command Line Options
-copy fenrir.mo translations file  from fenrir/locale/your_language/LC_MESSAGES/fenrir.mo to /usr/share/locale/your_language/LC_MESSAGES/fenrir.mo
+
+Fenrir supports several command-line options for different use cases:
+
+```
+fenrir [OPTIONS]
+```
+
+### Options:
+- `-h, --help` - Show help message and exit
+- `-v, --version` - Show version information and exit
+- `-f, --foreground` - Run in foreground (don't daemonize)
+- `-s, --setting SETTING-FILE` - Path to custom settings file
+- `-o, --options SECTION#SETTING=VALUE;..` - Override settings file options
+- `-d, --debug` - Enable debug mode
+- `-p, --print` - Print debug messages to screen
+- `-e, --emulated-pty` - Use PTY emulation with escape sequences for input (enables desktop/X/Wayland usage)
+- `-E, --emulated-evdev` - Use PTY emulation with evdev for input (single instance)
+- `-F, --force-all-screens` - Force Fenrir to respond on all screens, ignoring ignoreScreen setting
+- `-i, -I, --ignore-screen SCREEN` - Ignore specific screen(s). Can be used multiple times. Combines with existing ignore settings.
+
+### Examples:
+```bash
+# Run in foreground with debug output
+sudo fenrir -f -d
+
+# Use PTY emulation for desktop use
+sudo fenrir -e
+
+# Override settings via command line
+sudo fenrir -o "speech#rate=0.8;sound#volume=0.5"
+
+# Force Fenrir to work on all screens (ignore ignoreScreen setting)
+sudo fenrir -F
+
+# Ignore specific screens
+sudo fenrir --ignore-screen 1
+sudo fenrir -i 1 -i 2    # Ignore screens 1 and 2
+```
+
+## Localization
+Translation files are located in the `locale/` directory. To install translations:
+
+```bash
+# Copy translation file to system location
+sudo cp locale/your_language/LC_MESSAGES/fenrir.mo /usr/share/locale/your_language/LC_MESSAGES/fenrir.mo
+```
+
+Available languages:
+- German (de)
+- Spanish (es) 
+- Polish (pl)
+- Portuguese (pt)
+- Russian (ru)
 
- 
 ## Documentation and Support
 
-- Email list: [stormux+subscribe@groups.io](mailto:stormux+subscribe@groups.io?subject=subscribe) with the subject subscribe.
+- **Email list**: [stormux+subscribe@groups.io](mailto:stormux+subscribe@groups.io?subject=subscribe) with the subject subscribe
-- [Fenrir Wiki](https://git.stormux.org/storm/fenrir/wiki)
+- **Fenrir Wiki**: [https://git.stormux.org/storm/fenrir/wiki](https://git.stormux.org/storm/fenrir/wiki)
-- IRC: irc.stormux.org #stormux
+- **IRC**: irc.stormux.org #stormux
+- **Issues**: Report bugs and feature requests on the project repository

config/keyboard/desktop.conf

@@ -73,7 +73,8 @@ 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=last_incoming
+KEY_KPPLUS=progress_bar_monitor
+#KEY_FENRIR,KEY_KPPLUS=silence_until_prompt
 KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
 KEY_FENRIR,KEY_F4=toggle_speech
@@ -113,6 +114,8 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_X=set_mark
 KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_F10=toggle_vmenu_mode
+KEY_FENRIR,KEY_SHIFT,KEY_F10=voice_browser_safe
+KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_F10=apply_tested_voice
 KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
 KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
 KEY_FENRIR,KEY_RIGHT=next_quick_menu_entry
@@ -126,3 +129,4 @@ KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume
 KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version
+KEY_F4=cycle_keyboard_layout

config/keyboard/laptop.conf

@@ -75,11 +75,12 @@ KEY_FENRIR,KEY_F2=toggle_braille
 KEY_FENRIR,KEY_F3=toggle_sound
 KEY_FENRIR,KEY_F4=toggle_speech
 KEY_FENRIR,KEY_ENTER=temp_disable_speech
+KEY_FENRIR,KEY_SHIFT,KEY_P=progress_bar_monitor
+KEY_FENRIR,KEY_SHIFT,KEY_ENTER=toggle_auto_read
 KEY_FENRIR,KEY_SHIFT,KEY_CTRL,KEY_P=toggle_punctuation_level
 KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
-KEY_FENRIR,KEY_SHIFT,KEY_ENTER=toggle_output
+KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_ENTER=toggle_output
 KEY_FENRIR,KEY_SHIFT,KEY_E=toggle_emoticons
-KEY_FENRIR,KEY_ENTER=toggle_auto_read
 KEY_FENRIR,KEY_CTRL,KEY_T=toggle_auto_time
 KEY_FENRIR,KEY_Y=toggle_highlight_tracking
 #=toggle_barrier
@@ -111,6 +112,8 @@ KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_X=remove_marks
 KEY_FENRIR,KEY_X=set_mark
 KEY_FENRIR,KEY_SHIFT,KEY_X=marked_text
 KEY_FENRIR,KEY_F10=toggle_vmenu_mode
+KEY_FENRIR,KEY_SHIFT,KEY_F10=voice_browser_safe
+KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_F10=apply_tested_voice
 KEY_FENRIR,KEY_SPACE=current_quick_menu_entry
 KEY_FENRIR,KEY_CTRL,KEY_SPACE=current_quick_menu_value
 KEY_FENRIR,KEY_RIGHT=next_quick_menu_entry
@@ -126,3 +129,4 @@ KEY_FENRIR,KEY_F8=export_clipboard_to_x
 KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
 KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume
 KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version
+KEY_F4=cycle_keyboard_layout

config/keyboard/nvda-desktop.conf

@@ -72,7 +72,8 @@ 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=last_incoming
+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
@@ -126,3 +127,4 @@ KEY_FENRIR,KEY_CTRL,KEY_C=save_settings
 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

@@ -126,3 +126,4 @@ KEY_FENRIR,KEY_CTRL,KEY_C=save_settings
 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/pty.conf

@@ -85,3 +85,5 @@ alt+f12 - quit fenrir
 ^[[1;3F=temp_disable_speech
 # control+end - toggle auto read
 ^[[1;5F=toggle_auto_read
+# F12 - cycle keyboard layout
+^[[24~=cycle_keyboard_layout

config/keyboard/speakup.conf

@@ -1,218 +0,0 @@
-# Fenrir comment: copy of speakup DefaultKeyAssignments converted to fenrir syntax
-# Fenrir comment: https://android.googlesource.com/kernel/msm/+/android-7.1.0_r0.2/drivers/staging/speakup/DefaultKeyAssignments
-# Fenrir comment: The insert or shift key named below is the fenrir key
-
-# This file is intended to give you an overview of the default keys used
-# by speakup for it's review functions.  You may change them to be
-# anything you want but that will take some familiarity with key
-# mapping.
-
-# We have remapped the insert or zero key on the keypad to act as a
-# shift key.  Well, actually as an altgr key.  So in the following list
-# InsKeyPad-period means hold down the insert key like a shift key and
-# hit the keypad period.
-
-# KeyPad-8		Say current Line
-KEY_KP8=review_curr_line
-
-# InsKeyPad-8		say from top of screen to reading cursor.
-KEY_FENRIR,KEY_KP8=curr_screen_before_cursor
-
-# KeyPad-7		Say Previous Line (UP one line)
-KEY_KP7=review_prev_line
-
-# KeyPad-9		Say Next Line (down one line)
-KEY_KP9=review_next_line
-
-# KeyPad-5		Say Current Word
-KEY_KP5=review_curr_word
-
-# InsKeyPad-5		Spell Current Word
-KEY_FENRIR,KEY_KP5=review_curr_word_phonetic
-
-# KeyPad-4		Say Previous Word (left one word)
-KEY_KP4=review_prev_word
-
-# InsKeyPad-4		say from left edge of line to reading cursor.
-KEY_FENRIR,KEY_KP4=cursor_read_line_to_cursor
-
-# KeyPad-6		Say Next Word (right one word)
-KEY_KP6=review_next_word
-
-# InsKeyPad-6		Say from reading cursor to right edge of line.
-KEY_FENRIR,KEY_KP6=cursor_read_to_end_of_line
-
-# KeyPad-2		Say Current Letter
-KEY_KP2=review_curr_char
-
-# InsKeyPad-2		say current letter phonetically
-KEY_FENRIR,KEY_KP2=review_curr_char_phonetic
-
-# KeyPad-1		Say Previous Character (left one letter)
-KEY_KP1=review_prev_char
-
-# KeyPad-3		Say Next Character (right one letter)
-KEY_KP3=review_next_char
-
-# KeyPad-plus		Say Entire Screen
-KEY_KPPLUS=curr_screen
-
-# InsKeyPad-plus		Say from reading cursor line to bottom of screen.
-KEY_FENRIR,KEY_KPPLUS=curr_screen_after_cursor
-
-# KeyPad-Minus		Park reading cursor (toggle)
-# TODO
-
-# InsKeyPad-minus		Say character hex and decimal value.
-# TODO
-
-# KeyPad-period		Say Position (current line, position and console)
-KEY_KPDOT=cursor_position
-
-# InsKeyPad-period	say colour attributes of current position.
-KEY_FENRIR,KEY_KPDOT=attribute_cursor
-
-# InsKeyPad-9		Move reading cursor to top of screen (insert pgup)
-KEY_FENRIR,KEY_KP9=review_bottom
-
-# InsKeyPad-3		Move reading cursor to bottom of screen (insert pgdn)
-KEY_FENRIR,KEY_KP3=review_top
-
-# InsKeyPad-7		Move reading cursor to left edge of screen (insert home)
-KEY_FENRIR,KEY_KP7=review_screen_first_char
-
-# InsKeyPad-1		Move reading cursor to right edge of screen (insert end)
-KEY_FENRIR,KEY_KP1=review_screen_last_char
-
-# ControlKeyPad-1		Move reading cursor to last character on current line.
-KEY_CTRL,KEY_KP1=review_line_end
-
-# KeyPad-Enter		Shut Up (until another key is hit) and sync reading cursor
-KEY_KPENTER=temp_disable_speech
-
-# InsKeyPad-Enter		Shut Up (until toggled back on).
-KEY_FENRIR,KEY_KPENTER=toggle_speech
-
-# InsKeyPad-star n<x|y>	go to line (y) or column (x). Where 'n' is any
-# 		allowed value for the row or column for your current screen.
-# TODO
-
-# KeyPad-/		Mark and Cut screen region.
-KEY_KPSLASH=copy_marked_to_clipboard
-
-# InsKeyPad-/		Paste screen region into any console.
-KEY_FENRIR,KEY_KPSLASH=paste_clipboard
-
-
-# Hitting any key while speakup is outputting speech will quiet the
-# synth until it has caught up with what is being printed on the
-# console.
-
-# following by other fenrir commands
-KEY_FENRIR,KEY_H=toggle_tutorial_mode
-KEY_CTRL=shut_up
-
-
-KEY_FENRIR,KEY_KP4=review_line_begin
-#=review_line_end
-#=review_line_first_char
-#=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_SHIFT,KEY_KP4=review_prev_word_phonetic
-KEY_FENRIR,KEY_SHIFT,KEY_KP6=review_next_word_phonetic
-
-KEY_FENRIR,KEY_SHIFT,KEY_KP1=review_prev_char_phonetic
-KEY_FENRIR,KEY_SHIFT,KEY_KP3=review_next_char_phonetic
-KEY_FENRIR,KEY_CTRL,KEY_KP8=review_up
-KEY_FENRIR,KEY_CTRL,KEY_KP2=review_down
-#=exit_review
-KEY_FENRIR,KEY_I=indent_curr_line
-KEY_KPPLUS=curr_screen
-#=cursor_column
-#=cursor_lineno
-#=braille_flush
-#=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_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
-#=last_incoming
-KEY_FENRIR,KEY_F2=toggle_braille
-KEY_FENRIR,KEY_F3=toggle_sound
-
-KEY_FENRIR,KEY_F9=toggle_punctuation_level
-KEY_FENRIR,KEY_RIGHTBRACE=toggle_auto_spell_check
-KEY_FENRIR,KEY_BACKSLASH=toggle_output
-KEY_FENRIR,KEY_CTRL,KEY_E=toggle_emoticons
-key_FENRIR,KEY_KPENTER=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
-2,KEY_FENRIR,KEY_T=date
-KEY_KPSLASH=toggle_auto_indent
-#=toggle_has_attribute
-KEY_FENRIR,KEY_S=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_BACKSPACE=forward_keypress
-KEY_FENRIR,KEY_ALT,KEY_UP=inc_sound_volume
-KEY_FENRIR,KEY_ALT,KEY_DOWN=dec_sound_volume
-KEY_FENRIR,KEY_CTRL,KEY_SHIFT,KEY_C=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_CTRL,KEY_C=copy_last_echo_to_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_X=set_mark
-KEY_FENRIR,KEY_SHIFT,KEY_X=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_RIGHT=next_quick_menu_entry
-KEY_FENRIR,KEY_UP=next_quick_menu_value
-KEY_FENRIR,KEY_LEFT=prev_quick_menu_entry
-KEY_FENRIR,KEY_DOWN=prev_quick_menu_value
-KEY_FENRIR,KEY_CTRL,KEY_S=save_settings
-# linux specific
-KEY_FENRIR,KEY_F7=import_clipboard_from_x
-KEY_FENRIR,KEY_F8=export_clipboard_to_x
-KEY_FENRIR,KEY_CTRL,KEY_UP=inc_alsa_volume
-KEY_FENRIR,KEY_CTRL,KEY_DOWN=dec_alsa_volume

config/punctuation/de.conf

@@ -46,28 +46,33 @@ _:===:Lienie unten
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-# example for arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-# or
+regex;(?:^|\s)<3(?:\s|$):===:heart
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/default.conf

@@ -5,7 +5,7 @@
 [levelDict]
 none:===:
 some:===:-$~+*-/\@#
-most:===:.,:-$~+*-/\@!#%^&*()[]}{<>;
+most:===:.,:-_$~+*-/\@!#%^&*()[]}{<>;
 all:===:!"#$%& \'()*+,-./:;<=>?@[\\]^_`{|}~
 
 [punctDict]
@@ -46,27 +46,33 @@ _:===:line
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-# example for arrow left
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-# or
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)<3(?:\s|$):===:heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s+|'|"](Oo)|(oO)[\s+|'|"]:===:WTF?
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/en.conf

@@ -5,7 +5,7 @@
 [levelDict]
 none:===:
 some:===:-$~+*-/\@
-most:===:.,:-$~+*-/\@!#%^&*()[]}{<>;
+most:===:.,:-$~+*-_/\@!#%^&*()[]}{<>;
 all:===:!"#$%& \'()*+,-./:;<=>?@[\\]^_`{|}~
 
 [punctDict]
@@ -46,27 +46,33 @@ _:===:line
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-# example for arrow left
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-# or
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)<3(?:\s|$):===:heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/es.conf

@@ -46,28 +46,33 @@ _:===:subrayado
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-# example for arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-# or
+regex;(?:^|\s)<3(?:\s|$):===:heart
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/fr.conf

@@ -46,28 +46,33 @@ _:===:souligné
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-# example for arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-# or
+regex;(?:^|\s)<3(?:\s|$):===:heart
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/pl.conf

@@ -46,28 +46,33 @@ _:===:podkreślnik
 [customDict]
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-# example for arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-# or
+regex;(?:^|\s)<3(?:\s|$):===:heart
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/punctuation/rhvoice-en.conf

@@ -4,7 +4,7 @@
 # the entrys are seperated with :===: in words colon tripple equal colon ( to not collide with substitutions)
 [levelDict]
 none:===:
-some:===:-$~+*-/\@
+some:===:-$~+*-/\@_
 most:===:.,:-$~+*-/\@!#%^&*()[]}{<>;
 all:===:!"#$%& \'()*+,-./:;<=>?@[\\]^_`{|}~
 
@@ -52,27 +52,33 @@ regex;(?i)shit:===:shitt
 regex;(?i)slither:===:slitther
 
 [emoticonDict]
-# This dictionary uses regexp when prefixed with "regex;", so be sure to escape anything that would be parsed by regexp, e.g. *, ., ^, $, etc.
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
-regex;[\s*|'|"][\s*|'|"]<{-.-}>:===:Raves
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
-# example for arrow left
+regex;(?:^|\s)o_O(?:\s|$):===:confused
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
-# or
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
-#([ |^])<-([ ,.!?$]):===:arrow left\2
+regex;(?:^|\s)<3(?:\s|$):===:heart
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)<{-.-}>(?:\s|$):===:Raves
+regex;(?:^|\s)-\.-(?:\s|$):===:bugged
+regex;(?:^|\s)>\.<(?:\s|$):===:laughing
+regex;(?:^|\s)(?:>:\)|>:-\))(?:\s|$):===:evil smile
+regex;(?:^|\s)\^\^(?:\s|$):===:enjoy smile
+regex;(?:^|\s)->(?:\s|$):===:arrow right
+regex;(?:^|\s)<-(?:\s|$):===:arrow left

config/settings/settings.conf

@@ -15,7 +15,7 @@ theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.
-volume=1.0
+volume=0.7
 
 # shell commands for generic sound driver
 # the folowing variable are substituted
@@ -28,19 +28,19 @@ genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
 #the following command is used to generate a frequency beep
 genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
 
+# Enable progress bar monitoring with ascending tones by default
+progressMonitoring=True
+
 [speech]
 # Turn speech on or off:
 enabled=True
 
 # Select speech driver, options are speechdDriver or genericDriver:
-#driver=speechdDriver
+driver=speechdDriver
-driver=genericDriver
+#driver=genericDriver
-
-# server path for emacspeak
-# serverPath=
 
 # The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
+rate=0.5
 
 # Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
 pitch=0.5
@@ -95,8 +95,8 @@ fenrirMaxRate=450
 driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
-suspendingScreen=
+ignoreScreen=7
-autodetectSuspendingScreen=True
+autodetectIgnoreScreen=True
 
 [keyboard]
 driver=evdevDriver
@@ -124,7 +124,9 @@ interruptOnKeyPressFilter=
 doubleTapTimeout=0.2
 
 [general]
-debugLevel=0
+# Debug levels: 0=DEACTIVE, 1=ERROR, 2=WARNING, 3=INFO (most verbose)
+# For production use, WARNING (2) provides good balance of useful info without spam
+debugLevel=2
 # debugMode sets where the debug output should send to:
 # debugMode=File writes to debugFile (Default:/tmp/fenrir-PID.log)
 # debugMode=Print just prints on the screen
@@ -134,7 +136,7 @@ punctuationProfile=default
 punctuationLevel=some
 respectPunctuationPause=True
 newLinePause=True
-numberOfClipboards=10
+numberOfClipboards=50
 # used path for "export_clipboard_to_file"
 # $user is replaced by username
 #clipboardExportPath=/home/$user/fenrirClipboard
@@ -143,8 +145,8 @@ emoticons=True
 # define the current Fenrir key
 fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
 scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
+timeFormat=%%I:%%M%%P
-dateFormat=%A, %B %d, %Y
+dateFormat=%%A, %%B %%d, %%Y
 autoSpellCheck=True
 spellCheckLanguage=en_US
 # path for your scripts "scriptKeys" functionality
@@ -166,7 +168,7 @@ autoPresentIndent=False
 # 1 = sound only
 # 2 = speak only
 autoPresentIndentMode=1
-# play a sound when attributes are changeing
+# play a sound when attributes change
 hasAttributes=True
 # shell for PTY emulatiun (empty = default shell)
 shell=
@@ -193,7 +195,7 @@ enableSettingsRemote=True
 enableCommandRemote=True
 
 [barrier]
-enabled=True
+enabled=False
 leftBarriers=│└┌─
 rightBarriers=│┘┐─
 
@@ -214,8 +216,32 @@ list=
 vmenuPath=
 quickMenu=speech#rate;speech#pitch;speech#volume
 
+[prompt]
+# Custom prompt patterns for silence until prompt feature
+# You can add your own shell prompt patterns as regular expressions
+# Each pattern should be on a separate line, format: customPatterns=pattern1,pattern2,pattern3
+# 
+# Built-in patterns include:
+# - Shell prompts: $, #, >, user@host$, [user@host]$, bash-5.1$
+# - Package manager prompts: [Y/n], [y/N], [Yes/No], (Y/n), (y/N)
+# - sudo prompts: [sudo] password for user:, Password:, user's password:
+# - Confirmation prompts: Press any key, Are you sure?, Please confirm
+#
+# Custom pattern examples:
+# For PS1='[\u@\h \W] \$ ' use: \[.*@.*\s.*\]\s*[$#>]\s*
+# For "[user@hostname ~] $" use: \[.*@.*\s.*\]\s*[$#>]\s*
+# For custom prompts ending with specific strings, use patterns like: .*your_prompt_ending$
+# For custom package manager prompts: .*your_package_manager.*\[[YyNn]/[YyNn]\].*
+customPatterns=
+
+# Specific prompt strings to match exactly (useful for very specific custom prompts)
+# Format: exactMatches=prompt1,prompt2,prompt3
+# Examples:
+# exactMatches=[storm@fenrir ~] $,[root@fenrir ~] #,Continue installation? [Y/n]
+exactMatches=
+
 [time]
-# automatic time anouncement
+# automatic time announcement
 enabled=False
 # present time
 presentTime=True

config/sound/default/soundicons.conf

@@ -30,9 +30,6 @@ ContentChanged='ContentChanged.wav'
 # Speech has turned On or Off
 SpeechOn='SpeechOn.wav'
 SpeechOff='SpeechOff.wav'
-# Braille has turned On or Off
-BrailleOn='BrailleOn.wav'
-BrailleOff='BrailleOff.wav'
 # SoundIcons has turned On or Off
 SoundOn='SoundOn.wav'
 SoundOff='SoundOff.wav'
@@ -44,9 +41,8 @@ PlaceEndMark='PlaceEndMark.wav'
 CopyToClipboard='CopyToClipboard.wav'
 # Pasted on the screen
 PasteClipboardOnScreen='PasteClipboardOnScreen.wav'
-# An error accoured while speech or braille output or reading the screen
+# An error accoured while speech output or reading the screen
 ErrorSpeech='ErrorSpeech.wav'
-ErrorBraille='ErrorBraille.wav'
 ErrorScreen='ErrorScreen.wav'
 # If you cursor over an text that has attributs (like color)
 HasAttributes='has_attribute.wav'

docs/development.txt

@@ -1,4 +1,389 @@
-1. Basic
+# Fenrir Development Guide
-2. Commands
-3. Useful API
 
+This document provides information for developers who want to contribute to Fenrir or understand its architecture.
+
+## Project Structure
+
+Fenrir follows a modular, driver-based architecture:
+
+```
+src/fenrirscreenreader/
+├── core/                    # Core system modules
+│   ├── fenrirManager.py    # Main application manager
+│   ├── screenManager.py   # Screen handling
+│   ├── inputManager.py    # Input handling
+│   ├── outputManager.py   # Speech/sound output
+│   ├── commandManager.py  # Command system
+│   └── settingsManager.py # Configuration management
+├── commands/               # Command implementations
+│   ├── commands/          # User-invoked commands
+│   ├── onCursorChange/   # Cursor movement hooks
+│   ├── onScreenUpdate/   # Screen update hooks
+│   ├── onKeyInput/       # Key input hooks
+│   └── help/             # Tutorial system
+├── drivers/              # Driver implementations
+│   ├── inputDriver/     # Input drivers (evdev, pty, atspi)
+│   ├── screenDriver/    # Screen drivers (vcsa, pty)
+│   ├── speechDriver/    # Speech drivers (speechd, generic)
+│   └── soundDriver/     # Sound drivers (generic, gstreamer)
+└── utils/               # Utility modules
+```
+
+## Core Architecture
+
+### Driver System
+Fenrir uses a pluggable driver architecture:
+
+1. **Input Drivers**: Capture keyboard input
+   - evdevDriver: Linux evdev (recommended)
+   - ptyDriver: Terminal emulation
+   - atspiDriver: AT-SPI for desktop
+
+2. **Screen Drivers**: Read screen content
+   - vcsaDriver: Linux VCSA devices
+   - ptyDriver: Terminal emulation
+
+3. **Speech Drivers**: Text-to-speech output
+   - speechdDriver: Speech-dispatcher
+   - genericDriver: Command-line TTS
+
+4. **Sound Drivers**: Audio output
+   - genericDriver: Sox-based
+   - gstreamerDriver: GStreamer
+
+5. **Remote Drivers**: Remote control interfaces
+   - unixDriver: Unix socket control
+   - tcpDriver: TCP socket control
+
+### Command System
+Commands are Python modules that implement specific functionality:
+
+```python
+class command():
+    def __init__(self):
+        pass
+    
+    def initialize(self, environment):
+        self.env = environment
+    
+    def shutdown(self):
+        pass
+    
+    def getDescription(self):
+        return _('Command description')
+    
+    def run(self):
+        # Command implementation
+        pass
+```
+
+### Event Hooks
+Fenrir supports various event hooks:
+
+- **onCursorChange**: Triggered when cursor moves
+- **onScreenUpdate**: Triggered on screen content changes
+- **onKeyInput**: Triggered on key presses
+- **onByteInput**: Triggered on byte-level input
+- **onScreenChanged**: Triggered when switching screens
+
+## Development Setup
+
+### Requirements
+- Python 3.6+
+- python3-evdev
+- python3-pyudev
+- speech-dispatcher
+- sox
+
+### Getting Started
+```bash
+# Clone repository
+git clone https://git.stormux.org/storm/fenrir.git
+cd fenrir
+
+# Install dependencies
+sudo pip3 install -r requirements.txt
+
+# Run from source
+cd src/
+sudo ./fenrir -f -d
+```
+
+### Testing
+```bash
+# Run in debug mode
+sudo ./fenrir -f -d -p
+
+# Debug output goes to:
+# - Console (with -p flag)
+# - /var/log/fenrir.log
+```
+
+## Creating Commands
+
+### Basic Command
+Create a file in `src/fenrirscreenreader/commands/commands/`:
+
+```python
+from fenrirscreenreader.core import debug
+
+class command():
+    def __init__(self):
+        pass
+        
+    def initialize(self, environment):
+        self.env = environment
+        
+    def shutdown(self):
+        pass
+        
+    def getDescription(self):
+        return _('My custom command')
+        
+    def run(self):
+        # Get current text
+        text = self.env['screen']['newContentText']
+        
+        # Speak something
+        self.env['runtime']['outputManager'].presentText('Hello World')
+        
+        # Play sound
+        self.env['runtime']['outputManager'].playSoundIcon('Accept')
+```
+
+### Key Bindings
+Add key bindings in keyboard layout files:
+`config/keyboard/desktop.conf` or `config/keyboard/laptop.conf`
+
+```ini
+[KEY_CTRL]#[KEY_ALT]#[KEY_H]=my_command
+```
+
+### Event Hooks
+Create event handlers in appropriate directories:
+
+```python
+# onCursorChange/my_hook.py
+class command():
+    def __init__(self):
+        pass
+        
+    def initialize(self, environment):
+        self.env = environment
+        
+    def shutdown(self):
+        pass
+        
+    def getDescription(self):
+        return _('My cursor change handler')
+        
+    def run(self):
+        if self.env['runtime']['cursorManager'].isCursorHorizontalMove():
+            # Handle horizontal cursor movement
+            pass
+```
+
+## Creating Drivers
+
+### Driver Template
+```python
+class driver():
+    def __init__(self):
+        pass
+        
+    def initialize(self, environment):
+        self.env = environment
+        
+    def shutdown(self):
+        pass
+        
+    # Driver-specific methods...
+```
+
+### Input Driver
+Implement these methods:
+- `getInputEvent()`: Return input events
+- `writeEventBuffer()`: Handle output events
+- `grabDevices()`: Take exclusive control
+- `releaseDevices()`: Release control
+
+### Screen Driver
+Implement these methods:
+- `getCurrScreen()`: Get current screen content
+- `getSessionInformation()`: Get session info
+
+### Speech Driver
+Implement these methods:
+- `speak()`: Speak text
+- `cancel()`: Stop speech
+- `setCallback()`: Set callback functions
+
+### Remote Driver
+Implement these methods:
+- `initialize()`: Setup socket/connection
+- `watchDog()`: Listen for incoming commands
+- `shutdown()`: Clean up connections
+
+#### Remote Driver Example
+```python
+class driver(remoteDriver):
+    def initialize(self, environment):
+        self.env = environment
+        # Start watchdog thread
+        self.env['runtime']['processManager'].addCustomEventThread(
+            self.watchDog, multiprocess=True
+        )
+    
+    def watchDog(self, active, eventQueue):
+        # Listen for connections and process commands
+        while active.value:
+            # Accept connections
+            # Parse incoming data
+            # Send to event queue
+            eventQueue.put({
+                "Type": fenrirEventType.RemoteIncomming,
+                "Data": command_text
+            })
+```
+
+## Configuration
+
+### Settings System
+Settings are hierarchical:
+1. Command-line options (`-o`)
+2. Configuration file
+3. Hard-coded defaults
+
+### Adding Settings
+1. Add default value to `core/settingsData.py`
+2. Access via `self.env['runtime']['settingsManager'].getSetting(section, key)`
+
+## Debugging
+
+### Debug Levels
+- 0: DEACTIVE
+- 1: ERROR
+- 2: WARNING  
+- 3: INFO
+
+### Debug Output
+```python
+self.env['runtime']['debug'].writeDebugOut(
+    'Debug message', 
+    debug.debugLevel.INFO
+)
+```
+
+### Testing Commands
+```bash
+# Test specific functionality
+sudo fenrir -f -d -o "general#debugLevel=3"
+
+# Test with custom config
+sudo fenrir -f -s /path/to/test.conf
+```
+
+## Contributing
+
+### Code Style
+- Follow PEP 8
+- Use descriptive variable names
+- Add docstrings for complex functions
+- Handle exceptions gracefully
+
+### Testing
+- Test with different drivers
+- Test keyboard layouts
+- Test on different terminals
+- Verify accessibility features
+
+### Submitting Changes
+1. Fork the repository
+2. Create feature branch
+3. Make changes with clear commit messages
+4. Test thoroughly
+5. Submit pull request
+
+## API Reference
+
+### Environment Structure
+The `environment` dict contains all runtime data:
+
+```python
+environment = {
+    'runtime': {
+        'settingsManager': settingsManager,
+        'commandManager': commandManager,
+        'screenManager': screenManager,
+        'inputManager': inputManager,
+        'outputManager': outputManager,
+        'debug': debugManager,
+        # ... other managers
+    },
+    'screen': {
+        'newContentText': '',
+        'oldContentText': '',
+        'newCursor': {'x': 0, 'y': 0},
+        'oldCursor': {'x': 0, 'y': 0},
+        # ... screen data
+    },
+    'general': {
+        'prevCommand': '',
+        'currCommand': '',
+        # ... general data
+    }
+}
+```
+
+### Common Operations
+
+#### Speaking Text
+```python
+self.env['runtime']['outputManager'].presentText('Hello')
+```
+
+#### Playing Sounds
+```python
+self.env['runtime']['outputManager'].playSoundIcon('Accept')
+```
+
+#### Getting Settings
+```python
+rate = self.env['runtime']['settingsManager'].getSetting('speech', 'rate')
+```
+
+#### Cursor Information
+```python
+x = self.env['screen']['newCursor']['x']
+y = self.env['screen']['newCursor']['y']
+```
+
+#### Screen Content
+```python
+text = self.env['screen']['newContentText']
+lines = text.split('\n')
+current_line = lines[self.env['screen']['newCursor']['y']]
+```
+
+## Maintenance
+
+### Release Process
+1. Update version in `fenrirVersion.py`
+2. Update changelog
+3. Test on multiple systems
+4. Tag release
+5. Update documentation
+
+### Compatibility
+- Maintain Python 3.6+ compatibility
+- Test on multiple Linux distributions
+- Ensure driver compatibility
+- Check dependencies
+
+## Resources
+
+- **Repository**: https://git.stormux.org/storm/fenrir
+- **Wiki**: https://git.stormux.org/storm/fenrir/wiki
+- **Issues**: Use repository issue tracker
+- **Community**: IRC irc.stormux.org #stormux
+- **Email**: stormux+subscribe@groups.io

docs/fenrir.adoc

@@ -1202,6 +1202,47 @@ link:#Settings[Settings]
 
 === Commandline Arguments
 
+Fenrir supports several command-line options:
+
+....
+fenrir [OPTIONS]
+....
+
+==== Available Options
+
+`+-h, --help+`::
+Show help message and exit.
+
+`+-v, --version+`::
+Show version information and exit.
+
+`+-f, --foreground+`::
+Run Fenrir in the foreground instead of as a daemon.
+
+`+-s, --setting SETTING-FILE+`::
+Path to a custom settings file.
+
+`+-o, --options SECTION#SETTING=VALUE;..+`::
+Override settings file options (see below for details).
+
+`+-d, --debug+`::
+Enable debug mode. Debug information will be logged.
+
+`+-p, --print+`::
+Print debug messages to screen in addition to logging them.
+
+`+-e, --emulated-pty+`::
+Use PTY emulation with escape sequences for input. This enables usage in desktop/X11/Wayland environments and terminal emulators.
+
+`+-E, --emulated-evdev+`::
+Use PTY emulation with evdev for input (single instance mode).
+
+`+-F, --force-all-screens+`::
+Force Fenrir to respond on all screens, ignoring the ignoreScreen setting. This temporarily overrides screen filtering for the current session.
+
+`+-i, -I, --ignore-screen <SCREEN>+`::
+Ignore specific screen(s). Can be used multiple times to ignore multiple screens. This is equivalent to setting ignoreScreen in the configuration file and will be combined with any existing ignore settings.
+
 ==== Set settings options
 
 You can specify options that overwrite the setting.conf. This is done
@@ -1224,9 +1265,154 @@ or change the debug level to verbose
 fenrir -o "general#debugLevel=3"
 ....
 
+Example using force all screens option:
+
+....
+fenrir -F
+....
+
 You can find the available sections and variables here #Settings See
 Syntax link:#settings.conf syntax[#settings.conf syntax]
 
+=== Remote Control
+
+Fenrir includes a powerful remote control system that allows external applications and scripts to control Fenrir through Unix sockets or TCP connections.
+
+==== Configuration
+
+Enable remote control in settings.conf:
+
+....
+[remote]
+enable=True
+driver=unixDriver
+enableSettingsRemote=True
+enableCommandRemote=True
+....
+
+==== Using socat with Unix Sockets
+
+The `+socat+` command provides the easiest way to send commands to Fenrir:
+
+===== Basic Speech Control
+
+....
+# Interrupt current speech
+echo "command interrupt" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Speak custom text
+echo "command say Hello, this is a test message" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Temporarily disable speech (until next keystroke)
+echo "command tempdisablespeech" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+....
+
+===== Settings Control
+
+....
+# Enable highlight tracking mode
+echo "setting set focus#highlight=True" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Change speech rate
+echo "setting set speech#rate=0.8" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Change punctuation level (none/some/most/all)
+echo "setting set general#punctuationLevel=all" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Voice and TTS control
+echo "setting set speech#voice=en-us+f3" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Multiple settings at once
+echo "setting set speech#rate=0.8;sound#volume=0.7;general#punctuationLevel=most" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Reset all settings to defaults
+echo "setting reset" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+....
+
+===== Clipboard Operations
+
+....
+# Place text into clipboard
+echo "command clipboard This text will be copied to clipboard" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+
+# Export clipboard to file
+echo "command exportclipboard" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+....
+
+===== Application Control
+
+....
+# Quit Fenrir
+echo "command quitapplication" | socat - UNIX-CLIENT:/tmp/fenrirscreenreader-deamon.sock
+....
+
+==== Command Reference
+
+===== Available Commands
+
+*Speech Commands:*
+
+* `+command say <text>+` - Speak the specified text
+* `+command interrupt+` - Stop current speech
+* `+command tempdisablespeech+` - Disable speech until next key press
+
+*Clipboard Commands:*
+
+* `+command clipboard <text>+` - Add text to clipboard
+* `+command exportclipboard+` - Export clipboard to file
+
+*Window Commands:*
+
+* `+command window <x1> <y1> <x2> <y2>+` - Define window area
+* `+command resetwindow+` - Reset to full screen
+
+*VMenu Commands:*
+
+* `+command vmenu <menu_path>+` - Set virtual menu context
+* `+command resetvmenu+` - Reset virtual menu
+
+*Application Commands:*
+
+* `+command quitapplication+` - Quit Fenrir
+
+===== Available Settings
+
+*Settings Commands:*
+
+* `+setting set <section>#<key>=<value>+` - Set configuration value
+* `+setting reset+` - Reset all settings to defaults
+* `+setting save [path]+` - Save current settings
+
+*Key Settings You Can Control:*
+
+*Speech Settings:*
+* `+speech#enabled=True/False+` - Enable/disable speech
+* `+speech#rate=0.1-1.0+` - Speech rate (speed)
+* `+speech#pitch=0.1-1.0+` - Speech pitch (tone)
+* `+speech#volume=0.1-1.0+` - Speech volume
+* `+speech#voice=voice_name+` - Voice selection (e.g., "en-us+f3")
+* `+speech#module=module_name+` - TTS module (e.g., "espeak-ng")
+
+*General Settings:*
+* `+general#punctuationLevel=none/some/most/all+` - Punctuation verbosity
+* `+general#autoSpellCheck=True/False+` - Automatic spell checking
+* `+general#emoticons=True/False+` - Enable emoticon replacement
+
+*Sound Settings:*
+* `+sound#enabled=True/False+` - Enable/disable sound
+* `+sound#volume=0.1-1.0+` - Sound volume
+
+*Focus Settings:*
+* `+focus#cursor=True/False+` - Follow text cursor
+* `+focus#highlight=True/False+` - Follow text highlighting
+
+*Keyboard Settings:*
+* `+keyboard#charEchoMode=0-2+` - Character echo (0=none, 1=always, 2=capslock only)
+* `+keyboard#wordEcho=True/False+` - Echo complete words
+
+*Screen Settings:*
+* `+screen#ignoreScreen=1,2,3+` - TTY screens to ignore
+
 ==== settings.conf syntax
 
 the syntax of the link:#Settings[settings.conf] is quite simple and

install.sh

@@ -1,12 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #Basic install script for Fenrir.
-read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue." continue
+read -rp "This will install Fenrir. Press ctrl+C to cancel, or enter to continue."
 
 # Fenrir main application
 install -m755 -d /opt/fenrirscreenreader
 cp -af src/* /opt/fenrirscreenreader
 
-ln -fs /opt/fenrirscreenreader/fenrir-daemon /usr/bin/fenrir-daemon
 ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir
 # tools
 install -m755 -d /usr/share/fenrirscreenreader/tools
@@ -33,8 +32,9 @@ cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template
 # config
 if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then
     echo "Do you want to overwrite your current global settings? (y/n)"
-    read yn
+    read -r yn
-    if [ $yn = "Y" -o $yn = "y" ]; then
+    yn="${yn:0:1}"
+    if [[ "${yn^}" == "Y" ]]; then
       mv /etc/fenrirscreenreader/settings/settings.conf /etc/fenrirscreenreader/settings/settings.conf.bak
       echo "Your old settings.conf has been backed up to settings.conf.bak."
       install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf

requirements.txt

@@ -1,7 +1,10 @@
-evdev>=1.1.2
+daemonize
-daemonize>=2.5.0
+dbus-python
-dbus-python>=1.2.8
+evdev
-pyudev>=0.21.0
 pexpect
-pyttsx3
+pyenchant
-pyte>=0.7.0
+pyperclip
+pyte
+pyudev
+pyxdg
+setproctitle

setup.py

@@ -1,21 +1,29 @@
 #!/usr/bin/env python3
-#https://python-packaging.readthedocs.io/en/latest/minimal.html
 import os, glob, sys
 import os.path
 from shutil import copyfile
-from setuptools import find_packages
+from setuptools import find_namespace_packages
 from setuptools import setup
 
-fenrirVersion = '1.9.9'
-packageVersion = 'post1'
-
 # handle flags for package manager like aurman and pacaur.
-forceSettings = False
+# Allow both environment variable and command line flag
+forceSettingsFlag = (
+    "--force-settings" in sys.argv or
+    os.environ.get('FENRIR_FORCE_SETTINGS') == '1'
+)
 if "--force-settings" in sys.argv:
-    forceSettings = True
     sys.argv.remove("--force-settings")
 
-data_files = []
+dataFiles = []
+
+# Handle locale files
+localeFiles = glob.glob('locale/*/LC_MESSAGES/*.mo')
+for localeFile in localeFiles:
+    lang = localeFile.split(os.sep)[1]
+    destDir = f'/usr/share/locale/{lang}/LC_MESSAGES'
+    dataFiles.append((destDir, [localeFile]))
+
+# Handle other configuration files
 directories = glob.glob('config/*')
 for directory in directories:
     files = glob.glob(directory+'/*')
@@ -26,25 +34,25 @@ for directory in directories:
         destDir = '/etc/fenrirscreenreader/keyboard'
     elif 'config/settings' in directory:
         destDir = '/etc/fenrirscreenreader/settings'
-        if not forceSettings:
+        if not forceSettingsFlag:
             try:
-                del(files[files.index('config/settings/settings.conf')])
+                files = [f for f in files if not f.endswith('settings.conf')]
-            except:
+            except Exception as e:
                 pass
     elif 'config/scripts' in directory:
         destDir = '/usr/share/fenrirscreenreader/scripts'
     if destDir != '':
-        data_files.append((destDir, files))
+        dataFiles.append((destDir, files))
 
 files = glob.glob('config/sound/default/*')
 destDir = '/usr/share/sounds/fenrirscreenreader/default'
-data_files.append((destDir, files))
+dataFiles.append((destDir, files))
 files = glob.glob('config/sound//template/*')
 destDir = '/usr/share/sounds/fenrirscreenreader/template'
-data_files.append((destDir, files))
+dataFiles.append((destDir, files))
 files = glob.glob('tools/*') 
-data_files.append(('/usr/share/fenrirscreenreader/tools', files))
+dataFiles.append(('/usr/share/fenrirscreenreader/tools', files))
-data_files.append(('/usr/share/man/man1', ['docs/fenrir.1']))
+dataFiles.append(('/usr/share/man/man1', ['docs/fenrir.1']))
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
@@ -52,15 +60,13 @@ def read(fname):
 setup(
     # Application name:
     name="fenrir-screenreader",
-    # Version number:
-    version=fenrirVersion + '.' + packageVersion,
     # description
     description="A TTY Screen Reader for Linux.",
     long_description=read('README.md'),
+    long_description_content_type="text/markdown",
     keywords=['screenreader', 'a11y', 'accessibility', 'terminal', 'TTY', 'console'],
     license="License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
     url="https://git.stormux.org/storm/fenrir/",
-    download_url = 'https://git.stormux.org/storm/fenrir/archive/' + fenrirVersion + '.tar.gz',	
     classifiers=[
         "Programming Language :: Python",
         "License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)",
@@ -74,39 +80,43 @@ setup(
     author_email="storm_dragon@stormux.org",
 
     # Packages
-    packages=find_packages('src/'),
+    package_dir={'': 'src'},
-    package_dir={'': 'src/'},
+    packages=find_namespace_packages(
+        where='src',
+        include=['fenrirscreenreader*']
+    ),
     scripts=['src/fenrir'],
 
     # Include additional files into the package
     include_package_data=True,
     zip_safe=False,
 
-    data_files=data_files,
+    data_files=dataFiles,
 
     # Dependent packages (distributions)
+    python_requires='>=3.6',
     install_requires=[
         "evdev>=1.1.2",
         "daemonize>=2.5.0",
         "dbus-python>=1.2.8",
+        "pyperclip",
         "pyudev>=0.21.0",
         "setuptools",
+        "setproctitle",
         "pexpect",
-        "pyttsx3",
         "pyte>=0.7.0",
     ],
-
 )
 
-if not forceSettings:
+if not forceSettingsFlag:
     print('')
     # create settings file from example if not exist
     if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
         try:
-            copyfile('/etc/fenrirscreenreader/settings/settings.conf.example', '/etc/fenrirscreenreader/settings/settings.conf')
+            copyfile('config/fenrirscreenreader/settings/settings.conf', '/etc/fenrirscreenreader/settings/settings.conf')
             print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
-        except:
+        except OSError as e:
-            pass
+            print(f"Could not copy settings file to destination: {e}")
     else:
         print('settings.conf file found. It is not overwritten automatical')
 

src/fenrir

@@ -4,19 +4,22 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributors.
 
+import argparse
+import inspect
 import os
 import sys
-import inspect
+
-import argparse
 from daemonize import Daemonize
 
+from fenrirscreenreader import fenrirVersion
+from fenrirscreenreader.core import fenrirManager
+
 # Get the fenrir installation path
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
+fenrirPath = os.path.dirname(os.path.realpath(
-if not fenrirPath in sys.path:
+    os.path.abspath(inspect.getfile(inspect.currentframe()))))
+if fenrirPath not in sys.path:
     sys.path.append(fenrirPath)
 
-from fenrirscreenreader.core import fenrirManager
-from fenrirscreenreader import fenrirVersion
 
 def create_argument_parser():
     """Create and return the argument parser for Fenrir"""
@@ -27,7 +30,7 @@ def create_argument_parser():
     argumentParser.add_argument(
         '-v', '--version',
         action='version',
-        version=f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}',
+        version=f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.code_name}',
         help='Show version information and exit'
     )
     argumentParser.add_argument(
@@ -67,38 +70,72 @@ def create_argument_parser():
         action='store_true',
         help='Use PTY emulation with evdev for input (single instance)'
     )
+    argumentParser.add_argument(
+        '-F',
+        '--force-all-screens',
+        action='store_true',
+        help='Force Fenrir to respond on all screens, ignoring ignoreScreen setting')
+    argumentParser.add_argument(
+        '-i', '-I', '--ignore-screen',
+        metavar='SCREEN',
+        action='append',
+        help='Ignore specific screen(s). Can be used multiple times. Same as ignoreScreen setting.'
+    )
     return argumentParser
 
+
 def validate_arguments(cliArgs):
     """Validate command line arguments"""
     if cliArgs.options:
         for option in cliArgs.options.split(';'):
             if option and ('#' not in option or '=' not in option):
                 return False, f"Invalid option format: {option}\nExpected format: SECTION#SETTING=VALUE"
-    
+
     if cliArgs.emulated_pty and cliArgs.emulated_evdev:
         return False, "Cannot use both --emulated-pty and --emulated-evdev simultaneously"
-    
+
     return True, None
 
+
 def run_fenrir():
     """Main function that runs Fenrir"""
-    fenrirApp = fenrirManager.fenrirManager(cliArgs)
+    fenrirApp = None
-    fenrirApp.proceed()
+    try:
-    del fenrirApp
+        fenrirApp = fenrirManager.FenrirManager(cliArgs)
+        fenrirApp.proceed()
+    except Exception as e:
+        print(f"Error starting Fenrir: {e}", file=sys.stderr)
+        if fenrirApp and hasattr(fenrirApp, 'cleanup_on_error'):
+            try:
+                fenrirApp.cleanup_on_error()
+            except Exception as cleanup_error:
+                print(
+                    f"Error during cleanup: {cleanup_error}", file=sys.stderr)
+        sys.exit(1)
+    finally:
+        if fenrirApp:
+            del fenrirApp
+        # Clean up PID file if it exists
+        pidFile = "/run/fenrir.pid"
+        if os.path.exists(pidFile):
+            try:
+                os.remove(pidFile)
+            except Exception:
+                pass
+
 
 def main():
     global cliArgs
     argumentParser = create_argument_parser()
     cliArgs = argumentParser.parse_args()
-    
+
     # Validate arguments
     isValid, errorMsg = validate_arguments(cliArgs)
     if not isValid:
         argumentParser.error(errorMsg)
         sys.exit(1)
 
-    if cliArgs.foreground:
+    if cliArgs.foreground or cliArgs.emulated_pty:
         # Run directly in foreground
         run_fenrir()
     else:
@@ -112,5 +149,6 @@ def main():
         )
         daemonProcess.start()
 
+
 if __name__ == "__main__":
     main()

src/fenrirscreenreader/commands/command_template.py

@@ -1,21 +1,28 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return 'No description found'         
+
-    def run(self):
+    def shutdown(self):
-        pass
+        pass
-    def setCallback(self, callback):
+
-        pass
+    def get_description(self):
+        return "No description found"
+
+    def run(self):
+        pass
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/00_init_commands.py

@@ -1,26 +1,39 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+# this command is just to initialize stuff.
-# this command is just to initialize stuff.
+# like init index lists in MemoryManager
-# like init index lists in memoryManager
+# it is not useful to execute it
-# it is not useful to execute it
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+
-    def initialize(self, environment):
+class command:
-        self.env = environment
+    def __init__(self):
-        # clipboard
+        pass
-        self.env['runtime']['memoryManager'].addIndexList('clipboardHistory', self.env['runtime']['settingsManager'].getSettingAsInt('general', 'numberOfClipboards'))
+
-    def shutdown(self):
+    def initialize(self, environment):
-        pass
+        self.env = environment
-    def getDescription(self):
+        # clipboard
-        return 'No description found'         
+        self.env["runtime"]["MemoryManager"].add_index_list(
-    def run(self):
+            "clipboardHistory",
-        pass
+            self.env["runtime"]["SettingsManager"].get_setting_as_int(
-    def setCallback(self, callback):
+                "general", "numberOfClipboards"
-        pass
+            ),
+        )
+
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        return "No description found"
+
+    def run(self):
+        pass
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py

@@ -2,53 +2,92 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import word_utils
 import string
+
+from fenrirscreenreader.core.i18n import _
+from fenrirscreenreader.utils import word_utils
+
 initialized = False
 try:
     import enchant
+
     initialized = True
-except:
+except Exception as e:
     pass
-    
+
-class command():
+
+class command:
     def __init__(self):
-        self.language = ''
+        self.language = ""
         self.spellChecker = None
+
     def initialize(self, environment):
         self.env = environment
-        self.updateSpellLanguage()
+        self.update_spell_language()
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('adds the current word to the exceptions dictionary')        
+    def get_description(self):
-    def updateSpellLanguage(self):  
+        return _("adds the current word to the exceptions dictionary")
-        self.spellChecker = enchant.Dict(self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage'))
+
-        self.language = self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage')      
+    def update_spell_language(self):
-    
+        self.spellChecker = enchant.Dict(
+            self.env["runtime"]["SettingsManager"].get_setting(
+                "general", "spellCheckLanguage"
+            )
+        )
+        self.language = self.env["runtime"]["SettingsManager"].get_setting(
+            "general", "spellCheckLanguage"
+        )
+
     def run(self):
         if not initialized:
-           return
+            return
-        if self.env['runtime']['settingsManager'].getSetting('general', 'spellCheckLanguage') != self.language:
+        if (
+            self.env["runtime"]["SettingsManager"].get_setting(
+                "general", "spellCheckLanguage"
+            )
+            != self.language
+        ):
             try:
-                self.updateSpellLanguage()
+                self.update_spell_language()
             except Exception as e:
-                return    
+                return
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
         # get the word
-        newContent = self.env['screen']['newContentText'].split('\n')[cursorPos['y']]
+        new_content = self.env["screen"]["new_content_text"].split("\n")[
-        x, y, currWord, endOfScreen, lineBreak =  word_utils.getCurrentWord(cursorPos['x'], 0, newContent)
+            cursor_pos["y"]
-        currWord = currWord.strip(string.whitespace + r'!"#$%&\()*+,-./:;<=Â?@[\\]^_{|}~')
+        ]
+        x, y, curr_word, end_of_screen, line_break = (
+            word_utils.get_current_word(cursor_pos["x"], 0, new_content)
+        )
+        curr_word = curr_word.strip(
+            string.whitespace + r'!"#$%&\()*+,-./:;<=Â?@[\\]^_{|}~'
+        )
 
-        if currWord != '':
+        if curr_word != "":
-            if self.spellChecker.is_added(currWord):
+            if self.spellChecker.is_added(curr_word):
-                self.env['runtime']['outputManager'].presentText(_('{0} is already in dictionary').format(currWord,), soundIcon='Cancel', interrupt=True)                
+                self.env["runtime"]["OutputManager"].present_text(
+                    _("{0} is already in dictionary").format(
+                        curr_word,
+                    ),
+                    sound_icon="Cancel",
+                    interrupt=True,
+                )
             else:
-                self.spellChecker.add(currWord)             
+                self.spellChecker.add(curr_word)
-                self.env['runtime']['outputManager'].presentText(_('{0} added to dictionary').format(currWord,), soundIcon='Accept', interrupt=True)               
+                self.env["runtime"]["OutputManager"].present_text(
+                    _("{0} added to dictionary").format(
+                        curr_word,
+                    ),
+                    sound_icon="Accept",
+                    interrupt=True,
+                )
 
-    def setCallback(self, callback):
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/adjustment_base.py

@@ -0,0 +1,108 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributors.
+
+import math
+
+from fenrirscreenreader.core.i18n import _
+
+
+class adjustment_command:
+    """Base class for speech and sound adjustment commands"""
+
+    def __init__(self, section, setting, direction, step=0.1):
+        self.section = section  # 'speech' or 'sound'
+        self.setting = setting  # 'rate', 'pitch', 'volume'
+        self.direction = direction  # 'inc' or 'dec'
+        self.step = step
+
+    def initialize(self, environment):
+        self.env = environment
+
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        action = "Increase" if self.direction == "inc" else "Decrease"
+        if self.section == "speech":
+            return _(f"{action} the speech {self.setting}")
+        else:
+            return _(f"{action} the {self.section} {self.setting}")
+
+    def run(self):
+        if self.section == "sound" and self.setting == "volume":
+            # Sound volume uses different method
+            self._adjust_sound_volume()
+        else:
+            # Speech rate, pitch, volume use standard method
+            self._adjust_speech_setting()
+
+    def _adjust_speech_setting(self):
+        """Adjust speech settings (rate, pitch, volume)"""
+        value = self.env["runtime"]["SettingsManager"].get_setting_as_float(
+            self.section, self.setting
+        )
+
+        # Apply adjustment with rounding
+        if self.direction == "inc":
+            value = round((math.ceil(10 * value) / 10) + self.step, 2)
+            if value > 1.0:
+                value = 1.0
+        else:  # dec
+            value = round((math.ceil(10 * value) / 10) - self.step, 2)
+            if value < 0.0:
+                value = 0.0
+
+        # Set the new value
+        self.env["runtime"]["SettingsManager"].set_setting(
+            self.section, self.setting, str(value)
+        )
+
+        # Present feedback
+        percentage = int(value * 100)
+        if self.section == "speech":
+            feedback = _("{0} percent speech {1}").format(
+                percentage, self.setting
+            )
+        else:
+            feedback = _("{0} percent {1} {2}").format(
+                percentage, self.section, self.setting
+            )
+
+        self.env["runtime"]["OutputManager"].present_text(
+            feedback, sound_icon="", interrupt=True
+        )
+
+    def _adjust_sound_volume(self):
+        """Adjust sound volume using same logic as speech"""
+        value = self.env["runtime"]["SettingsManager"].get_setting_as_float(
+            self.section, self.setting
+        )
+
+        # Sound volume uses same math as speech settings
+        if self.direction == "inc":
+            value = round((math.ceil(10 * value) / 10) + self.step, 2)
+            if value > 1.0:
+                value = 1.0
+        else:  # dec
+            value = round((math.ceil(10 * value) / 10) - self.step, 2)
+            if value < 0.0:
+                value = 0.0
+
+        # Set the new value
+        self.env["runtime"]["SettingsManager"].set_setting(
+            self.section, self.setting, str(value)
+        )
+
+        # Present feedback with appropriate sound icon
+        percentage = int(value * 100)
+        sound_icon = "SoundOn" if self.direction == "inc" else "SoundOff"
+        feedback = _("{0} percent sound volume").format(percentage)
+        self.env["runtime"]["OutputManager"].present_text(
+            feedback, sound_icon=sound_icon, interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/announce_fenrir_version.py

@@ -2,26 +2,37 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader import fenrirVersion
+from fenrirscreenreader.core.i18n import _
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
         pass
-    def getDescription(self):
+
-        return _('Present the version of Fenrir currrrently in use.')
+    def get_description(self):
-    
+        return _("Present the version of Fenrir currently in use.")
+
     def run(self):
         try:
-            self.env['runtime']['outputManager'].presentText(f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}', interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
-        except exception as e:
+                f"Fenrir screen reader version {
-            self.env['runtime']['outputManager'].presentText(_('Version information is unavailable.'), interrupt=True)
+                    fenrirVersion.version}-{
-            
+                    fenrirVersion.code_name}",
-    def setCallback(self, callback):
+                interrupt=True,
+            )
+        except Exception as e:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Version information is unavailable."), interrupt=True
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/apply_tested_voice.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env python3
+
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
+    def __init__(self):
+        pass
+
+    def initialize(self, environment):
+        self.env = environment
+
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        return "Apply the last tested voice from safe voice browser"
+
+    def run(self):
+        try:
+            # Check if we have a tested voice
+            if (
+                "commandBuffer" not in self.env
+                or "lastTestedModule" not in self.env["commandBuffer"]
+                or "lastTestedVoice" not in self.env["commandBuffer"]
+            ):
+                self.env["runtime"]["OutputManager"].present_text(
+                    "No voice has been tested yet", interrupt=True
+                )
+                self.env["runtime"]["OutputManager"].present_text(
+                    "Use voice browser first", interrupt=True
+                )
+                return
+
+            module = self.env["commandBuffer"]["lastTestedModule"]
+            voice = self.env["commandBuffer"]["lastTestedVoice"]
+
+            self.env["runtime"]["OutputManager"].present_text(
+                f"Applying {voice} from {module}", interrupt=True
+            )
+
+            # Apply to runtime settings only (temporary until saved)
+            SettingsManager = self.env["runtime"]["SettingsManager"]
+
+            # Store old values for safety
+            old_driver = SettingsManager.get_setting("speech", "driver")
+            old_module = SettingsManager.get_setting("speech", "module")
+            old_voice = SettingsManager.get_setting("speech", "voice")
+
+            try:
+                # Apply new settings to runtime only (use set_setting to update
+                # settingArgDict)
+                SettingsManager.set_setting(
+                    "speech", "driver", "speechdDriver"
+                )
+                SettingsManager.set_setting("speech", "module", module)
+                SettingsManager.set_setting("speech", "voice", voice)
+
+                # Apply to speech driver instance directly
+                if "SpeechDriver" in self.env["runtime"]:
+                    SpeechDriver = self.env["runtime"]["SpeechDriver"]
+
+                    # Set the module and voice on the driver instance
+                    SpeechDriver.set_module(module)
+                    SpeechDriver.set_voice(voice)
+
+                    self.env["runtime"]["OutputManager"].present_text(
+                        "Voice applied successfully!", interrupt=True
+                    )
+                    self.env["runtime"]["OutputManager"].present_text(
+                        "Use save settings to make permanent", interrupt=True
+                    )
+                    self.env["runtime"]["OutputManager"].play_sound("Accept")
+
+            except Exception as e:
+                # Revert on failure
+                SettingsManager.set_setting("speech", "driver", old_driver)
+                SettingsManager.set_setting("speech", "module", old_module)
+                SettingsManager.set_setting("speech", "voice", old_voice)
+
+                self.env["runtime"]["OutputManager"].present_text(
+                    f"Failed to apply voice, reverted: {str(e)}",
+                    interrupt=True,
+                )
+                self.env["runtime"]["OutputManager"].play_sound("Error")
+
+        except Exception as e:
+            self.env["runtime"]["OutputManager"].present_text(
+                f"Apply voice error: {str(e)}", interrupt=True
+            )
+            self.env["runtime"]["OutputManager"].play_sound("Error")
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/attribute_cursor.py

@@ -1,30 +1,46 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
-from fenrirscreenreader.utils import screen_utils
+from fenrirscreenreader.utils import screen_utils
-
+
-class command():
+
-    def __init__(self):
+class command:
-        pass
+    def __init__(self):
-    def initialize(self, environment):
+        pass
-        self.env = environment
+
-    def shutdown(self):
+    def initialize(self, environment):
-        pass
+        self.env = environment
-    def getDescription(self):
+
-        return _('Reads attributes of current cursor position')         
+    def shutdown(self):
-    def run(self):
+        pass
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+
-        try:
+    def get_description(self):
-            attributes = self.env['runtime']['attributeManager'].getAttributeByXY( cursorPos['x'], cursorPos['y'])
+        return _("Reads attributes of current cursor position")
-        except Exception as e:
+
-            print(e)        
+    def run(self):
-        attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
+        cursor_pos = self.env["runtime"][
-        attributeFormatString = self.env['runtime']['attributeManager'].formatAttributes(attributes, attributeFormatString)
+            "CursorManager"
-        
+        ].get_review_or_text_cursor()
-        self.env['runtime']['outputManager'].presentText(attributeFormatString, soundIcon='', interrupt=True)
+        try:
-    def setCallback(self, callback):
+            attributes = self.env["runtime"][
-        pass
+                "AttributeManager"
+            ].get_attribute_by_xy(cursor_pos["x"], cursor_pos["y"])
+        except Exception as e:
+            print(e)
+        attribute_format_string = self.env["runtime"][
+            "SettingsManager"
+        ].get_setting("general", "attribute_format_string")
+        attribute_format_string = self.env["runtime"][
+            "AttributeManager"
+        ].format_attributes(attributes, attribute_format_string)
+
+        self.env["runtime"]["OutputManager"].present_text(
+            attribute_format_string, sound_icon="", interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/bookmark_1.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '1'
+        super().__init__(1, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_10.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '10'
+        super().__init__(10, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_2.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '2'
+        super().__init__(2, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_3.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '3'
+        super().__init__(3, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_4.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '4'
+        super().__init__(4, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_5.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '5'
+        super().__init__(5, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_6.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '6'
+        super().__init__(6, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_7.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '7'
+        super().__init__(7, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_8.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '8'
+        super().__init__(8, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_9.py

@@ -2,47 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
-from fenrirscreenreader.utils import mark_utils
+import os
-from fenrirscreenreader.utils import line_utils
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '9'
+        super().__init__(9, "read")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read Bookmark {0}').format(self.ID,)
-
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-        if not self.env['commandBuffer']['bookMarks'][self.ID]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set').format(self.ID,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-        if not self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1']:
-            self.env['runtime']['outputManager'].presentText(_('Bookmark for application {0} not set').format(currApp,), interrupt=True)
-            return
-
-        # set marks
-        marked = ''
-        startMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'].copy()
-        if self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2']:
-            endMark = self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'].copy()
-            marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
-        else:
-            x, y, marked = \
-              line_utils.getCurrentLine(startMark['x'], startMark['y'], self.env['screen']['newContentText'])
-        if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_('blank'), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/bookmark_base.py

@@ -0,0 +1,211 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributors.
+
+from fenrirscreenreader.core.i18n import _
+from fenrirscreenreader.utils import line_utils
+from fenrirscreenreader.utils import mark_utils
+
+
+class bookmark_command:
+    """Base class for bookmark operations - read, set, clear"""
+
+    def __init__(self, bookmark_id, action="read"):
+        self.ID = str(bookmark_id)
+        self.action = action
+
+    def initialize(self, environment):
+        self.env = environment
+        # Always initialize bookmark structure - all commands need this
+        if self.ID not in self.env["commandBuffer"]["bookMarks"]:
+            self.env["commandBuffer"]["bookMarks"][self.ID] = {}
+
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        if self.action == "read":
+            return _("read Bookmark {0}").format(self.ID)
+        elif self.action == "set":
+            return _("set Bookmark {0}").format(self.ID)
+        elif self.action == "clear":
+            return _("remove Bookmark {0}").format(self.ID)
+        return f"{self.action} Bookmark {self.ID}"
+
+    def run(self):
+        if self.action == "read":
+            self._read_bookmark()
+        elif self.action == "set":
+            self._set_bookmark()
+        elif self.action == "clear":
+            self._clear_bookmark()
+
+    def _read_bookmark(self):
+        curr_app = self.env["runtime"][
+            "ApplicationManager"
+        ].get_current_application()
+
+        if not self.env["commandBuffer"]["bookMarks"][self.ID]:
+            self.env["runtime"]["OutputManager"].present_text(
+                "Bookmark {0} not set".format(self.ID), interrupt=True
+            )
+            return
+
+        if curr_app not in self.env["commandBuffer"]["bookMarks"][self.ID]:
+            self.env["runtime"]["OutputManager"].present_text(
+                "Bookmark for application {0} not set".format(curr_app),
+                interrupt=True,
+            )
+            return
+
+        if not self.env["commandBuffer"]["bookMarks"][self.ID][curr_app].get(
+            "1"
+        ):
+            self.env["runtime"]["OutputManager"].present_text(
+                "Bookmark for application {0} not set".format(curr_app),
+                interrupt=True,
+            )
+            return
+
+        # Get bookmarked text
+        marked = ""
+        start_mark = self.env["commandBuffer"]["bookMarks"][self.ID][curr_app][
+            "1"
+        ].copy()
+
+        if self.env["commandBuffer"]["bookMarks"][self.ID][curr_app]["2"]:
+            end_mark = self.env["commandBuffer"]["bookMarks"][self.ID][
+                curr_app
+            ]["2"].copy()
+            marked = mark_utils.get_text_between_marks(
+                start_mark, end_mark, self.env["screen"]["new_content_text"]
+            )
+        else:
+            x, y, marked = line_utils.get_current_line(
+                start_mark["x"],
+                start_mark["y"],
+                self.env["screen"]["new_content_text"],
+            )
+
+        if marked.isspace():
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                marked, interrupt=True
+            )
+
+    def _set_bookmark(self):
+        if not self.env["commandBuffer"]["Marks"]["1"]:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("No mark found"), interrupt=True
+            )
+            return
+
+        curr_app = self.env["runtime"][
+            "ApplicationManager"
+        ].get_current_application()
+        self.env["commandBuffer"]["bookMarks"][self.ID][curr_app] = {}
+
+        bookmarks = self.env["commandBuffer"]["bookMarks"][self.ID][curr_app]
+        bookmarks["1"] = self.env["commandBuffer"]["Marks"]["1"].copy()
+
+        if self.env["commandBuffer"]["Marks"]["2"]:
+            bookmarks["2"] = self.env["commandBuffer"]["Marks"]["2"].copy()
+        else:
+            bookmarks["2"] = None
+
+        self.env["runtime"]["OutputManager"].present_text(
+            _("Bookmark {0} set for application {1}").format(
+                self.ID, curr_app
+            ),
+            interrupt=True,
+        )
+
+        # Clear marks after setting bookmark
+        self.env["commandBuffer"]["Marks"]["1"] = None
+        self.env["commandBuffer"]["Marks"]["2"] = None
+
+    def _clear_bookmark(self):
+        curr_app = self.env["runtime"][
+            "ApplicationManager"
+        ].get_current_application()
+
+        bookmarks = self.env["commandBuffer"]["bookMarks"]
+        if self.ID in bookmarks and curr_app in bookmarks[self.ID]:
+            del self.env["commandBuffer"]["bookMarks"][self.ID][curr_app]
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Bookmark {0} removed for application {1}").format(
+                    self.ID, curr_app
+                ),
+                interrupt=True,
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Bookmark {0} not set for application {1}").format(
+                    self.ID, curr_app
+                ),
+                interrupt=True,
+            )
+
+    def set_callback(self, callback):
+        pass
+
+
+# Factory function to create bookmark command instances
+
+
+def create_bookmark_commands():
+    """Create all bookmark command instances"""
+    commands = {}
+
+    # Create read bookmark commands (bookmark_1 through bookmark_10)
+    for i in range(1, 11):
+        commands[f"bookmark_{i}"] = lambda i=i: bookmark_command(i, "read")
+
+    # Create set bookmark commands (set_bookmark_1 through set_bookmark_10)
+    for i in range(1, 11):
+        commands[f"set_bookmark_{i}"] = lambda i=i: bookmark_command(i, "set")
+
+    # Create clear bookmark commands (clear_bookmark_1 through
+    # clear_bookmark_10)
+    for i in range(1, 11):
+        commands[f"clear_bookmark_{i}"] = lambda i=i: bookmark_command(
+            i, "clear"
+        )
+
+    return commands
+
+
+# For backwards compatibility, provide individual command classes
+# This allows the existing command loading system to work unchanged
+
+
+def _make_command_class(bookmark_id, action):
+    """Create a command class for a specific bookmark and action"""
+
+    class command(bookmark_command):
+        def __init__(self):
+            super().__init__(bookmark_id, action)
+
+    return command
+
+
+# Generate individual command classes for each bookmark operation
+# These will be used by the existing command loading system
+
+
+# Read bookmarks (bookmark_1.py style)
+for i in range(1, 11):
+    globals()[f"bookmark_{i}_command"] = _make_command_class(i, "read")
+
+# Set bookmarks (set_bookmark_1.py style)
+for i in range(1, 11):
+    globals()[f"set_bookmark_{i}_command"] = _make_command_class(i, "set")
+
+# Clear bookmarks (clear_bookmark_1.py style)
+for i in range(1, 11):
+    globals()[f"clear_bookmark_{i}_command"] = _make_command_class(i, "clear")

src/fenrirscreenreader/commands/commands/clear_bookmark_1.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '1'
+        super().__init__(1, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_10.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '10'
+        super().__init__(10, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_2.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '2'
+        super().__init__(2, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_3.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '3'
+        super().__init__(3, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_4.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '4'
+        super().__init__(4, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_5.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '5'
+        super().__init__(5, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_6.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '6'
+        super().__init__(6, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_7.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '7'
+        super().__init__(7, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_8.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '8'
+        super().__init__(8, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_9.py

@@ -2,26 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+import importlib.util
+import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+_base_path = os.path.join(os.path.dirname(__file__), "bookmark_base.py")
+_spec = importlib.util.spec_from_file_location("bookmark_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+bookmark_command = _module.bookmark_command
+
+
+class command(bookmark_command):
     def __init__(self):
-        self.ID = '9'
+        super().__init__(9, "clear")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('remove Bookmark {0}').format(self.ID,)        
-    
-    def run(self):
-        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
-
-        del self.env['commandBuffer']['bookMarks'][self.ID][currApp]
-
-        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} removed for application {1}').format(self.ID, currApp), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_clipboard.py

@@ -1,24 +1,34 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('clears the currently selected clipboard')     
+
-
+    def shutdown(self):
-    def run(self):
+        pass
-        self.env['runtime']['memoryManager'].clearCurrentIndexList('clipboardHistory')
+
-        self.env['runtime']['outputManager'].presentText(_('clipboard cleared'), interrupt=True)
+    def get_description(self):
-        return                
+        return _("clears the currently selected clipboard")
-    def setCallback(self, callback):
+
-        pass
+    def run(self):
+        self.env["runtime"]["MemoryManager"].clear_current_index_list(
+            "clipboardHistory"
+        )
+        self.env["runtime"]["OutputManager"].present_text(
+            _("clipboard cleared"), interrupt=True
+        )
+        return
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/clear_window_application.py

@@ -2,26 +2,40 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('Turn off window mode for application')
+    def get_description(self):
-    
+        return _("Turn off window mode for application")
-    def run(self):
+
-        if self.env['runtime']['cursorManager'].clearWindowForApplication():
+    def run(self):
-            currApp = self.env['runtime']['applicationManager'].getCurrentApplication()    
+        if self.env["runtime"]["CursorManager"].clear_window_for_application():
-            self.env['runtime']['outputManager'].presentText(_('Window Mode off for application {0}').format(currApp,), interrupt=True)
+            curr_app = self.env["runtime"][
-        else:
+                "ApplicationManager"
-            self.env['runtime']['outputManager'].presentText(_("Not in window Mode"), interrupt=True)
+            ].get_current_application()
-        
+            self.env["runtime"]["OutputManager"].present_text(
-    def setCallback(self, callback):
+                _("Window Mode off for application {0}").format(
+                    curr_app,
+                ),
+                interrupt=True,
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Not in window Mode"), interrupt=True
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py

@@ -2,27 +2,35 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import mark_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('copies last presented text to the clipboard')    
-    
-    def run(self):
-        lastEcho = self.env['runtime']['outputManager'].getLastEcho()
-        if lastEcho.rstrip() != "":
-            lastEcho = lastEcho.rstrip()
-        self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', lastEcho)
-        self.env['runtime']['outputManager'].presentText(lastEcho, soundIcon='CopyToClipboard', interrupt=True)
 
-    def setCallback(self, callback):
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        return _("copies last presented text to the clipboard")
+
+    def run(self):
+        last_echo = self.env["runtime"]["OutputManager"].get_last_echo()
+        if last_echo.rstrip() != "":
+            last_echo = last_echo.rstrip()
+        self.env["runtime"]["MemoryManager"].add_value_to_first_index(
+            "clipboardHistory", last_echo
+        )
+        self.env["runtime"]["OutputManager"].present_text(
+            last_echo, sound_icon="CopyToClipboard", interrupt=True
+        )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py

@@ -2,73 +2,81 @@
 # -*- coding: utf-8 -*-
 
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import mark_utils
-class command():
+
+
+class command:
     def __init__(self):
         pass
-        
+
     def initialize(self, environment):
         self.env = environment
-        
+
     def shutdown(self):
-        pass 
+        pass
-        
+
-    def getDescription(self):
+    def get_description(self):
-        return _('copies marked text to the currently selected clipboard')    
+        return _("copies marked text to the currently selected clipboard")
-    
+
-    def getTextFromScreen(self, startMark, endMark):
+    def get_text_from_screen(self, start_mark, end_mark):
-        screenContent = self.env['screen']['newContentText']
+        screen_content = self.env["screen"]["new_content_text"]
-        screenLines = screenContent.split('\n')
+        screen_lines = screen_content.split("\n")
-        
+
-        startY = min(startMark['y'], len(screenLines) - 1)
+        start_y = min(start_mark["y"], len(screen_lines) - 1)
-        endY = min(endMark['y'], len(screenLines) - 1)
+        end_y = min(end_mark["y"], len(screen_lines) - 1)
-        
+
         # If marks are on the same line
-        if startY == endY:
+        if start_y == end_y:
-            line = screenLines[startY]
+            line = screen_lines[start_y]
-            startX = min(startMark['x'], len(line))
+            start_x = min(start_mark["x"], len(line))
-            endX = min(endMark['x'], len(line)) + 1
+            end_x = min(end_mark["x"], len(line)) + 1
-            return line[startX:endX]
+            return line[start_x:end_x]
-            
+
         # Handle multi-line selection
         result = []
-        
+
         # First line (from start mark to end of line)
-        firstLine = screenLines[startY]
+        first_line = screen_lines[start_y]
-        startX = min(startMark['x'], len(firstLine))
+        start_x = min(start_mark["x"], len(first_line))
-        result.append(firstLine[startX:].rstrip())
+        result.append(first_line[start_x:].rstrip())
-        
+
         # Middle lines (complete lines)
-        for lineNum in range(startY + 1, endY):
+        for lineNum in range(start_y + 1, end_y):
-            result.append(screenLines[lineNum].rstrip())
+            result.append(screen_lines[lineNum].rstrip())
-            
+
         # Last line (from start to end mark)
-        if endY > startY:
+        if end_y > start_y:
-            lastLine = screenLines[endY]
+            last_line = screen_lines[end_y]
-            endX = min(endMark['x'], len(lastLine)) + 1
+            end_x = min(end_mark["x"], len(last_line)) + 1
-            result.append(lastLine[:endX].rstrip())
+            result.append(last_line[:end_x].rstrip())
-            
+
-        return '\n'.join(result)
+        return "\n".join(result)
-    
+
     def run(self):
-        if not self.env['commandBuffer']['Marks']['1']:
+        if not self.env["commandBuffer"]["Marks"]["1"]:
-            self.env['runtime']['outputManager'].presentText(_("One or two marks are needed"), interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
+                _("One or two marks are needed"), interrupt=True
+            )
             return
-        if not self.env['commandBuffer']['Marks']['2']:
+        if not self.env["commandBuffer"]["Marks"]["2"]:
-            self.env['runtime']['cursorManager'].setMark()
+            self.env["runtime"]["CursorManager"].set_mark()
-            
+
         # use the last first and the last setted mark as range
-        startMark = self.env['commandBuffer']['Marks']['1'].copy()
+        start_mark = self.env["commandBuffer"]["Marks"]["1"].copy()
-        endMark = self.env['commandBuffer']['Marks']['2'].copy()         
+        end_mark = self.env["commandBuffer"]["Marks"]["2"].copy()
-        
+
-        # Replace mark_utils.getTextBetweenMarks with our new method
+        # Replace mark_utils.get_text_between_marks with our new method
-        marked = self.getTextFromScreen(startMark, endMark)
+        marked = self.get_text_from_screen(start_mark, end_mark)
-        
+
-        self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', marked)
+        self.env["runtime"]["MemoryManager"].add_value_to_first_index(
+            "clipboardHistory", marked
+        )
         # reset marks
-        self.env['runtime']['cursorManager'].clearMarks()      
+        self.env["runtime"]["CursorManager"].clear_marks()
-        self.env['runtime']['outputManager'].presentText(marked, soundIcon='CopyToClipboard', interrupt=True)
+        self.env["runtime"]["OutputManager"].present_text(
-        
+            marked, sound_icon="CopyToClipboard", interrupt=True
-    def setCallback(self, callback):
+        )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/curr_clipboard.py

@@ -1,27 +1,40 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('speaks the contents of the currently selected clipboard')       
+
-
+    def shutdown(self):
-    def run(self):
+        pass
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+    def get_description(self):
-            return 
+        return _("speaks the contents of the currently selected clipboard")
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+
-        self.env['runtime']['outputManager'].presentText(clipboard , interrupt=True)
+    def run(self):
-               
+        if self.env["runtime"]["MemoryManager"].is_index_list_empty(
-    def setCallback(self, callback):
+            "clipboardHistory"
-        pass
+        ):
+            self.env["runtime"]["OutputManager"].present_text(
+                _("clipboard empty"), interrupt=True
+            )
+            return
+        clipboard = self.env["runtime"][
+            "MemoryManager"
+        ].get_index_list_element("clipboardHistory")
+        self.env["runtime"]["OutputManager"].present_text(
+            clipboard, interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen.py

@@ -1,26 +1,35 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('reads the contents of the current screen')        
+
-
+    def shutdown(self):
-    def run(self):
+        pass
-        if self.env['screen']['newContentText'].isspace():
+
-            self.env['runtime']['outputManager'].presentText(_("screen is empty"), soundIcon='EmptyLine', interrupt=True)
+    def get_description(self):
-        else:    
+        return _("reads the contents of the current screen")
-           self.env['runtime']['outputManager'].presentText(self.env['screen']['newContentText'],interrupt=True)
+
- 
+    def run(self):
-    def setCallback(self, callback):
+        if self.env["screen"]["new_content_text"].isspace():
-        pass
+            self.env["runtime"]["OutputManager"].present_text(
+                _("screen is empty"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                self.env["screen"]["new_content_text"], interrupt=True
+            )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py

@@ -2,31 +2,43 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import mark_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('reads from the cursor to the bottom of the screen')        
+    def get_description(self):
+        return _("reads from the cursor to the bottom of the screen")
 
     def run(self):
         # Prefer review cursor over text cursor
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
 
-        textAfterCursor = mark_utils.getTextAfterMark(cursorPos, self.env['screen']['newContentText'])
+        text_after_cursor = mark_utils.get_text_after_mark(
+            cursor_pos, self.env["screen"]["new_content_text"]
+        )
 
-        if textAfterCursor.isspace():
+        if text_after_cursor.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
         else:
-            self.env['runtime']['outputManager'].presentText(textAfterCursor, interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
+                text_after_cursor, interrupt=True
+            )
 
-    def setCallback(self, callback):
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py

@@ -2,35 +2,44 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import mark_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('Reads from the top of the screen to the cursor position')        
+    def get_description(self):
+        return _("Reads from the top of the screen to the cursor position")
 
     def run(self):
         # Prefer review cursor over text cursor
-        if self.env['screen']['newCursorReview']:
+        if self.env["screen"]["newCursorReview"]:
-            cursorPos = self.env['screen']['newCursorReview'].copy()
+            cursor_pos = self.env["screen"]["newCursorReview"].copy()
         else:
-            cursorPos = self.env['screen']['newCursor'].copy()
+            cursor_pos = self.env["screen"]["new_cursor"].copy()
 
-        textBeforeCursor = mark_utils.getTextBeforeMark(cursorPos, self.env['screen']['newContentText'])
+        text_before_cursor = mark_utils.get_text_before_mark(
+            cursor_pos, self.env["screen"]["new_content_text"]
+        )
 
-        if textBeforeCursor.isspace():
+        if text_before_cursor.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
         else:
-            self.env['runtime']['outputManager'].presentText(textBeforeCursor, interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
-   
+                text_before_cursor, interrupt=True
-    def setCallback(self, callback):
+            )
+
+    def set_callback(self, callback):
         pass
-

src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py

@@ -2,25 +2,34 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('get current quick menu entry')
+    def get_description(self):
-    def run(self):
+        return _("get current quick menu entry")
-        menu = ''
+
-        value = ''
+    def run(self):
-        menu = self.env['runtime']['quickMenuManager'].getCurrentEntry()
+        menu = ""
-        if menu != '':
+        value = ""
-            value = self.env['runtime']['quickMenuManager'].getCurrentValue()
+        menu = self.env["runtime"]["QuickMenuManager"].get_current_entry()
-            self.env['runtime']['outputManager'].presentText(menu + ' ' + value, interrupt=True)
+        if menu != "":
-    def setCallback(self, callback):
+            value = self.env["runtime"]["QuickMenuManager"].get_current_value()
+            self.env["runtime"]["OutputManager"].present_text(
+                menu + " " + value, interrupt=True
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/current_quick_menu_value.py

@@ -2,21 +2,30 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('get current quick menu value')
+    def get_description(self):
-    def run(self):
+        return _("get current quick menu value")
-        value = self.env['runtime']['quickMenuManager'].getCurrentValue()
+
-        self.env['runtime']['outputManager'].presentText(value, interrupt=True)
+    def run(self):
-    def setCallback(self, callback):
+        value = self.env["runtime"]["QuickMenuManager"].get_current_value()
+        self.env["runtime"]["OutputManager"].present_text(
+            value, interrupt=True
+        )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/cursor_column.py

@@ -1,25 +1,37 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('Column number for cursor')       
+
-    def run(self):
+    def shutdown(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        pass
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
+
-        self.env['runtime']['outputManager'].announceActiveCursor()
+    def get_description(self):
-        self.env['runtime']['outputManager'].presentText(' column number' , interrupt=False)
+        return _("Column number for cursor")
-        
+
-    def setCallback(self, callback):
+    def run(self):
-        pass
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
+        self.env["runtime"]["OutputManager"].present_text(
+            str(cursor_pos["x"] + 1), interrupt=True
+        )
+        self.env["runtime"]["OutputManager"].announce_active_cursor()
+        self.env["runtime"]["OutputManager"].present_text(
+            " column number", interrupt=False
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_lineno.py

@@ -1,25 +1,37 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('Line number for cursor')         
+
-    def run(self):
+    def shutdown(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        pass
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)
+
-        self.env['runtime']['outputManager'].announceActiveCursor()
+    def get_description(self):
-        self.env['runtime']['outputManager'].presentText(' line number' , interrupt=False)
+        return _("Line number for cursor")
-        
+
-    def setCallback(self, callback):
+    def run(self):
-        pass
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
+        self.env["runtime"]["OutputManager"].present_text(
+            str(cursor_pos["y"] + 1), interrupt=True
+        )
+        self.env["runtime"]["OutputManager"].announce_active_cursor()
+        self.env["runtime"]["OutputManager"].present_text(
+            " line number", interrupt=False
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_position.py

@@ -2,25 +2,39 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('displays the position of the review cursor')        
+    def get_description(self):
+        return _("displays the position of the review cursor")
 
     def run(self):
         # Prefer review cursor over text cursor
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
 
-        self.env['runtime']['outputManager'].presentText(_("line {0}, column {1}, Terminal {2}").format(cursorPos['y']+1, cursorPos['x']+1, self.env['screen']['newTTY']), interrupt=True)
+        self.env["runtime"]["OutputManager"].present_text(
-   
+            _("line {0}, column {1}, Terminal {2}").format(
-    def setCallback(self, callback):
+                cursor_pos["y"] + 1,
+                cursor_pos["x"] + 1,
+                self.env["screen"]["newTTY"],
+            ),
+            interrupt=True,
+        )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py

@@ -2,32 +2,47 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import line_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read line to cursor pos, use review cursor if you are in review mode, otherwhise use text cursor')
-    
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
 
-        x, y, currLine = \
+    def shutdown(self):
-          line_utils.getCurrentLine(cursorPos['x'], cursorPos['y'], self.env['screen']['newContentText'])
-        
-        if currLine.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(currLine[:cursorPos['x']], interrupt=True) 
-        self.env['runtime']['outputManager'].announceActiveCursor()
-    def setCallback(self, callback):
         pass
 
+    def get_description(self):
+        return _(
+            "read line to cursor pos, use review cursor if you are in review mode, otherwhise use text cursor"
+        )
+
+    def run(self):
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
+
+        x, y, curr_line = line_utils.get_current_line(
+            cursor_pos["x"],
+            cursor_pos["y"],
+            self.env["screen"]["new_content_text"],
+        )
+
+        if curr_line.isspace():
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                curr_line[: cursor_pos["x"]], interrupt=True
+            )
+        self.env["runtime"]["OutputManager"].announce_active_cursor()
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py

@@ -2,32 +2,47 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import line_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('read to end of line, use review cursor if you are in review mode, otherwhise use text cursor')        
-    
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
 
-        x, y, currLine = \
+    def shutdown(self):
-          line_utils.getCurrentLine(cursorPos['x'], cursorPos['y'], self.env['screen']['newContentText'])
-        
-        if currLine.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(currLine[cursorPos['x']:], interrupt=True) 
-        self.env['runtime']['outputManager'].announceActiveCursor()
-    def setCallback(self, callback):
         pass
 
+    def get_description(self):
+        return _(
+            "read to end of line, use review cursor if you are in review mode, otherwhise use text cursor"
+        )
+
+    def run(self):
+        cursor_pos = self.env["runtime"][
+            "CursorManager"
+        ].get_review_or_text_cursor()
+
+        x, y, curr_line = line_utils.get_current_line(
+            cursor_pos["x"],
+            cursor_pos["y"],
+            self.env["screen"]["new_content_text"],
+        )
+
+        if curr_line.isspace():
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                curr_line[cursor_pos["x"] :], interrupt=True
+            )
+        self.env["runtime"]["OutputManager"].announce_active_cursor()
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cycle_keyboard_layout.py

@@ -0,0 +1,105 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributors.
+
+import os
+
+from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
+    def __init__(self):
+        pass
+
+    def initialize(self, environment):
+        self.env = environment
+
+    def shutdown(self):
+        pass
+
+    def get_description(self):
+        return _("cycles between available keyboard layouts")
+
+    def get_available_layouts(self):
+        """Get list of available keyboard layout files"""
+        layouts = []
+
+        # Check standard locations for keyboard layouts
+        settings_root = "/etc/fenrirscreenreader/"
+        if not os.path.exists(settings_root):
+            # Fallback to source directory
+            import fenrirscreenreader
+
+            fenrir_path = os.path.dirname(fenrirscreenreader.__file__)
+            settings_root = fenrir_path + "/../../config/"
+
+        keyboard_path = settings_root + "keyboard/"
+
+        if os.path.exists(keyboard_path):
+            for file in os.listdir(keyboard_path):
+                if (
+                    file.endswith(".conf")
+                    and not file.startswith("__")
+                    and not file.lower().startswith("pty")
+                ):
+                    layout_name = file.replace(".conf", "")
+                    if layout_name not in layouts:
+                        layouts.append(layout_name)
+
+        # Ensure we have at least basic layouts
+        if not layouts:
+            layouts = ["desktop", "laptop"]
+        else:
+            layouts.sort()
+
+        return layouts
+
+    def run(self):
+        current_layout = self.env["runtime"]["SettingsManager"].get_setting(
+            "keyboard", "keyboardLayout"
+        )
+
+        # Extract layout name from full path if needed
+        if "/" in current_layout:
+            current_layout = os.path.basename(current_layout).replace(
+                ".conf", ""
+            )
+
+        # Get available layouts
+        available_layouts = self.get_available_layouts()
+
+        # Find next layout in cycle
+        try:
+            current_index = available_layouts.index(current_layout)
+            next_index = (current_index + 1) % len(available_layouts)
+        except ValueError:
+            # If current layout not found, start from beginning
+            next_index = 0
+
+        next_layout = available_layouts[next_index]
+
+        # Update setting and reload shortcuts
+        self.env["runtime"]["SettingsManager"].set_setting(
+            "keyboard", "keyboardLayout", next_layout
+        )
+
+        # Reload shortcuts with new layout
+        try:
+            self.env["runtime"]["InputManager"].reload_shortcuts()
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Switched to {} keyboard layout").format(next_layout),
+                interrupt=True,
+            )
+        except Exception as e:
+            self.env["runtime"]["DebugManager"].write_debug_out(
+                "Error reloading shortcuts: " + str(e), debug.DebugLevel.ERROR
+            )
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Error switching keyboard layout"), interrupt=True
+            )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/date.py

@@ -1,30 +1,42 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import datetime
-import datetime
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('presents the date')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        dateFormat = self.env['runtime']['settingsManager'].getSetting('general', 'dateFormat')
+
-
+    def get_description(self):
-        # get the time formatted
+        return _("presents the date")
-        dateString = datetime.datetime.strftime(datetime.datetime.now(), dateFormat)
+
-
+    def run(self):
-        # present the time via speak and braile, there is no soundicon, interrupt the current speech
+        date_format = self.env["runtime"]["SettingsManager"].get_setting(
-        self.env['runtime']['outputManager'].presentText(dateString , soundIcon='', interrupt=True)
+            "general", "date_format"
-
+        )
-    def setCallback(self, callback):
+
-        pass
+        # get the time formatted
+        date_string = datetime.datetime.strftime(
+            datetime.datetime.now(), date_format
+        )
+
+        # present the time via speak and braile, there is no soundicon,
+        # interrupt the current speech
+        self.env["runtime"]["OutputManager"].present_text(
+            date_string, sound_icon="", interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/dec_alsa_volume.py

@@ -2,38 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-initialized = False
+import importlib.util
-try:
+import os
-    import alsaaudio
-    initialized = True
-except:
-    pass
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 
-class command():
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+adjustment_command = _module.adjustment_command
+
+
+class command(adjustment_command):
     def __init__(self):
-        pass
+        super().__init__("alsa", "volume", "dec")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _("Decrease system volume")         
-
-    def run(self):
-        if not initialized:
-           self.env['runtime']['outputManager'].presentText(_('alsaaudio is not installed'), interrupt=True) 
-           return
-        mixer = alsaaudio.Mixer()
-        value = mixer.getvolume()[0]
-        value = value - 5
-        if value < 5:
-            value = 5
-        mixer.setvolume(value)
-        self.env['runtime']['outputManager'].presentText(_("{0} percent system volume").format(value), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/dec_sound_volume.py

@@ -1,33 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('decrease sound volume')        
+
-
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        
+        super().__init__("sound", "volume", "dec")
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('sound', 'volume')
-
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.1:
-            value = 0.1  
-        self.env['runtime']['settingsManager'].setSetting('sound', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent sound volume").format(int(value * 100)), soundIcon='SoundOff', interrupt=True)
-   
-    def setCallback(self, callback):
-        pass
-

src/fenrirscreenreader/commands/commands/dec_speech_pitch.py

@@ -1,29 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Decreases the pitch of the speech')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
+        super().__init__("speech", "pitch", "dec")
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.0:
-            value = 0.0 
-        self.env['runtime']['settingsManager'].setSetting('speech', 'pitch', str(value))   
-        self.env['runtime']['outputManager'].presentText(_('{0} percent speech pitch').format(int(value * 100)), soundIcon='', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/dec_speech_rate.py

@@ -1,30 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Decreases the rate of the speech')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
+        super().__init__("speech", "rate", "dec")
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.0:
-            value = 0.0 
-        self.env['runtime']['settingsManager'].setSetting('speech', 'rate', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech rate").format(int(value * 100)), soundIcon='', interrupt=True)
-  
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/dec_speech_volume.py

@@ -1,31 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Decreases the volume of the speech')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
+        super().__init__("speech", "volume", "dec")
-        value = round((math.ceil(10 * value) / 10) - 0.1, 2)
-        if value < 0.1:
-            value = 0.1  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech volume").format(int(value * 100)), soundIcon='', interrupt=True)
-
-    def setCallback(self, callback):
-        pass
-

src/fenrirscreenreader/commands/commands/exit_review.py

@@ -1,28 +1,37 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('exits review mode')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        if not self.env['runtime']['cursorManager'].isReviewMode():
+
-            self.env['runtime']['outputManager'].presentText(_("Not in Review Mode"), interrupt=True)
+    def get_description(self):
-            return  
+        return _("exits review mode")
-
+
-        self.env['runtime']['cursorManager'].clearReviewCursor()
+    def run(self):
-        self.env['runtime']['outputManager'].presentText(_("Exiting Review Mode"), interrupt=True)
+        if not self.env["runtime"]["CursorManager"].is_review_mode():
-   
+            self.env["runtime"]["OutputManager"].present_text(
-    def setCallback(self, callback):
+                _("Not in Review Mode"), interrupt=True
-        pass
+            )
+            return
+
+        self.env["runtime"]["CursorManager"].clear_review_cursor()
+        self.env["runtime"]["OutputManager"].present_text(
+            _("Exiting Review Mode"), interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/export_clipboard_to_file.py

@@ -1,39 +1,67 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import os
-import os
+
-
+from fenrirscreenreader.core import debug
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+
-    def initialize(self, environment, scriptPath=''):
+class command:
-        self.env = environment
+    def __init__(self):
-
+        pass
-    def shutdown(self):
+
-        pass
+    def initialize(self, environment, script_path=""):
-    def getDescription(self):
+        self.env = environment
-        return _('export the current fenrir clipboard to a file')
+
-    def run(self):  
+    def shutdown(self):
-        clipboardFilePath = self.env['runtime']['settingsManager'].getSetting('general', 'clipboardExportPath')
+        pass
-        clipboardFilePath = clipboardFilePath.replace('$user',self.env['general']['currUser'])        
+
-        clipboardFilePath = clipboardFilePath.replace('$USER',self.env['general']['currUser'])        
+    def get_description(self):
-        clipboardFilePath = clipboardFilePath.replace('$User',self.env['general']['currUser'])                        
+        return _("export the current fenrir clipboard to a file")
-        clipboardFile = open(clipboardFilePath,'w')        
+
-        try:
+    def run(self):
-            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+        clipboard_file_path = self.env["runtime"][
-                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+            "SettingsManager"
-                return 
+        ].get_setting("general", "clipboardExportPath")
-            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')                             
+        clipboard_file_path = clipboard_file_path.replace(
-            clipboardFile.write(clipboard)
+            "$user", self.env["general"]["curr_user"]
-            clipboardFile.close()
+        )
-            os.chmod(clipboardFilePath, 0o666)
+        clipboard_file_path = clipboard_file_path.replace(
-            self.env['runtime']['outputManager'].presentText(_('clipboard exported to file'), interrupt=True)            
+            "$USER", self.env["general"]["curr_user"]
-        except Exception as e:
+        )
-            self.env['runtime']['debug'].writeDebugOut('export_clipboard_to_file:run: Filepath:'+ clipboardFile +' trace:' + str(e),debug.debugLevel.ERROR)                                
+        clipboard_file_path = clipboard_file_path.replace(
-        
+            "$User", self.env["general"]["curr_user"]
-    def setCallback(self, callback):
+        )
-        pass
+        clipboard_file = open(clipboard_file_path, "w")
+        try:
+            if self.env["runtime"]["MemoryManager"].is_index_list_empty(
+                "clipboardHistory"
+            ):
+                self.env["runtime"]["OutputManager"].present_text(
+                    _("clipboard empty"), interrupt=True
+                )
+                return
+            clipboard = self.env["runtime"][
+                "MemoryManager"
+            ].get_index_list_element("clipboardHistory")
+            clipboard_file.write(clipboard)
+            clipboard_file.close()
+            os.chmod(clipboard_file_path, 0o644)
+            self.env["runtime"]["OutputManager"].present_text(
+                _("clipboard exported to file"), interrupt=True
+            )
+        except Exception as e:
+            self.env["runtime"]["DebugManager"].write_debug_out(
+                "export_clipboard_to_file:run: Filepath:"
+                + clipboard_file
+                + " trace:"
+                + str(e),
+                debug.DebugLevel.ERROR,
+            )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/export_clipboard_to_x.py

@@ -1,77 +1,96 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import _thread
-import subprocess, os
+import importlib
-from subprocess import Popen, PIPE
+import os
-import _thread
+
-
+import pyperclip
-class command():
+
-    def __init__(self):
+from fenrirscreenreader.core.i18n import _
-        pass
+
-    def initialize(self, environment):
+
-        self.env = environment
+class command:
-    def shutdown(self):
+    def __init__(self):
-        pass
+        pass
-    def getDescription(self):
+
-        return _('Export current fenrir clipboard to X or GUI clipboard')
+    def initialize(self, environment, script_path=""):
-    def run(self):                       
+        self.env = environment
-       _thread.start_new_thread(self._threadRun , ())
+        self.script_path = script_path
-    def _threadRun(self):
+
-        try:
+    def shutdown(self):
-            if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+        pass
-                self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+
-                return
+    def get_description(self):
-                                                                                                                                                    
+        return _("Export current fenrir clipboard to X or GUI clipboard")
-            clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+
-            user = self.env['general']['currUser']
+    def run(self):
-        
+        _thread.start_new_thread(self._thread_run, ())
-            # First try to find xclip in common locations
+
-            xclip_paths = [
+    def _thread_run(self):
-                '/usr/bin/xclip',
+        try:
-                '/bin/xclip',
+            # Check if clipboard is empty
-                '/usr/local/bin/xclip'
+            if self.env["runtime"]["MemoryManager"].is_index_list_empty(
-            ]
+                "clipboardHistory"
-        
+            ):
-            xclip_path = None
+                self.env["runtime"]["OutputManager"].present_text(
-            for path in xclip_paths:
+                    _("clipboard empty"), interrupt=True
-                if os.path.isfile(path) and os.access(path, os.X_OK):
+                )
-                    xclip_path = path
+                return
-                    break
+
-                
+            # Get current clipboard content
-            if not xclip_path:
+            clipboard = self.env["runtime"][
-                self.env['runtime']['outputManager'].presentText(
+                "MemoryManager"
-                    'xclip not found in common locations', 
+            ].get_index_list_element("clipboardHistory")
-                    interrupt=True
+
-                )
+            # Remember original display environment variable if it exists
-                return
+            original_display = os.environ.get("DISPLAY", "")
-                                                                                                                                                    
+            success = False
-            for display in range(10):
+
-                p = Popen(
+            # Try different display options
-                    ['su', user, '-p', '-c', f"{xclip_path} -d :{display} -selection clipboard"],
+            for i in range(10):
-                    stdin=PIPE, stdout=PIPE, stderr=PIPE, preexec_fn=os.setpgrp
+                display = f":{i}"
-                )
+                try:
-                stdout, stderr = p.communicate(input=clipboard.encode('utf-8'))
+                    # Set display environment variable
-                                                                                                                                                    
+                    os.environ["DISPLAY"] = display
-                self.env['runtime']['outputManager'].interruptOutput()
+                    # Attempt to set clipboard content
-                                                                                                                                                    
+                    # Weird workaround for some distros
-                stderr = stderr.decode('utf-8')
+                    importlib.reload(pyperclip)
-                stdout = stdout.decode('utf-8')
+                    pyperclip.copy(clipboard)
-                                                                                                                                                    
+                    # If we get here without exception, we found a working
-                if stderr == '':
+                    # display
-                    break
+                    success = True
-                                                                                                                                                    
+                    break
-            if stderr != '':
+                except Exception:
-                self.env['runtime']['outputManager'].presentText(stderr, soundIcon='', interrupt=False)
+                    # Failed for this display, try next one
-            else:
+                    continue
-                self.env['runtime']['outputManager'].presentText('exported to the X session.', interrupt=True)
+
-                                                                                                                                                    
+            # Restore original display setting
-        except Exception as e:
+            if original_display:
-            self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
+                os.environ["DISPLAY"] = original_display
-
+            else:
-                                                                                                                                                                
+                os.environ.pop("DISPLAY", None)
-    def setCallback(self, callback):
+
-        pass
+            # Notify the user of the result
+            if success:
+                self.env["runtime"]["OutputManager"].present_text(
+                    _("exported to the X session."), interrupt=True
+                )
+            else:
+                self.env["runtime"]["OutputManager"].present_text(
+                    _(
+                        "failed to export to X clipboard. No available display found."
+                    ),
+                    interrupt=True,
+                )
+
+        except Exception as e:
+            self.env["runtime"]["OutputManager"].present_text(
+                str(e), sound_icon="", interrupt=False
+            )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/first_clipboard.py

@@ -1,28 +1,43 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('selects the first clipboard')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+    def get_description(self):
-            return
+        return _("selects the first clipboard")
-        self.env['runtime']['memoryManager'].setFirstIndex('clipboardHistory')     
+
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+    def run(self):
-        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
+        if self.env["runtime"]["MemoryManager"].is_index_list_empty(
-           
+            "clipboardHistory"
-    def setCallback(self, callback):
+        ):
-        pass
+            self.env["runtime"]["OutputManager"].present_text(
+                _("clipboard empty"), interrupt=True
+            )
+            return
+        self.env["runtime"]["MemoryManager"].set_first_index(
+            "clipboardHistory"
+        )
+        clipboard = self.env["runtime"][
+            "MemoryManager"
+        ].get_index_list_element("clipboardHistory")
+        self.env["runtime"]["OutputManager"].present_text(
+            clipboard, interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/forward_keypress.py

@@ -1,24 +1,31 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('sends the following keypress to the terminal or application')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        self.env['input']['keyForeward'] = 3
+
-        self.env['runtime']['outputManager'].presentText(_('Forward next keypress'), interrupt=True)
+    def get_description(self):
-
+        return _("sends the following keypress to the terminal or application")
-    def setCallback(self, callback):
+
-        pass
+    def run(self):
+        self.env["input"]["keyForeward"] = 3
+        self.env["runtime"]["OutputManager"].present_text(
+            _("Forward next keypress"), interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/import_clipboard_from_file.py

@@ -2,38 +2,58 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
 import os
 
-class command():
+from fenrirscreenreader.core.i18n import _
+from fenrirscreenreader.utils import mark_utils
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('imports text from clipboard file to the clipboard')    
+    def get_description(self):
-    
+        return _("imports text from clipboard file to the clipboard")
-    def run(self):
+
-        clipboardFilePath = self.env['runtime']['settingsManager'].getSetting('general', 'clipboardExportPath')
+    def run(self):
-        clipboardFilePath = clipboardFilePath.replace('$user',self.env['general']['currUser'])        
+        clipboard_file_path = self.env["runtime"][
-        clipboardFilePath = clipboardFilePath.replace('$USER',self.env['general']['currUser'])        
+            "SettingsManager"
-        clipboardFilePath = clipboardFilePath.replace('$User',self.env['general']['currUser'])                        
+        ].get_setting("general", "clipboardExportPath")
-        if not os.path.exists(clipboardFilePath):
+        clipboard_file_path = clipboard_file_path.replace(
-            self.env['runtime']['outputManager'].presentText(_('File does not exist'), soundIcon='', interrupt=True)        
+            "$user", self.env["general"]["curr_user"]
-            return
+        )
-        clipboardFile = open(clipboardFilePath,'r') 
+        clipboard_file_path = clipboard_file_path.replace(
-        imported = clipboardFile.read()
+            "$USER", self.env["general"]["curr_user"]
-        clipboardFile.close()
+        )
-        self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', imported)        
+        clipboard_file_path = clipboard_file_path.replace(
-
+            "$User", self.env["general"]["curr_user"]
-        self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
+        )
-        self.env['runtime']['outputManager'].presentText(imported, soundIcon='', interrupt=False)        
+        if not os.path.exists(clipboard_file_path):
-        
+            self.env["runtime"]["OutputManager"].present_text(
-
+                _("File does not exist"), sound_icon="", interrupt=True
-    def setCallback(self, callback):
+            )
+            return
+        clipboard_file = open(clipboard_file_path, "r")
+        imported = clipboard_file.read()
+        clipboard_file.close()
+        self.env["runtime"]["MemoryManager"].add_value_to_first_index(
+            "clipboardHistory", imported
+        )
+
+        self.env["runtime"]["OutputManager"].present_text(
+            "Import to Clipboard", sound_icon="CopyToClipboard", interrupt=True
+        )
+        self.env["runtime"]["OutputManager"].present_text(
+            imported, sound_icon="", interrupt=False
+        )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/import_clipboard_from_x.py

@@ -1,54 +1,87 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import _thread
-import subprocess, os
+import importlib
-from subprocess import Popen, PIPE
+import os
-import _thread
+
-class command():
+import pyperclip
-    def __init__(self):
+
-        pass
+from fenrirscreenreader.core.i18n import _
-    def initialize(self, environment, scriptPath=''):
+
-        self.env = environment
+
-        self.scriptPath = scriptPath
+class command:
-    def shutdown(self):
+    def __init__(self):
-        pass
+        pass
-    def getDescription(self):
+
-        return _("imports the graphical clipboard to Fenrir's clipboard")
+    def initialize(self, environment, script_path=""):
-    def run(self):                       
+        self.env = environment
-       _thread.start_new_thread(self._threadRun , ())
+        self.script_path = script_path
-    def _threadRun(self):
+
-        try:
+    def shutdown(self):
-            # Find xclip path
+        pass
-            xclip_paths = ['/usr/bin/xclip', '/bin/xclip', '/usr/local/bin/xclip']
+
-            xclip_path = None
+    def get_description(self):
-            for path in xclip_paths:
+        return _("imports the graphical clipboard to Fenrir's clipboard")
-                if os.path.isfile(path) and os.access(path, os.X_OK):
+
-                    xclip_path = path
+    def run(self):
-                    break
+        _thread.start_new_thread(self._thread_run, ())
-            if not xclip_path:
+
-                self.env['runtime']['outputManager'].presentText('xclip not found in common locations', interrupt=True)
+    def _thread_run(self):
-                return
+        try:
-            xClipboard = ''
+            # Remember original display environment variable if it exists
-            for display in range(10):
+            original_display = os.environ.get("DISPLAY", "")
-                p = Popen('su ' + self.env['general']['currUser'] + ' -p -c  "' + xclip_path + ' -d :' + str(display) + ' -o"', stdout=PIPE, stderr=PIPE, shell=True)
+            clipboard_content = None
-                stdout, stderr = p.communicate()
+
-                self.env['runtime']['outputManager'].interruptOutput()
+            # Try different display options
-                stderr = stderr.decode('utf-8')
+            for i in range(10):
-                xClipboard = stdout.decode('utf-8')
+                display = f":{i}"
-                if (stderr == ''):
+                try:
-                    break      
+                    # Set display environment variable
-            if stderr != '':
+                    os.environ["DISPLAY"] = display
-                self.env['runtime']['outputManager'].presentText(stderr , soundIcon='', interrupt=False)
+                    # Attempt to get clipboard content
-            else:
+                    # Weird workaround for some distros
-                self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', xClipboard)
+                    importlib.reload(pyperclip)
-                self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
+                    clipboard_content = pyperclip.paste()
-                self.env['runtime']['outputManager'].presentText(xClipboard, soundIcon='', interrupt=False)               
+                    # If we get here without exception, we found a working
-        except Exception as e:
+                    # display
-            self.env['runtime']['outputManager'].presentText(e , soundIcon='', interrupt=False)
+                    if clipboard_content:
-        
+                        break
-    def setCallback(self, callback):
+                except Exception:
-        pass
+                    # Failed for this display, try next one
+                    continue
+
+            # Restore original display setting
+            if original_display:
+                os.environ["DISPLAY"] = original_display
+            else:
+                os.environ.pop("DISPLAY", None)
+
+            # Process the clipboard content if we found any
+            if clipboard_content and isinstance(clipboard_content, str):
+                self.env["runtime"]["MemoryManager"].add_value_to_first_index(
+                    "clipboardHistory", clipboard_content
+                )
+                self.env["runtime"]["OutputManager"].present_text(
+                    "Import to Clipboard",
+                    sound_icon="CopyToClipboard",
+                    interrupt=True,
+                )
+                self.env["runtime"]["OutputManager"].present_text(
+                    clipboard_content, sound_icon="", interrupt=False
+                )
+            else:
+                self.env["runtime"]["OutputManager"].present_text(
+                    "No text found in clipboard or no accessible display",
+                    interrupt=True,
+                )
+        except Exception as e:
+            self.env["runtime"]["OutputManager"].present_text(
+                str(e), sound_icon="", interrupt=False
+            )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/inc_alsa_volume.py

@@ -2,38 +2,20 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-initialized = False
+import importlib.util
-try:
+import os
-    import alsaaudio
-    initialized = True
-except:
-    pass
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 
-class command():
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
+_module = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_module)
+adjustment_command = _module.adjustment_command
+
+
+class command(adjustment_command):
     def __init__(self):
-        pass
+        super().__init__("alsa", "volume", "inc")
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass
-    def getDescription(self):
-        return _("Increase system volume")         
-
-    def run(self):
-        if not initialized:
-           self.env['runtime']['outputManager'].presentText(_('alsaaudio is not installed'), interrupt=True) 
-           return
-        mixer = alsaaudio.Mixer()
-        value = mixer.getvolume()[0]
-        value = value + 5
-        if value > 100:
-            value = 100
-        mixer.setvolume(value)
-        self.env['runtime']['outputManager'].presentText(_("{0} percent system volume").format(value), interrupt=True)
-
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/inc_sound_volume.py

@@ -1,32 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('adjusts the volume for in coming sounds')        
+
-
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        
+        super().__init__("sound", "volume", "inc")
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('sound', 'volume')
-
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('sound', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent sound volume").format(int(value * 100)),  soundIcon='SoundOn', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/inc_speech_pitch.py

@@ -1,30 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Increases the pitch of the speech')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
+        super().__init__("speech", "pitch", "inc")
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'pitch', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech pitch").format(int(value * 100)), soundIcon='', interrupt=True)
-   
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/inc_speech_rate.py

@@ -1,30 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Increase the speech rate')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'rate')
+        super().__init__("speech", "rate", "inc")
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'rate', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech rate").format(int(value * 100)), soundIcon='', interrupt=True)
- 
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/inc_speech_volume.py

@@ -1,30 +1,21 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import importlib.util
-import math
+import os
-
+
-class command():
+from fenrirscreenreader.core.i18n import _
-    def __init__(self):
+
-        pass
+_base_path = os.path.join(os.path.dirname(__file__), "adjustment_base.py")
-    def initialize(self, environment):
+_spec = importlib.util.spec_from_file_location("adjustment_base", _base_path)
-        self.env = environment
+_module = importlib.util.module_from_spec(_spec)
-    def shutdown(self):
+_spec.loader.exec_module(_module)
-        pass 
+adjustment_command = _module.adjustment_command
-    def getDescription(self):
+
-        return _('Increase the speech volume')        
+
-    
+class command(adjustment_command):
-    def run(self):
+    def __init__(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'volume')
+        super().__init__("speech", "volume", "inc")
-        value = round((math.ceil(10 * value) / 10) + 0.1, 2)
-        if value > 1.0:
-            value = 1.0  
-        self.env['runtime']['settingsManager'].setSetting('speech', 'volume', str(value))   
-
-        self.env['runtime']['outputManager'].presentText(_("{0} percent speech volume").format(int(value * 100)), soundIcon='', interrupt=True)
-  
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/indent_curr_line.py

@@ -2,35 +2,49 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import line_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('Presents the indentation level for the current line')        
+    def get_description(self):
+        return _("Presents the indentation level for the current line")
 
     def run(self):
         # Prefer review cursor over text cursor
 
-        if self.env['screen']['newCursorReview']:
+        if self.env["screen"]["newCursorReview"]:
-            cursorPos = self.env['screen']['newCursorReview'].copy()
+            cursor_pos = self.env["screen"]["newCursorReview"].copy()
         else:
-            cursorPos = self.env['screen']['newCursor'].copy()
+            cursor_pos = self.env["screen"]["new_cursor"].copy()
-        x, y, currLine = \
+        x, y, curr_line = line_utils.get_current_line(
-          line_utils.getCurrentLine(cursorPos['x'], cursorPos['y'], self.env['screen']['newContentText'])
+            cursor_pos["x"],
-        
+            cursor_pos["y"],
-        if currLine.isspace():
+            self.env["screen"]["new_content_text"],
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
+        )
-        else:        
-            self.env['runtime']['outputManager'].presentText(_("indent {0}").format(len(currLine) - len(currLine.lstrip())), interrupt=True)
 
-    def setCallback(self, callback):
+        if curr_line.isspace():
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("indent {0}").format(
+                    len(curr_line) - len(curr_line.lstrip())
+                ),
+                interrupt=True,
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/last_clipboard.py

@@ -1,28 +1,41 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('selects the last clipboard')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+    def get_description(self):
-            return
+        return _("selects the last clipboard")
-        self.env['runtime']['memoryManager'].setLastIndex('clipboardHistory')     
+
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+    def run(self):
-        self.env['runtime']['outputManager'].presentText(clipboard, interrupt=True)
+        if self.env["runtime"]["MemoryManager"].is_index_list_empty(
-            
+            "clipboardHistory"
-    def setCallback(self, callback):
+        ):
-        pass
+            self.env["runtime"]["OutputManager"].present_text(
+                _("clipboard empty"), interrupt=True
+            )
+            return
+        self.env["runtime"]["MemoryManager"].set_last_index("clipboardHistory")
+        clipboard = self.env["runtime"][
+            "MemoryManager"
+        ].get_index_list_element("clipboardHistory")
+        self.env["runtime"]["OutputManager"].present_text(
+            clipboard, interrupt=True
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/last_incoming.py

@@ -1,23 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Presents the text which was last received')        
-    
-    def run(self):
-        self.env['runtime']['outputManager'].presentText(self.env['screen']['newDelta'], interrupt=True)
-  
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/marked_text.py

@@ -2,37 +2,53 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import mark_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('Presents the currently selected text that will be copied to the clipboard')        
+    def get_description(self):
-    
+        return _(
+            "Presents the currently selected text that will be copied to the clipboard"
+        )
+
     def run(self):
-        if not (self.env['commandBuffer']['Marks']['1'] and \
+        if not (
-          self.env['commandBuffer']['Marks']['2']):
+            self.env["commandBuffer"]["Marks"]["1"]
-            self.env['runtime']['outputManager'].presentText(_("please set begin and endmark"), interrupt=True)
+            and self.env["commandBuffer"]["Marks"]["2"]
+        ):
+            self.env["runtime"]["OutputManager"].present_text(
+                _("please set begin and endmark"), interrupt=True
+            )
             return
 
         # use the last first and the last setted mark as range
-        startMark = self.env['commandBuffer']['Marks']['1'].copy()
+        start_mark = self.env["commandBuffer"]["Marks"]["1"].copy()
-        endMark = self.env['commandBuffer']['Marks']['2'].copy() 
+        end_mark = self.env["commandBuffer"]["Marks"]["2"].copy()
 
-        marked = mark_utils.getTextBetweenMarks(startMark, endMark, self.env['screen']['newContentText'])
+        marked = mark_utils.get_text_between_marks(
+            start_mark, end_mark, self.env["screen"]["new_content_text"]
+        )
 
         if marked.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
         else:
-            self.env['runtime']['outputManager'].presentText(marked, interrupt=True)
+            self.env["runtime"]["OutputManager"].present_text(
-    
+                marked, interrupt=True
-    def setCallback(self, callback):
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/next_clipboard.py

@@ -1,36 +1,57 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-    def shutdown(self):
+
-        pass 
+    def initialize(self, environment):
-    def getDescription(self):
+        self.env = environment
-        return _('selects the next clipboard')        
+
-    
+    def shutdown(self):
-    def run(self):
+        pass
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+    def get_description(self):
-            return      
+        return _("selects the next clipboard")
-        self.env['runtime']['memoryManager'].getNextIndex('clipboardHistory')               
+
-        isFirst = self.env['runtime']['memoryManager'].isFirstIndex('clipboardHistory')   
+    def run(self):
-        isLast = self.env['runtime']['memoryManager'].isLastIndex('clipboardHistory')               
+        if self.env["runtime"]["MemoryManager"].is_index_list_empty(
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')            
+            "clipboardHistory"
-        if isFirst:
+        ):
-            self.env['runtime']['outputManager'].presentText(_('First clipboard '), interrupt=True)   
+            self.env["runtime"]["OutputManager"].present_text(
-        if isLast:
+                _("clipboard empty"), interrupt=True
-            self.env['runtime']['outputManager'].presentText(_('Last clipboard '), interrupt=True)                     
+            )
-        
+            return
-        speechInterrupt = not(isLast or isFirst)
+        self.env["runtime"]["MemoryManager"].get_next_index("clipboardHistory")
-        self.env['runtime']['outputManager'].presentText(clipboard, interrupt = speechInterrupt)
+        is_first = self.env["runtime"]["MemoryManager"].is_first_index(
-             
+            "clipboardHistory"
-    def setCallback(self, callback):
+        )
-        pass
+        is_last = self.env["runtime"]["MemoryManager"].is_last_index(
+            "clipboardHistory"
+        )
+        clipboard = self.env["runtime"][
+            "MemoryManager"
+        ].get_index_list_element("clipboardHistory")
+        if is_first:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("First clipboard "), interrupt=True
+            )
+        if is_last:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Last clipboard "), interrupt=True
+            )
+
+        speech_interrupt = not (is_last or is_first)
+        self.env["runtime"]["OutputManager"].present_text(
+            clipboard, interrupt=speech_interrupt
+        )
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/next_quick_menu_entry.py

@@ -2,28 +2,41 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('get next quick menu entry')
+    def get_description(self):
-    def run(self):
+        return _("get next quick menu entry")
-        menu = ''
+
-        value = ''
+    def run(self):
-        if self.env['runtime']['quickMenuManager'].nextEntry():
+        menu = ""
-            menu = self.env['runtime']['quickMenuManager'].getCurrentEntry()
+        value = ""
-            if menu != '':
+        if self.env["runtime"]["QuickMenuManager"].next_entry():
-                value = self.env['runtime']['quickMenuManager'].getCurrentValue()
+            menu = self.env["runtime"]["QuickMenuManager"].get_current_entry()
-                self.env['runtime']['outputManager'].presentText(menu + ' ' + value, interrupt=True)
+            if menu != "":
-        else:
+                value = self.env["runtime"][
-            self.env['runtime']['outputManager'].presentText(_('Quick menu not available'), interrupt=True)
+                    "QuickMenuManager"
-    def setCallback(self, callback):
+                ].get_current_value()
+                self.env["runtime"]["OutputManager"].present_text(
+                    menu + " " + value, interrupt=True
+                )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                _("Quick menu not available"), interrupt=True
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/next_quick_menu_value.py

@@ -2,22 +2,31 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
 
-class command():
+from fenrirscreenreader.core.i18n import _
+
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
+        pass
-    def getDescription(self):
+
-        return _('get next quick menu value')
+    def get_description(self):
-    def run(self):
+        return _("get next quick menu value")
-        if self.env['runtime']['quickMenuManager'].nextValue():
+
-            value = self.env['runtime']['quickMenuManager'].getCurrentValue()
+    def run(self):
-            self.env['runtime']['outputManager'].presentText(value, interrupt=True)
+        if self.env["runtime"]["QuickMenuManager"].next_value():
-    def setCallback(self, callback):
+            value = self.env["runtime"]["QuickMenuManager"].get_current_value()
+            self.env["runtime"]["OutputManager"].present_text(
+                value, interrupt=True
+            )
+
+    def set_callback(self, callback):
         pass

src/fenrirscreenreader/commands/commands/paste_clipboard.py

@@ -1,30 +1,50 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-
+
-# Fenrir TTY screen reader
+# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
-
+
-from fenrirscreenreader.core import debug
+import time
-import time
+
-
+from fenrirscreenreader.core.i18n import _
-class command():
+
-    def __init__(self):
+
-        pass
+class command:
-    def initialize(self, environment):
+    def __init__(self):
-        self.env = environment
+        pass
-        self.env['runtime']['memoryManager'].addIndexList('clipboardHistory', self.env['runtime']['settingsManager'].getSettingAsInt('general', 'numberOfClipboards'))
+
-    def shutdown(self):
+    def initialize(self, environment):
-        pass 
+        self.env = environment
-    def getDescription(self):
+        self.env["runtime"]["MemoryManager"].add_index_list(
-        return _('pastes the text from the currently selected clipboard')        
+            "clipboardHistory",
-    
+            self.env["runtime"]["SettingsManager"].get_setting_as_int(
-    def run(self):    
+                "general", "numberOfClipboards"
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+            ),
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+        )
-            return                                          
+
-        self.env['runtime']['outputManager'].presentText('paste clipboard', soundIcon='PasteClipboardOnScreen', interrupt=True)
+    def shutdown(self):
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+        pass
-        self.env['runtime']['screenManager'].injectTextToScreen(clipboard)
+
-              
+    def get_description(self):
-    def setCallback(self, callback):
+        return _("pastes the text from the currently selected clipboard")
-        pass
+
+    def run(self):
+        if self.env["runtime"]["MemoryManager"].is_index_list_empty(
+            "clipboardHistory"
+        ):
+            self.env["runtime"]["OutputManager"].present_text(
+                _("clipboard empty"), interrupt=True
+            )
+            return
+        self.env["runtime"]["OutputManager"].present_text(
+            "paste clipboard",
+            sound_icon="PasteClipboardOnScreen",
+            interrupt=True,
+        )
+        clipboard = self.env["runtime"][
+            "MemoryManager"
+        ].get_index_list_element("clipboardHistory")
+        self.env["runtime"]["ScreenManager"].inject_text_to_screen(clipboard)
+
+    def set_callback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/present_first_line.py

@@ -2,29 +2,38 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-from fenrirscreenreader.core import debug
+from fenrirscreenreader.core.i18n import _
 from fenrirscreenreader.utils import line_utils
 
-class command():
+
+class command:
     def __init__(self):
         pass
+
     def initialize(self, environment):
         self.env = environment
+
     def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('present first line')        
-    
-    def run(self):
-        x, y, firstLine = \
-          line_utils.getCurrentLine(0, 0, self.env['screen']['newContentText'])
-        
-        if firstLine.isspace():
-            self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True)
-        else:
-            self.env['runtime']['outputManager'].presentText(firstLine, interrupt=True) 
-    def setCallback(self, callback):
         pass
 
+    def get_description(self):
+        return _("present first line")
+
+    def run(self):
+        x, y, first_line = line_utils.get_current_line(
+            0, 0, self.env["screen"]["new_content_text"]
+        )
+
+        if first_line.isspace():
+            self.env["runtime"]["OutputManager"].present_text(
+                _("blank"), sound_icon="EmptyLine", interrupt=True
+            )
+        else:
+            self.env["runtime"]["OutputManager"].present_text(
+                first_line, interrupt=True
+            )
+
+    def set_callback(self, callback):
+        pass