From 50e31cbac83ec87e86150880e535db11960e6245 Mon Sep 17 00:00:00 2001 From: Matteo Riondato Date: Sat, 29 Apr 2006 12:34:19 +0000 Subject: [PATCH] Add curses ACS line graphics support for iso15 fonts Now ncurses-based programs such as sysinstall and mc will display the correct font for graphical lines instead of "-" and "+" characters. Correct two special characters for cons25l1 in termcap: use real arrows instead of ">>" and "<<". Add a lot of additional symbols for line drawing which are taken from the CP437 font. Almost all of the ACS symbols are now implemented. PR: conf/90082 Submitted by: Oliver Fromme MFC after: 1 week --- share/syscons/fonts/iso15-8x14.fnt | 16 ++++++++-------- share/syscons/fonts/iso15-8x16.fnt | 18 +++++++++--------- share/syscons/fonts/iso15-8x8.fnt | 10 +++++----- share/syscons/fonts/iso15-thin-8x16.fnt | 18 +++++++++--------- share/termcap/termcap.src | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/share/syscons/fonts/iso15-8x14.fnt b/share/syscons/fonts/iso15-8x14.fnt index 2c8adda91e0e..9c51aef4bf91 100644 --- a/share/syscons/fonts/iso15-8x14.fnt +++ b/share/syscons/fonts/iso15-8x14.fnt @@ -39,14 +39,14 @@ M,S,^,#!X````````.V9F9CX&!@\```````!N,S`P,'@``````````#YC.`YC M/@````````@8?A@8&!L.``````````!F9F9F9CL``````````&-C8S8<"``` M````````8V-K:W\V``````````!C-AP<-F,``````````&-F9F8^!F8\```` M````?V8,&#-_```````.&!@8,S\P'@`.&Q@\&!@\````';,S'P,^.!@;'9F9N8`,`!P,#`P>``,``P,#,S, M>.!@9FQX;.8`<#`P,#`P>````,S^_M;&````^,S,S,P```!XS,S,>````-QF M9GQ@\```=LS,?`P>``#<=F9@\````'S`>`SX`!`P?#`P-!@```#,S,S,=@`` M`,S,S'@P````QM;^_FP```#&;#ALQ@```,S,S'P,^```_)@P9/P`'#`PX#`P -M'``8&!@`&!@8`.`P,!PP,.``=MP````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` +M'``8&!@`&!@8`.`P,!PP,.``=MP````````````````````````?&!@8&!@8 +M&!\`````````^!@8&!@8&!CX````&!@8&!\8&!@8&!@8^!@8&!@8&!C_```` +M`````/\8&!@`````_P```!@8&!@8&!@8&!@8&/\8&!@0.'S^?#@0`"*((H@B +MB"*(`#!@_F`P````&`S^#!@``!@8&!A^/!@`&#Q^&!@8&`!5JE6J5:I5JO__ +M________&#!@,!@`_`!@,!@P8`#\``#^;&QL;&P````````````````````` M```````````````````````````````````````````````````````````` M`````````````````````````````````````#``,#!X>#`````0?,#`?!`` M.&!@\&#\``X9,'XP&0X``,S,>##\,``P?,!X#/@``'[`?,9\!OP`,'S`>`SX diff --git a/share/syscons/fonts/iso15-thin-8x16.fnt b/share/syscons/fonts/iso15-thin-8x16.fnt index 1cb4d678b25f..334484972ae3 100644 --- a/share/syscons/fonts/iso15-thin-8x16.fnt +++ b/share/syscons/fonts/iso15-thin-8x16.fnt @@ -45,15 +45,15 @@ M/$)`/`)"/````````!`0$'P0$!`0$`X```````````!"0D)"0D(]```````` M````0D)"0D(D&````````````$E)24E)238```````````!"0B08)$)"```` M````````0D)"0D)"/@("/````````'X$"!`@0'X```````P0$!`0(!`0$!`, M```````0$!`0$!`0$!`0$!``````,`@("`@$"`@("#`````````R3``````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` -M```````````````````````````````````````````````````````````` +M````````````````````````````````````````'Q@8&!@8&!@8&!@8&!@8 +M&!\```````````````````#X&!@8&!@8&!@8&!@8&!@8^```````````&!@8 +M&!@8&!\8&!@8&!@8&!@8&!@8&!CX&!@8&!@8&!@8&!@8&!@8_P`````````` +M`````````/\8&!@8&!@8&`````````#_```````````8&!@8&!@8&!@8&!@8 +M&!@8&!@8&!@8&/\8&!@8&!@8&``````0.'S^?#@0```````11!%$$4011!%$ +M$4011!%$```````@0/Y`(```````````````"`3^!`@``````````!`0$!`0 +M$!!\.!`````````0.'P0$!`0$!`0`````%6J5:I5JE6J5:I5JE6J5:K_____ +M________________````"!`@0"`0"`!^`````````!`(!`($"!``?@`````` +M````_D1$1$1$1$0````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` M```````````````````````````````````````````````````````````` diff --git a/share/termcap/termcap.src b/share/termcap/termcap.src index c5df916dede7..c808a354bcc9 100644 --- a/share/termcap/termcap.src +++ b/share/termcap/termcap.src @@ -2369,7 +2369,7 @@ cons60l2-m|cons60-iso8859-2-mono:\ :li#60:tc=cons25l2-m: # ISO 8859-1 FreeBSD console with ACS support cons25l1|cons25-iso8859-1:\ - :ac=f\260g\261}\243+\253,\273i\247:\ + :ac=:ac=l\200m\201k\202j\203t\204u\205v\206w\207q\210x\211n\212`\213a\214f\260g\261~\267,\215+\216.\217-\220h\221i\2470\222y\223z\224{\225}\243:\ :tc=cons25w: cons25l1-m|cons25-iso8859-1-mono:\ :pa@:Co@:AF@:AB@:AX@:op@:us=\E[4m:ue=\E[24m:tc=cons25l1: