From c8a024ddf452cf3099184702032d0827801dbd63 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 2 Jul 2015 22:27:34 +0200 Subject: [PATCH] Add a joined right-left-line character to the newfont --- src/fenum.h | 1 + src/fonts/8x16graph.bdf | 32 ++++++++++++++++---------------- src/fonts/8x16graph.pcf.gz | Bin 5124 -> 5126 bytes src/fonts/newfont.h | 2 +- src/fterm.cpp | 1 + src/fwidget.cpp | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/fenum.h b/src/fenum.h index d866dd60..094ef33b 100644 --- a/src/fenum.h +++ b/src/fenum.h @@ -152,6 +152,7 @@ class fc NF_radio_button1 = 0x1ad9, // ( NF_border_corner_upper_left = 0x1ada, // ⎡ NF_shadow_box_checked = 0x1adc, // ✓ + NF_rev_border_line_right_and_left = 0x1ae7, // || NF_rev_up_pointing_triangle2 = 0x1ae8, // ◣ NF_rev_down_pointing_triangle2 = 0x1ae9, // ◤ NF_rev_menu_button3 = 0x1af4, // ] diff --git a/src/fonts/8x16graph.bdf b/src/fonts/8x16graph.bdf index 3f5a887e..5aea1cb3 100644 --- a/src/fonts/8x16graph.bdf +++ b/src/fonts/8x16graph.bdf @@ -5330,22 +5330,22 @@ SWIDTH 480 0 DWIDTH 8 0 BBX 8 16 0 -4 BITMAP -00 -00 -00 -00 -76 -DC -18 -18 -18 -18 -18 -18 -00 -00 -00 -00 +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E +7E ENDCHAR STARTCHAR char232 ENCODING 232 diff --git a/src/fonts/8x16graph.pcf.gz b/src/fonts/8x16graph.pcf.gz index b3ffe17ceba1b628408e2c805c138bb90178c262..353641635be938e3ed318d05e756f449a03c9af4 100644 GIT binary patch literal 5126 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 SoS)Z@U?XpM-{orp0{;bbZ;uWD diff --git a/src/fonts/newfont.h b/src/fonts/newfont.h index 3840813a..60041864 100644 --- a/src/fonts/newfont.h +++ b/src/fonts/newfont.h @@ -237,7 +237,7 @@ static unsigned char __8x16graph[] = 0x00, 0x00, 0x00, 0xfe, 0xc6, 0x60, 0x30, 0x18, 0x30, 0x60, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, /* 228 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8, 0xd8, 0xd8, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, /* 229 */ 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x60, 0x60, 0xc0, 0x00, 0x00, 0x00, /* 230 */ - 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, /* 231 */ + 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, /* 231 */ 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0x7e, 0x3e, 0x1e, 0x0e, 0x06, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, /* 232 */ 0x00, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x06, 0x0e, 0x1e, 0x3e, 0x7e, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, /* 233 */ 0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00, /* 234 */ diff --git a/src/fterm.cpp b/src/fterm.cpp index be69eee6..54ef302a 100644 --- a/src/fterm.cpp +++ b/src/fterm.cpp @@ -3749,6 +3749,7 @@ inline void FTerm::appendAttributes (char_data*& screen_attr) case fc::NF_rev_up_pointing_triangle2: case fc::NF_rev_down_pointing_triangle2: case fc::NF_rev_menu_button3: + case fc::NF_rev_border_line_right_and_left: setTermColor (screen_attr->bg_color, screen_attr->fg_color); } } diff --git a/src/fwidget.cpp b/src/fwidget.cpp index eb35a68f..2e452026 100644 --- a/src/fwidget.cpp +++ b/src/fwidget.cpp @@ -1894,7 +1894,7 @@ void FWidget::drawFlatBorder() { gotoxy (x1-1, y1+y+1); if ( double_flatline_mask.left[uLong(y)] ) - print (fc::NF_rev_border_line_right); // || is not yet defined + print (fc::NF_rev_border_line_right_and_left); // left+right line (on left side) else print (fc::NF_rev_border_line_right); // right line (on left side) } @@ -1903,7 +1903,7 @@ void FWidget::drawFlatBorder() for (int y=0; y < height; y++) { if ( double_flatline_mask.right[uLong(y)] ) - print (fc::NF_border_line_left); // || is not yet defined + print (fc::NF_rev_border_line_right_and_left); // left+right line (on right side) else print (fc::NF_border_line_left); // left line (on right side) gotoxy (x2, y1+y+2);