rename onScreenChange to onScreenUpdate and create onScreenChange

This commit is contained in:
chrys 2016-09-21 23:30:27 +02:00
parent e9b97945a3
commit 02520c9739
14 changed files with 15 additions and 14 deletions

7
TODO
View File

@ -17,8 +17,6 @@ ToDos in Priority order:
possiblity to forewart shortcut (or use them as shortcut) [pressing twice while timeout] possiblity to forewart shortcut (or use them as shortcut) [pressing twice while timeout]
cleanup inputManager cleanup inputManager
split input driver out of the handler split input driver out of the handler
- add screenManager
abstract screen driver
- dictonary for special chars and string replacements - dictonary for special chars and string replacements
- punctuation - punctuation
@ -46,7 +44,6 @@ ToDos in Priority order:
first item first item
last item last item
- improve performance - improve performance
- pass environment instance in init and remove it from function calls
- implement onScreenChange (new onScreenUpdate) commands - implement onScreenChange (new onScreenUpdate) commands
read highlighted text mode read highlighted text mode
@ -214,3 +211,7 @@ ps a -o tty,comm | grep -e Xorg | grep -v "grep -e Xorg"
promoted text promoted text
clear_marks_on_screen_change clear_marks_on_screen_change
leve_review_mode_on_screen_change leve_review_mode_on_screen_change
- add screenManager
abstract screen driver
- pass environment instance in init and remove it from function calls

View File

@ -17,8 +17,6 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['screenData']['newTTY'] == self.env['screenData']['oldTTY']:
return
self.env['runtime']['outputManager'].presentText("screen " + str(self.env['screenData']['newTTY']),soundIcon='ChangeTTY', interrupt=True) self.env['runtime']['outputManager'].presentText("screen " + str(self.env['screenData']['newTTY']),soundIcon='ChangeTTY', interrupt=True)
self.env['runtime']['outputManager'].presentText(self.env['screenData']['newDelta'], interrupt=False) self.env['runtime']['outputManager'].presentText(self.env['screenData']['newDelta'], interrupt=False)

View File

@ -17,8 +17,6 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['screenData']['newTTY'] == self.env['screenData']['oldTTY']:
return
self.env['commandBuffer']['Marks']['1'] = None self.env['commandBuffer']['Marks']['1'] = None
self.env['commandBuffer']['Marks']['2'] = None self.env['commandBuffer']['Marks']['2'] = None

View File

@ -17,8 +17,6 @@ class command():
return 'No Description found' return 'No Description found'
def run(self): def run(self):
if self.env['screenData']['newTTY'] == self.env['screenData']['oldTTY']:
return
self.env['screenData']['oldCursorReview'] = None self.env['screenData']['oldCursorReview'] = None
self.env['screenData']['newCursorReview'] = None self.env['screenData']['newCursorReview'] = None

View File

@ -14,12 +14,14 @@ class commandManager():
def initialize(self, environment): def initialize(self, environment):
self.env = environment self.env = environment
self.env['runtime']['commandManager'].loadCommands('commands') self.env['runtime']['commandManager'].loadCommands('commands')
environment['runtime']['commandManager'].loadCommands('onInput') self.env['runtime']['commandManager'].loadCommands('onInput')
environment['runtime']['commandManager'].loadCommands('onScreenChanged') self.env['runtime']['commandManager'].loadCommands('onScreenUpdate')
self.env['runtime']['commandManager'].loadCommands('onScreenChanged')
def shutdown(self): def shutdown(self):
self.env['runtime']['commandManager'].shutdownCommands('commands') self.env['runtime']['commandManager'].shutdownCommands('commands')
self.env['runtime']['commandManager'].shutdownCommands('onInput') self.env['runtime']['commandManager'].shutdownCommands('onInput')
self.env['runtime']['commandManager'].shutdownCommands('onScreenUpdate')
self.env['runtime']['commandManager'].shutdownCommands('onScreenChanged') self.env['runtime']['commandManager'].shutdownCommands('onScreenChanged')
def loadCommands(self, section='commands'): def loadCommands(self, section='commands'):

View File

@ -32,6 +32,8 @@ commands = {
}, },
'onScreenChanged':{ 'onScreenChanged':{
}, },
'onScreenUpdate':{
},
'commands':{ 'commands':{
} }
} }

View File

@ -50,9 +50,11 @@ class fenrir():
print(e) print(e)
self.environment['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) self.environment['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR)
self.environment['runtime']['commandManager'].executeTriggerCommands('onInput') self.environment['runtime']['commandManager'].executeTriggerCommands('onInput')
self.environment['runtime']['commandManager'].executeTriggerCommands('onScreenChanged') if self.environment['screenData']['newTTY'] == self.environment['screenData']['oldTTY']:
self.environment['runtime']['commandManager'].executeTriggerCommands('onScreenUpdate')
else:
self.environment['runtime']['commandManager'].executeTriggerCommands('onScreenChanged')
self.handleCommands() self.handleCommands()
def prepareCommand(self): def prepareCommand(self):