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

Update linux.py

Browse Source
This commit is contained in:
chrys87 2016-09-20 11:14:06 +02:00 committed by GitHub
parent 370c34532b
commit 7ff3d77519
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fenrir-package/screenDriver/linux.py
View File

@ -45,7 +45,7 @@ class driver():
xlist.append(i[3]) xlist.append(i[3])
return xlist return xlist
def getCurrApplication(self): def getCurrApplication(self, screen):
apps = [] apps = []
appList = [] appList = []
try: try:
@ -53,7 +53,7 @@ def getCurrApplication(self):
except Exception as e: except Exception as e:
print(e) print(e)
return appList return appList
currScreen = str(self.getCurrScreen()) currScreen = str(screen)
for i in apps: for i in apps:
i = i.split() i = i.split()
i[0] = i[0].lower() i[0] = i[0].lower()
@ -93,6 +93,7 @@ def getCurrApplication(self):
environment['screenData']['oldTTY'] = environment['screenData']['newTTY'] environment['screenData']['oldTTY'] = environment['screenData']['newTTY']
environment['screenData']['oldDelta'] = environment['screenData']['newDelta'] environment['screenData']['oldDelta'] = environment['screenData']['newDelta']
environment['screenData']['oldNegativeDelta'] = environment['screenData']['newNegativeDelta'] environment['screenData']['oldNegativeDelta'] = environment['screenData']['newNegativeDelta']
environment['screenData']['oldApplication'] = environment['screenData']['newApplication']
environment['screenData']['newTTY'] = newTTY environment['screenData']['newTTY'] = newTTY
environment['screenData']['newContentBytes'] = newContentBytes environment['screenData']['newContentBytes'] = newContentBytes
# get metadata like cursor or screensize # get metadata like cursor or screensize
@ -100,6 +101,7 @@ def getCurrApplication(self):
environment['screenData']['columns'] = int( environment['screenData']['newContentBytes'][1]) environment['screenData']['columns'] = int( environment['screenData']['newContentBytes'][1])
environment['screenData']['newCursor']['x'] = int( environment['screenData']['newContentBytes'][2]) environment['screenData']['newCursor']['x'] = int( environment['screenData']['newContentBytes'][2])
environment['screenData']['newCursor']['y'] = int( environment['screenData']['newContentBytes'][3]) environment['screenData']['newCursor']['y'] = int( environment['screenData']['newContentBytes'][3])
environment['screenData']['newApplication'] = self.getCurrApplication(newTTY)
# analyze content # analyze content
environment['screenData']['newContentText'] = environment['screenData']['newContentBytes'][4:][::2].decode(screenEncoding, "replace").encode('utf-8').decode('utf-8') environment['screenData']['newContentText'] = environment['screenData']['newContentBytes'][4:][::2].decode(screenEncoding, "replace").encode('utf-8').decode('utf-8')
environment['screenData']['newContentAttrib'] = environment['screenData']['newContentBytes'][5:][::2] environment['screenData']['newContentAttrib'] = environment['screenData']['newContentBytes'][5:][::2]