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

get sure decode doesnt break

Browse Source
This commit is contained in:
Chrys
2019-11-04 22:52:38 +01:00
parent 6761b6267c
commit f04d8584d9
1 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,29 +287,37 @@ class driver(screenDriver):
lineAttrib.append(charAttrib)
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
# blink seems to be set always, ignore for now
blink = 0
bold = 0
if attr & 16:
bold = 1
#if (ink != 7) or (paper != 0):
# print(ink,paper)
if sh & self.hichar:
ch |= 0x100
bold = 0
ink = 7
paper = 0
ch = 32
try:
(sh,) = unpack("=H", data)
attr = (sh >> 8) & 0xFF
ch = sh & 0xFF
if self.hichar == 0x100:
attr >>= 1
ink = attr & 0x0F
paper = (attr>>4) & 0x0F
if attr & 1:
blink = 1
# blink seems to be set always, ignore for now
blink = 0
bold = 0
if attr & 16:
bold = 1
#if (ink != 7) or (paper != 0):
# print(ink,paper)
if sh & self.hichar:
ch |= 0x100
except:
pass
try:
lineText += self.charmap[ch]
except KeyError:
lineText += '?'
charAttrib = [
self.fgColorValues[ink],
self.bgColorValues[paper],