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

Update vcsaDriver.py

Browse Source
This commit is contained in:
chrys 2019-08-21 15:36:07 +02:00 committed by GitHub
parent a574e94348
commit b1d9e943ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/fenrirscreenreader/screenDriver/vcsaDriver.py
View File

@ -97,12 +97,19 @@ class driver(screenDriver):
def updateWatchdog(self,active , eventQueue): def updateWatchdog(self,active , eventQueue):
try: try:
useVCSU = os.access('/dev/vcsu', os.R_OK)
vcsa = {} vcsa = {}
vcsaDevices = glob.glob('/dev/vcsa*') vcsaDevices = glob.glob('/dev/vcsa*')
vcsu = {}
vcsuDevices = None
for vcsaDev in vcsaDevices: for vcsaDev in vcsaDevices:
index = vcsaDev[9:] index = vcsaDev[9:]
vcsa[str(index)] = open(vcsaDev,'rb') vcsa[str(index)] = open(vcsaDev,'rb')
if useVCSU:
vcsuDevices = glob.glob('/dev/vcsu*')
for vcsuDev in vcsuDevices:
index = vcsuDev[9:]
vcsu[str(index)] = open(vcsuDev,'rb')
tty = open('/sys/devices/virtual/tty/tty0/active','r') tty = open('/sys/devices/virtual/tty/tty0/active','r')
currScreen = str(tty.read()[3:-1]) currScreen = str(tty.read()[3:-1])
oldScreen = currScreen oldScreen = currScreen
@ -143,6 +150,7 @@ class driver(screenDriver):
vcsa[currScreen].seek(0) vcsa[currScreen].seek(0)
dirtyContent = vcsa[currScreen].read() dirtyContent = vcsa[currScreen].read()
screenContent = b'' screenContent = b''
vcsuContent = None
timeout = time.time() timeout = time.time()
while screenContent != dirtyContent: while screenContent != dirtyContent:
screenContent = dirtyContent screenContent = dirtyContent
@ -151,29 +159,33 @@ 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()
if useVCSU:
vcsuContent = vcsu[currScreen].read()
eventQueue.put({"Type":fenrirEventType.ScreenUpdate, eventQueue.put({"Type":fenrirEventType.ScreenUpdate,
"Data":self.createScreenEventData(currScreen,screenContent) "Data":self.createScreenEventData(currScreen, screenContent, vcsuContent)
}) })
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)
time.sleep(0.2) time.sleep(0.2)
def createScreenEventData(self, screen, content): def createScreenEventData(self, screen, vcsaContent, vcsuContent = None):
eventData = { eventData = {
'bytes': content, 'bytes': vcsaContent,
'lines': int( content[0]), 'lines': int( vcsaContent[0]),
'columns': int( content[1]), 'columns': int( vcsaContent[1]),
'textCursor': 'textCursor':
{ {
'x': int( content[2]), 'x': int( vcsaContent[2]),
'y': int( content[3]) 'y': int( vcsaContent[3])
}, },
'screen': screen, 'screen': screen,
'screenUpdateTime': time.time(), 'screenUpdateTime': time.time(),
} }
eventData['text'], eventData['attributes'] =\ eventData['text'], eventData['attributes'] =\
self.autoDecodeVCSA(content[4:], eventData['lines'], eventData['columns']) self.autoDecodeVCSA(vcsaContent[4:], eventData['lines'], eventData['columns'])
#if vcsuContent != None:
# eventData['text'] = vcsuContent.decode('utf-8')
return eventData.copy() return eventData.copy()
def updateCharMap(self, screen): def updateCharMap(self, screen):
self.charmap = {} self.charmap = {}