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

Add a joined right-left-line character to the newfont

This commit is contained in:
Markus Gans 2015-07-02 22:27:34 +02:00
parent 796c86da6f
commit c8a024ddf4
6 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fenum.h
View File

@ -152,6 +152,7 @@ class fc
NF_radio_button1 = 0x1ad9, // ( NF_radio_button1 = 0x1ad9, // (
NF_border_corner_upper_left = 0x1ada, // ⎡ NF_border_corner_upper_left = 0x1ada, // ⎡
NF_shadow_box_checked = 0x1adc, // ✓ NF_shadow_box_checked = 0x1adc, // ✓
NF_rev_border_line_right_and_left = 0x1ae7, // ||
NF_rev_up_pointing_triangle2 = 0x1ae8, // ◣ NF_rev_up_pointing_triangle2 = 0x1ae8, // ◣
NF_rev_down_pointing_triangle2 = 0x1ae9, // ◤ NF_rev_down_pointing_triangle2 = 0x1ae9, // ◤
NF_rev_menu_button3 = 0x1af4, // ] NF_rev_menu_button3 = 0x1af4, // ]

32
src/fonts/8x16graph.bdf
View File

@ -5330,22 +5330,22 @@ SWIDTH 480 0
DWIDTH 8 0 DWIDTH 8 0
BBX 8 16 0 -4 BBX 8 16 0 -4
BITMAP BITMAP
00 7E
00 7E
00 7E
00 7E
76 7E
DC 7E
18 7E
18 7E
18 7E
18 7E
18 7E
18 7E
00 7E
00 7E
00 7E
00 7E
ENDCHAR ENDCHAR
STARTCHAR char232 STARTCHAR char232
ENCODING 232 ENCODING 232

BIN
src/fonts/8x16graph.pcf.gz
View File

Binary file not shown.

2
src/fonts/newfont.h
View File

@ -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, 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, 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, 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, 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, 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 */ 0x00, 0x00, 0x38, 0x6c, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00, /* 234 */

1
src/fterm.cpp
View File

@ -3749,6 +3749,7 @@ inline void FTerm::appendAttributes (char_data*& screen_attr)
case fc::NF_rev_up_pointing_triangle2: case fc::NF_rev_up_pointing_triangle2:
case fc::NF_rev_down_pointing_triangle2: case fc::NF_rev_down_pointing_triangle2:
case fc::NF_rev_menu_button3: case fc::NF_rev_menu_button3:
case fc::NF_rev_border_line_right_and_left:
setTermColor (screen_attr->bg_color, screen_attr->fg_color); setTermColor (screen_attr->bg_color, screen_attr->fg_color);
} }
} }

4
src/fwidget.cpp
View File

@ -1894,7 +1894,7 @@ void FWidget::drawFlatBorder()
{ {
gotoxy (x1-1, y1+y+1); gotoxy (x1-1, y1+y+1);
if ( double_flatline_mask.left[uLong(y)] ) 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 else
print (fc::NF_rev_border_line_right); // right line (on left side) 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++) for (int y=0; y < height; y++)
{ {
if ( double_flatline_mask.right[uLong(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 else
print (fc::NF_border_line_left); // left line (on right side) print (fc::NF_border_line_left); // left line (on right side)
gotoxy (x2, y1+y+2); gotoxy (x2, y1+y+2);