Compare commits
22 Commits
71d92e9702
...
2025.04.17
Author | SHA1 | Date | |
---|---|---|---|
7a12992b88 | |||
26a8c8cf86 | |||
bbfd2790a9 | |||
6edb743c23 | |||
a1fcee9a45 | |||
4e6e6e2d17 | |||
7a87fb51bb | |||
676c2b07a9 | |||
2dda73ac87 | |||
f68a1af223 | |||
5ab66f6978 | |||
2cc2fda28c | |||
c99d0f6ee1 | |||
1552b962a1 | |||
09391bfe84 | |||
e76ca9889a | |||
73206ce393 | |||
5b642cd9e2 | |||
4966b87ba1 | |||
145cab6221 | |||
e46926f145 | |||
8cd50c5070 |
10
install.sh
10
install.sh
@ -1,12 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/usr/bin/env bash
|
||||||
#Basic install script for Fenrir.
|
#Basic install script for Fenrir.
|
||||||
read -p "This will install Fenrir. Press ctrl+C to cancel, or enter to continue." continue
|
read -rp "This will install Fenrir. Press ctrl+C to cancel, or enter to continue."
|
||||||
|
|
||||||
# Fenrir main application
|
# Fenrir main application
|
||||||
install -m755 -d /opt/fenrirscreenreader
|
install -m755 -d /opt/fenrirscreenreader
|
||||||
cp -af src/* /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
|
ln -fs /opt/fenrirscreenreader/fenrir /usr/bin/fenrir
|
||||||
# tools
|
# tools
|
||||||
install -m755 -d /usr/share/fenrirscreenreader/tools
|
install -m755 -d /usr/share/fenrirscreenreader/tools
|
||||||
@ -33,8 +32,9 @@ cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template
|
|||||||
# config
|
# config
|
||||||
if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then
|
if [ -f "/etc/fenrirscreenreader/settings/settings.conf" ]; then
|
||||||
echo "Do you want to overwrite your current global settings? (y/n)"
|
echo "Do you want to overwrite your current global settings? (y/n)"
|
||||||
read yn
|
read -r yn
|
||||||
if [ $yn = "Y" -o $yn = "y" ]; then
|
yn="${yn:0:1}"
|
||||||
|
if [[ "${yn^}" == "Y" ]]; then
|
||||||
mv /etc/fenrirscreenreader/settings/settings.conf /etc/fenrirscreenreader/settings/settings.conf.bak
|
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."
|
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
|
install -m644 -D "config/settings/settings.conf" /etc/fenrirscreenreader/settings/settings.conf
|
||||||
|
@ -3,5 +3,6 @@ daemonize>=2.5.0
|
|||||||
dbus-python>=1.2.8
|
dbus-python>=1.2.8
|
||||||
pyudev>=0.21.0
|
pyudev>=0.21.0
|
||||||
pexpect
|
pexpect
|
||||||
pyttsx3
|
pyperclip
|
||||||
pyte>=0.7.0
|
pyte>=0.7.0
|
||||||
|
setproctitle
|
||||||
|
9
setup.py
9
setup.py
@ -99,10 +99,11 @@ setup(
|
|||||||
"evdev>=1.1.2",
|
"evdev>=1.1.2",
|
||||||
"daemonize>=2.5.0",
|
"daemonize>=2.5.0",
|
||||||
"dbus-python>=1.2.8",
|
"dbus-python>=1.2.8",
|
||||||
|
"pyperclip",
|
||||||
"pyudev>=0.21.0",
|
"pyudev>=0.21.0",
|
||||||
"setuptools",
|
"setuptools",
|
||||||
|
"setproctitle",
|
||||||
"pexpect",
|
"pexpect",
|
||||||
"pyttsx3",
|
|
||||||
"pyte>=0.7.0",
|
"pyte>=0.7.0",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@ -112,10 +113,10 @@ if not forceSettingsFlag:
|
|||||||
# create settings file from example if not exist
|
# create settings file from example if not exist
|
||||||
if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
|
if not os.path.isfile('/etc/fenrirscreenreader/settings/settings.conf'):
|
||||||
try:
|
try:
|
||||||
copyfile('/etc/fenrirscreenreader/settings/settings.conf.example', '/etc/fenrirscreenreader/settings/settings.conf')
|
copyfile('config/fenrirscreenreader/settings/settings.conf', '/etc/fenrirscreenreader/settings/settings.conf')
|
||||||
print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
|
print('create settings file in /etc/fenrirscreenreader/settings/settings.conf')
|
||||||
except:
|
except OSError as e:
|
||||||
pass
|
print(f"Could not copy settings file to destination: {e}")
|
||||||
else:
|
else:
|
||||||
print('settings.conf file found. It is not overwritten automatical')
|
print('settings.conf file found. It is not overwritten automatical')
|
||||||
|
|
||||||
|
@ -5,15 +5,17 @@
|
|||||||
# By Chrys, Storm Dragon, and contributers.
|
# By Chrys, Storm Dragon, and contributers.
|
||||||
|
|
||||||
from fenrirscreenreader.core import debug
|
from fenrirscreenreader.core import debug
|
||||||
import subprocess, os
|
import os
|
||||||
from subprocess import Popen, PIPE
|
import importlib
|
||||||
import _thread
|
import _thread
|
||||||
|
import pyperclip
|
||||||
|
|
||||||
class command():
|
class command():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pass
|
pass
|
||||||
def initialize(self, environment):
|
def initialize(self, environment, scriptPath=''):
|
||||||
self.env = environment
|
self.env = environment
|
||||||
|
self.scriptPath = scriptPath
|
||||||
def shutdown(self):
|
def shutdown(self):
|
||||||
pass
|
pass
|
||||||
def getDescription(self):
|
def getDescription(self):
|
||||||
@ -22,56 +24,48 @@ class command():
|
|||||||
_thread.start_new_thread(self._threadRun , ())
|
_thread.start_new_thread(self._threadRun , ())
|
||||||
def _threadRun(self):
|
def _threadRun(self):
|
||||||
try:
|
try:
|
||||||
|
# Check if clipboard is empty
|
||||||
if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
|
if self.env['runtime']['memoryManager'].isIndexListEmpty('clipboardHistory'):
|
||||||
self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
|
self.env['runtime']['outputManager'].presentText(_('clipboard empty'), interrupt=True)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Get current clipboard content
|
||||||
clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
|
clipboard = self.env['runtime']['memoryManager'].getIndexListElement('clipboardHistory')
|
||||||
user = self.env['general']['currUser']
|
|
||||||
|
|
||||||
# First try to find xclip in common locations
|
# Remember original display environment variable if it exists
|
||||||
xclip_paths = [
|
originalDisplay = os.environ.get('DISPLAY', '')
|
||||||
'/usr/bin/xclip',
|
success = False
|
||||||
'/bin/xclip',
|
|
||||||
'/usr/local/bin/xclip'
|
|
||||||
]
|
|
||||||
|
|
||||||
xclip_path = None
|
# Try different display options
|
||||||
for path in xclip_paths:
|
for i in range(10):
|
||||||
if os.path.isfile(path) and os.access(path, os.X_OK):
|
display = f":{i}"
|
||||||
xclip_path = path
|
try:
|
||||||
|
# Set display environment variable
|
||||||
|
os.environ['DISPLAY'] = display
|
||||||
|
# Attempt to set clipboard content
|
||||||
|
importlib.reload(pyperclip) # Weird workaround for some distros
|
||||||
|
pyperclip.copy(clipboard)
|
||||||
|
# If we get here without exception, we found a working display
|
||||||
|
success = True
|
||||||
break
|
break
|
||||||
|
except Exception:
|
||||||
|
# Failed for this display, try next one
|
||||||
|
continue
|
||||||
|
|
||||||
if not xclip_path:
|
# Restore original display setting
|
||||||
self.env['runtime']['outputManager'].presentText(
|
if originalDisplay:
|
||||||
'xclip not found in common locations',
|
os.environ['DISPLAY'] = originalDisplay
|
||||||
interrupt=True
|
|
||||||
)
|
|
||||||
return
|
|
||||||
|
|
||||||
for display in range(10):
|
|
||||||
p = Popen(
|
|
||||||
['su', user, '-p', '-c', f"{xclip_path} -d :{display} -selection clipboard"],
|
|
||||||
stdin=PIPE, stdout=PIPE, stderr=PIPE, preexec_fn=os.setpgrp
|
|
||||||
)
|
|
||||||
stdout, stderr = p.communicate(input=clipboard.encode('utf-8'))
|
|
||||||
|
|
||||||
self.env['runtime']['outputManager'].interruptOutput()
|
|
||||||
|
|
||||||
stderr = stderr.decode('utf-8')
|
|
||||||
stdout = stdout.decode('utf-8')
|
|
||||||
|
|
||||||
if stderr == '':
|
|
||||||
break
|
|
||||||
|
|
||||||
if stderr != '':
|
|
||||||
self.env['runtime']['outputManager'].presentText(stderr, soundIcon='', interrupt=False)
|
|
||||||
else:
|
else:
|
||||||
self.env['runtime']['outputManager'].presentText('exported to the X session.', interrupt=True)
|
os.environ.pop('DISPLAY', None)
|
||||||
|
|
||||||
|
# Notify the user of the result
|
||||||
|
if success:
|
||||||
|
self.env['runtime']['outputManager'].presentText(_('exported to the X session.'), interrupt=True)
|
||||||
|
else:
|
||||||
|
self.env['runtime']['outputManager'].presentText(_('failed to export to X clipboard. No available display found.'), interrupt=True)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
|
self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
|
||||||
|
|
||||||
|
|
||||||
def setCallback(self, callback):
|
def setCallback(self, callback):
|
||||||
pass
|
pass
|
||||||
|
@ -5,9 +5,11 @@
|
|||||||
# By Chrys, Storm Dragon, and contributers.
|
# By Chrys, Storm Dragon, and contributers.
|
||||||
|
|
||||||
from fenrirscreenreader.core import debug
|
from fenrirscreenreader.core import debug
|
||||||
import subprocess, os
|
import importlib
|
||||||
from subprocess import Popen, PIPE
|
|
||||||
import _thread
|
import _thread
|
||||||
|
import pyperclip
|
||||||
|
import os
|
||||||
|
|
||||||
class command():
|
class command():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
pass
|
pass
|
||||||
@ -22,33 +24,41 @@ class command():
|
|||||||
_thread.start_new_thread(self._threadRun , ())
|
_thread.start_new_thread(self._threadRun , ())
|
||||||
def _threadRun(self):
|
def _threadRun(self):
|
||||||
try:
|
try:
|
||||||
# Find xclip path
|
# Remember original display environment variable if it exists
|
||||||
xclip_paths = ['/usr/bin/xclip', '/bin/xclip', '/usr/local/bin/xclip']
|
originalDisplay = os.environ.get('DISPLAY', '')
|
||||||
xclip_path = None
|
clipboardContent = None
|
||||||
for path in xclip_paths:
|
|
||||||
if os.path.isfile(path) and os.access(path, os.X_OK):
|
# Try different display options
|
||||||
xclip_path = path
|
for i in range(10):
|
||||||
|
display = f":{i}"
|
||||||
|
try:
|
||||||
|
# Set display environment variable
|
||||||
|
os.environ['DISPLAY'] = display
|
||||||
|
# Attempt to get clipboard content
|
||||||
|
importlib.reload(pyperclip) # Weird workaround for some distros
|
||||||
|
clipboardContent = pyperclip.paste()
|
||||||
|
# If we get here without exception, we found a working display
|
||||||
|
if clipboardContent:
|
||||||
break
|
break
|
||||||
if not xclip_path:
|
except Exception:
|
||||||
self.env['runtime']['outputManager'].presentText('xclip not found in common locations', interrupt=True)
|
# Failed for this display, try next one
|
||||||
return
|
continue
|
||||||
xClipboard = ''
|
|
||||||
for display in range(10):
|
# Restore original display setting
|
||||||
p = Popen('su ' + self.env['general']['currUser'] + ' -p -c "' + xclip_path + ' -d :' + str(display) + ' -o"', stdout=PIPE, stderr=PIPE, shell=True)
|
if originalDisplay:
|
||||||
stdout, stderr = p.communicate()
|
os.environ['DISPLAY'] = originalDisplay
|
||||||
self.env['runtime']['outputManager'].interruptOutput()
|
|
||||||
stderr = stderr.decode('utf-8')
|
|
||||||
xClipboard = stdout.decode('utf-8')
|
|
||||||
if (stderr == ''):
|
|
||||||
break
|
|
||||||
if stderr != '':
|
|
||||||
self.env['runtime']['outputManager'].presentText(stderr , soundIcon='', interrupt=False)
|
|
||||||
else:
|
else:
|
||||||
self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', xClipboard)
|
os.environ.pop('DISPLAY', None)
|
||||||
|
|
||||||
|
# Process the clipboard content if we found any
|
||||||
|
if clipboardContent and isinstance(clipboardContent, str):
|
||||||
|
self.env['runtime']['memoryManager'].addValueToFirstIndex('clipboardHistory', clipboardContent)
|
||||||
self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
|
self.env['runtime']['outputManager'].presentText('Import to Clipboard', soundIcon='CopyToClipboard', interrupt=True)
|
||||||
self.env['runtime']['outputManager'].presentText(xClipboard, soundIcon='', interrupt=False)
|
self.env['runtime']['outputManager'].presentText(clipboardContent, soundIcon='', interrupt=False)
|
||||||
|
else:
|
||||||
|
self.env['runtime']['outputManager'].presentText('No text found in clipboard or no accessible display', interrupt=True)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['outputManager'].presentText(e , soundIcon='', interrupt=False)
|
self.env['runtime']['outputManager'].presentText(str(e), soundIcon='', interrupt=False)
|
||||||
|
|
||||||
def setCallback(self, callback):
|
def setCallback(self, callback):
|
||||||
pass
|
pass
|
||||||
|
@ -35,12 +35,18 @@ class command():
|
|||||||
if not (self.env['runtime']['byteManager'].getLastByteKey() in [b'^[[A',b'^[[B']):
|
if not (self.env['runtime']['byteManager'].getLastByteKey() in [b'^[[A',b'^[[B']):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Get the current cursor's line from both old and new content
|
||||||
prevLine = self.env['screen']['oldContentText'].split('\n')[self.env['screen']['newCursor']['y']]
|
prevLine = self.env['screen']['oldContentText'].split('\n')[self.env['screen']['newCursor']['y']]
|
||||||
currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]
|
currLine = self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]
|
||||||
|
|
||||||
|
is_blank = currLine.strip() == ''
|
||||||
|
|
||||||
if prevLine == currLine:
|
if prevLine == currLine:
|
||||||
if self.env['screen']['newDelta'] != '':
|
if self.env['screen']['newDelta'] != '':
|
||||||
return
|
return
|
||||||
if not currLine.isspace():
|
|
||||||
|
announce = currLine
|
||||||
|
if not is_blank:
|
||||||
currPrompt = currLine.find('$')
|
currPrompt = currLine.find('$')
|
||||||
rootPrompt = currLine.find('#')
|
rootPrompt = currLine.find('#')
|
||||||
if currPrompt <= 0:
|
if currPrompt <= 0:
|
||||||
@ -55,13 +61,13 @@ class command():
|
|||||||
else:
|
else:
|
||||||
announce = currLine
|
announce = currLine
|
||||||
|
|
||||||
if currLine.isspace():
|
if is_blank:
|
||||||
self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True, flush=False)
|
self.env['runtime']['outputManager'].presentText(_("blank"), soundIcon='EmptyLine', interrupt=True, flush=False)
|
||||||
else:
|
else:
|
||||||
self.env['runtime']['outputManager'].presentText(announce, interrupt=True, flush=False)
|
self.env['runtime']['outputManager'].presentText(announce, interrupt=True, flush=False)
|
||||||
|
|
||||||
self.env['commandsIgnore']['onScreenUpdate']['CHAR_DELETE_ECHO'] = True
|
self.env['commandsIgnore']['onScreenUpdate']['CHAR_DELETE_ECHO'] = True
|
||||||
self.env['commandsIgnore']['onScreenUpdate']['CHAR_ECHO'] = True
|
self.env['commandsIgnore']['onScreenUpdate']['CHAR_ECHO'] = True
|
||||||
self.env['commandsIgnore']['onScreenUpdate']['INCOMING_IGNORE'] = True
|
self.env['commandsIgnore']['onScreenUpdate']['INCOMING_IGNORE'] = True
|
||||||
def setCallback(self, callback):
|
def setCallback(self, callback):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@ -159,7 +159,13 @@ class commandManager():
|
|||||||
self.env['runtime']['debug'].writeDebugOut("Loading script:" + fileName ,debug.debugLevel.ERROR)
|
self.env['runtime']['debug'].writeDebugOut("Loading script:" + fileName ,debug.debugLevel.ERROR)
|
||||||
self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
|
self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
def shutdownCommands(self, section):
|
def shutdownCommands(self, section):
|
||||||
|
# Check if the section exists in the commands dictionary
|
||||||
|
if section not in self.env['commands']:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut("shutdownCommands: section not found:" + section, debug.debugLevel.WARNING)
|
||||||
|
return
|
||||||
|
|
||||||
for command in sorted(self.env['commands'][section]):
|
for command in sorted(self.env['commands'][section]):
|
||||||
try:
|
try:
|
||||||
self.env['commands'][section][command].shutdown()
|
self.env['commands'][section][command].shutdown()
|
||||||
|
@ -11,6 +11,14 @@ class cursorManager():
|
|||||||
pass
|
pass
|
||||||
def initialize(self, environment):
|
def initialize(self, environment):
|
||||||
self.env = environment
|
self.env = environment
|
||||||
|
def shouldProcessNumpadCommands(self):
|
||||||
|
"""
|
||||||
|
Check if numpad commands should be processed based on numlock state
|
||||||
|
Return True if numlock is OFF (commands should work)
|
||||||
|
Return False if numlock is ON (let keys type numbers)
|
||||||
|
"""
|
||||||
|
# Return False if numlock is ON
|
||||||
|
return not self.env['input']['newNumLock']
|
||||||
def shutdown(self):
|
def shutdown(self):
|
||||||
pass
|
pass
|
||||||
def clearMarks(self):
|
def clearMarks(self):
|
||||||
|
@ -42,6 +42,25 @@ class inputDriver():
|
|||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
return True
|
return True
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
def forceUngrab(self):
|
||||||
|
"""Emergency method to release grabbed devices in case of failure"""
|
||||||
|
if not self._initialized:
|
||||||
|
return True
|
||||||
|
try:
|
||||||
|
# Try standard ungrab first
|
||||||
|
return self.ungrabAllDevices()
|
||||||
|
except Exception as e:
|
||||||
|
# Just log the failure and inform the user
|
||||||
|
if hasattr(self, 'env') and 'runtime' in self.env and 'debug' in self.env['runtime']:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut(
|
||||||
|
f"Emergency device release failed: {str(e)}",
|
||||||
|
debug.debugLevel.ERROR
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
print(f"Emergency device release failed: {str(e)}")
|
||||||
|
return False
|
||||||
|
|
||||||
def hasIDevices(self):
|
def hasIDevices(self):
|
||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
return False
|
return False
|
||||||
|
@ -49,6 +49,7 @@ class inputManager():
|
|||||||
return event
|
return event
|
||||||
def setExecuteDeviceGrab(self, newExecuteDeviceGrab = True):
|
def setExecuteDeviceGrab(self, newExecuteDeviceGrab = True):
|
||||||
self.executeDeviceGrab = newExecuteDeviceGrab
|
self.executeDeviceGrab = newExecuteDeviceGrab
|
||||||
|
|
||||||
def handleDeviceGrab(self, force = False):
|
def handleDeviceGrab(self, force = False):
|
||||||
if force:
|
if force:
|
||||||
self.setExecuteDeviceGrab()
|
self.setExecuteDeviceGrab()
|
||||||
@ -61,17 +62,38 @@ class inputManager():
|
|||||||
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
||||||
self.executeDeviceGrab = False
|
self.executeDeviceGrab = False
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Add maximum retries to prevent infinite loops
|
||||||
|
maxRetries = 5
|
||||||
|
retryCount = 0
|
||||||
|
grabTimeout = 3 # Timeout in seconds
|
||||||
|
startTime = time.time()
|
||||||
|
|
||||||
if self.env['runtime']['screenManager'].getCurrScreenIgnored():
|
if self.env['runtime']['screenManager'].getCurrScreenIgnored():
|
||||||
while not self.ungrabAllDevices():
|
while not self.ungrabAllDevices():
|
||||||
|
retryCount += 1
|
||||||
|
if retryCount >= maxRetries or (time.time() - startTime) > grabTimeout:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut("Failed to ungrab devices after multiple attempts", debug.debugLevel.ERROR)
|
||||||
|
# Force a release of devices if possible through alternative means
|
||||||
|
try:
|
||||||
|
self.env['runtime']['inputDriver'].forceUngrab()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
break
|
||||||
time.sleep(0.25)
|
time.sleep(0.25)
|
||||||
self.env['runtime']['debug'].writeDebugOut("retry ungrabAllDevices " ,debug.debugLevel.WARNING)
|
self.env['runtime']['debug'].writeDebugOut(f"retry ungrabAllDevices {retryCount}/{maxRetries}", debug.debugLevel.WARNING)
|
||||||
self.env['runtime']['debug'].writeDebugOut("All devices ungrabbed" ,debug.debugLevel.INFO)
|
|
||||||
else:
|
else:
|
||||||
while not self.grabAllDevices():
|
while not self.grabAllDevices():
|
||||||
|
retryCount += 1
|
||||||
|
if retryCount >= maxRetries or (time.time() - startTime) > grabTimeout:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut("Failed to grab devices after multiple attempts", debug.debugLevel.ERROR)
|
||||||
|
# Continue without grabbing input - limited functionality but not locked
|
||||||
|
break
|
||||||
time.sleep(0.25)
|
time.sleep(0.25)
|
||||||
self.env['runtime']['debug'].writeDebugOut("retry grabAllDevices" ,debug.debugLevel.WARNING)
|
self.env['runtime']['debug'].writeDebugOut(f"retry grabAllDevices {retryCount}/{maxRetries}", debug.debugLevel.WARNING)
|
||||||
self.env['runtime']['debug'].writeDebugOut("All devices grabbed" ,debug.debugLevel.INFO)
|
|
||||||
self.executeDeviceGrab = False
|
self.executeDeviceGrab = False
|
||||||
|
|
||||||
def sendKeys(self, keyMacro):
|
def sendKeys(self, keyMacro):
|
||||||
for e in keyMacro:
|
for e in keyMacro:
|
||||||
key = ''
|
key = ''
|
||||||
@ -252,10 +274,32 @@ class inputManager():
|
|||||||
def getCurrShortcut(self, inputSequence = None):
|
def getCurrShortcut(self, inputSequence = None):
|
||||||
shortcut = []
|
shortcut = []
|
||||||
shortcut.append(self.env['input']['shortcutRepeat'])
|
shortcut.append(self.env['input']['shortcutRepeat'])
|
||||||
|
|
||||||
|
numpadKeys = ['KEY_KP0', 'KEY_KP1', 'KEY_KP2', 'KEY_KP3', 'KEY_KP4',
|
||||||
|
'KEY_KP5', 'KEY_KP6', 'KEY_KP7', 'KEY_KP8', 'KEY_KP9',
|
||||||
|
'KEY_KPDOT', 'KEY_KPPLUS', 'KEY_KPMINUS', 'KEY_KPASTERISK',
|
||||||
|
'KEY_KPSLASH', 'KEY_KPENTER', 'KEY_KPEQUAL']
|
||||||
if inputSequence:
|
if inputSequence:
|
||||||
|
# Check if any key in the sequence is a numpad key and numlock is ON
|
||||||
|
# If numlock is ON and any key in the sequence is a numpad key, return an empty shortcut
|
||||||
|
if not self.env['runtime']['cursorManager'].shouldProcessNumpadCommands():
|
||||||
|
for key in inputSequence:
|
||||||
|
if key in numpadKeys:
|
||||||
|
# Return an empty/invalid shortcut that won't match any command
|
||||||
|
return "[]"
|
||||||
|
|
||||||
shortcut.append(inputSequence)
|
shortcut.append(inputSequence)
|
||||||
else:
|
else:
|
||||||
|
# Same check for current input
|
||||||
|
|
||||||
|
if not self.env['runtime']['cursorManager'].shouldProcessNumpadCommands():
|
||||||
|
for key in self.env['input']['currInput']:
|
||||||
|
if key in numpadKeys:
|
||||||
|
# Return an empty/invalid shortcut that won't match any command
|
||||||
|
return "[]"
|
||||||
|
|
||||||
shortcut.append(self.env['input']['currInput'])
|
shortcut.append(self.env['input']['currInput'])
|
||||||
|
|
||||||
if len(self.env['input']['prevInput']) < len(self.env['input']['currInput']):
|
if len(self.env['input']['prevInput']) < len(self.env['input']['currInput']):
|
||||||
if self.env['input']['shortcutRepeat'] > 1 and not self.shortcutExists(str(shortcut)):
|
if self.env['input']['shortcutRepeat'] > 1 and not self.shortcutExists(str(shortcut)):
|
||||||
shortcut = []
|
shortcut = []
|
||||||
|
@ -4,5 +4,5 @@
|
|||||||
# Fenrir TTY screen reader
|
# Fenrir TTY screen reader
|
||||||
# By Chrys, Storm Dragon, and contributers.
|
# By Chrys, Storm Dragon, and contributers.
|
||||||
|
|
||||||
version = "2025.01.08"
|
version = "2025.04.14"
|
||||||
codeName = "testing"
|
codeName = "master"
|
||||||
|
@ -72,14 +72,16 @@ class driver(inputDriver):
|
|||||||
self.env['runtime']['debug'].writeDebugOut('plugInputDeviceWatchdogUdev:' + str(device), debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('plugInputDeviceWatchdogUdev:' + str(device), debug.debugLevel.INFO)
|
||||||
try:
|
try:
|
||||||
try:
|
try:
|
||||||
if device.name.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
# FIX: Check if attributes exist before accessing them
|
||||||
|
if hasattr(device, 'name') and device.name and device.name.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
||||||
ignorePlug = True
|
ignorePlug = True
|
||||||
if device.phys.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
if hasattr(device, 'phys') and device.phys and device.phys.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
||||||
ignorePlug = True
|
ignorePlug = True
|
||||||
if 'BRLTTY' in device.name.upper():
|
if hasattr(device, 'name') and device.name and 'BRLTTY' in device.name.upper():
|
||||||
ignorePlug = True
|
ignorePlug = True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['debug'].writeDebugOut("plugInputDeviceWatchdogUdev CHECK NAME CRASH: " + str(e), debug.debugLevel.ERROR)
|
self.env['runtime']['debug'].writeDebugOut("plugInputDeviceWatchdogUdev CHECK NAME CRASH: " + str(e), debug.debugLevel.ERROR)
|
||||||
|
|
||||||
if not ignorePlug:
|
if not ignorePlug:
|
||||||
virtual = '/sys/devices/virtual/input/' in device.sys_path
|
virtual = '/sys/devices/virtual/input/' in device.sys_path
|
||||||
if device.device_node:
|
if device.device_node:
|
||||||
@ -89,7 +91,7 @@ class driver(inputDriver):
|
|||||||
try:
|
try:
|
||||||
pollTimeout = 1
|
pollTimeout = 1
|
||||||
device = monitor.poll(pollTimeout)
|
device = monitor.poll(pollTimeout)
|
||||||
except:
|
except Exception:
|
||||||
device = None
|
device = None
|
||||||
ignorePlug = False
|
ignorePlug = False
|
||||||
if validDevices:
|
if validDevices:
|
||||||
@ -146,7 +148,7 @@ class driver(inputDriver):
|
|||||||
if uDevice:
|
if uDevice:
|
||||||
if self.gDevices[iDevice.fd]:
|
if self.gDevices[iDevice.fd]:
|
||||||
self.writeUInput(uDevice, event)
|
self.writeUInput(uDevice, event)
|
||||||
except Exception as e:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def writeUInput(self, uDevice, event):
|
def writeUInput(self, uDevice, event):
|
||||||
@ -191,7 +193,7 @@ class driver(inputDriver):
|
|||||||
try:
|
try:
|
||||||
with open(deviceFile) as f:
|
with open(deviceFile) as f:
|
||||||
pass
|
pass
|
||||||
except Exception as e:
|
except Exception:
|
||||||
continue
|
continue
|
||||||
# 3 pos absolute
|
# 3 pos absolute
|
||||||
# 2 pos relative
|
# 2 pos relative
|
||||||
@ -201,11 +203,12 @@ class driver(inputDriver):
|
|||||||
except:
|
except:
|
||||||
continue
|
continue
|
||||||
try:
|
try:
|
||||||
if currDevice.name.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
# FIX: Check if attributes exist before accessing them
|
||||||
|
if hasattr(currDevice, 'name') and currDevice.name and currDevice.name.upper() in ['', 'SPEAKUP', 'FENRIR-UINPUT']:
|
||||||
continue
|
continue
|
||||||
if currDevice.phys.upper() in ['','SPEAKUP','FENRIR-UINPUT']:
|
if hasattr(currDevice, 'phys') and currDevice.phys and currDevice.phys.upper() in ['', 'SPEAKUP', 'FENRIR-UINPUT']:
|
||||||
continue
|
continue
|
||||||
if 'BRLTTY' in currDevice.name.upper():
|
if hasattr(currDevice, 'name') and currDevice.name and 'BRLTTY' in currDevice.name.upper():
|
||||||
continue
|
continue
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
@ -233,7 +236,11 @@ class driver(inputDriver):
|
|||||||
self.addDevice(currDevice)
|
self.addDevice(currDevice)
|
||||||
self.env['runtime']['debug'].writeDebugOut('Device added (Name):' + self.iDevices[currDevice.fd].name, debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('Device added (Name):' + self.iDevices[currDevice.fd].name, debug.debugLevel.INFO)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['debug'].writeDebugOut("Device Skipped (Exception): " + deviceFile +' ' + currDevice.name +' '+ str(e),debug.debugLevel.INFO)
|
try:
|
||||||
|
device_name = currDevice.name if hasattr(currDevice, 'name') else "unknown"
|
||||||
|
self.env['runtime']['debug'].writeDebugOut("Device Skipped (Exception): " + deviceFile + ' ' + device_name + ' ' + str(e), debug.debugLevel.INFO)
|
||||||
|
except:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut("Device Skipped (Exception): " + deviceFile + ' ' + str(e), debug.debugLevel.INFO)
|
||||||
self.iDeviceNo = len(evdev.list_devices())
|
self.iDeviceNo = len(evdev.list_devices())
|
||||||
self.updateMPiDevicesFD()
|
self.updateMPiDevicesFD()
|
||||||
|
|
||||||
@ -247,6 +254,7 @@ class driver(inputDriver):
|
|||||||
self.iDevicesFD.remove(fd)
|
self.iDevicesFD.remove(fd)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def mapEvent(self, event):
|
def mapEvent(self, event):
|
||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
return None
|
return None
|
||||||
@ -268,7 +276,7 @@ class driver(inputDriver):
|
|||||||
mEvent['EventState'] = event.value
|
mEvent['EventState'] = event.value
|
||||||
mEvent['EventType'] = event.type
|
mEvent['EventType'] = event.type
|
||||||
return mEvent
|
return mEvent
|
||||||
except Exception as e:
|
except Exception:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def getLedState(self, led=0):
|
def getLedState(self, led=0):
|
||||||
@ -281,6 +289,7 @@ class driver(inputDriver):
|
|||||||
if led in dev.leds():
|
if led in dev.leds():
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def toggleLedState(self, led=0):
|
def toggleLedState(self, led=0):
|
||||||
if not self.hasIDevices():
|
if not self.hasIDevices():
|
||||||
return False
|
return False
|
||||||
@ -293,6 +302,7 @@ class driver(inputDriver):
|
|||||||
self.iDevices[i].set_led(led, 0)
|
self.iDevices[i].set_led(led, 0)
|
||||||
else:
|
else:
|
||||||
self.iDevices[i].set_led(led, 1)
|
self.iDevices[i].set_led(led, 1)
|
||||||
|
|
||||||
def grabAllDevices(self):
|
def grabAllDevices(self):
|
||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
return True
|
return True
|
||||||
@ -301,6 +311,7 @@ class driver(inputDriver):
|
|||||||
if not self.gDevices[fd]:
|
if not self.gDevices[fd]:
|
||||||
ok = ok and self.grabDevice(fd)
|
ok = ok and self.grabDevice(fd)
|
||||||
return ok
|
return ok
|
||||||
|
|
||||||
def ungrabAllDevices(self):
|
def ungrabAllDevices(self):
|
||||||
if not self._initialized:
|
if not self._initialized:
|
||||||
return True
|
return True
|
||||||
@ -309,6 +320,7 @@ class driver(inputDriver):
|
|||||||
if self.gDevices[fd]:
|
if self.gDevices[fd]:
|
||||||
ok = ok and self.ungrabDevice(fd)
|
ok = ok and self.ungrabDevice(fd)
|
||||||
return ok
|
return ok
|
||||||
|
|
||||||
def createUInputDev(self, fd):
|
def createUInputDev(self, fd):
|
||||||
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
||||||
self.uDevices[fd] = None
|
self.uDevices[fd] = None
|
||||||
@ -336,6 +348,7 @@ class driver(inputDriver):
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: init Uinput not possible: ' + str(e), debug.debugLevel.ERROR)
|
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: init Uinput not possible: ' + str(e), debug.debugLevel.ERROR)
|
||||||
return
|
return
|
||||||
|
|
||||||
def addDevice(self, newDevice):
|
def addDevice(self, newDevice):
|
||||||
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: device added: ' + str(newDevice.fd) + ' ' + str(newDevice), debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: device added: ' + str(newDevice.fd) + ' ' + str(newDevice), debug.debugLevel.INFO)
|
||||||
try:
|
try:
|
||||||
@ -360,6 +373,9 @@ class driver(inputDriver):
|
|||||||
def grabDevice(self, fd):
|
def grabDevice(self, fd):
|
||||||
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
# FIX: Handle exception variable scope correctly
|
||||||
|
grab_error = None
|
||||||
try:
|
try:
|
||||||
self.iDevices[fd].grab()
|
self.iDevices[fd].grab()
|
||||||
self.gDevices[fd] = True
|
self.gDevices[fd] = True
|
||||||
@ -371,19 +387,26 @@ class driver(inputDriver):
|
|||||||
try:
|
try:
|
||||||
self.uDevices[fd].write(e.EV_KEY, key, 0) # 0 = key up
|
self.uDevices[fd].write(e.EV_KEY, key, 0) # 0 = key up
|
||||||
self.uDevices[fd].syn()
|
self.uDevices[fd].syn()
|
||||||
except Exception as e:
|
except Exception as mod_error:
|
||||||
self.env['runtime']['debug'].writeDebugOut('Failed to reset modifier key: ' + str(e), debug.debugLevel.WARNING)
|
self.env['runtime']['debug'].writeDebugOut('Failed to reset modifier key: ' + str(mod_error), debug.debugLevel.WARNING)
|
||||||
except IOError:
|
except IOError:
|
||||||
if not self.gDevices[fd]:
|
if not self.gDevices[fd]:
|
||||||
return False
|
return False
|
||||||
except Exception as e:
|
except Exception as ex:
|
||||||
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: grabing not possible: ' + str(e),debug.debugLevel.ERROR)
|
grab_error = ex
|
||||||
|
|
||||||
|
if grab_error:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: grabing not possible: ' + str(grab_error), debug.debugLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def ungrabDevice(self, fd):
|
def ungrabDevice(self, fd):
|
||||||
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
if not self.env['runtime']['settingsManager'].getSettingAsBool('keyboard', 'grabDevices'):
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
# FIX: Handle exception variable scope correctly
|
||||||
|
ungrab_error = None
|
||||||
try:
|
try:
|
||||||
self.iDevices[fd].ungrab()
|
self.iDevices[fd].ungrab()
|
||||||
self.gDevices[fd] = False
|
self.gDevices[fd] = False
|
||||||
@ -391,11 +414,15 @@ class driver(inputDriver):
|
|||||||
except IOError:
|
except IOError:
|
||||||
if self.gDevices[fd]:
|
if self.gDevices[fd]:
|
||||||
return False
|
return False
|
||||||
# self.gDevices[fd] = False
|
except Exception as ex:
|
||||||
# #self.removeDevice(fd)
|
ungrab_error = ex
|
||||||
except Exception as e:
|
|
||||||
|
if ungrab_error:
|
||||||
|
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: ungrabing not possible: ' + str(ungrab_error), debug.debugLevel.ERROR)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def removeDevice(self, fd):
|
def removeDevice(self, fd):
|
||||||
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: device removed: ' + str(fd) + ' ' + str(self.iDevices[fd]), debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('InputDriver evdev: device removed: ' + str(fd) + ' ' + str(self.iDevices[fd]), debug.debugLevel.INFO)
|
||||||
self.clearEventBuffer()
|
self.clearEventBuffer()
|
||||||
|
Reference in New Issue
Block a user