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

initial say prev,curr,next line

Browse Source
This commit is contained in:
chrys 2016-07-13 21:40:19 +02:00
parent 311e653893
commit 333232d7ce
9 changed files with 38 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/keyboard/Readme.md
View File

File diff suppressed because one or more lines are too long

9
config/keyboard/desktop.kb
View File

@ -1,3 +1,8 @@
2-KEY_LEFTCTRL,1-KEY_LEFTSHIFT=curr_line
2-KEY_LEFTCTRL,1-KEY_A=shut_up
#2-KEY_LEFTCTRL,1-KEY_LEFTSHIFT=curr_line
#2-KEY_LEFTCTRL,1-KEY_S=next_line
#2-KEY_LEFTCTRL,1-KEY_W=prev_line
2-KEY_LEFTCTRL,1-KEY_E=shut_up
1-KEY_KP8=curr_line
1-KEY_KP7=prev_line
1-KEY_KP9=next_line

BIN
src/fenrir-package/commands/commands/__pycache__/curr_line.cpython-35.pyc
View File

Binary file not shown.

9
src/fenrir-package/commands/commands/curr_line.py
View File

@ -5,10 +5,15 @@ class command():
pass
def run(self, environment):
environment['runtime']['speechDriver'].cancel()
environment['screenData']['oldCursorReview'] = environment['screenData']['newCursorReview']
if environment['screenData']['newCursorReview']['y'] == -1:
environment['screenData']['newCursorReview'] = environment['screenData']['newCursor'].copy()
if environment['screenData']['newContentText'].replace(" ","") == '':
environment['runtime']['speechDriver'].speak("empty screen")
environment['runtime']['speechDriver'].speak("empty line")
else:
environment['runtime']['speechDriver'].speak(environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursor']['y']])
environment['runtime']['speechDriver'].speak(environment['screenData']['newContentText'].split('\n')[environment['screenData']['newCursorReview']['y']])
return environment
def setCallback(self, callback):
pass
def shutdown(self):

1
src/fenrir-package/core/commandManager.py
View File

@ -29,6 +29,7 @@ class commandManager():
for cmd in sorted(environment['commands'][trigger]):
environment = environment['commands'][trigger][cmd].run(environment)
return environment
def executeCommand(self, environment, currCommand, section = 'commands'):
if self.isCommandDefined(environment):
try:

29
src/fenrir-package/core/inputManager.py
View File

@ -11,19 +11,22 @@ class inputManager():
#for dev in self.devices.values(): print(dev)
def getKeyPressed(self, environment):
r, w, x = select(self.devices, [], [])
currShortcut = environment['input']['currShortcut']
if r != []:
for fd in r:
for event in self.devices[fd].read():
if event.type == evdev.ecodes.EV_KEY:
if event.value != 0:
currShortcut[str(event.code)] = event.value
else:
try:
del(currShortcut[str(event.code)])
except:
pass
try:
r, w, x = select(self.devices, [], [])
currShortcut = environment['input']['currShortcut']
if r != []:
for fd in r:
for event in self.devices[fd].read():
if event.type == evdev.ecodes.EV_KEY:
if event.value != 0:
currShortcut[str(event.code)] = event.value
else:
try:
del(currShortcut[str(event.code)])
except:
pass
except:
pass
environment['input']['currShortcut'] = currShortcut
environment['input']['currShortcutString'] = self.getShortcutString(environment)
return environment

4
src/fenrir-package/core/screenData.py
View File

@ -4,13 +4,13 @@ screenData = {
'columns': 0,
'lines': 0,
'oldDelta': '',
'oldCursorReview':{'x':0,'y':0},
'oldCursorReview':{'x':-1,'y':-1},
'oldCursor':{'x':0,'y':0},
'oldContentBytes': b'',
'oldContentText': '',
'oldContentAttrib': b'',
'newDelta': '',
'newCursorReview':{'x':0,'y':0},
'newCursorReview':{'x':-1,'y':-1},
'newCursor':{'x':0,'y':0},
'newContentBytes': b'',
'newContentText': '',

1
src/fenrir-package/fenrir.py
View File

@ -41,6 +41,7 @@ class fenrir():
def proceed(self):
self.threadHandleInput = Thread(target=self.handleInput, args=())
self.threadHandleInput.start()
self.updateScreen()
while(self.environment['generalInformation']['running']):
self.updateScreen()
self.shutdown()