daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Really show correct G0 and G2 character set in widgets

Browse Source 
Amendment to 7b59c78. This should prevent spurious NOS character sets from
appearing in the widgets, and should also prevent the G0 and G2 character
sets from getting mixed up in the widgets when those triplets are within
object definitions.

The G0 and G2 character set in the widgets may still be incorrect in corner
cases of objects invoked within areas of the page where the character set
has been changed either with the ESC/Switch spacing attribute or with the
"modified G0/G2 character set designation" triplet.
This commit is contained in:
G.K.MacGregor
2023-08-15 18:11:40 +01:00
parent 6185ca7110
commit f36143e10f
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
decode.cpp
View File

@@ -466,8 +466,8 @@ void TeletextPageDecode::decodeRow(int r)
if (c == 0 || c == 40 || c == 56) {
level1CharSet = m_level1DefaultCharSet;
m_level1ActivePainter.g0CharSet = m_g0CharacterMap.value(m_defaultG0andG2, 0);
m_level1ActivePainter.g2CharSet = m_g2CharacterMap.value(m_defaultG0andG2, 7);
m_level1ActivePainter.result.g0Set = m_g0CharacterMap.value(m_defaultG0andG2, 0);
m_level1ActivePainter.result.g2Set = m_g2CharacterMap.value(m_defaultG0andG2, 7);
m_level1ActivePainter.attribute.flash.mode = 0;
m_level1ActivePainter.attribute.flash.ratePhase = 0;
@@ -661,12 +661,12 @@ void TeletextPageDecode::decodeRow(int r)
break;
case 0x28: // Modified G0 and G2 character set designation
if (m_level == 3 || triplet.data() == m_defaultG0andG2 || triplet.data() == m_secondG0andG2) {
painter->g0CharSet = m_g0CharacterMap.value(triplet.data(), 0);
painter->g2CharSet = m_g2CharacterMap.value(triplet.data(), 7);
painter->result.g0Set = m_g0CharacterMap.value(triplet.data(), 0);
painter->result.g2Set = m_g2CharacterMap.value(triplet.data(), 7);
} else if (m_secondG0andG2 == -1) {
m_secondG0andG2 = triplet.data();
painter->g0CharSet = m_g0CharacterMap.value(triplet.data(), 0);
painter->g2CharSet = m_g2CharacterMap.value(triplet.data(), 7);
painter->result.g0Set = m_g0CharacterMap.value(triplet.data(), 0);
painter->result.g2Set = m_g2CharacterMap.value(triplet.data(), 7);
}
break;
case 0x2c: // Display attributes
@@ -754,9 +754,9 @@ void TeletextPageDecode::decodeRow(int r)
if (result.code != 0x00) {
m_level1ActivePainter.result.character = result;
if (result.set == 0)
m_level1ActivePainter.result.character.set = m_level1ActivePainter.g0CharSet;
m_level1ActivePainter.result.character.set = m_level1ActivePainter.result.g0Set;
else if (result.set == 2)
m_level1ActivePainter.result.character.set = m_level1ActivePainter.g2CharSet;
m_level1ActivePainter.result.character.set = m_level1ActivePainter.result.g2Set;
x26Character = 1;
}
} else if (m_level >= 2)
@@ -779,10 +779,10 @@ void TeletextPageDecode::decodeRow(int r)
painter->result.character = result;
switch (result.set) {
case 0:
painter->result.character.set = painter->g0CharSet;
painter->result.character.set = painter->result.g0Set;
break;
case 2:
painter->result.character.set = painter->g2CharSet;
painter->result.character.set = painter->result.g2Set;
break;
case 24:
if (painter->attribute.display.underlineSeparated)