Worked on updating installation files, e.g. install.sh, requirements.txt, and setup.py. Maybe broken, proceed with caution.

?

.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
-* Jeremiah: Coder.
+* **Storm Dragon** - Project leader and maintainer
+
+
+## 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.
-* Stormux for continuation of the project.
+* **F123 Consulting** - Suggestions, funding, and extensive testing
+* **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,81 +1,100 @@
 # 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
 
-# OS Requirements
+## Key Features
 
-- Linux (ptyDriver, vcsaDriver, evdevDriver)
-- macOS (ptyDriver)
-- BSD (ptyDriver)
-- Windows (ptyDriver)
+- **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
 
 
-# Core Requirements
+## OS Requirements
 
-- python3 >= 3.3
-- screen, input, speech, sound or braille drivers dependencies see "Features, Drivers, Extras".
+- Linux (ptyDriver, vcsaDriver, evdevDriver) - Primary platform with full support
+- macOS (ptyDriver) - Limited support
+- BSD (ptyDriver) - Limited support  
+- Windows (ptyDriver) - Limited support
 
 
-# Features, Drivers, Extras, Dependencies
+## Core Requirements
 
-# Input Drivers:
-1. "evdevDriver" input driver for linux evdev
-  - python-evdev >=0.6.3 (This is commonly referred to as python3-evdev by your distribution)
-  - python-pyudev
-  - loaded uinput kernel module
-  - ReadWrite permission 
-    - /dev/input
-    - /dev/uinput
-2. "ptyDriver" terminal emulation input driver
-  - python-pyte
+- Python 3 >= 3.9 (recommended 3.13+)
+- Screen, input, speech, sound driver dependencies (see "Features, Drivers, Extras" section)
+- For full functionality on Linux: evdev, speech-dispatcher, sox
 
 
-# Screen Drivers:
+## Features, Drivers, Extras, Dependencies
 
-1. "vcsaDriver" screen driver for linux VCSA devices
-  - python-dbus
-  - Read permission to the following files and services:
-    - /sys/devices/virtual/tty/tty0/active
-    - /dev/tty[1-64]
-    - /dev/vcsa[1-64]
-    - read logind DBUS
-2. "ptyDriver" terminal emulation driver
-  - python-pyte
+### Input Drivers:
+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-pyudev
+   - loaded uinput kernel module
+   - ReadWrite permission:
+     - /dev/input
+     - /dev/uinput
+2. **ptyDriver** - Terminal emulation input driver (cross-platform)
+   - 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** - Linux VCSA devices driver (recommended for Linux TTY)
+   - python-dbus
+   - Read permission to the following files and services:
+     - /sys/devices/virtual/tty/tty0/active
+     - /dev/tty[1-64]
+     - /dev/vcsa[1-64]
+     - read logind DBUS
+2. **ptyDriver** - Terminal emulation driver (cross-platform)
+   - python-pyte
   
 
-# Speech Drivers:
+### Speech Drivers:
 
-1. "genericDriver" (default) speech driver for sound as subprocess:
-  - espeak or espeak-ng
-2. "espeakDriver" speech driver for Espeak or Espeak-NG:
-  - python-espeak
-3. "speechdDriver" speech driver for Speech-dispatcher:
-  - Speech-dispatcher
-  - python-speechd
-4. "emacspeakDriver" speech driver for emacspeak
-  - emacspeak
+1. **speechdDriver** - Speech-dispatcher driver (recommended)
+   - Speech-dispatcher
+   - python-speechd
+2. **genericDriver** - Generic subprocess speech driver
+   - espeak or espeak-ng (or any TTS command)
+3. **debugDriver** - Debug speech driver for testing
+   - No dependencies
 
 
-# Braille Drivers:
+### Sound Drivers:
 
-1. "BrlttyDriver" braille driver (WIP):
-  - brltty (configured and running)
-  - python-brlapi
+1. **genericDriver** (default) - Generic subprocess sound driver
+   - Sox with opus support (recommended)
+2. **gstreamerDriver** - GStreamer sound driver
+   - gstreamer >=1.0
+   - GLib
+3. **debugDriver** - Debug sound driver for testing
+   - No dependencies
 
 
-# Sound Drivers:
-
-1. "genericDriver" (default) sound driver for sound as subprocess:
-  - Sox
-2. "gstreamerDriver" sound driver for gstreamer
-  - gstreamer >=1.0
-  - GLib
-
-
-# Extras:
+## Extras:
 
 1. spellchecker
   - python-pyenchant
@@ -86,38 +105,369 @@ This software is licensed under the LGPL v3.
   - pyalsaaudio (needs libasound2's headers).
 
 
-# installation
+## installation
 
 If there is a package for your distrobution of choice, please let us know so we can add it here.
 
-- Archlinux: PKGBUILD in AUR (fenrir-git recommended)
-- PIP: sudo pip install fenrir-screenreader
+- Archlinux: PKGBUILD in AUR
+  - fenrir: stable release
+  - fenrir-git: Bleeding edge release
 - Manual:
- - install "espeak" and "sox" with your package manager
- - sudo pip install -r requirements.txt 
- - run install.sh or uninstall.sh as root
-- you also can just run it from Git without installing:
-You can just run the following as root:
-if you are in Fenrir Git rootfolder:
+  - install "espeak" and "sox" with your package manager
+  - sudo pip install -r requirements.txt 
+  - run install.sh or uninstall.sh as root
+- You can also just run it from Git without installing:
+Requires root privileges
 
-    cd src/fenrir/
+    cd src/
     sudo ./fenrir
 
-Same thing, but use the daemon so the terminal is not blocked:
+Settings are located in:
+- **After installation**: `/etc/fenrir/settings/settings.conf`
+- **Development**: `config/settings/settings.conf`
 
-    cd src/fenrir/
-    sudo ./fenrir-daemon
+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)
 
-Settings "settings.conf" is located in the "config" directory or after installation in /etc/fenrir/settings.
-Take care to use drivers from the config matching your installed drivers. 
-By default it uses:
-- sound driver: genericDriver (via sox, could configured in settings.conf)
-- speech driver: genericDriver (via espeak or espeak-ng, could configured in settings.conf)
-- braille driver: brlttyDriver (WIP)
-- input driver: evdevDriver
+## Getting Started
 
+### Basic Usage
 
-# Configure pulseaudio
+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
 
 Pulseaudio by default only plays sound for the user its currently running for. As fenrir is running as root, your local user does not hear the sound and speech produced by fenrir.
 for this fenrir provides a script to configure pulseaudio to stream the sound played as root to your local user. This is not a issue of fenrir but this is how pulseaudio works.
@@ -130,7 +480,7 @@ just run the configuration script twice (once as user, once as root):
 The script is also located in the tools directory in git
 
 
-# Configure pipewire
+## Configure pipewire
 
 Pipewire by default only plays sound for the user its currently running for. As fenrir is running as root, your local user does not hear the sound and speech produced by fenrir.
 for this fenrir provides a script to configure pipewire to stream the sound played as root to your local user. This is not a issue of fenrir but this is how pipewire works.
@@ -142,10 +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
-copy fenrir.mo translations file  from fenrir/locale/your_language/LC_MESSAGES/fenrir.mo to /usr/share/locale/your_language/LC_MESSAGES/fenrir.mo
+## Command Line Options
 
- 
-# Documentation
+Fenrir supports several command-line options for different use cases:
 
-Here is the [Fenrir Wiki](https://github.com/chrys87/fenrir/wiki). It is currently being updated, so keep checking back. Feel free to help with documentation.
+```
+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
+- **Fenrir Wiki**: [https://git.stormux.org/storm/fenrir/wiki](https://git.stormux.org/storm/fenrir/wiki)
+- **IRC**: irc.stormux.org #stormux
+- **Issues**: Report bugs and feature requests on the project repository

autostart/runit/fenrir/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -r ./conf ] && . ./conf
-exec fenrir
+exec fenrir -f

autostart/systemd/Arch/fenrir.service

@@ -1,18 +1,15 @@
 [Unit]
 Description=Fenrir screenreader
 Wants=systemd-udev-settle.service
-After=systemd-udev-settle.service sound.target
+After=systemd-udev-settle.service getty.target
 [Service]
 Type=forking
 PIDFile=/var/run/fenrir.pid
-ExecStart=/usr/bin/fenrir-daemon
+ExecStart=/usr/bin/fenrir
 ExecReload=/usr/bin/kill -HUP $MAINPID
 Restart=always
 #Group=fenrirscreenreader
 #User=fenrirscreenreader
 
 [Install]
-# start as early as possible in boot process
-#WantedBy=sound.target
-# start as soon the login prompt is available
 WantedBy=getty.target

autostart/systemd/Debian/fenrir.service

@@ -5,7 +5,7 @@ After=systemd-udev-settle.service sound.target
 [Service]
 Type=forking
 PIDFile=/var/run/fenrir.pid
-ExecStart=/usr/local/bin/fenrir-daemon
+ExecStart=/usr/local/bin/fenrir
 ExecReload=/usr/bin/kill -HUP $MAINPID
 Restart=always
 #Group=fenrirscreenreader

check-dependencies.py

@@ -1,232 +1,134 @@
-#!/bin/env python3
-import os, sys
+#!/usr/bin/env python3
 
-# default installation
-# core
-# speech: speech-dispatcher
-# sound: sox
-# braille: brltty:
-defaultInstallation = ['FenrirCore','vcsaDriver','dummyDriver (braille)','evdevDriver','genericDriver (speech)', 'genericDriver (sound)']
-currentInstallation = []
+import os
+import sys
+from dataclasses import dataclass
+from typing import List, Optional
 
-print('checking dependencys...')
-# CORE
-print('')
-print('fenrir core:')
-available = True
-try:
-    from daemonize import Daemonize
-    print('python3-daemonize: OK')
-except:
-    print('python3-daemonize: FAIL')
-    available = available and False
+@dataclass
+class Dependency:
+    name: str
+    depType: str  # screen, input, sound, speech, core
+    moduleName: str
+    checkCommands: Optional[List[str]] = None  # Command-line tools to check
+    pythonImports: Optional[List[str]] = None  # Python packages to check
+    devicePaths: Optional[List[str]] = None    # Device files to check
+
+def check_dependency(dep: Dependency) -> bool:
+    """Check if a single dependency is satisfied."""
+    isAvailable = True
     
-try:
-    import enchant
-    print('pyenchant: OK')
-except:
-    print('pyenchant: FAIL')
-    available = available and False
-    
-if available:
-    currentInstallation.append('FenrirCore')
-    
-# SCREEN
-print('--------------------')
-print('screen driver')
-# dummy and debug
-print('dummyDriver (screen): OK')
-currentInstallation.append('dummyDriver (screen)')
+    if dep.pythonImports:
+        for package in dep.pythonImports:
+            try:
+                moduleName = package.split('.')[0]
+                __import__(moduleName)
+                print(f'{package}: OK')
+            except ImportError:
+                print(f'{package}: FAIL')
+                isAvailable = False
 
-# VCSA (screen driver)
-print('vcsaDriver')
-available = True
-try:
-    import dbus
-    print('python3-dbus: OK')
-except:
-    print('python3-dbus: FAIL')
-    available = available and False
-if os.path.exists('/dev/vcsa'):
-    print('VCSA Device: OK')
-else:    
-    print('VCSA Device: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('vcsaDriver')
-print('')
-# pty emulation (screen driver)
-print('ptyDriver')
-available = True
-try:
-    import pyte
-    print('pyte: OK')
-except:
-    print('pyte: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('ptyDriver (screen)') 
+    if dep.checkCommands:
+        for cmd in dep.checkCommands:
+            if os.path.exists(f'/usr/bin/{cmd}') or os.path.exists(f'/bin/{cmd}'):
+                print(f'{cmd}: OK')
+            else:
+                print(f'{cmd}: FAIL')
+                isAvailable = False
+
+    if dep.devicePaths:
+        for path in dep.devicePaths:
+            if os.path.exists(path):
+                print(f'{path}: OK')
+            else:
+                print(f'{path}: FAIL')
+                isAvailable = False
+
+    return isAvailable
+
+# Define all dependencies
+dependencyList = [
+    # Core dependencies
+    Dependency('FenrirCore', 'core', 'core', 
+              pythonImports=['daemonize', 'enchant']),
     
-# BRAILLE
-print('--------------------')
-print('braille driver')
-# dummy and debug
-print('dummyDriver (braille): OK')
-currentInstallation.append('dummyDriver (braille)')
-print('debugDriver (braille): OK')
-currentInstallation.append('debugDriver (braille)')
-# brltty (braille driver)
-print('brlapiDriver')
-available = True
-try:
-    import brlapi
-    print('python3-brlapi: OK')
-except:
-    print('python3-brlapi: FAIL')
-    available = available and False
+    # Screen drivers
+    Dependency('DummyScreen', 'screen', 'dummyDriver'),
+    Dependency('VCSA', 'screen', 'vcsaDriver',
+              pythonImports=['dbus'],
+              devicePaths=['/dev/vcsa']),
+    Dependency('PTY', 'screen', 'ptyDriver',
+              pythonImports=['pyte']),
+              
+    # Input drivers
+    Dependency('DummyInput', 'input', 'dummyDriver'),
+    Dependency('DebugInput', 'input', 'debugDriver'),
+    Dependency('Evdev', 'input', 'evdevDriver',
+              pythonImports=['evdev', 'evdev.InputDevice', 'evdev.UInput', 'pyudev']),
+    Dependency('PTYInput', 'input', 'ptyDriver',
+              pythonImports=['pyte']),
+              
+    # Sound drivers
+    Dependency('DummySound', 'sound', 'dummyDriver'),
+    Dependency('DebugSound', 'sound', 'debugDriver'),
+    Dependency('GenericSound', 'sound', 'genericDriver',
+              checkCommands=['play', 'sox']),
+    Dependency('GStreamer', 'sound', 'gstreamerDriver',
+              pythonImports=['gi', 'gi.repository.GLib', 'gi.repository.Gst']),
+              
+    # Speech drivers
+    Dependency('DummySpeech', 'speech', 'dummyDriver'),
+    Dependency('DebugSpeech', 'speech', 'debugDriver'),
+    Dependency('Speechd', 'speech', 'speechdDriver',
+              pythonImports=['speechd']),
+    Dependency('GenericSpeech', 'speech', 'genericDriver',
+              checkCommands=['espeak-ng'])
+]
+
+defaultModules = {
+    'FenrirCore',
+    'VCSA',
+    'Evdev',
+    'GenericSpeech',
+    'GenericSound'
+}
+
+def check_all_dependencies():
+    print('Checking dependencies...\n')
+    availableModules = []
     
-if available:
-    currentInstallation.append('brlapiDriver')
-# INPUT
-print('--------------------')
-print('input driver')
-# dummy and debug
-print('dummyDriver (input): OK')
-currentInstallation.append('dummyDriver (input)')
-print('debugDriver (input): OK')
-currentInstallation.append('debugDriver (input)')
-# evdev (input driver)
-print('evdevDriver')
-available = True
-try:
-    import evdev
-    from evdev import InputDevice, UInput
-    print('python3-evdev: OK')
-except:
-    print('python3-evdev: FAIL')
-    available = available and False
-try:
-    import pyudev
-    print('python3-pyudev: OK')
-except:
-    print('python3-pyudev: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('evdevDriver')
-# pty emulation (input driver)
-print('')
-print('ptyDriver')
-available = True
-try:
-    import pyte
-    print('pyte: OK')
-except:
-    print('pyte: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('ptyDriver (Input)')
-# SOUND
-print('--------------------')
-print('sound driver')
-# dummy and debug
-print('dummyDriver (sound): OK')
-currentInstallation.append('dummyDriver (sound)')
-print('debugDriver (sound): OK')
-currentInstallation.append('debugDriver (sound)')
-print('genericDriver (uses sox by default)')
-available = True
-if os.path.exists('/usr/bin/play') and os.path.exists('/usr/bin/sox'):
-    print('sox: OK')
-else:
-    print('sox: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('genericDriver (sound)')
-print('')
-# gstreamer (sound driver)
-print('gstreamerDriver')
-available = True
-try:
-    import gi
-    print('gi: OK')
-except:
-    print('gi: FAIL')
-    available = available and False
-try:
-    from gi.repository import GLib 
-    print('gi GLib: OK')
-except:
-    print('gi GLib: FAIL')
-    available = available and False
-try:
-    gi.require_version('Gst', '1.0')
-    from gi.repository import Gst
-    print('gi Gst: OK')
-except:
-    print('gi Gst: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('gstreamerDriver')
+    # Group dependencies by type for organized output
+    for depType in ['core', 'screen', 'input', 'sound', 'speech']:
+        print(f'{depType.upper()} DRIVERS')
+        print('-' * 20)
+        
+        depsOfType = [d for d in dependencyList if d.depType == depType]
+        for dep in depsOfType:
+            print(f'\nChecking {dep.name}:')
+            if check_dependency(dep):
+                availableModules.append(dep.name)
+        print('')
 
-# SPEECH
-print('--------------------')
-print('speech driver')
-# dummy and debug
-print('dummyDriver (speech): OK')
-currentInstallation.append('dummyDriver (speech)')
-print('debugDriver (speech): OK')
-currentInstallation.append('debugDriver (speech)')
-# speechd (speech driver)
-print('speechdDriver')
-available = True
-try:
-    import speechd
-    print('python3-speechd: OK')
-except:
-    print('python3-speechd: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('speechdDriver')
-print('')
-# espeak (speech driver)
-print('espeakDriver')
-available = True
-try:
-    from espeak import espeak 
-    print('python3-espeak: OK')
-except:
-    print('python3-espeak: FAIL')
-    available = available and False
-if available:
-    currentInstallation.append('espeakDriver')
-print('genericDriver (uses espeak-ng by default)')
-available = True
-if os.path.exists('/usr/bin/espeak-ng') or os.path.exists('/bin/espeak-ng'):
-    print('espeak-ng: OK')
-else:
-    print('espeak-ng: FAIL')
-    available = available and False    
-if available:
-    currentInstallation.append('genericDriver (speech)')
+    print_summary(availableModules)
 
-# SUMMERY
-print('====================')
-available = True
-missing = []
-for element in  defaultInstallation:
-    if not element in currentInstallation:
-        available = False
-        missing.append(element)
-if available:
-    print('Default Setup: OK')
-else:
-    print('Default Setup: FAIL')    
-    print('Unavailable Default Modules:')
-    for e in missing:
-        print(e)
-    print('you may need to install the missing dependencys for the modules above or reconfigure fenrir to not use them')
-print('')
-print('Available Modules:')   
-for element in  currentInstallation:
-    print(element)
+def print_summary(availableModules: List[str]):
+    print('=' * 20)
+    print('SUMMARY')
+    print('=' * 20)
+    
+    missingModules = defaultModules - set(availableModules)
+    if missingModules:
+        print('Default Setup: FAIL')
+        print('\nUnavailable Default Modules:')
+        for module in missingModules:
+            print(f'- {module}')
+        print('\nYou may need to install the missing dependencies for the modules above or reconfigure fenrir to not use them.')
+    else:
+        print('Default Setup: OK')
 
+    print('\nAvailable Modules:')
+    for module in availableModules:
+        print(f'- {module}')
+
+if __name__ == '__main__':
+    check_all_dependencies()

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
@@ -125,3 +128,5 @@ 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
+KEY_FENRIR,KEY_SHIFT,KEY_V=announce_fenrir_version
+KEY_F4=cycle_keyboard_layout

config/keyboard/laptop.conf

@@ -75,9 +75,11 @@ 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=silence_until_prompt
 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
@@ -111,6 +113,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
@@ -125,3 +129,5 @@ 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
+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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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/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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"](Oo)|(oO)[\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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/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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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/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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"][\s*|'|"]8\):===:smile with sunglasses
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s*|'|"][O|o][O|o][\s*|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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/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*|'|"]<{-.-}>:===:Raves
-regex;[\s*|'|"][\s*|'|"]8-\):===:smile with sunglasses
-regex;[\s*|'|"][\s*|'|"]:-/:===:confused
-regex;[\s*|'|"][\s*|'|"]-\.-:===:bugged
-regex;[\s*|'|"][\s*|'|"]>\.<:===:laughing
-regex;[\s*|'|"][\s*|'|"]8-X:===:skull
-regex;[\s*|'|"][\s*|'|"]>:\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]>:-\):===:evil smile
-regex;[\s*|'|"][\s*|'|"]\\o/:===:Hurray
-regex;[\s*|'|"][\s*|'|"]:/:===:confused
-regex;[\s*|'|"]:D[\s*|'|"]:===:laugh
-regex;[\s*|'|"];\)[\s*|'|"]:===:wink
-regex;[\s*|'|"]XD[\s*|'|"]:===:LOL
-regex;[\s*|'|"]:-\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]:\)[\s*|'|"]:===:smile
-regex;[\s*|'|"]->[\s*|'|"]:===:arrow right
-# example for arrow left
-#(?:[ |^])(<-)(?:[ ,.!?$]):===:arrow left
-# or
-#([ |^])<-([ ,.!?$]):===:arrow left\2
-regex;[\s*|'|"]<-[\s*|'|"]:===:arrow left
-regex;[\s+|'|"][O|o][O|o][\s+|'|"]:===:WTF?
-regex;[\s*|'|"]\^\^[\s*|'|"]:===:enjoy smile
+regex;(?:^|\s)(?::-\)|:\))(?:\s|$):===:smile
+regex;(?:^|\s)(?::-\(|:\()(?:\s|$):===:frown
+regex;(?:^|\s)(?::-D|:D)(?:\s|$):===:big grin
+regex;(?:^|\s)(?:;-\)|;\))(?:\s|$):===:wink
+regex;(?:^|\s)(?::-P|:P)(?:\s|$):===:tongue out
+regex;(?:^|\s)(?::-O|:O)(?:\s|$):===:surprised
+regex;(?:^|\s)(?::-/|:/)(?:\s|$):===:skeptical
+regex;(?:^|\s)(?:>:-\(|>:\()(?:\s|$):===:angry
+regex;(?:^|\s)(?::'\(|:'-\()(?:\s|$):===:crying
+regex;(?:^|\s)(?::-\||:\|)(?:\s|$):===:neutral
+regex;(?:^|\s)(?:8-\)|B-\))(?:\s|$):===:cool
+regex;(?:^|\s)8-X(?:\s|$):===:skull and crossbones
+regex;(?:^|\s)(?:X-X|x-x)(?:\s|$):===:knocked out
+regex;(?:^|\s)(?::-X|:-x|:X|:x)(?:\s|$):===:lips sealed
+regex;(?:^|\s)XD(?:\s|$):===:laughing hard
+regex;(?:^|\s)\^_\^(?:\s|$):===:happy
+regex;(?:^|\s)-_-(?:\s|$):===:annoyed
+regex;(?:^|\s)o_O(?:\s|$):===:confused
+regex;(?:^|\s)>_<(?:\s|$):===:frustrated
+regex;(?:^|\s)\\o/(?:\s|$):===:hurray
+regex;(?:^|\s)<3(?:\s|$):===:heart
+regex;(?:^|\s)</3(?:\s|$):===:broken heart
+regex;(?:^|\s)(?:Oo|oO)(?:\s|$):===:WTF?
+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/espeak.settings.conf

@@ -1,253 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are generic and gstreamer.
-# Sox is the default.
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your chosen soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituded
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequence to play
-# fenrirDuration = the duration of the frequence
-# the following command is used for play a soundfile
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile 2>/dev/null
-#the following command is used for generating a frequency beep
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence 2>/dev/null
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=genericDriver
-driver=espeakDriver
-
-# server path for emacspeak
-serverPath=
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.35
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help ti find out which modules are available.
-# The default is Espeak.
-module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-voice=f3
-
-# Select the language you want Fenrir to use.
-language=en_US
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module used in Speech-dispatcher, not every TTY needs this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# these are the minimum and maximum values of the TTS system used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and let consume keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-## echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=True
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-scriptPath=/usr/share/fenrirscreenreader/scripts
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-cursor=True
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-enabled=False
-presentTime=True
-presentDate=True
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon
-announce=True
-# interrupt current speech for time announcement
-interrupt=False
-

config/settings/settings-chime.conf

@@ -1,267 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-# chrys: comment out genericDriver, uncomment speechdDriver
-driver=speechdDriver
-#driver=espeakDriver
-#driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is specified in speechd.conf.
-# chrys: uncomment module, set it to voxin (default espeak-ng)
-module=voxin
-
-# Voice selects the voice you want to use, for example, en-GB-scotland will use the Scotish English voice in Espeak,
-# To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-# You can add a variant by adding +name onto the end.
-# chrys: set voice (default was en-us)
-voice=allison-embedded-high
-
-# Select the language you want Fenrir to use.
-# chrys: uncomment language and set language to en-US (default was en)
-language=en
-
-# Read new text as it happens?
-autoReadIncoming=True
-
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False# genericSpeechCommand is the command that is executed for talking
-
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak-ng -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings-daemon.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings-pty.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

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=genericDriver
-
-# server path for emacspeak
-# serverPath=
+driver=speechdDriver
+#driver=genericDriver
 
 # 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
@@ -91,43 +91,12 @@ fenrirMaxPitch=99
 fenrirMinRate=80
 fenrirMaxRate=450
 
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
 [screen]
 driver=vcsaDriver
 encoding=auto
 screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
+ignoreScreen=7
+autodetectIgnoreScreen=True
 
 [keyboard]
 driver=evdevDriver
@@ -165,7 +134,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
@@ -174,8 +143,8 @@ emoticons=True
 # define the current Fenrir key
 fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
 scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
+timeFormat=%%I:%%M%%P
+dateFormat=%%A, %%B %%d, %%Y
 autoSpellCheck=True
 spellCheckLanguage=en_US
 # path for your scripts "scriptKeys" functionality
@@ -197,7 +166,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=
@@ -224,7 +193,7 @@ enableSettingsRemote=True
 enableCommandRemote=True
 
 [barrier]
-enabled=True
+enabled=False
 leftBarriers=│└┌─
 rightBarriers=│┘┐─
 
@@ -245,8 +214,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/settings/settings.conf.dectalk

@@ -1,264 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.2
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is specified in speechd.conf.
-#module=espeak-ng
-
-# Voice selects the voice you want to use, for example, en-GB-scotland will use the Scotish English voice in Espeak,
-# To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-# You can add a variant by adding +name onto the end.
-voice=0
-
-# Select the language you want Fenrir to use.
-#language=en
-
-# Read new text as it happens?
-autoReadIncoming=True
-
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=/opt/dectalk/say -v fenrirVolume -r fenrirRate -s fenrirVoice -a "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=100
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=75
-fenrirMaxRate=600
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=1
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings.conf.example

@@ -1,264 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver, emacspeak or espeakDriver:
-#driver=speechdDriver
-#driver=espeakDriver
-driver=genericDriver
-#driver=emacspeakDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-#module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=en-us
-
-# Select the language you want Fenrir to use.
-#language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKey=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKey" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/settings.conf.storm

@@ -1,204 +0,0 @@
-[sound]
-enabled=True
-driver=gstreamerDriver
-theme=default
-volume=0.5
-# shell commands for generic sound driver
-genericPlayFileCommand=play -q -v fenrirVolume fenrirSoundFile
-genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence
-
-[speech]
-enabled=True
-driver=speechdDriver
-#driver=genericDriver
-serverPath=
-rate=0.80
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-module=espeak-ng
-voice=en-us
-language=en-us
-volume=0.6
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits = False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# these are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=890
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-grabDevices=True
-ignoreShortcuts=False
-keyboardLayout=desktop
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-charDeleteEcho=True
-wordEcho=False
-interruptOnKeyPress=True
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-autoPresentIndentMode=1
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-fenrirKeys=KEY_KP0,KEY_CAPSLOCK
-scriptKeys=KEY_COMPOSE,KEY_META
-timeFormat=%H:%M:%P
-dateFormat="%A, %B %d, %Y"
-autoSpellCheck=True
-spellCheckLanguage=en_US
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-autoPresentIndent=False
-# play a sound when attributes are changeing
-hasAttributes=False
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=True
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after x seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00
-# announce via soundicon
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

config/settings/speech-dispatcher.settings.conf

@@ -1,263 +0,0 @@
-[sound]
-# Turn sound on or off:
-enabled=True
-
-# Select the driver used to play sounds, choices are genericDriver and gstreamerDriver.
-# Sox is the default.
-#driver=gstreamerDriver
-driver=genericDriver
-
-# Sound themes. These are the pack of sounds used for sound alerts.
-# Sound packs may be located at /usr/share/sounds
-# For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
-# For the current user.
-theme=default
-
-# Sound volume controls how loud the sounds for your selected soundpack are.
-# 0 is quietest, 1.0 is loudest.
-volume=1.0
-
-# shell commands for generic sound driver
-# the folowing variable are substituted
-# fenrirVolume = the current volume setting
-# fenrirSoundFile = the soundfile for an soundicon
-# fenrirFrequence = the frequency to play
-# fenrirDuration = the duration of the frequency
-# the following command is used to play a soundfile
-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
-
-[speech]
-# Turn speech on or off:
-enabled=True
-
-# Select speech driver, options are speechdDriver (default), genericDriver or espeakDriver:
-driver=speechdDriver
-#driver=espeakDriver
-#driver=genericDriver
-
-# server path for emacspeak
-serverPath=/home/chrys/Projekte/emacspeak/servers/espeak
-
-# The rate selects how fast Fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
-rate=0.65
-
-# Pitch controls the pitch of the voice, select from 0, lowest, to 1.0, highest.
-pitch=0.5
-# Pitch for capital letters
-capitalPitch=0.9
-
-# Volume controls the loudness of the voice, select from 0, quietest, to 1.0, loudest.
-volume=1.0
-
-# Module is used for Speech-dispatcher, to select the speech module you want to use.
-# Consult Speech-dispatcher's configuration and help Fenrir find out which modules are available.
-# The default is espeak.
-module=espeak
-
-# Voice selects the varient you want to use, for example, f5 will use the female voice #5 in Espeak,
-# or if using the Espeak module in Speech-dispatcher. To find out which voices are available, consult the documentation provided with your selected synthesizer.
-# This also sets the voice used in the generic driver.
-voice=
-
-# Select the language you want Fenrir to use.
-language=english-us
-
-# Read new text as it happens?
-autoReadIncoming=True
-                                                                                                                                                                          
-# Speak individual numbers instead of whole string.
-readNumbersAsDigits': False
-
-# genericSpeechCommand is the command that is executed for talking
-# the following variables are replaced with values 
-# fenrirText = is the text that should be spoken
-# fenrirModule = may be the speech module like used in speech-dispatcher, not every TTY need this
-# fenrirLanguage = the language 
-# fenrirVoice = is the current voice that should be used. Set the voice variable above.
-# the current volume, pitch and rate is calculated like this
-# value = min + settingValue * (min - max )
-# fenrirVolume = is replaced with the current volume
-# fenrirPitch = is replaced with the current pitch
-# fenrirRate = is replaced with the current speed (speech rate)
-genericSpeechCommand=espeak -a fenrirVolume -s fenrirRate -p fenrirPitch -v fenrirVoice -- "fenrirText"
-
-# those are the min and max values of the TTS system that is used in genericSpeechCommand
-fenrirMinVolume=0
-fenrirMaxVolume=200
-fenrirMinPitch=0
-fenrirMaxPitch=99
-fenrirMinRate=80
-fenrirMaxRate=450
-
-[braille]
-enabled=False
-driver=dummyDriver
-layout=en
-# to what should the flush timeout relate to 
-# word = flush after (number of words to display) * seconds
-# char = flush after (number of chars to display) * seconds
-# fix = flush after X seconds
-# none = no automatic flush (manual via shortcut)
-flushMode=word
-# seconds to flush or
-# -1 = no automatic flush (manual via shortcut)
-flushTimeout=3
-# how should the cursor be focused?
-# page = if cursor cross the border move to next page and start at beginn
-# fixCell = ajust the cursor on an special cell where it is always placed. the display scroll here more smooth.
-cursorFocusMode=page
-# define the cell on the Braille device where fenrir should scroll and keep the cursor
-# 0 = first cell on device
-# -1 = last cell on device 
-# >0 = fix cell number
-fixCursorOnCell=-1
-#How should the braille follow the focus
-# none = no automatic toggle command used
-# review = priority to review
-# last = follow last used cursor
-cursorFollowMode=review
-# number of cells in panning (horizontal)
-# 0 = display size, >0 number of cells
-panSizeHorizontal=0
-
-[screen]
-driver=vcsaDriver
-encoding=auto
-screenUpdateDelay=0.05
-suspendingScreen=
-autodetectSuspendingScreen=True
-
-[keyboard]
-driver=evdevDriver
-# filter input devices NOMICE, ALL or a DEVICE NAME
-device=ALL
-# gives Fenrir exclusive access to the keyboard and lets it control keystrokes.
-grabDevices=True
-ignoreShortcuts=False
-# the current shortcut layout located in /etc/fenrirscreenreader/keyboard
-keyboardLayout=desktop
-# echo chars while typing.
-# 0 = None
-# 1 = always
-# 2 = only while capslock
-charEchoMode=2
-# echo deleted chars
-charDeleteEcho=True
-# echo word after pressing space
-wordEcho=False
-# interrupt speech on any keypress
-interruptOnKeyPress=False
-# you can filter the keys on that the speech should interrupt (empty = all keys, otherwhise the given keys)
-interruptOnKeyPressFilter=
-# timeout for double tap in sec
-doubleTapTimeout=0.2
-
-[general]
-debugLevel=0
-# 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
-debugMode=File
-debugFile=
-punctuationProfile=default
-punctuationLevel=some
-respectPunctuationPause=True
-newLinePause=True
-numberOfClipboards=10
-# used path for "export_clipboard_to_file"
-# $user is replaced by username
-#clipboardExportPath=/home/$user/fenrirClipboard
-clipboardExportPath=/tmp/fenrirClipboard
-emoticons=True
-# define the current Fenrir key
-fenrirKeys=KEY_KP0,KEY_META,KEY_INSERT
-scriptKeys=KEY_COMPOSE
-timeFormat=%H:%M:%P
-dateFormat=%A, %B %d, %Y
-autoSpellCheck=True
-spellCheckLanguage=en_US
-# path for your scripts "scriptKeys" functionality
-scriptPath=/usr/share/fenrirscreenreader/scripts
-# overload commands, and create new one without changing Fenrir default
-commandPath=
-#fenrirBGColor = the backgroundcolor
-#fenrirFGColor = the foregroundcolor
-#fenrirUnderline = speak the underline attribute
-#fenrirBold = speak the bold attribute
-#fenrirBlink = speak the blink attribute
-#fenrirFont = the font
-#fenrirFontSize = the fontsize
-attributeFormatString=Background fenrirBGColor,Foreground fenrirFGColor,fenrirUnderline,fenrirBold,fenrirBlink, Font fenrirFont,Fontsize fenrirFontSize
-# present indentation
-autoPresentIndent=False
-# speak is only invoked on changeing ident level, sound always
-# 0 = sound and speak
-# 1 = sound only
-# 2 = speak only
-autoPresentIndentMode=1
-# play a sound when attributes are changeing
-hasAttributes=True
-# shell for PTY emulatiun (empty = default shell)
-shell=
-
-[focus]
-#follow the text cursor
-cursor=True
-#follow highlighted text changes
-highlight=False
-
-[remote]
-enable=True
-# driver
-# unixDriver = unix sockets
-# tcpDriver = tcp (localhost only)
-driver=unixDriver
-# tcp port
-port=22447
-# socket filepath
-socketFile=
-# allow settings to overwrite
-enableSettingsRemote=True
-# allow commands to be executed
-enableCommandRemote=True
-
-[barrier]
-enabled=True
-leftBarriers=│└┌─
-rightBarriers=│┘┐─
-  
-[review]
-lineBreak=True
-endOfScreen=True
-# leave the review when pressing a key
-leaveReviewOnCursorChange=True
-# leave the review when changing the screen
-leaveReviewOnScreenChange=True
-
-[promote]
-enabled=True
-inactiveTimeoutSec=120
-list=
-
-[menu]
-vmenuPath=
-quickMenu=speech#rate;speech#pitch;speech#volume
-
-[time]
-# automatic time anouncement
-enabled=False
-# present time
-presentTime=True
-# present date (on change)
-presentDate=True
-# present time after a given period of seconds
-delaySec=0
-# present time after to given minutes example every 15 minutes: 00,15,30,45
-# if delaySec is >0 onMinutes is ignored
-onMinutes=00,30
-# announce via soundicon (not interrupting)
-announce=True
-# interrupt current speech for time announcement
-interrupt=False

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/create_manpage.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # needs pandoc and php installed
 
 # remove old files

docs/development.txt

@@ -1,4 +1,389 @@
-1. Basic
-2. Commands
-3. Useful API
+# Fenrir Development Guide
 
+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,13 +1,141 @@
-#!/bin/bash
-#Basic install script for Fenrir.
-read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue." continue
+#!/usr/bin/env bash
+# Install script for Fenrir Screen Reader
+set -e
+
+# Check if running as root
+if [[ $(whoami) != "root" ]]; then
+   echo "This script must be run as root"
+   exit 1
+fi
+
+# Check Python version
+pythonVersion=$(python3 -c "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')")
+requiredVersion="3.8"
+if ! python3 -c "import sys; exit(0 if sys.version_info >= (3, 8) else 1)" 2>/dev/null; then
+    echo "Python ${requiredVersion} or higher is required. Current version: ${pythonVersion}"
+    exit 1
+fi
+
+echo "Fenrir Screen Reader Installation"
+echo "=================================="
+read -rp "This will install the Fenrir screen reader. Press Ctrl+C to cancel, or Enter to continue."
+
+# Check for pip3
+if ! command -v pip3 &> /dev/null; then
+    echo "pip3 is required but not installed. Please install pip3 first."
+    exit 1
+fi
+
+# Function to check dependencies
+checkDependencies() {
+    echo "Checking dependencies..."
+    if python3 check-dependencies.py; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Function to install dependencies with pip
+installWithPip() {
+    echo "Installing Python dependencies with pip..."
+    pip3 install -r requirements.txt --break-system-packages
+}
+
+# Function to detect package manager and provide instructions
+detectPackageManager() {
+    if command -v apt &> /dev/null; then
+        echo "apt"
+    elif command -v dnf &> /dev/null; then
+        echo "dnf"
+    elif command -v yum &> /dev/null; then
+        echo "yum"
+    elif command -v pacman &> /dev/null; then
+        echo "pacman"
+    elif command -v zypper &> /dev/null; then
+        echo "zypper"
+    else
+        echo "unknown"
+    fi
+}
+
+# Function to show package manager instructions
+showPackageInstructions() {
+    local pm=$1
+    echo "Package manager installation instructions:"
+    case $pm in
+        "apt")
+            echo "  sudo apt update"
+            echo "  sudo apt install python3-evdev python3-daemonize python3-dbus python3-pyudev python3-pexpect"
+            echo "  sudo apt install python3-pyte python3-setproctitle python3-enchant python3-xdg"
+            echo "  sudo apt install speech-dispatcher espeak-ng sox alsa-utils"
+            ;;
+        "dnf"|"yum")
+            echo "  sudo $pm install python3-evdev python3-daemonize python3-dbus python3-pyudev python3-pexpect"
+            echo "  sudo $pm install python3-pyte python3-setproctitle python3-enchant python3-pyxdg"
+            echo "  sudo $pm install speech-dispatcher espeak-ng sox alsa-utils"
+            ;;
+        "pacman")
+            echo "  sudo pacman -S python-evdev python-daemonize python-dbus python-pyudev python-pexpect"
+            echo "  sudo pacman -S python-pyte python-setproctitle python-pyenchant python-pyxdg"
+            echo "  sudo pacman -S speech-dispatcher espeak-ng sox alsa-utils"
+            ;;
+        "zypper")
+            echo "  sudo zypper install python3-evdev python3-daemonize python3-dbus python3-pyudev python3-pexpect"
+            echo "  sudo zypper install python3-pyte python3-setproctitle python3-enchant python3-pyxdg"
+            echo "  sudo zypper install speech-dispatcher espeak-ng sox alsa-utils"
+            ;;
+        *)
+            echo "  Unknown package manager. Please install the dependencies manually."
+            echo "  Required packages: evdev, daemonize, dbus-python, pyudev, pexpect, pyte, setproctitle"
+            echo "  System packages: speech-dispatcher, espeak-ng, sox, alsa-utils"
+            ;;
+    esac
+}
+
+# Initial dependency check
+echo "Performing initial dependency check..."
+if ! checkDependencies; then
+    echo ""
+    echo "Some dependencies are missing. You have two options:"
+    echo "1. Install using pip (not recommended uses --break-system-packages)"
+    echo "2. Install using your system package manager (recommended assuming I got the package names and package manager syntax right)"
+    echo ""
+    
+    read -rp "Use pip to install Python dependencies? (y/N): " usePip
+    usePip="${usePip:0:1}"
+    
+    if [[ "${usePip^}" == "Y" ]]; then
+        installWithPip
+    else
+        packageManager=$(detectPackageManager)
+        echo ""
+        showPackageInstructions "$packageManager"
+        echo ""
+        echo "Please install the packages above, then press Enter to continue..."
+        read -r
+    fi
+    
+    # Check dependencies again
+    echo "Rechecking dependencies..."
+    if ! checkDependencies; then
+        echo "Some dependencies are still missing. Please install them manually."
+        echo "You can run 'python3 check-dependencies.py' to see which ones are missing."
+        exit 1
+    fi
+fi
+
+echo "All dependencies satisfied!"
+
+# Install Fenrir application files
+echo "Installing Fenrir application files..."
 
 # 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
 cp -af tools/* /usr/share/fenrirscreenreader/tools
@@ -33,8 +161,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
-    if [ $yn = "Y" -o $yn = "y" ]; then
+    read -r yn
+    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
@@ -43,24 +172,49 @@ if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then
     fi
 else
     install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf    
-fi    
+fi
 
+# Install systemd service if systemd is available
+if command -v systemctl &> /dev/null; then
+    echo "Installing systemd service..."
+    
+    # Detect which service file to use
+    if [ -f "/etc/arch-release" ] || [ -f "/etc/manjaro-release" ]; then
+        serviceFile="autostart/systemd/Arch/fenrir.service"
+    else
+        serviceFile="autostart/systemd/Debian/fenrir.service"
+    fi
+    
+    if [ -f "$serviceFile" ]; then
+        install -m644 "$serviceFile" /etc/systemd/system/fenrir.service
+        systemctl daemon-reload
+        echo "Systemd service installed. Enable with: sudo systemctl enable fenrir"
+    else
+        echo "Warning: Systemd service file not found: $serviceFile"
+    fi
+else
+    echo "Warning: Systemd not detected. Manual service setup may be required."
+fi
 
-# end message
+# Final message
 cat << EOF
-Installation complete.
-install path:/opt/fenrirscreenreader
-settings path:/etc/fenrirscreenreader
 
-To test Fenrir:
-sudo fenrir
+Installation complete!
+=============================
+Install path: /opt/fenrirscreenreader
+Settings path: /etc/fenrirscreenreader
 
-To have Fenrir start on system boot using systemd:
-download service file: https://raw.githubusercontent.com/chrys87/fenrir/master/autostart/systemd/Arch/fenrir.service
-move the service file to: /etc/systemd/system/fenrir.service
-sudo systemctl enable fenrir
+Next steps:
+1. Test Fenrir: sudo fenrir
+2. Enable autostart: sudo systemctl enable fenrir
+3. Configure audio (run both as user and root):
+   - PulseAudio: /usr/share/fenrirscreenreader/tools/configure_pulse.sh
+   - PipeWire: /usr/share/fenrirscreenreader/tools/configure_pipewire.sh
 
-Pulseaudio users may want to run
-/usr/share/fenrirscreenreader/tools/configure_pulse.sh
-once from their user account, then once from the root.
+For help:
+- Documentation: https://git.stormux.org/storm/fenrir
+- Configuration: sudo fenrir --help
+- Dependency check: python3 check-dependencies.py
+
+Fenrir installation successful!
 EOF

requirements.txt

@@ -1,7 +1,16 @@
-evdev>=1.1.2
 daemonize>=2.5.0
-dbus-python>=1.2.8
-pyudev>=0.21.0
-pexpect
-pyttsx3
-pyte>=0.7.0
+evdev>=1.4.0
+dbus-python>=1.3.0
+pyperclip>=1.8.0
+pyudev>=0.24.0
+pyte>=0.8.0
+setproctitle>=1.3.0
+setuptools>=65.0.0
+pexpect>=4.8.0
+
+# Optional dependencies for enhanced functionality:
+# pyenchant>=3.2.0       # For spell checking commands  
+# pyxdg>=0.28            # For XDG base directory support
+# PyGObject>=3.42.0      # For GStreamer sound driver
+# pyatspi>=2.40.0        # For AT-SPI input driver
+# speechd>=0.11.0        # For speech-dispatcher Python bindings

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:
                 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))
-data_files.append(('/usr/share/man/man1', ['docs/fenrir.1']))
+dataFiles.append(('/usr/share/fenrirscreenreader/tools', files))
+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,41 +80,45 @@ setup(
     author_email="storm_dragon@stormux.org",
 
     # Packages
-    packages=find_packages('src/'),
-    package_dir={'': 'src/'},
-    scripts=['src/fenrir','src/fenrir-daemon'],
+    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.8',
     install_requires=[
-        "evdev>=1.1.2",
+        "evdev>=1.4.0",
         "daemonize>=2.5.0",
-        "dbus-python>=1.2.8",
-        "pyudev>=0.21.0",
-        "setuptools",
-        "pexpect",
-        "pyttsx3",
-        "pyte>=0.7.0",
+        "dbus-python>=1.3.0",
+        "pyperclip>=1.8.0",
+        "pyudev>=0.24.0",
+        "setuptools>=65.0.0",
+        "setproctitle>=1.3.0",
+        "pexpect>=4.8.0",
+        "pyte>=0.8.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/settings/settings.conf', '/etc/fenrirscreenreader/settings/settings.conf')
             print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
-        except:
-            pass
+        except OSError as e:
+            print(f"Could not copy settings file to destination: {e}")
     else:
-        print('settings.conf file found. It is not overwritten automatical')
+        print('settings.conf file found. It is not overwritten automatically')
 
 print('')
 print('To have Fenrir start at boot:')
@@ -119,5 +129,4 @@ print('once as their user account and once as root to configure Pulseaudio.')
 print('Please install the following packages manually:')
 print('- Speech-dispatcher: for the default speech driver')
 print('- Espeak: as basic TTS engine')
-print('- BrlTTY: for Braille')
 print('- sox: is a player for the generic sound driver')

src/fenrir

@@ -2,20 +2,126 @@
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
+# By Chrys, Storm Dragon, and contributors.
 
-import os, sys, inspect
+import os
+import sys
+import inspect
+import argparse
+from daemonize import Daemonize
+
+# Get the fenrir installation path
 fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
 if not fenrirPath 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"""
+    argumentParser = argparse.ArgumentParser(
+        description="Fenrir - A console screen reader for Linux",
+        formatter_class=argparse.RawDescriptionHelpFormatter
+    )
+    argumentParser.add_argument(
+        '-v', '--version',
+        action='version',
+        version=f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}',
+        help='Show version information and exit'
+    )
+    argumentParser.add_argument(
+        '-f', '--foreground',
+        action='store_true',
+        help='Run Fenrir in the foreground (default: run as daemon)'
+    )
+    argumentParser.add_argument(
+        '-s', '--setting',
+        metavar='SETTING-FILE',
+        default='/etc/fenrir/settings/settings.conf',
+        help='Path to custom settings file'
+    )
+    argumentParser.add_argument(
+        '-o', '--options',
+        metavar='SECTION#SETTING=VALUE;..',
+        default='',
+        help='Override settings file options. Format: SECTION#SETTING=VALUE;... (case sensitive)'
+    )
+    argumentParser.add_argument(
+        '-d', '--debug',
+        action='store_true',
+        help='Enable debug mode'
+    )
+    argumentParser.add_argument(
+        '-p', '--print',
+        action='store_true',
+        help='Print debug messages to screen'
+    )
+    argumentParser.add_argument(
+        '-e', '--emulated-pty',
+        action='store_true',
+        help='Use PTY emulation with escape sequences for input (enables desktop/X/Wayland usage)'
+    )
+    argumentParser.add_argument(
+        '-E', '--emulated-evdev',
+        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.proceed()
+    del fenrirApp
 
 def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
+    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 or cliArgs.emulated_pty:
+        # Run directly in foreground
+        run_fenrir()
+    else:
+        # Run as daemon
+        pidFile = "/run/fenrir.pid"
+        daemonProcess = Daemonize(
+            app="fenrir",
+            pid=pidFile,
+            action=run_fenrir,
+            chdir=fenrirPath
+        )
+        daemonProcess.start()
 
 if __name__ == "__main__":
-    main()     
+    main()

src/fenrir-daemon

@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-from daemonize import Daemonize
-
-pidFile = "/run/fenrir.pid"
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    # for debug in foreground
-    #daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=fenrirPath)
-    daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=fenrirPath)
-    daemon.start()
-

src/fenrir-daemon-pypy

@@ -1,28 +0,0 @@
-#!/usr/bin/env pypy3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-from daemonize import Daemonize
-
-pidFile = "/run/fenrir.pid"
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    # for debug in foreground
-    #daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__)))    
-    daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=fenrirPath)
-    daemon.start()
-

src/fenrir-pypy

@@ -1,21 +0,0 @@
-#!/usr/bin/env pypy3
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-import os, sys, inspect
-fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe()))))
-
-if not fenrirPath in sys.path:
-    sys.path.append(fenrirPath)
-
-from fenrirscreenreader.core import fenrirManager
-
-def main():
-    app = fenrirManager.fenrirManager()
-    app.proceed()
-    del app
-
-if __name__ == "__main__":
-    main()     

src/fenrirscreenreader/brailleDriver/brlapiDriver.py

@@ -1,66 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)
-        self._brl = None
-
-    def initialize(self, environment):
-        self.env = environment
-        try:
-            import brlapi
-            self._brl = brlapi.Connection()
-            self._deviceSize = self._brl.displaySize
-        except Exception as e:
-            print(e)
-            self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
-            return
-        self._isInitialized = True
-
-    def getDeviceSize(self):
-        if not self._isInitialized:
-            return (0,0)
-        if not self._deviceSize:
-            return (0,0)
-        return self._deviceSize
-
-    def flush(self):
-        if not self._isInitialized:
-            return
-        try:
-            self._brl.writeText('',0)
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('BRAILLE.flush '+str(e),debug.debugLevel.ERROR)
-    
-    def writeText(self,text):
-        if not self._isInitialized:
-            return
-        try:
-            self._brl.writeText(text)
-        except Exception as e:
-            self.env['runtime']['debug'].writeDebugOut('BRAILLE.writeText '+str(e),debug.debugLevel.ERROR)
-
-    def connectDevice(self):
-        self._brl = brlapi.Connection()
-
-    def enterScreen(self, screen):
-        if not self._isInitialized:
-            return
-        self._brl.enterTtyMode(int(screen))
-
-    def leveScreen(self):
-        if not self._isInitialized:
-            return
-        self._brl.leaveTtyMode()
-
-    def shutdown(self):
-        if not self._isInitialized:
-            return
-        self.leveScreen()

src/fenrirscreenreader/brailleDriver/debugDriver.py

@@ -1,49 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)
-
-    def initialize(self, environment):
-        self.env = environment
-        self._isInitialized = True
-        self.deviceSize = (40,0)
-        print('Braille Debug Driver: Initialized')
-
-    def getDeviceSize(self):
-        if not self._isInitialized:
-            return (0,0)
-        print('Braille Debug Driver: getDeviceSize ' + str(self.deviceSize))
-        return self.deviceSize
-
-    def writeText(self,text):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: writeText:' + str(text))
-        print('Braille Debug Driver: -----------------------------------')
-
-    def connectDevice(self): 
-        print('Braille Debug Driver: connectDevice')
-
-    def enterScreen(self, screen):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: enterScreen')
-
-    def leveScreen(self):
-        if not self._isInitialized:
-            return
-        print('Braille Debug Driver: leveScreen')
-
-    def shutdown(self):
-        if self._isInitialized:
-            self.leveScreen()
-        self._isInitialized = False
-        print('Braille Debug Driver: Shutdown')

src/fenrirscreenreader/brailleDriver/dummyDriver.py

@@ -1,12 +0,0 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.core.brailleDriver import brailleDriver
-
-class driver(brailleDriver):
-    def __init__(self):
-        brailleDriver.__init__(self)

src/fenrirscreenreader/commands/command_template.py

@@ -1,21 +1,20 @@
-#!/bin/python
-# -*- 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 'No description found'         
-    def run(self):
-        pass
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return 'No description found'         
+    def run(self):
+        pass
+    def setCallback(self, callback):
+        pass

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

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

src/fenrirscreenreader/commands/commands/add_word_to_spell_check.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import word_utils
 import string
 initialized = False

src/fenrirscreenreader/commands/commands/adjustment_base.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import math
+
+class AdjustmentCommand():
+    """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 getDescription(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'].getSettingAsFloat(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'].setSetting(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'].presentText(feedback, soundIcon='', interrupt=True)
+    
+    def _adjust_sound_volume(self):
+        """Adjust sound volume using same logic as speech"""
+        value = self.env['runtime']['settingsManager'].getSettingAsFloat(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'].setSetting(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'].presentText(feedback, soundIcon=sound_icon, interrupt=True)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/announce_fenrir_version.py

@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader import fenrirVersion
+
+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 run(self):
+        try:
+            self.env['runtime']['outputManager'].presentText(f'Fenrir screen reader version {fenrirVersion.version}-{fenrirVersion.codeName}', interrupt=True)
+        except exception as e:
+            self.env['runtime']['outputManager'].presentText(_('Version information is unavailable.'), interrupt=True)
+            
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/apply_tested_voice.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python3
+
+class command():
+    def __init__(self):
+        pass
+    
+    def initialize(self, environment):
+        self.env = environment
+    
+    def shutdown(self):
+        pass
+    
+    def getDescription(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'].presentText("No voice has been tested yet", interrupt=True)
+                self.env['runtime']['outputManager'].presentText("Use voice browser first", interrupt=True)
+                return
+            
+            module = self.env['commandBuffer']['lastTestedModule']
+            voice = self.env['commandBuffer']['lastTestedVoice']
+            
+            self.env['runtime']['outputManager'].presentText(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
+            oldDriver = settingsManager.getSetting('speech', 'driver')
+            oldModule = settingsManager.getSetting('speech', 'module')
+            oldVoice = settingsManager.getSetting('speech', 'voice')
+            
+            try:
+                # Apply new settings to runtime only (use setSetting to update settingArgDict)
+                settingsManager.setSetting('speech', 'driver', 'speechdDriver')
+                settingsManager.setSetting('speech', 'module', module)
+                settingsManager.setSetting('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.setModule(module)
+                    speechDriver.setVoice(voice)
+                    
+                    self.env['runtime']['outputManager'].presentText("Voice applied successfully!", interrupt=True)
+                    self.env['runtime']['outputManager'].presentText("Use save settings to make permanent", interrupt=True)
+                    self.env['runtime']['outputManager'].playSound('Accept')
+                    
+            except Exception as e:
+                # Revert on failure
+                settingsManager.setSetting('speech', 'driver', oldDriver)
+                settingsManager.setSetting('speech', 'module', oldModule)
+                settingsManager.setSetting('speech', 'voice', oldVoice)
+                
+                self.env['runtime']['outputManager'].presentText(f"Failed to apply voice, reverted: {str(e)}", interrupt=True)
+                self.env['runtime']['outputManager'].playSound('Error')
+                
+        except Exception as e:
+            self.env['runtime']['outputManager'].presentText(f"Apply voice error: {str(e)}", interrupt=True)
+            self.env['runtime']['outputManager'].playSound('Error')
+    
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/attribute_cursor.py

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

src/fenrirscreenreader/commands/commands/bookmark_1.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '1'
-    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
+        super().__init__(1, 'read')

src/fenrirscreenreader/commands/commands/bookmark_10.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '10'
-    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
+        super().__init__(10, 'read')

src/fenrirscreenreader/commands/commands/bookmark_2.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '2'
-    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
+        super().__init__(2, 'read')

src/fenrirscreenreader/commands/commands/bookmark_3.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '3'
-    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
+        super().__init__(3, 'read')

src/fenrirscreenreader/commands/commands/bookmark_4.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '4'
-    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
+        super().__init__(4, 'read')

src/fenrirscreenreader/commands/commands/bookmark_5.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '5'
-    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
+        super().__init__(5, 'read')

src/fenrirscreenreader/commands/commands/bookmark_6.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '6'
-    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
+        super().__init__(6, 'read')

src/fenrirscreenreader/commands/commands/bookmark_7.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '7'
-    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
+        super().__init__(7, 'read')

src/fenrirscreenreader/commands/commands/bookmark_8.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '8'
-    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
+        super().__init__(8, 'read')

src/fenrirscreenreader/commands/commands/bookmark_9.py

@@ -1,48 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
-from fenrirscreenreader.utils import mark_utils
-from fenrirscreenreader.utils import line_utils
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '9'
-    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
+        super().__init__(9, 'read')

src/fenrirscreenreader/commands/commands/bookmark_base.py

@@ -0,0 +1,150 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import gettext
+_ = gettext.gettext
+
+from fenrirscreenreader.utils import mark_utils
+from fenrirscreenreader.utils import line_utils
+
+class BookmarkCommand():
+    """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 getDescription(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):
+        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 currApp not in self.env['commandBuffer']['bookMarks'][self.ID]:
+            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].get('1'):
+            self.env['runtime']['outputManager'].presentText('Bookmark for application {0} not set'.format(currApp), interrupt=True)
+            return
+
+        # Get bookmarked text
+        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 _set_bookmark(self):
+        if not self.env['commandBuffer']['Marks']['1']:
+            self.env['runtime']['outputManager'].presentText(_("No mark found"), interrupt=True)
+            return
+            
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        self.env['commandBuffer']['bookMarks'][self.ID][currApp] = {}
+        
+        self.env['commandBuffer']['bookMarks'][self.ID][currApp]['1'] = self.env['commandBuffer']['Marks']['1'].copy()
+        
+        if self.env['commandBuffer']['Marks']['2']:
+            self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = self.env['commandBuffer']['Marks']['2'].copy()
+        else:
+            self.env['commandBuffer']['bookMarks'][self.ID][currApp]['2'] = None
+            
+        self.env['runtime']['outputManager'].presentText(_('Bookmark {0} set for application {1}').format(self.ID, currApp), interrupt=True)
+        
+        # Clear marks after setting bookmark
+        self.env['commandBuffer']['Marks']['1'] = None
+        self.env['commandBuffer']['Marks']['2'] = None
+    
+    def _clear_bookmark(self):
+        currApp = self.env['runtime']['applicationManager'].getCurrentApplication()
+        
+        if self.ID in self.env['commandBuffer']['bookMarks'] and currApp in self.env['commandBuffer']['bookMarks'][self.ID]:
+            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)
+        else:
+            self.env['runtime']['outputManager'].presentText(_('Bookmark {0} not set for application {1}').format(self.ID, currApp), interrupt=True)
+        
+    def setCallback(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: BookmarkCommand(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: BookmarkCommand(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: BookmarkCommand(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(BookmarkCommand):
+        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/braille_pan_left.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- 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 _('Move braille view to the left.')         
-    def run(self):
-        panned = self.env['runtime']['outputManager'].setPanLeft()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/braille_pan_right.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- 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 _('Move braille view to the right.')         
-    def run(self):
-        panned = self.env['runtime']['outputManager'].setPanRight()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/braille_return_to_cursor.py

@@ -1,21 +0,0 @@
-#!/bin/python
-# -*- 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 _('Set the braille view back to cursor.')         
-    def run(self):
-        self.env['runtime']['outputManager'].removePanning()
-    def setCallback(self, callback):
-        pass

src/fenrirscreenreader/commands/commands/clear_bookmark_1.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '1'
-    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
+        super().__init__(1, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_10.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '10'
-    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
+        super().__init__(10, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_2.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '2'
-    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
+        super().__init__(2, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_3.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '3'
-    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
+        super().__init__(3, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_4.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '4'
-    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
+        super().__init__(4, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_5.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '5'
-    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
+        super().__init__(5, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_6.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '6'
-    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
+        super().__init__(6, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_7.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '7'
-    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
+        super().__init__(7, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_8.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '8'
-    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
+        super().__init__(8, 'clear')

src/fenrirscreenreader/commands/commands/clear_bookmark_9.py

@@ -1,27 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
+import os
+import importlib.util
+_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)
+BookmarkCommand = _module.BookmarkCommand
 
-class command():
+class command(BookmarkCommand):
     def __init__(self):
-        self.ID = '9'
-    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
+        super().__init__(9, 'clear')

src/fenrirscreenreader/commands/commands/clear_clipboard.py

@@ -1,24 +1,23 @@
-#!/bin/python
-# -*- 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 _('clears the currently selected clipboard')     
-
-    def run(self):
-        self.env['runtime']['memoryManager'].clearCurrentIndexList('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(_('clipboard cleared'), interrupt=True)
-        return                
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('clears the currently selected clipboard')     
+
+    def run(self):
+        self.env['runtime']['memoryManager'].clearCurrentIndexList('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(_('clipboard cleared'), interrupt=True)
+        return                
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/clear_window_application.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/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):

src/fenrirscreenreader/commands/commands/copy_last_echo_to_clipboard.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/copy_marked_to_clipboard.py

@@ -1,8 +1,7 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 class command():
     def __init__(self):

src/fenrirscreenreader/commands/commands/curr_clipboard.py

@@ -1,27 +1,26 @@
-#!/bin/python
-# -*- 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 _('speaks the contents of the currently selected clipboard')       
-
-    def run(self):
-        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
-            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
-            return 
-        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
-        self.env['runtime']['outputManager'].presentText(clipboard , interrupt=True)
-               
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('speaks the contents of the currently selected clipboard')       
+
+    def run(self):
+        if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
+            self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
+            return 
+        clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
+        self.env['runtime']['outputManager'].presentText(clipboard , interrupt=True)
+               
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen.py

@@ -1,26 +1,25 @@
-#!/bin/python
-# -*- 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 _('reads the contents of the current screen')        
-
-    def run(self):
-        if self.env['screen']['newContentText'].isspace():
-            self.env['runtime']['outputManager'].presentText(_("screen is empty"), soundIcon='EmptyLine', interrupt=True)
-        else:    
-           self.env['runtime']['outputManager'].presentText(self.env['screen']['newContentText'],interrupt=True)
- 
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('reads the contents of the current screen')        
+
+    def run(self):
+        if self.env['screen']['newContentText'].isspace():
+            self.env['runtime']['outputManager'].presentText(_("screen is empty"), soundIcon='EmptyLine', interrupt=True)
+        else:    
+           self.env['runtime']['outputManager'].presentText(self.env['screen']['newContentText'],interrupt=True)
+ 
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/curr_screen_after_cursor.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/curr_screen_before_cursor.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import mark_utils
 
 class command():

src/fenrirscreenreader/commands/commands/current_quick_menu_entry.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/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):

src/fenrirscreenreader/commands/commands/current_quick_menu_value.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/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):

src/fenrirscreenreader/commands/commands/cursor_column.py

@@ -1,25 +1,24 @@
-#!/bin/python
-# -*- 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 _('Column number for cursor')       
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
-        self.env['runtime']['outputManager'].announceActiveCursor()
-        self.env['runtime']['outputManager'].presentText(' column number' , interrupt=False)
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Column number for cursor')       
+    def run(self):
+        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        self.env['runtime']['outputManager'].presentText(str(cursorPos['x'] + 1) , interrupt=True)
+        self.env['runtime']['outputManager'].announceActiveCursor()
+        self.env['runtime']['outputManager'].presentText(' column number' , interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_lineno.py

@@ -1,25 +1,24 @@
-#!/bin/python
-# -*- 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 _('Line number for cursor')         
-    def run(self):
-        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
-        self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)
-        self.env['runtime']['outputManager'].announceActiveCursor()
-        self.env['runtime']['outputManager'].presentText(' line number' , interrupt=False)
-        
-    def setCallback(self, callback):
-        pass
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass
+    def getDescription(self):
+        return _('Line number for cursor')         
+    def run(self):
+        cursorPos = self.env['runtime']['cursorManager'].getReviewOrTextCursor()
+        self.env['runtime']['outputManager'].presentText(str(cursorPos['y'] + 1), interrupt=True)
+        self.env['runtime']['outputManager'].announceActiveCursor()
+        self.env['runtime']['outputManager'].presentText(' line number' , interrupt=False)
+        
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/cursor_position.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/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):

src/fenrirscreenreader/commands/commands/cursor_read_line_to_cursor.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/cursor_read_to_end_of_line.py

@@ -1,10 +1,9 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import line_utils
 
 class command():

src/fenrirscreenreader/commands/commands/cycle_keyboard_layout.py

@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+from fenrirscreenreader.core import debug
+import os
+
+class command():
+    def __init__(self):
+        pass
+    def initialize(self, environment):
+        self.env = environment
+    def shutdown(self):
+        pass 
+    def getDescription(self):
+        return _('cycles between available keyboard layouts')
+    
+    def getAvailableLayouts(self):
+        """Get list of available keyboard layout files"""
+        layouts = []
+        
+        # Check standard locations for keyboard layouts
+        settingsRoot = '/etc/fenrirscreenreader/'
+        if not os.path.exists(settingsRoot):
+            # Fallback to source directory
+            import fenrirscreenreader
+            fenrirPath = os.path.dirname(fenrirscreenreader.__file__)
+            settingsRoot = fenrirPath + '/../../config/'
+        
+        keyboardPath = settingsRoot + 'keyboard/'
+        
+        if os.path.exists(keyboardPath):
+            for file in os.listdir(keyboardPath):
+                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'].getSetting('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.getAvailableLayouts()
+        
+        # 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'].setSetting('keyboard', 'keyboardLayout', next_layout)
+        
+        # Reload shortcuts with new layout
+        try:
+            self.env['runtime']['inputManager'].reloadShortcuts()
+            self.env['runtime']['outputManager'].presentText(
+                _('Switched to {} keyboard layout').format(next_layout), 
+                interrupt=True
+            )
+        except Exception as e:
+            self.env['runtime']['debug'].writeDebugOut(
+                "Error reloading shortcuts: " + str(e), 
+                debug.debugLevel.ERROR
+            )
+            self.env['runtime']['outputManager'].presentText(
+                _('Error switching keyboard layout'), 
+                interrupt=True
+            )
+
+    def setCallback(self, callback):
+        pass

src/fenrirscreenreader/commands/commands/date.py

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

src/fenrirscreenreader/commands/commands/dec_alsa_volume.py

@@ -1,39 +1,17 @@
-#!/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-initialized = False
-try:
-    import alsaaudio
-    initialized = True
-except:
-    pass
+import os
+import importlib.util
+_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)
+AdjustmentCommand = _module.AdjustmentCommand
 
-from fenrirscreenreader.core import debug
-
-class command():
+class command(AdjustmentCommand):
     def __init__(self):
-        pass
-    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
+        super().__init__('alsa', 'volume', 'dec')

src/fenrirscreenreader/commands/commands/dec_sound_volume.py

@@ -1,33 +1,17 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('decrease sound volume')        
-
-    def run(self):
-        
-        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
-
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import os
+import importlib.util
+_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)
+AdjustmentCommand = _module.AdjustmentCommand
+
+class command(AdjustmentCommand):
+    def __init__(self):
+        super().__init__('sound', 'volume', 'dec')

src/fenrirscreenreader/commands/commands/dec_speech_pitch.py

@@ -1,29 +1,17 @@
-#!/bin/python
-# -*- coding: utf-8 -*-
-
-# Fenrir TTY screen reader
-# By Chrys, Storm Dragon, and contributers.
-
-from fenrirscreenreader.core import debug
-import math
-
-class command():
-    def __init__(self):
-        pass
-    def initialize(self, environment):
-        self.env = environment
-    def shutdown(self):
-        pass 
-    def getDescription(self):
-        return _('Decreases the pitch of the speech')        
-    
-    def run(self):
-        value = self.env['runtime']['settingsManager'].getSettingAsFloat('speech', 'pitch')
-        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
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+# Fenrir TTY screen reader
+# By Chrys, Storm Dragon, and contributers.
+
+import os
+import importlib.util
+_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)
+AdjustmentCommand = _module.AdjustmentCommand
+
+class command(AdjustmentCommand):
+    def __init__(self):
+        super().__init__('speech', 'pitch', 'dec')