storm/fenrir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

polish word echo

Browse Source
This commit is contained in:
chrys 2016-08-06 14:43:00 +02:00
parent 54b2682d03
commit 30155b6d83
4 changed files with 57 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/settings/settings.conf
View File

@ -23,7 +23,7 @@ driver=linux
[keyboard]
keyboardLayout=desktop
charEcho=False
wordEcho=False
wordEcho=True
interruptOnKeyPress=False
[general]

24
src/fenrir-package/commands/onInput/54000-read_char_if_cursor_change_horizontal.py Normal file
View File

@ -0,0 +1,24 @@
#!/bin/python
import time
class command():
def __init__(self):
pass
def run(self, environment):
if environment['screenData']['newTTY'] != environment['screenData']['oldTTY']:
return environment
if environment['screenData']['newDelta'] != environment['screenData']['oldDelta']:
return environment
if environment['screenData']['newCursor']['y'] != environment['screenData']['oldCursor']['y'] or\
environment['screenData']['newCursor']['x'] == environment['screenData']['oldCursor']['x']:
return environment
if environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']].strip(" \t\n") == '':
pass
#environment['runtime']['outputManager'].presentText(environment, "blank",True)
else:
environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']][environment['screenData']['newCursor']['x']],interrupt=True)
return environment
def setCallback(self, callback):
pass
def shutdown(self):
pass

21
src/fenrir-package/commands/onInput/55000-read_line_if_cursor_change_vertical.py Normal file
View File

@ -0,0 +1,21 @@
#!/bin/python
class command():
def __init__(self):
pass
def run(self, environment):
if environment['screenData']['newTTY'] != environment['screenData']['oldTTY']:
return environment
if environment['screenData']['newDelta'] != environment['screenData']['oldDelta']:
return environment
if environment['screenData']['newCursor']['y'] == environment['screenData']['oldCursor']['y']:
return environment
if environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']].strip(" \t\n") == '':
environment['runtime']['outputManager'].presentText(environment, "blank", soundIconName='EmptyLine', interrupt=True)
else:
environment['runtime']['outputManager'].presentText(environment, environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']], True)
return environment
def setCallback(self, callback):
pass
def shutdown(self):
pass

17
src/fenrir-package/commands/onScreenChanged/69000-speak_word_echo.py
View File

@ -5,29 +5,34 @@ class command():
def __init__(self):
pass
def run(self, environment):
#return environment
if not environment['runtime']['settingsManager'].getSettingAsBool(environment, 'keyboard', 'wordEcho'):
return environment
# just when typing is a new word
if environment['screenData']['newCursor']['x'] <= environment['screenData']['oldCursor']['x']:
return environment
# TTY Change is no new word
if environment['screenData']['newTTY'] != environment['screenData']['oldTTY']:
return environment
# here we just arrow arround (left right) no changes
if environment['screenData']['newDelta'] == environment['screenData']['oldDelta'] and \
environment['screenData']['newNegativeDelta'] == '':
environment['screenData']['newNegativeDelta'] == '':
return environment
# this is not the end of the word
if environment['screenData']['newDelta'] == environment['screenData']['oldDelta'] and \
environment['screenData']['newNegativeDelta'] != ' ':
return environment
# japp its a finished word... announce it:x
newContent = environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']]
x, y, currWord = word_utils.getCurrentWord(environment['screenData']['newCursor']['x'], 0, newContent)
print('|',environment['screenData']['newNegativeDelta'] ,'|',len(currWord) + x + 2, environment['screenData']['newCursor']['x'],'|',newContent[environment['screenData']['newCursor']['x'] - 1],'|',x, y, currWord)
print(newContent )
#len(currWord) + x + 2 == environment['screenData']['newCursor']['x']:
if environment['screenData']['newCursor']['x'] > 0 and \
newContent[environment['screenData']['newCursor']['x']- 1] == ' ':
environment['runtime']['outputManager'].presentText(environment, currWord, interrupt=True)
print('word')
return environment
def setCallback(self, callback):
pass