perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fake-reverse bugfix in FOptiAttr

This commit is contained in:
Markus Gans 2018-04-15 19:55:50 +02:00
parent 81c7a7e65a
commit bbacc369ec
4 changed files with 665 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2017-04-15 Markus Gans <guru.mail@muenster.de>
* Fake-reverse bugfix in FOptiAttr
2017-04-11 Markus Gans <guru.mail@muenster.de> 2017-04-11 Markus Gans <guru.mail@muenster.de>
* Remove Cygwin bold color quirks fix in FOptiAttr * Remove Cygwin bold color quirks fix in FOptiAttr
* Added unit test for FOptiAttr * Added unit test for FOptiAttr

77
src/foptiattr.cpp
View File

@ -556,7 +556,7 @@ char* FOptiAttr::changeAttribute (char_data*& term, char_data*& next)
next->code = ' '; next->code = ' ';
// Look for no changes // Look for no changes
if ( ! ( switchOn() || switchOff() || colorChange(term, next) ) ) if ( ! (switchOn() || switchOff() || colorChange(term, next)) )
return 0; return 0;
if ( hasNoAttribute(next) ) if ( hasNoAttribute(next) )
@ -564,7 +564,7 @@ char* FOptiAttr::changeAttribute (char_data*& term, char_data*& next)
deactivateAttributes (term, next); deactivateAttributes (term, next);
} }
else if ( F_set_attributes.cap else if ( F_set_attributes.cap
&& ( ! term->attr.bit.pc_charset || alt_equal_pc_charset) ) && (! term->attr.bit.pc_charset || alt_equal_pc_charset) )
{ {
changeAttributeSGR (term, next); changeAttributeSGR (term, next);
} }
@ -573,9 +573,6 @@ char* FOptiAttr::changeAttribute (char_data*& term, char_data*& next)
changeAttributeSeparately (term, next); changeAttributeSeparately (term, next);
} }
if ( fake_reverse )
term->attr.bit.reverse = true;
return attr_buf; return attr_buf;
} }
@ -759,7 +756,7 @@ inline bool FOptiAttr::setTermReverse (char_data*& term)
term->attr.bit.reverse = true; term->attr.bit.reverse = true;
if ( append_sequence(F_enter_reverse_mode.cap) ) if ( ! fake_reverse && append_sequence(F_enter_reverse_mode.cap) )
return true; return true;
else else
return false; return false;
@ -776,7 +773,7 @@ inline bool FOptiAttr::unsetTermReverse (char_data*& term)
else else
term->attr.bit.reverse = false; term->attr.bit.reverse = false;
if ( append_sequence(F_exit_reverse_mode.cap) ) if ( ! fake_reverse && append_sequence(F_exit_reverse_mode.cap) )
return true; return true;
else else
return false; return false;
@ -790,7 +787,7 @@ inline bool FOptiAttr::setTermStandout (char_data*& term)
term->attr.bit.standout = true; term->attr.bit.standout = true;
if ( append_sequence(F_enter_standout_mode.cap) ) if ( ! fake_reverse && append_sequence(F_enter_standout_mode.cap) )
return true; return true;
else else
return false; return false;
@ -807,7 +804,7 @@ inline bool FOptiAttr::unsetTermStandout (char_data*& term)
else else
term->attr.bit.standout = false; term->attr.bit.standout = false;
if ( append_sequence(F_exit_standout_mode.cap) ) if ( ! fake_reverse && append_sequence(F_exit_standout_mode.cap) )
return true; return true;
else else
return false; return false;
@ -951,9 +948,16 @@ bool FOptiAttr::setTermAttributes ( char_data*& term
if ( term && F_set_attributes.cap ) if ( term && F_set_attributes.cap )
{ {
char* sgr = tparm ( F_set_attributes.cap char* sgr = tparm ( F_set_attributes.cap
, p1, p2, p3, p4, p5, p6, p7, p8, p9 ); , p1 && ! fake_reverse
, p2
, p3 && ! fake_reverse
, p4
, p5
, p6
, p7
, p8
, p9 );
append_sequence (sgr); append_sequence (sgr);
resetColor(term); resetColor(term);
term->attr.bit.standout = p1; term->attr.bit.standout = p1;
term->attr.bit.underline = p2; term->attr.bit.underline = p2;
@ -1209,7 +1213,11 @@ inline bool FOptiAttr::colorChange (char_data*& term, char_data*& next)
{ {
if ( term && next ) if ( term && next )
{ {
return bool ( fake_reverse bool frev = ( on.attr.bit.reverse
|| on.attr.bit.standout
|| off.attr.bit.reverse
|| off.attr.bit.standout ) && fake_reverse;
return bool ( frev
|| term->fg_color != next->fg_color || term->fg_color != next->fg_color
|| term->bg_color != next->bg_color ); || term->bg_color != next->bg_color );
} }
@ -1251,13 +1259,7 @@ inline void FOptiAttr::prevent_no_color_video_attributes ( char_data*& attr
break; break;
case reverse_mode: case reverse_mode:
if ( attr->attr.bit.reverse )
{
attr->attr.bit.reverse = false;
if ( attr->fg_color != attr->bg_color )
fake_reverse = true; fake_reverse = true;
}
break; break;
case blink_mode: case blink_mode:
@ -1336,7 +1338,9 @@ inline void FOptiAttr::changeAttributeSGR ( char_data*& term
, next->attr.bit.protect , next->attr.bit.protect
, next->attr.bit.alt_charset ); , next->attr.bit.alt_charset );
if ( alt_equal_pc_charset && next->attr.bit.alt_charset ) if ( alt_equal_pc_charset
&& F_enter_pc_charset_mode.cap
&& next->attr.bit.alt_charset )
{ {
term->attr.bit.pc_charset = next->attr.bit.pc_charset; term->attr.bit.pc_charset = next->attr.bit.pc_charset;
off.attr.bit.pc_charset = false; off.attr.bit.pc_charset = false;
@ -1346,16 +1350,17 @@ inline void FOptiAttr::changeAttributeSGR ( char_data*& term
if ( off.attr.bit.pc_charset ) if ( off.attr.bit.pc_charset )
unsetTermPCcharset(term); unsetTermPCcharset(term);
if ( next->attr.bit.italic ) if ( ! term->attr.bit.italic && next->attr.bit.italic )
setTermItalic(term); setTermItalic(term);
if ( next->attr.bit.crossed_out ) if ( ! term->attr.bit.crossed_out && next->attr.bit.crossed_out )
setTermCrossedOut(term); setTermCrossedOut(term);
if ( next->attr.bit.dbl_underline ) if ( ! term->attr.bit.dbl_underline && next->attr.bit.dbl_underline )
setTermDoubleUnderline(term); setTermDoubleUnderline(term);
if ( next->attr.bit.pc_charset && pc_charset_usable ) if ( ! term->attr.bit.pc_charset && next->attr.bit.pc_charset
&& pc_charset_usable )
setTermPCcharset(term); setTermPCcharset(term);
if ( colorChange(term, next) ) if ( colorChange(term, next) )
@ -1380,9 +1385,16 @@ void FOptiAttr::change_color (char_data*& term, char_data*& next)
{ {
short fg, bg; short fg, bg;
if ( monochron || ! (term && next) ) if ( ! (term && next) )
return; return;
if ( monochron )
{
next->fg_color = fc::Default;
next->bg_color = fc::Default;
return;
}
next->fg_color %= max_color; next->fg_color %= max_color;
next->bg_color %= max_color; next->bg_color %= max_color;
fg = next->fg_color; fg = next->fg_color;
@ -1391,10 +1403,11 @@ void FOptiAttr::change_color (char_data*& term, char_data*& next)
if ( fg == Default || bg == Default ) if ( fg == Default || bg == Default )
change_to_default_color (term, next, fg, bg); change_to_default_color (term, next, fg, bg);
if ( ! fake_reverse && fg < 0 && bg < 0 ) if ( fake_reverse && fg < 0 && bg < 0 )
return; return;
if ( fake_reverse ) if ( fake_reverse
&& (next->attr.bit.reverse || next->attr.bit.standout) )
{ {
std::swap (fg, bg); std::swap (fg, bg);
@ -1458,27 +1471,31 @@ inline void FOptiAttr::change_current_color ( char_data*& term
char* Sf = F_set_foreground.cap; char* Sf = F_set_foreground.cap;
char* Sb = F_set_background.cap; char* Sb = F_set_background.cap;
char* sp = F_set_color_pair.cap; char* sp = F_set_color_pair.cap;
bool frev = ( off.attr.bit.reverse
|| off.attr.bit.standout
|| term->attr.bit.reverse
|| term->attr.bit.standout ) && fake_reverse;
if ( AF && AB ) if ( AF && AB )
{ {
short ansi_fg = vga2ansi(fg); short ansi_fg = vga2ansi(fg);
short ansi_bg = vga2ansi(bg); short ansi_bg = vga2ansi(bg);
if ( term->fg_color != fg if ( (term->fg_color != fg || frev)
&& (color_str = tparm(AF, ansi_fg, 0, 0, 0, 0, 0, 0, 0, 0)) ) && (color_str = tparm(AF, ansi_fg, 0, 0, 0, 0, 0, 0, 0, 0)) )
append_sequence (color_str); append_sequence (color_str);
if ( term->bg_color != bg if ( (term->bg_color != bg || frev)
&& (color_str = tparm(AB, ansi_bg, 0, 0, 0, 0, 0, 0, 0, 0)) ) && (color_str = tparm(AB, ansi_bg, 0, 0, 0, 0, 0, 0, 0, 0)) )
append_sequence (color_str); append_sequence (color_str);
} }
else if ( Sf && Sb ) else if ( Sf && Sb )
{ {
if ( term->fg_color != fg if ( (term->fg_color != fg || frev)
&& (color_str = tparm(Sf, fg, 0, 0, 0, 0, 0, 0, 0, 0)) ) && (color_str = tparm(Sf, fg, 0, 0, 0, 0, 0, 0, 0, 0)) )
append_sequence (color_str); append_sequence (color_str);
if ( term->bg_color != bg if ( (term->bg_color != bg || frev)
&& (color_str = tparm(Sb, bg, 0, 0, 0, 0, 0, 0, 0, 0)) ) && (color_str = tparm(Sb, bg, 0, 0, 0, 0, 0, 0, 0, 0)) )
append_sequence (color_str); append_sequence (color_str);
} }

1
src/fterm.cpp
View File

@ -3686,7 +3686,6 @@ void FTerm::init_termcaps_linux_quirks()
TCAP(fc::t_exit_dim_mode) = 0; TCAP(fc::t_exit_dim_mode) = 0;
TCAP(fc::t_enter_underline_mode) = 0; TCAP(fc::t_enter_underline_mode) = 0;
TCAP(fc::t_exit_underline_mode) = 0; TCAP(fc::t_exit_underline_mode) = 0;
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------

671
src/test/foptiattr-test.cpp
View File

@ -69,7 +69,8 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
protected: protected:
void classNameTest(); void classNameTest();
void noArgumentTest(); void noArgumentTest();
void vga2ansi(); void vga2ansiTest();
void fakeReverseTest();
void ansiTest(); void ansiTest();
void vt100Test(); void vt100Test();
void xtermTest(); void xtermTest();
@ -79,6 +80,7 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
void puttyTest(); void puttyTest();
void teratermTest(); void teratermTest();
void ibmColorTest(); void ibmColorTest();
void wyse50Test();
private: private:
std::string printSequence (char*); std::string printSequence (char*);
@ -89,7 +91,8 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
// Add a methods to the test suite // Add a methods to the test suite
CPPUNIT_TEST (classNameTest); CPPUNIT_TEST (classNameTest);
CPPUNIT_TEST (noArgumentTest); CPPUNIT_TEST (noArgumentTest);
CPPUNIT_TEST (vga2ansi); CPPUNIT_TEST (vga2ansiTest);
CPPUNIT_TEST (fakeReverseTest);
CPPUNIT_TEST (ansiTest); CPPUNIT_TEST (ansiTest);
CPPUNIT_TEST (vt100Test); CPPUNIT_TEST (vt100Test);
CPPUNIT_TEST (xtermTest); CPPUNIT_TEST (xtermTest);
@ -99,6 +102,7 @@ class FOptiAttrTest : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST (puttyTest); CPPUNIT_TEST (puttyTest);
CPPUNIT_TEST (teratermTest); CPPUNIT_TEST (teratermTest);
CPPUNIT_TEST (ibmColorTest); CPPUNIT_TEST (ibmColorTest);
CPPUNIT_TEST (wyse50Test);
// End of test suite definition // End of test suite definition
CPPUNIT_TEST_SUITE_END(); CPPUNIT_TEST_SUITE_END();
@ -138,7 +142,7 @@ void FOptiAttrTest::noArgumentTest()
} }
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FOptiAttrTest::vga2ansi() void FOptiAttrTest::vga2ansiTest()
{ {
FOptiAttr oa; FOptiAttr oa;
CPPUNIT_ASSERT (oa.vga2ansi(0) == 0); CPPUNIT_ASSERT (oa.vga2ansi(0) == 0);
@ -159,6 +163,92 @@ void FOptiAttrTest::vga2ansi()
CPPUNIT_ASSERT (oa.vga2ansi(15) == 15); CPPUNIT_ASSERT (oa.vga2ansi(15) == 15);
} }
//----------------------------------------------------------------------
void FOptiAttrTest::fakeReverseTest()
{
FOptiAttr oa;
oa.setDefaultColorSupport(); // ANSI default color
oa.setNoColorVideo (4); // Avoid reverse (4)
oa.setMaxColor (8);
oa.set_enter_bold_mode (0);
oa.set_exit_bold_mode (0);
oa.set_enter_dim_mode (0);
oa.set_exit_dim_mode (0);
oa.set_enter_italics_mode (0);
oa.set_exit_italics_mode (0);
oa.set_enter_underline_mode (0);
oa.set_exit_underline_mode (0);
oa.set_enter_blink_mode (0);
oa.set_exit_blink_mode (0);
oa.set_enter_reverse_mode (0);
oa.set_exit_reverse_mode (0);
oa.set_enter_standout_mode (0);
oa.set_exit_standout_mode (0);
oa.set_enter_secure_mode (0);
oa.set_exit_secure_mode (0);
oa.set_enter_protected_mode (0);
oa.set_exit_protected_mode (0);
oa.set_enter_crossed_out_mode (0);
oa.set_exit_crossed_out_mode (0);
oa.set_enter_dbl_underline_mode (0);
oa.set_exit_dbl_underline_mode (0);
oa.set_set_attributes (0);
oa.set_exit_attribute_mode (0);
oa.set_enter_alt_charset_mode (0);
oa.set_exit_alt_charset_mode (0);
oa.set_enter_pc_charset_mode (0);
oa.set_exit_pc_charset_mode (0);
oa.set_a_foreground_color (C_STR(CSI "3%p1%dm"));
oa.set_a_background_color (C_STR(CSI "4%p1%dm"));
oa.set_foreground_color (0);
oa.set_background_color (0);
oa.set_term_color_pair (0);
oa.set_orig_pair (0);
oa.set_orig_orig_colors (0);
oa.initialize();
FOptiAttr::char_data* from = new FOptiAttr::char_data();
FOptiAttr::char_data* to = new FOptiAttr::char_data();
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Gray text on blue background
to->fg_color = fc::LightGray;
to->bg_color = fc::Blue;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "37m" CSI "44m") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reverse on
to->attr.bit.reverse = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "34m" CSI "47m") );
CPPUNIT_ASSERT ( from->fg_color == fc::LightGray );
CPPUNIT_ASSERT ( from->bg_color == fc::Blue );
CPPUNIT_ASSERT ( *from == *to );
// Gray text on red background
to->bg_color = fc::Red;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "31m" CSI "47m") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reverse off
to->attr.bit.reverse = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "37m" CSI "41m") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
delete to;
delete from;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void FOptiAttrTest::ansiTest() void FOptiAttrTest::ansiTest()
{ {
@ -166,7 +256,7 @@ void FOptiAttrTest::ansiTest()
FOptiAttr oa; FOptiAttr oa;
oa.setDefaultColorSupport(); // ANSI default color oa.setDefaultColorSupport(); // ANSI default color
oa.setNoColorVideo (3); // Advid standout (1) + underline mode (2) oa.setNoColorVideo (3); // Avoid standout (1) + underline mode (2)
oa.setMaxColor (8); oa.setMaxColor (8);
oa.set_enter_bold_mode (C_STR(CSI "1m")); oa.set_enter_bold_mode (C_STR(CSI "1m"));
oa.set_exit_bold_mode (C_STR(CSI "0m")); oa.set_exit_bold_mode (C_STR(CSI "0m"));
@ -632,7 +722,7 @@ void FOptiAttrTest::vt100Test()
// Simulate a vt100 terminal // Simulate a vt100 terminal
FOptiAttr oa; FOptiAttr oa;
//oa.setDefaultColorSupport(); // ANSI default color oa.unsetDefaultColorSupport(); // No ANSI default color
oa.setNoColorVideo (0); oa.setNoColorVideo (0);
oa.setMaxColor (1); oa.setMaxColor (1);
oa.set_enter_bold_mode (C_STR(CSI "1m$<2>")); oa.set_enter_bold_mode (C_STR(CSI "1m$<2>"));
@ -701,6 +791,8 @@ void FOptiAttrTest::vt100Test()
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0;1m\017$<2>") ); , C_STR(CSI "0;1m\017$<2>") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reset attributes + default background // Reset attributes + default background
to->attr.bit.bold = false; to->attr.bit.bold = false;
@ -970,9 +1062,8 @@ void FOptiAttrTest::vt100Test()
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016" CSI "4m$<2>" , C_STR(CSI "0m$<2>\016" CSI "4m$<2>"
CSI "5m$<2>" CSI "7m$<2>" CSI "7m$<2>") ); CSI "5m$<2>" CSI "7m$<2>" CSI "7m$<2>") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Dim off // Dim off
to->attr.bit.dim = false; to->attr.bit.dim = false;
@ -980,17 +1071,15 @@ void FOptiAttrTest::vt100Test()
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016" CSI "4m$<2>" , C_STR(CSI "0m$<2>\016" CSI "4m$<2>"
CSI "5m$<2>" CSI "7m$<2>" CSI "7m$<2>") ); CSI "5m$<2>" CSI "7m$<2>" CSI "7m$<2>") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Italic off // Italic off
to->attr.bit.italic = false; to->attr.bit.italic = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") ); CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Underline off // Underline off
to->attr.bit.underline = false; to->attr.bit.underline = false;
@ -998,9 +1087,8 @@ void FOptiAttrTest::vt100Test()
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "m$<2>\016" CSI "5m$<2>" , C_STR(CSI "m$<2>\016" CSI "5m$<2>"
CSI "7m$<2>" CSI "7m$<2>") ); CSI "7m$<2>" CSI "7m$<2>") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Blink off // Blink off
to->attr.bit.blink = false; to->attr.bit.blink = false;
@ -1008,94 +1096,83 @@ void FOptiAttrTest::vt100Test()
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016" CSI "7m$<2>" , C_STR(CSI "0m$<2>\016" CSI "7m$<2>"
CSI "7m$<2>") ); CSI "7m$<2>") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Reverse off // Reverse off
to->attr.bit.reverse = false; to->attr.bit.reverse = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016" CSI "7m$<2>") ); , C_STR(CSI "0m$<2>\016" CSI "7m$<2>") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Standout off // Standout off
to->attr.bit.standout = false; to->attr.bit.standout = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "m$<2>\016") ); , C_STR(CSI "m$<2>\016") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Invisible off // Invisible off
to->attr.bit.invisible = false; to->attr.bit.invisible = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016") ); , C_STR(CSI "0m$<2>\016") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Protect off // Protect off
to->attr.bit.protect = false; to->attr.bit.protect = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016") ); , C_STR(CSI "0m$<2>\016") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Crossed out off // Crossed out off
to->attr.bit.crossed_out = false; to->attr.bit.crossed_out = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to) CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(CSI "0m$<2>\016") ); , C_STR(CSI "0m$<2>\016") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Double underline off // Double underline off
to->attr.bit.dbl_underline = false; to->attr.bit.dbl_underline = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") ); CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Alternate character set off // Alternate character set off
to->attr.bit.alt_charset = false; to->attr.bit.alt_charset = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("\017") ); CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("\017") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// PC character set off // PC character set off
to->attr.bit.pc_charset = false; to->attr.bit.pc_charset = false;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR(CSI "0m$<2>") ); CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
CPPUNIT_ASSERT ( *from != *to ) ; , C_STR(CSI "0m$<2>") );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->bg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Green text color // Green text color
to->fg_color = fc::Green; to->fg_color = fc::Green;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") ); CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from != *to ) ; CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( from->fg_color == fc::Default ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
// Default text color // Default text color
to->fg_color = fc::Default; to->fg_color = fc::Default;
CPPUNIT_ASSERT ( *from != *to ); CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") ); CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
CPPUNIT_ASSERT ( *from != *to ) ;
CPPUNIT_ASSERT ( from->fg_color == fc::Default );
CPPUNIT_ASSERT ( from->bg_color == fc::Default );
delete to; delete to;
delete from; delete from;
@ -3019,7 +3096,7 @@ void FOptiAttrTest::teratermTest()
FOptiAttr oa; FOptiAttr oa;
oa.unsetDefaultColorSupport(); // No ANSI default color oa.unsetDefaultColorSupport(); // No ANSI default color
oa.setNoColorVideo (41); // Advid standout (1) + blink (8) + bold (32) oa.setNoColorVideo (41); // Avoid standout (1) + blink (8) + bold (32)
oa.setMaxColor (16); oa.setMaxColor (16);
oa.set_enter_bold_mode (C_STR(CSI "1m")); oa.set_enter_bold_mode (C_STR(CSI "1m"));
oa.set_exit_bold_mode (C_STR(CSI "22m")); oa.set_exit_bold_mode (C_STR(CSI "22m"));
@ -3486,7 +3563,7 @@ void FOptiAttrTest::ibmColorTest()
FOptiAttr oa; FOptiAttr oa;
oa.unsetDefaultColorSupport(); // No ANSI default color oa.unsetDefaultColorSupport(); // No ANSI default color
oa.setNoColorVideo (3); // Advid standout (1) + underline mode (2) oa.setNoColorVideo (3); // Avoid standout (1) + underline mode (2)
oa.setMaxColor (8); oa.setMaxColor (8);
oa.set_enter_bold_mode (0); oa.set_enter_bold_mode (0);
oa.set_exit_bold_mode (0); oa.set_exit_bold_mode (0);
@ -3918,6 +3995,481 @@ void FOptiAttrTest::ibmColorTest()
delete from; delete from;
} }
//----------------------------------------------------------------------
void FOptiAttrTest::wyse50Test()
{
// Simulate an Wyse-50 terminal
FOptiAttr oa;
oa.unsetDefaultColorSupport(); // No ANSI default color
oa.setNoColorVideo (0);
oa.setMaxColor (1);
oa.set_enter_bold_mode (0);
oa.set_exit_bold_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_dim_mode (C_STR(ESC "Gp"));
oa.set_exit_dim_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_italics_mode (0);
oa.set_exit_italics_mode (0);
oa.set_enter_underline_mode (C_STR(ESC "G8"));
oa.set_exit_underline_mode (C_STR(ESC "G0"));
oa.set_enter_blink_mode (C_STR(ESC "G2"));
oa.set_exit_blink_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_reverse_mode (C_STR(ESC "G2"));
oa.set_exit_reverse_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_standout_mode (C_STR(ESC "Gt"));
oa.set_exit_standout_mode (C_STR(ESC "G0"));
oa.set_enter_secure_mode (C_STR(ESC "G1"));
oa.set_exit_secure_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_protected_mode (C_STR(ESC ")"));
oa.set_exit_protected_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_crossed_out_mode (0);
oa.set_exit_crossed_out_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_dbl_underline_mode (0);
oa.set_exit_dbl_underline_mode (0);
oa.set_set_attributes (C_STR("%?%p8%t\E)%e\E(%;"
"%?%p9%t\EcE%e\EcD%;\EG%'0'"
"%?%p2%t%{8}%|%;"
"%?%p1%p3%|%p6%|%t%{4}%|%;"
"%?%p4%t%{2}%|%;"
"%?%p1%p5%|%t%'@'%|%;"
"%?%p7%t%{1}%|%;%c"));
oa.set_exit_attribute_mode (C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"));
oa.set_enter_alt_charset_mode (C_STR(ESC "cE"));
oa.set_exit_alt_charset_mode (C_STR(ESC "cD"));
oa.set_enter_pc_charset_mode (0);
oa.set_exit_pc_charset_mode (0);
oa.set_a_foreground_color (0);
oa.set_a_background_color (0);
oa.set_foreground_color (0);
oa.set_background_color (0);
oa.set_term_color_pair (0);
oa.set_orig_pair (0);
oa.set_orig_orig_colors (0);
oa.initialize();
FOptiAttr::char_data* from = new FOptiAttr::char_data();
FOptiAttr::char_data* to = new FOptiAttr::char_data();
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Default color + bold
from->fg_color = fc::Default;
from->bg_color = fc::Default;
to->attr.bit.bold = true;
to->fg_color = fc::Default;
to->bg_color = fc::Default;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G4") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Blue text on white background + dim + italic
to->fg_color = fc::Blue;
to->bg_color = fc::White;
to->attr.bit.dim = true;
to->attr.bit.italic = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "Gt") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reset attributes + default background
to->attr.bit.bold = false;
to->attr.bit.dim = false;
to->attr.bit.italic = false;
to->bg_color = fc::Default;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Red text on black background
to->fg_color = fc::Red;
to->bg_color = fc::Black;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// 256 color text and background
to->fg_color = fc::SpringGreen3;
to->bg_color = fc::NavyBlue;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Bold on (with default colors)
to->fg_color = fc::Default;
to->bg_color = fc::Default;
to->attr.bit.bold = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G4") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Bold off (with default colors)
to->attr.bit.bold = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Dim on (with default colors)
to->attr.bit.dim = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "Gp") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Dim off (with default colors)
to->attr.bit.dim = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Italic on (with default colors)
to->attr.bit.italic = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Italic off (with default colors)
to->attr.bit.italic = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Underline on (with default colors)
to->attr.bit.underline = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G8") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Underline off (with default colors)
to->attr.bit.underline = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Blink on (with default colors)
to->attr.bit.blink = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G2") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Blink off (with default colors)
to->attr.bit.blink = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reverse on (with default colors)
to->attr.bit.reverse = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G4") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reverse off (with default colors)
to->attr.bit.reverse = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Standout on (with default colors)
to->attr.bit.standout = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "Gt") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Standout off (with default colors)
to->attr.bit.standout = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Invisible on (with default colors)
to->attr.bit.invisible = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G1") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Invisible off (with default colors)
to->attr.bit.invisible = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Protect on (with default colors)
to->attr.bit.protect = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC ")" ESC "cD" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Protect off (with default colors)
to->attr.bit.protect = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Crossed out on (with default colors)
to->attr.bit.crossed_out = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Crossed out off (with default colors)
to->attr.bit.crossed_out = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Double underline on (with default colors)
to->attr.bit.dbl_underline = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Double underline off (with default colors)
to->attr.bit.dbl_underline = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Alternate character set on (with default colors)
to->attr.bit.alt_charset = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cE" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Alternate character set off (with default colors)
to->attr.bit.alt_charset = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "cD" ESC "(" ESC "H\003" ESC "G0"
ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// PC character set on (with default colors)
to->attr.bit.pc_charset = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "cD" ESC "G0") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// PC character set off (with default colors)
to->attr.bit.pc_charset = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Turn on all attributes (with default colors)
to->attr.bit.pc_charset = true;
to->attr.bit.bold = true;
to->attr.bit.dim = true;
to->attr.bit.italic = true;
to->attr.bit.underline = true;
to->attr.bit.blink = true;
to->attr.bit.reverse = true;
to->attr.bit.standout = true;
to->attr.bit.invisible = true;
to->attr.bit.protect = true;
to->attr.bit.crossed_out = true;
to->attr.bit.dbl_underline = true;
to->attr.bit.alt_charset = true;
to->attr.bit.pc_charset = true;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC ")" ESC "cE" ESC "G\177") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Cyan text on blue background
to->fg_color = fc::Cyan;
to->bg_color = fc::Blue;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Bold off
to->attr.bit.bold = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE" ESC "Gp" ESC "G8" ESC "G2"
ESC "G2" ESC "Gt" ESC "G1" ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Dim off
to->attr.bit.dim = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE" ESC "G8" ESC "G2" ESC "G2"
ESC "Gt" ESC "G1" ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Italic off
to->attr.bit.italic = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Underline off
to->attr.bit.underline = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "G0" ESC "cE" ESC "G2" ESC "G2"
ESC "Gt" ESC "G1" ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Blink off
to->attr.bit.blink = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE" ESC "G2" ESC "Gt" ESC "G1"
ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Reverse off
to->attr.bit.reverse = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE" ESC "Gt" ESC "G1" ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Standout off
to->attr.bit.standout = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "G0" ESC "cE" ESC "G1" ESC ")") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Invisible off
to->attr.bit.invisible = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE" ESC ")" ) );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Protect off
to->attr.bit.protect = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Crossed out off
to->attr.bit.crossed_out = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD"
ESC "cE") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Double underline off
to->attr.bit.dbl_underline = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Alternate character set off
to->attr.bit.alt_charset = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR(ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// PC character set off
to->attr.bit.pc_charset = false;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to)
, C_STR(ESC "(" ESC "H\003" ESC "G0" ESC "cD") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Green text color
to->fg_color = fc::Green;
CPPUNIT_ASSERT ( *from != *to );
CPPUNIT_ASSERT_CSTRING ( oa.changeAttribute(from, to), C_STR("") );
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
// Default text color
to->fg_color = fc::Default;
CPPUNIT_ASSERT ( *from == *to );
CPPUNIT_ASSERT ( oa.changeAttribute(from, to) == 0 );
delete to;
delete from;
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
std::string FOptiAttrTest::printSequence (char* str) std::string FOptiAttrTest::printSequence (char* str)
{ {
@ -3932,12 +4484,16 @@ std::string FOptiAttrTest::printSequence (char* str)
{ {
switch ( int(s[i]) ) switch ( int(s[i]) )
{ {
case 0x03:
sequence << "ETX ";
break;
case 0x08: case 0x08:
sequence << "BS "; sequence << "BS ";
break; break;
case 0x09: case 0x09:
sequence << "TAB "; sequence << "Tab ";
break; break;
case 0x0a: case 0x0a:
@ -3961,8 +4517,7 @@ std::string FOptiAttrTest::printSequence (char* str)
break; break;
default: default:
sequence << s[i]; sequence << s[i] << ' ';
sequence << ' ';
} }
} }