get sure decode doesnt break

This commit is contained in:
Chrys 2019-11-04 22:52:38 +01:00
parent 6761b6267c
commit f04d8584d9

View File

@ -287,6 +287,12 @@ class driver(screenDriver):
lineAttrib.append(charAttrib) lineAttrib.append(charAttrib)
lineText += ' ' lineText += ' '
continue continue
blink = 0
bold = 0
ink = 7
paper = 0
ch = 32
try:
(sh,) = unpack("=H", data) (sh,) = unpack("=H", data)
attr = (sh >> 8) & 0xFF attr = (sh >> 8) & 0xFF
ch = sh & 0xFF ch = sh & 0xFF
@ -294,7 +300,6 @@ class driver(screenDriver):
attr >>= 1 attr >>= 1
ink = attr & 0x0F ink = attr & 0x0F
paper = (attr>>4) & 0x0F paper = (attr>>4) & 0x0F
blink = 0
if attr & 1: if attr & 1:
blink = 1 blink = 1
# blink seems to be set always, ignore for now # blink seems to be set always, ignore for now
@ -306,10 +311,13 @@ class driver(screenDriver):
# print(ink,paper) # print(ink,paper)
if sh & self.hichar: if sh & self.hichar:
ch |= 0x100 ch |= 0x100
except:
pass
try: try:
lineText += self.charmap[ch] lineText += self.charmap[ch]
except KeyError: except KeyError:
lineText += '?' lineText += '?'
charAttrib = [ charAttrib = [
self.fgColorValues[ink], self.fgColorValues[ink],
self.bgColorValues[paper], self.bgColorValues[paper],