itsscb/ratatui
1
0
Fork 0
mirror of https://github.com/ratatui/ratatui.git synced 2025-10-04 08:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter out wide unicode characters on windows

Browse Source
This commit is contained in:
defiori 2019-02-15 13:14:43 +00:00 committed by Florian Dehau
parent 4a1f3cd61f
commit 624e6ee047
1 changed files with 61 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/backend/curses.rs
View File

@ -4,12 +4,12 @@ use crate::backend::Backend;
use crate::buffer::Cell; use crate::buffer::Cell;
use crate::layout::Rect; use crate::layout::Rect;
use crate::style::{Color, Modifier, Style}; use crate::style::{Color, Modifier, Style};
use unicode_segmentation::UnicodeSegmentation;
use crate::symbols::{bar, block};
#[cfg(unix)] #[cfg(unix)]
use crate::symbols::{bar, block, line, DOT}; use crate::symbols::{line, DOT};
#[cfg(unix)] #[cfg(unix)]
use pancurses::ToChtype; use pancurses::ToChtype;
#[cfg(unix)]
use unicode_segmentation::UnicodeSegmentation;
pub struct CursesBackend { pub struct CursesBackend {
curses: easycurses::EasyCurses, curses: easycurses::EasyCurses,
@ -137,20 +137,7 @@ struct CursesStyle {
/// Deals with lack of unicode support for ncurses on unix /// Deals with lack of unicode support for ncurses on unix
fn draw(curses: &mut easycurses::EasyCurses, symbol: &str) { fn draw(curses: &mut easycurses::EasyCurses, symbol: &str) {
for grapheme in symbol.graphemes(true) { for grapheme in symbol.graphemes(true) {
let ch = convert_to_curses_char(grapheme); let ch = match grapheme {
curses.win.addch(ch);
}
}
#[cfg(windows)]
fn draw(curses: &mut easycurses::EasyCurses, symbol: &str) {
curses.print(symbol);
}
#[cfg(unix)]
/// Unicode to ASCII / ncurses extended characters
fn convert_to_curses_char(unicode: &str) -> pancurses::chtype {
match unicode {
line::TOP_RIGHT => pancurses::ACS_URCORNER(), line::TOP_RIGHT => pancurses::ACS_URCORNER(),
line::VERTICAL => pancurses::ACS_VLINE(), line::VERTICAL => pancurses::ACS_VLINE(),
line::HORIZONTAL => pancurses::ACS_HLINE(), line::HORIZONTAL => pancurses::ACS_HLINE(),
@ -166,16 +153,16 @@ fn convert_to_curses_char(unicode: &str) -> pancurses::chtype {
block::THREE_QUATERS => pancurses::ACS_BLOCK(), block::THREE_QUATERS => pancurses::ACS_BLOCK(),
block::FIVE_EIGHTHS => pancurses::ACS_BLOCK(), block::FIVE_EIGHTHS => pancurses::ACS_BLOCK(),
block::HALF => pancurses::ACS_BLOCK(), block::HALF => pancurses::ACS_BLOCK(),
block::THREE_EIGHTHS => pancurses::ACS_BLOCK(), block::THREE_EIGHTHS => ' ' as u64,
block::ONE_QUATER => pancurses::ACS_BLOCK(), block::ONE_QUATER => ' ' as u64,
block::ONE_EIGHTH => pancurses::ACS_BLOCK(), block::ONE_EIGHTH => ' ' as u64,
bar::SEVEN_EIGHTHS => pancurses::ACS_BLOCK(), bar::SEVEN_EIGHTHS => pancurses::ACS_BLOCK(),
bar::THREE_QUATERS => pancurses::ACS_BLOCK(), bar::THREE_QUATERS => pancurses::ACS_BLOCK(),
bar::FIVE_EIGHTHS => pancurses::ACS_BLOCK(), bar::FIVE_EIGHTHS => pancurses::ACS_BLOCK(),
bar::HALF => pancurses::ACS_BLOCK(), bar::HALF => pancurses::ACS_BLOCK(),
bar::THREE_EIGHTHS => pancurses::ACS_BLOCK(), bar::THREE_EIGHTHS => pancurses::ACS_S9(),
bar::ONE_QUATER => pancurses::ACS_BLOCK(), bar::ONE_QUATER => pancurses::ACS_S9(),
bar::ONE_EIGHTH => pancurses::ACS_BLOCK(), bar::ONE_EIGHTH => pancurses::ACS_S9(),
DOT => pancurses::ACS_BULLET(), DOT => pancurses::ACS_BULLET(),
unicode_char => { unicode_char => {
if unicode_char.is_ascii() { if unicode_char.is_ascii() {
@ -189,6 +176,31 @@ fn convert_to_curses_char(unicode: &str) -> pancurses::chtype {
pancurses::ACS_BLOCK() pancurses::ACS_BLOCK()
} }
} }
};
curses.win.addch(ch);
}
}
#[cfg(windows)]
fn draw(curses: &mut easycurses::EasyCurses, symbol: &str) {
for grapheme in symbol.graphemes(true) {
let ch = match grapheme {
block::SEVEN_EIGHTHS => block::FULL,
block::THREE_QUATERS => block::FULL,
block::FIVE_EIGHTHS => block::HALF,
block::THREE_EIGHTHS => block::HALF,
block::ONE_QUATER => block::HALF,
block::ONE_EIGHTH => " ",
bar::SEVEN_EIGHTHS => bar::FULL,
bar::THREE_QUATERS => bar::FULL,
bar::FIVE_EIGHTHS => bar::HALF,
bar::THREE_EIGHTHS => bar::HALF,
bar::ONE_QUATER => bar::HALF,
bar::ONE_EIGHTH => " ",
ch => ch,
};
// curses.win.addch(ch);
curses.print(ch);
} }
} }