send full event via event bus
This commit is contained in:
chrys
parent
f98c1b61b6
commit
45e4a1249b
@ -5,7 +5,7 @@
|
|||||||
# By Chrys, Storm Dragon, and contributers.
|
# By Chrys, Storm Dragon, and contributers.
|
||||||
|
|
||||||
from fenrirscreenreader.core import debug
|
from fenrirscreenreader.core import debug
|
||||||
import time, os
|
import time, os, re, difflib
|
||||||
|
|
||||||
class screenManager():
|
class screenManager():
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
@ -26,16 +26,107 @@ class screenManager():
|
|||||||
if self.isScreenChange():
|
if self.isScreenChange():
|
||||||
self.changeBrailleScreen()
|
self.changeBrailleScreen()
|
||||||
if not self.isSuspendingScreen(self.env['screen']['newTTY']):
|
if not self.isSuspendingScreen(self.env['screen']['newTTY']):
|
||||||
self.env['runtime']['screenDriver'].update(eventData, 'onScreenChange')
|
self.update(eventData, 'onScreenChange')
|
||||||
self.env['screen']['lastScreenUpdate'] = time.time()
|
self.env['screen']['lastScreenUpdate'] = time.time()
|
||||||
def handleScreenUpdate(self, eventData):
|
def handleScreenUpdate(self, eventData):
|
||||||
self.env['screen']['oldApplication'] = self.env['screen']['newApplication']
|
self.env['screen']['oldApplication'] = self.env['screen']['newApplication']
|
||||||
if not self.isSuspendingScreen(self.env['screen']['newTTY']):
|
if not self.isSuspendingScreen(self.env['screen']['newTTY']):
|
||||||
self.env['runtime']['screenDriver'].update(eventData, 'onScreenUpdate')
|
self.update(eventData, 'onScreenUpdate')
|
||||||
#if trigger == 'onUpdate' or self.isScreenChange() \
|
#if trigger == 'onUpdate' or self.isScreenChange() \
|
||||||
# or len(self.env['screen']['newDelta']) > 6:
|
# or len(self.env['screen']['newDelta']) > 6:
|
||||||
# self.env['runtime']['screenDriver'].getCurrApplication()
|
# self.env['runtime']['screenDriver'].getCurrApplication()
|
||||||
self.env['screen']['lastScreenUpdate'] = time.time()
|
self.env['screen']['lastScreenUpdate'] = time.time()
|
||||||
|
def update(self, eventData, trigger='onUpdate'):
|
||||||
|
|
||||||
|
# set new "old" values
|
||||||
|
self.env['screen']['oldContentBytes'] = self.env['screen']['newContentBytes']
|
||||||
|
self.env['screen']['oldContentText'] = self.env['screen']['newContentText']
|
||||||
|
self.env['screen']['oldContentAttrib'] = self.env['screen']['newContentAttrib']
|
||||||
|
self.env['screen']['oldCursor'] = self.env['screen']['newCursor'].copy()
|
||||||
|
if self.env['screen']['newCursorAttrib']:
|
||||||
|
self.env['screen']['oldCursorAttrib'] = self.env['screen']['newCursorAttrib'].copy()
|
||||||
|
self.env['screen']['oldDelta'] = self.env['screen']['newDelta']
|
||||||
|
self.env['screen']['oldAttribDelta'] = self.env['screen']['newAttribDelta']
|
||||||
|
self.env['screen']['oldNegativeDelta'] = self.env['screen']['newNegativeDelta']
|
||||||
|
self.env['screen']['newContentBytes'] = eventData['bytes']
|
||||||
|
# get metadata like cursor or screensize
|
||||||
|
self.env['screen']['lines'] = int( eventData['lines'])
|
||||||
|
self.env['screen']['columns'] = int( eventData['columns'])
|
||||||
|
self.env['screen']['newCursor']['x'] = int( eventData['textCursor']['x'])
|
||||||
|
self.env['screen']['newCursor']['y'] = int( eventData['textCursor']['y'])
|
||||||
|
self.env['screen']['newTTY'] = eventData['screen']
|
||||||
|
# analyze content
|
||||||
|
#self.updateCharMap(str(self.env['screen']['newTTY']))
|
||||||
|
self.env['screen']['newContentText'] = eventData['text']
|
||||||
|
self.env['screen']['newContentAttrib'] = eventData['attributes']
|
||||||
|
|
||||||
|
if self.env['screen']['newTTY'] != self.env['screen']['oldTTY']:
|
||||||
|
self.env['screen']['oldContentBytes'] = b''
|
||||||
|
self.env['screen']['oldContentAttrib'] = None
|
||||||
|
self.env['screen']['oldContentText'] = ''
|
||||||
|
self.env['screen']['oldCursor']['x'] = 0
|
||||||
|
self.env['screen']['oldCursor']['y'] = 0
|
||||||
|
self.env['screen']['oldDelta'] = ''
|
||||||
|
self.env['screen']['oldAttribDelta'] = ''
|
||||||
|
self.env['screen']['oldCursorAttrib'] = None
|
||||||
|
self.env['screen']['newCursorAttrib'] = None
|
||||||
|
self.env['screen']['oldNegativeDelta'] = ''
|
||||||
|
# initialize current deltas
|
||||||
|
self.env['screen']['newNegativeDelta'] = ''
|
||||||
|
self.env['screen']['newDelta'] = ''
|
||||||
|
self.env['screen']['newAttribDelta'] = ''
|
||||||
|
|
||||||
|
# changes on the screen
|
||||||
|
oldScreenText = re.sub(' +',' ',self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screen']['oldContentText']))
|
||||||
|
newScreenText = re.sub(' +',' ',self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screen']['newContentText']))
|
||||||
|
typing = False
|
||||||
|
diffList = []
|
||||||
|
if (self.env['screen']['oldContentText'] != self.env['screen']['newContentText']):
|
||||||
|
if self.env['screen']['newContentText'] != '' and self.env['screen']['oldContentText'] == '':
|
||||||
|
if oldScreenText == '' and\
|
||||||
|
newScreenText != '':
|
||||||
|
self.env['screen']['newDelta'] = newScreenText
|
||||||
|
else:
|
||||||
|
cursorLineStart = self.env['screen']['newCursor']['y'] * self.env['screen']['columns'] + self.env['screen']['newCursor']['y']
|
||||||
|
cursorLineEnd = cursorLineStart + self.env['screen']['columns']
|
||||||
|
if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) >= 1 and \
|
||||||
|
self.env['screen']['oldCursor']['y'] == self.env['screen']['newCursor']['y'] and \
|
||||||
|
self.env['screen']['newContentText'][:cursorLineStart] == self.env['screen']['oldContentText'][:cursorLineStart] and \
|
||||||
|
self.env['screen']['newContentText'][cursorLineEnd:] == self.env['screen']['oldContentText'][cursorLineEnd:]:
|
||||||
|
cursorLineStartOffset = cursorLineStart
|
||||||
|
cursorLineEndOffset = cursorLineEnd
|
||||||
|
#if cursorLineStart < cursorLineStart + self.env['screen']['newCursor']['x'] - 4:
|
||||||
|
# cursorLineStartOffset = cursorLineStart + self.env['screen']['newCursor']['x'] - 4
|
||||||
|
if cursorLineEnd > cursorLineStart + self.env['screen']['newCursor']['x'] + 3:
|
||||||
|
cursorLineEndOffset = cursorLineStart + self.env['screen']['newCursor']['x'] + 3
|
||||||
|
oldScreenText = self.env['screen']['oldContentText'][cursorLineStartOffset:cursorLineEndOffset]
|
||||||
|
# oldScreenText = re.sub(' +',' ',oldScreenText)
|
||||||
|
newScreenText = self.env['screen']['newContentText'][cursorLineStartOffset:cursorLineEndOffset]
|
||||||
|
#newScreenText = re.sub(' +',' ',newScreenText)
|
||||||
|
diff = difflib.ndiff(oldScreenText, newScreenText)
|
||||||
|
diffList = list(diff)
|
||||||
|
tempNewDelta = ''.join(x[2:] for x in diffList if x[0] == '+')
|
||||||
|
if tempNewDelta.strip() != '':
|
||||||
|
if tempNewDelta != ''.join(newScreenText[self.env['screen']['oldCursor']['x']:self.env['screen']['newCursor']['x']].rstrip()):
|
||||||
|
diffList = ['+ ' + self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]]
|
||||||
|
typing = True
|
||||||
|
else:
|
||||||
|
diff = difflib.ndiff( oldScreenText.split('\n'),\
|
||||||
|
newScreenText.split('\n'))
|
||||||
|
|
||||||
|
diffList = list(diff)
|
||||||
|
|
||||||
|
if self.env['runtime']['settingsManager'].getSetting('general', 'newLinePause') and not typing:
|
||||||
|
self.env['screen']['newDelta'] = '\n'.join(x[2:] for x in diffList if x[0] == '+')
|
||||||
|
else:
|
||||||
|
self.env['screen']['newDelta'] = ''.join(x[2:] for x in diffList if x[0] == '+')
|
||||||
|
self.env['screen']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x[0] == '-')
|
||||||
|
|
||||||
|
# track highlighted
|
||||||
|
if self.env['screen']['oldContentAttrib'] != self.env['screen']['newContentAttrib']:
|
||||||
|
if self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'highlight'):
|
||||||
|
self.env['screen']['newAttribDelta'], self.env['screen']['newCursorAttrib'] = screen_utils.trackHighlights(self.env['screen']['oldContentAttrib'], self.env['screen']['newContentAttrib'], self.env['screen']['newContentText'], self.env['screen']['columns'])
|
||||||
|
|
||||||
def formatAttributes(self, attribute, attributeFormatString = None):
|
def formatAttributes(self, attribute, attributeFormatString = None):
|
||||||
if not attributeFormatString:
|
if not attributeFormatString:
|
||||||
attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
|
attributeFormatString = self.env['runtime']['settingsManager'].getSetting('general', 'attributeFormatString')
|
||||||
|
|||||||
@ -10,9 +10,6 @@
|
|||||||
#blink = 5 if attr & 1 else 0
|
#blink = 5 if attr & 1 else 0
|
||||||
#bold = 1 if attr & 16 else 0
|
#bold = 1 if attr & 16 else 0
|
||||||
|
|
||||||
|
|
||||||
import difflib
|
|
||||||
import re
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import glob, os
|
import glob, os
|
||||||
import termios
|
import termios
|
||||||
@ -21,8 +18,6 @@ import select
|
|||||||
import dbus
|
import dbus
|
||||||
import fcntl
|
import fcntl
|
||||||
from array import array
|
from array import array
|
||||||
import errno
|
|
||||||
import sys
|
|
||||||
from fenrirscreenreader.utils import screen_utils
|
from fenrirscreenreader.utils import screen_utils
|
||||||
from fcntl import ioctl
|
from fcntl import ioctl
|
||||||
from struct import unpack_from, unpack, pack
|
from struct import unpack_from, unpack, pack
|
||||||
@ -116,21 +111,6 @@ class driver(screenDriver):
|
|||||||
#self.env['runtime']['debug'].writeDebugOut('getSessionInformation:' + str(self.env['screen']['autoIgnoreScreens']) + ' ' + str(self.env['general']) ,debug.debugLevel.INFO)
|
#self.env['runtime']['debug'].writeDebugOut('getSessionInformation:' + str(self.env['screen']['autoIgnoreScreens']) + ' ' + str(self.env['general']) ,debug.debugLevel.INFO)
|
||||||
|
|
||||||
def updateWatchdog(self,active , eventQueue):
|
def updateWatchdog(self,active , eventQueue):
|
||||||
screenData = {
|
|
||||||
'columns': 0,
|
|
||||||
'lines': 0,
|
|
||||||
'delta': '',
|
|
||||||
'negativeDelta': '',
|
|
||||||
'attribDelta': '',
|
|
||||||
'cursorAttrib':None,
|
|
||||||
'cursor':{'x':0,'y':0},
|
|
||||||
'Bytes': b'',
|
|
||||||
'Text': '',
|
|
||||||
'Attributes': None,
|
|
||||||
'Scren':'0',
|
|
||||||
'Application': '',
|
|
||||||
'screenUpdateTime': time.time(),
|
|
||||||
}
|
|
||||||
try:
|
try:
|
||||||
vcsa = {}
|
vcsa = {}
|
||||||
vcsaDevices = glob.glob('/dev/vcsa*')
|
vcsaDevices = glob.glob('/dev/vcsa*')
|
||||||
@ -168,7 +148,9 @@ class driver(screenDriver):
|
|||||||
lastScreenContent = vcsa[currScreen].read()
|
lastScreenContent = vcsa[currScreen].read()
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
eventQueue.put({"Type":fenrirEventType.ScreenChanged,"Data":lastScreenContent})
|
eventQueue.put({"Type":fenrirEventType.ScreenChanged,
|
||||||
|
"Data":self.createScreenEventData(currScreen,lastScreenContent)
|
||||||
|
})
|
||||||
else:
|
else:
|
||||||
self.env['runtime']['debug'].writeDebugOut('ScreenUpdate',debug.debugLevel.INFO)
|
self.env['runtime']['debug'].writeDebugOut('ScreenUpdate',debug.debugLevel.INFO)
|
||||||
vcsa[currScreen].seek(0)
|
vcsa[currScreen].seek(0)
|
||||||
@ -182,10 +164,32 @@ class driver(screenDriver):
|
|||||||
time.sleep(0.02)
|
time.sleep(0.02)
|
||||||
vcsa[currScreen].seek(0)
|
vcsa[currScreen].seek(0)
|
||||||
dirtyContent = vcsa[currScreen].read()
|
dirtyContent = vcsa[currScreen].read()
|
||||||
eventQueue.put({"Type":fenrirEventType.ScreenUpdate,"Data":screenContent})
|
eventQueue.put({"Type":fenrirEventType.ScreenUpdate,
|
||||||
|
"Data":self.createScreenEventData(currScreen,screenContent)
|
||||||
|
})
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.env['runtime']['debug'].writeDebugOut('VCSA:updateWatchdog:' + str(e),debug.debugLevel.ERROR)
|
self.env['runtime']['debug'].writeDebugOut('VCSA:updateWatchdog:' + str(e),debug.debugLevel.ERROR)
|
||||||
|
|
||||||
|
|
||||||
|
def createScreenEventData(self, screen, content):
|
||||||
|
self.updateCharMap(screen)
|
||||||
|
eventData = {
|
||||||
|
'bytes': content,
|
||||||
|
'lines': int( content[0]),
|
||||||
|
'columns': int( content[1]),
|
||||||
|
'textCursor':
|
||||||
|
{
|
||||||
|
'x': int( content[2]),
|
||||||
|
'y': int( content[3])
|
||||||
|
},
|
||||||
|
'screen': screen,
|
||||||
|
'screenUpdateTime': time.time(),
|
||||||
|
}
|
||||||
|
encText, encAttr =\
|
||||||
|
self.autoDecodeVCSA(content[4:], eventData['lines'], eventData['columns'])
|
||||||
|
eventData['text'] = encText
|
||||||
|
eventData['attributes'] = encAttr
|
||||||
|
return eventData.copy()
|
||||||
def updateCharMap(self, screen):
|
def updateCharMap(self, screen):
|
||||||
self.charmap = {}
|
self.charmap = {}
|
||||||
try:
|
try:
|
||||||
@ -287,94 +291,3 @@ class driver(screenDriver):
|
|||||||
return _('Default')
|
return _('Default')
|
||||||
def getFenrirFontSize(self, attribute):
|
def getFenrirFontSize(self, attribute):
|
||||||
return _('Default')
|
return _('Default')
|
||||||
def update(self, text, trigger='onUpdate'):
|
|
||||||
newContentBytes = text
|
|
||||||
# set new "old" values
|
|
||||||
self.env['screen']['oldContentBytes'] = self.env['screen']['newContentBytes']
|
|
||||||
self.env['screen']['oldContentText'] = self.env['screen']['newContentText']
|
|
||||||
self.env['screen']['oldContentAttrib'] = self.env['screen']['newContentAttrib']
|
|
||||||
self.env['screen']['oldCursor'] = self.env['screen']['newCursor'].copy()
|
|
||||||
if self.env['screen']['newCursorAttrib']:
|
|
||||||
self.env['screen']['oldCursorAttrib'] = self.env['screen']['newCursorAttrib'].copy()
|
|
||||||
self.env['screen']['oldDelta'] = self.env['screen']['newDelta']
|
|
||||||
self.env['screen']['oldAttribDelta'] = self.env['screen']['newAttribDelta']
|
|
||||||
self.env['screen']['oldNegativeDelta'] = self.env['screen']['newNegativeDelta']
|
|
||||||
self.env['screen']['newContentBytes'] = newContentBytes
|
|
||||||
# get metadata like cursor or screensize
|
|
||||||
self.env['screen']['lines'] = int( self.env['screen']['newContentBytes'][0])
|
|
||||||
self.env['screen']['columns'] = int( self.env['screen']['newContentBytes'][1])
|
|
||||||
self.env['screen']['newCursor']['x'] = int( self.env['screen']['newContentBytes'][2])
|
|
||||||
self.env['screen']['newCursor']['y'] = int( self.env['screen']['newContentBytes'][3])
|
|
||||||
|
|
||||||
# analyze content
|
|
||||||
self.updateCharMap(str(self.env['screen']['newTTY']))
|
|
||||||
self.env['screen']['newContentText'], \
|
|
||||||
self.env['screen']['newContentAttrib'] =\
|
|
||||||
self.autoDecodeVCSA(self.env['screen']['newContentBytes'][4:], self.env['screen']['lines'], self.env['screen']['columns'])
|
|
||||||
if self.env['screen']['newTTY'] != self.env['screen']['oldTTY']:
|
|
||||||
self.env['screen']['oldContentBytes'] = b''
|
|
||||||
self.env['screen']['oldContentAttrib'] = None
|
|
||||||
self.env['screen']['oldContentText'] = ''
|
|
||||||
self.env['screen']['oldCursor']['x'] = 0
|
|
||||||
self.env['screen']['oldCursor']['y'] = 0
|
|
||||||
self.env['screen']['oldDelta'] = ''
|
|
||||||
self.env['screen']['oldAttribDelta'] = ''
|
|
||||||
self.env['screen']['oldCursorAttrib'] = None
|
|
||||||
self.env['screen']['newCursorAttrib'] = None
|
|
||||||
self.env['screen']['oldNegativeDelta'] = ''
|
|
||||||
# initialize current deltas
|
|
||||||
self.env['screen']['newNegativeDelta'] = ''
|
|
||||||
self.env['screen']['newDelta'] = ''
|
|
||||||
self.env['screen']['newAttribDelta'] = ''
|
|
||||||
|
|
||||||
# changes on the screen
|
|
||||||
oldScreenText = re.sub(' +',' ',self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screen']['oldContentText']))
|
|
||||||
newScreenText = re.sub(' +',' ',self.env['runtime']['screenManager'].getWindowAreaInText(self.env['screen']['newContentText']))
|
|
||||||
typing = False
|
|
||||||
diffList = []
|
|
||||||
if (self.env['screen']['oldContentText'] != self.env['screen']['newContentText']):
|
|
||||||
if self.env['screen']['newContentText'] != '' and self.env['screen']['oldContentText'] == '':
|
|
||||||
if oldScreenText == '' and\
|
|
||||||
newScreenText != '':
|
|
||||||
self.env['screen']['newDelta'] = newScreenText
|
|
||||||
else:
|
|
||||||
cursorLineStart = self.env['screen']['newCursor']['y'] * self.env['screen']['columns'] + self.env['screen']['newCursor']['y']
|
|
||||||
cursorLineEnd = cursorLineStart + self.env['screen']['columns']
|
|
||||||
if abs(self.env['screen']['oldCursor']['x'] - self.env['screen']['newCursor']['x']) >= 1 and \
|
|
||||||
self.env['screen']['oldCursor']['y'] == self.env['screen']['newCursor']['y'] and \
|
|
||||||
self.env['screen']['newContentText'][:cursorLineStart] == self.env['screen']['oldContentText'][:cursorLineStart] and \
|
|
||||||
self.env['screen']['newContentText'][cursorLineEnd:] == self.env['screen']['oldContentText'][cursorLineEnd:]:
|
|
||||||
cursorLineStartOffset = cursorLineStart
|
|
||||||
cursorLineEndOffset = cursorLineEnd
|
|
||||||
#if cursorLineStart < cursorLineStart + self.env['screen']['newCursor']['x'] - 4:
|
|
||||||
# cursorLineStartOffset = cursorLineStart + self.env['screen']['newCursor']['x'] - 4
|
|
||||||
if cursorLineEnd > cursorLineStart + self.env['screen']['newCursor']['x'] + 3:
|
|
||||||
cursorLineEndOffset = cursorLineStart + self.env['screen']['newCursor']['x'] + 3
|
|
||||||
oldScreenText = self.env['screen']['oldContentText'][cursorLineStartOffset:cursorLineEndOffset]
|
|
||||||
# oldScreenText = re.sub(' +',' ',oldScreenText)
|
|
||||||
newScreenText = self.env['screen']['newContentText'][cursorLineStartOffset:cursorLineEndOffset]
|
|
||||||
#newScreenText = re.sub(' +',' ',newScreenText)
|
|
||||||
diff = difflib.ndiff(oldScreenText, newScreenText)
|
|
||||||
diffList = list(diff)
|
|
||||||
tempNewDelta = ''.join(x[2:] for x in diffList if x[0] == '+')
|
|
||||||
if tempNewDelta.strip() != '':
|
|
||||||
if tempNewDelta != ''.join(newScreenText[self.env['screen']['oldCursor']['x']:self.env['screen']['newCursor']['x']].rstrip()):
|
|
||||||
diffList = ['+ ' + self.env['screen']['newContentText'].split('\n')[self.env['screen']['newCursor']['y']]]
|
|
||||||
typing = True
|
|
||||||
else:
|
|
||||||
diff = difflib.ndiff( oldScreenText.split('\n'),\
|
|
||||||
newScreenText.split('\n'))
|
|
||||||
|
|
||||||
diffList = list(diff)
|
|
||||||
|
|
||||||
if self.env['runtime']['settingsManager'].getSetting('general', 'newLinePause') and not typing:
|
|
||||||
self.env['screen']['newDelta'] = '\n'.join(x[2:] for x in diffList if x[0] == '+')
|
|
||||||
else:
|
|
||||||
self.env['screen']['newDelta'] = ''.join(x[2:] for x in diffList if x[0] == '+')
|
|
||||||
self.env['screen']['newNegativeDelta'] = ''.join(x[2:] for x in diffList if x[0] == '-')
|
|
||||||
|
|
||||||
# track highlighted
|
|
||||||
if self.env['screen']['oldContentAttrib'] != self.env['screen']['newContentAttrib']:
|
|
||||||
if self.env['runtime']['settingsManager'].getSettingAsBool('focus', 'highlight'):
|
|
||||||
self.env['screen']['newAttribDelta'], self.env['screen']['newCursorAttrib'] = screen_utils.trackHighlights(self.env['screen']['oldContentAttrib'], self.env['screen']['newContentAttrib'], self.env['screen']['newContentText'], self.env['screen']['columns'])
|
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user