From f70bf506c9f4075b19767b502d2052c72ce9dada Mon Sep 17 00:00:00 2001 From: chrys Date: Fri, 23 Mar 2018 21:05:47 +0100 Subject: [PATCH] cleanup --- src/fenrirscreenreader/core/screenDriver.py | 2 - .../screenDriver/ptyDriver.py | 215 ++---------------- 2 files changed, 13 insertions(+), 204 deletions(-) diff --git a/src/fenrirscreenreader/core/screenDriver.py b/src/fenrirscreenreader/core/screenDriver.py index e16108a9..3ddc7191 100644 --- a/src/fenrirscreenreader/core/screenDriver.py +++ b/src/fenrirscreenreader/core/screenDriver.py @@ -43,6 +43,4 @@ class screenDriver(): return '' def getFenrirFontSize(self, attribute): return '' - def update(self, trigger='onUpdate'): - pass diff --git a/src/fenrirscreenreader/screenDriver/ptyDriver.py b/src/fenrirscreenreader/screenDriver/ptyDriver.py index d1c33788..4ab4d636 100644 --- a/src/fenrirscreenreader/screenDriver/ptyDriver.py +++ b/src/fenrirscreenreader/screenDriver/ptyDriver.py @@ -38,113 +38,20 @@ class driver(screenDriver): self.env['runtime']['processManager'].addCustomEventThread(self.updateWatchdog) def getCurrScreen(self): self.env['screen']['oldTTY'] = self.env['screen']['newTTY'] - try: - currScreenFile = open('/sys/devices/virtual/tty/tty0/active','r') - self.env['screen']['newTTY'] = str(currScreenFile.read()[3:-1]) - currScreenFile.close() - except Exception as e: - self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) + self.env['screen']['newTTY'] = str(1) + def injectTextToScreen(self, text, screen = None): - useScreen = "/dev/tty" + self.env['screen']['newTTY'] - if screen != None: - useScreen = screen - with open(useScreen, 'w') as fd: - for c in text: - fcntl.ioctl(fd, termios.TIOCSTI, c) + pass def getSessionInformation(self): - try: - bus = dbus.SystemBus() - if not self.ListSessions: - obj = bus.get_object('org.freedesktop.login1', '/org/freedesktop/login1') - inf = dbus.Interface(obj, 'org.freedesktop.login1.Manager') - self.ListSessions = inf.get_dbus_method('ListSessions') - sessions = self.ListSessions() - self.env['screen']['autoIgnoreScreens'] = [] - for session in sessions: - obj = bus.get_object('org.freedesktop.login1', session[4]) - inf = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') - sessionType = inf.Get('org.freedesktop.login1.Session', 'Type') - screen = str(inf.Get('org.freedesktop.login1.Session', 'VTNr')) - if screen == '': - screen = str(inf.Get('org.freedesktop.login1.Session', 'TTY')) - screen = screen[screen.upper().find('TTY') + 3:] - if screen == '': - self.env['runtime']['debug'].writeDebugOut('No TTY found for session:' + session[4],debug.debugLevel.ERROR) - return - if sessionType.upper() != 'TTY': - self.env['screen']['autoIgnoreScreens'].append(screen) - if screen == self.env['screen']['newTTY'] : - if self.env['general']['currUser'] != session[2]: - self.env['general']['prevUser'] = self.env['general']['currUser'] - self.env['general']['currUser'] = session[2] - except Exception as e: - self.env['runtime']['debug'].writeDebugOut('getSessionInformation: Maybe no LoginD:' + str(e),debug.debugLevel.ERROR) - self.env['screen']['autoIgnoreScreens'] = [] - #self.env['runtime']['debug'].writeDebugOut('getSessionInformation:' + str(self.env['screen']['autoIgnoreScreens']) + ' ' + str(self.env['general']) ,debug.debugLevel.INFO) + self.env['screen']['autoIgnoreScreens'] = [] + self.env['general']['prevUser'] = 'chrys' + self.env['general']['currUser'] = 'chrys' def updateWatchdog(self,active , eventQueue): - try: - vcsa = {} - vcsaDevices = glob.glob('/dev/vcsa*') - for vcsaDev in vcsaDevices: - index = vcsaDev[9:] - vcsa[str(index)] = open(vcsaDev,'rb') + pass - tty = open('/sys/devices/virtual/tty/tty0/active','r') - currScreen = str(tty.read()[3:-1]) - oldScreen = currScreen - watchdog = select.epoll() - watchdog.register(vcsa[currScreen], select.POLLPRI | select.POLLERR) - watchdog.register(tty, select.POLLPRI | select.POLLERR) - while active.value == 1: - changes = watchdog.poll(2) - for change in changes: - fileno = change[0] - event = change[1] - if fileno == tty.fileno(): - self.env['runtime']['debug'].writeDebugOut('ScreenChange',debug.debugLevel.INFO) - tty.seek(0) - currScreen = str(tty.read()[3:-1]) - if currScreen != oldScreen: - try: - watchdog.unregister(vcsa[ oldScreen ]) - except: - pass - try: - watchdog.register(vcsa[ currScreen ], select.POLLPRI | select.POLLERR) - except: - pass - oldScreen = currScreen - try: - vcsa[currScreen].seek(0) - lastScreenContent = vcsa[currScreen].read() - except: - pass - eventQueue.put({"Type":fenrirEventType.ScreenChanged, - "Data":self.createScreenEventData(currScreen,lastScreenContent) - }) - else: - self.env['runtime']['debug'].writeDebugOut('ScreenUpdate',debug.debugLevel.INFO) - vcsa[currScreen].seek(0) - dirtyContent = vcsa[currScreen].read() - screenContent = b'' - timeout = time.time() - while screenContent != dirtyContent: - screenContent = dirtyContent - if time.time() - timeout >= 0.4: - break - time.sleep(0.02) - vcsa[currScreen].seek(0) - dirtyContent = vcsa[currScreen].read() - eventQueue.put({"Type":fenrirEventType.ScreenUpdate, - "Data":self.createScreenEventData(currScreen,screenContent) - }) - except Exception as e: - self.env['runtime']['debug'].writeDebugOut('VCSA:updateWatchdog:' + str(e),debug.debugLevel.ERROR) - - - def createScreenEventData(self, screen, content): + def createScreenEventData(self, screen, content, attribute): self.updateCharMap(screen) eventData = { 'bytes': content, @@ -158,84 +65,12 @@ class driver(screenDriver): 'screen': screen, 'screenUpdateTime': time.time(), } - encText, encAttr =\ - self.autoDecodeVCSA(content[4:], eventData['lines'], eventData['columns']) - eventData['text'] = encText - eventData['attributes'] = encAttr + #encText, encAttr =\ + # self.autoDecodeVCSA(content[4:], eventData['lines'], eventData['columns']) + eventData['text'] = content + eventData['attributes'] = attribute return eventData.copy() - def updateCharMap(self, screen): - self.charmap = {} - try: - tty = open('/dev/tty' + screen, 'rb') - except Exception as e: - self.env['runtime']['debug'].writeDebugOut('VCSA:updateCharMap:' + str(e),debug.debugLevel.ERROR) - return - GIO_UNIMAP = 0x4B66 - VT_GETHIFONTMASK = 0x560D - himask = array("H", (0,)) - ioctl(tty, VT_GETHIFONTMASK, himask) - self.hichar, = unpack_from("@H", himask) - sz = 512 - line = '' - while True: - try: - unipairs = array("H", [0]*(2*sz)) - unimapdesc = array("B", pack("@HP", sz, unipairs.buffer_info()[0])) - ioctl(tty.fileno(), GIO_UNIMAP, unimapdesc) - break - except Exception as e: - self.env['runtime']['debug'].writeDebugOut('VCSA:updateCharMap:scaling up sz=' + str(sz) + ' ' + str(e),debug.debugLevel.WARNING) - sz *= 2 - tty.close() - ncodes, = unpack_from("@H", unimapdesc) - utable = unpack_from("@%dH" % (2*ncodes), unipairs) - for u, b in zip(utable[::2], utable[1::2]): - if self.charmap.get(b) is None: - self.charmap[b] = chr(u) - def autoDecodeVCSA(self, allData, rows, cols): - allText = '' - allAttrib = [] - i = 0 - for y in range(rows): - lineText = '' - lineAttrib = [] - for x in range(cols): - data = allData[i: i + 2] - i += 2 - if data == b' \x07': - #attr = 7 - #ink = 7 - #paper = 0 - #ch = ' ' - lineAttrib.append((7,15,0,0,0,0)) # attribute, ink, paper, blink, bold, underline - lineText += ' ' - continue - (sh,) = unpack("=H", data) - attr = (sh >> 8) & 0xFF - ch = sh & 0xFF - if self.hichar == 0x100: - attr >>= 1 - ink = attr & 0x0F - paper = (attr>>4) & 0x0F - blink = 0 - #if attr & 1: - # blink = 1 - bold = 0 - #if attr & 16: - # bold = 1 - #if (ink != 7) or (paper != 0): - # print(ink,paper) - if sh & self.hichar: - ch |= 0x100 - try: - lineText += self.charmap[ch] - except KeyError: - lineText += '?' - lineAttrib.append((attr,ink, paper,blink,bold,0)) # attribute, ink, paper, blink, bold, underline - allText += lineText + '\n' - allAttrib += lineAttrib - return str(allText), allAttrib def getFenrirBGColor(self, attribute): try: return self.bgColorNames[attribute[2]] @@ -265,28 +100,4 @@ class driver(screenDriver): def getFenrirFontSize(self, attribute): return _('Default') def getCurrApplication(self): - apps = [] - try: - currScreen = self.env['screen']['newTTY'] - apps = subprocess.Popen('ps -t tty' + currScreen + ' -o comm,tty,stat', shell=True, stdout=subprocess.PIPE).stdout.read().decode()[:-1].split('\n') - except Exception as e: - self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) - return - try: - for i in apps: - i = i.upper() - i = i.split() - i[0] = i[0] - i[1] = i[1] - if '+' in i[2]: - if i[0] != '': - if not "GREP" == i[0] and \ - not "SH" == i[0] and \ - not "PS" == i[0]: - if "TTY"+currScreen in i[1]: - if self.env['screen']['newApplication'] != i[0]: - self.env['screen']['newApplication'] = i[0] - return - except Exception as e: - self.env['runtime']['debug'].writeDebugOut(str(e),debug.debugLevel.ERROR) - + pass