mslot
/
alacritty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cursor dimension style issues

This commit is contained in:
Christian Duerr 2019-04-19 20:56:11 +00:00 committed by GitHub
parent cfc20d4f34
commit 371d13f8ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/renderer/mod.rs
View File

@ -983,12 +983,15 @@ impl<'a> RenderApi<'a> {
} }
pub fn render_cell(&mut self, cell: RenderableCell, glyph_cache: &mut GlyphCache) { pub fn render_cell(&mut self, cell: RenderableCell, glyph_cache: &mut GlyphCache) {
// loader.load_glyph(&rasterized) let chars = match cell.inner {
if let RenderableCellContent::Raw(ref raw) = cell.inner { RenderableCellContent::Raw(ref raw) => {
let glyph = self.load_glyph(raw); // Raw cell pixel buffers like cursors don't need to go through font lookup
self.add_render_item(&cell, &glyph); let glyph = self.load_glyph(raw);
return; self.add_render_item(&cell, &glyph);
} return;
},
RenderableCellContent::Chars(chars) => chars,
};
// Get font key for cell // Get font key for cell
// FIXME this is super inefficient. // FIXME this is super inefficient.
@ -1003,10 +1006,8 @@ impl<'a> RenderApi<'a> {
// Don't render text of HIDDEN cells // Don't render text of HIDDEN cells
let mut chars = if cell.flags.contains(cell::Flags::HIDDEN) { let mut chars = if cell.flags.contains(cell::Flags::HIDDEN) {
[' '; cell::MAX_ZEROWIDTH_CHARS + 1] [' '; cell::MAX_ZEROWIDTH_CHARS + 1]
} else if let RenderableCellContent::Chars(chars) = cell.inner {
chars
} else { } else {
unimplemented!(); chars
}; };
// Render tabs as spaces in case the font doesn't support it // Render tabs as spaces in case the font doesn't support it

88
src/term/mod.rs
View File

@ -227,17 +227,17 @@ impl<'a> RenderableCellsIter<'a> {
// Load cursor glyph // Load cursor glyph
let cursor = &term.cursor.point; let cursor = &term.cursor.point;
let cursor_cell = let cursor_visible = term.mode.contains(TermMode::SHOW_CURSOR) && grid.contains(cursor);
if term.mode.contains(mode::TermMode::SHOW_CURSOR) && grid.contains(cursor) { let cursor_cell = if cursor_visible {
let offset_x = config.font().offset().x; let offset_x = config.font().offset().x;
let offset_y = config.font().offset().y; let offset_y = config.font().offset().y;
let is_wide = grid[cursor].flags.contains(cell::Flags::WIDE_CHAR) let is_wide = grid[cursor].flags.contains(cell::Flags::WIDE_CHAR)
&& (cursor.col + 1) < grid.num_cols(); && (cursor.col + 1) < grid.num_cols();
Some(cursor::get_cursor_glyph(cursor_style, metrics, offset_x, offset_y, is_wide)) Some(cursor::get_cursor_glyph(cursor_style, metrics, offset_x, offset_y, is_wide))
} else { } else {
None None
}; };
RenderableCellsIter { RenderableCellsIter {
cursor, cursor,
@ -452,7 +452,7 @@ pub mod mode {
} }
} }
pub use self::mode::TermMode; pub use crate::term::mode::TermMode;
trait CharsetMapping { trait CharsetMapping {
fn map(&self, c: char) -> char { fn map(&self, c: char) -> char {
@ -1357,7 +1357,7 @@ impl ansi::Handler for Term {
} }
if self.input_needs_wrap { if self.input_needs_wrap {
if !self.mode.contains(mode::TermMode::LINE_WRAP) { if !self.mode.contains(TermMode::LINE_WRAP) {
return; return;
} }
@ -1385,9 +1385,7 @@ impl ansi::Handler for Term {
let num_cols = self.grid.num_cols(); let num_cols = self.grid.num_cols();
// If in insert mode, first shift cells to the right. // If in insert mode, first shift cells to the right.
if self.mode.contains(mode::TermMode::INSERT) if self.mode.contains(TermMode::INSERT) && self.cursor.point.col + width < num_cols {
&& self.cursor.point.col + width < num_cols
{
let line = self.cursor.point.line; let line = self.cursor.point.line;
let col = self.cursor.point.col; let col = self.cursor.point.col;
let line = &mut self.grid[line]; let line = &mut self.grid[line];
@ -1447,7 +1445,7 @@ impl ansi::Handler for Term {
#[inline] #[inline]
fn goto(&mut self, line: Line, col: Column) { fn goto(&mut self, line: Line, col: Column) {
trace!("Going to: line={}, col={}", line, col); trace!("Going to: line={}, col={}", line, col);
let (y_offset, max_y) = if self.mode.contains(mode::TermMode::ORIGIN) { let (y_offset, max_y) = if self.mode.contains(TermMode::ORIGIN) {
(self.scroll_region.start, self.scroll_region.end - 1) (self.scroll_region.start, self.scroll_region.end - 1)
} else { } else {
(Line(0), self.grid.num_lines() - 1) (Line(0), self.grid.num_lines() - 1)
@ -1656,7 +1654,7 @@ impl ansi::Handler for Term {
fn newline(&mut self) { fn newline(&mut self) {
self.linefeed(); self.linefeed();
if self.mode.contains(mode::TermMode::LINE_FEED_NEW_LINE) { if self.mode.contains(TermMode::LINE_FEED_NEW_LINE) {
self.carriage_return(); self.carriage_return();
} }
} }
@ -1962,34 +1960,34 @@ impl ansi::Handler for Term {
match mode { match mode {
ansi::Mode::SwapScreenAndSetRestoreCursor => { ansi::Mode::SwapScreenAndSetRestoreCursor => {
if !self.alt { if !self.alt {
self.mode.insert(mode::TermMode::ALT_SCREEN); self.mode.insert(TermMode::ALT_SCREEN);
self.save_cursor_position(); self.save_cursor_position();
self.swap_alt(); self.swap_alt();
self.save_cursor_position(); self.save_cursor_position();
} }
}, },
ansi::Mode::ShowCursor => self.mode.insert(mode::TermMode::SHOW_CURSOR), ansi::Mode::ShowCursor => self.mode.insert(TermMode::SHOW_CURSOR),
ansi::Mode::CursorKeys => self.mode.insert(mode::TermMode::APP_CURSOR), ansi::Mode::CursorKeys => self.mode.insert(TermMode::APP_CURSOR),
ansi::Mode::ReportMouseClicks => { ansi::Mode::ReportMouseClicks => {
self.mode.insert(mode::TermMode::MOUSE_REPORT_CLICK); self.mode.insert(TermMode::MOUSE_REPORT_CLICK);
self.set_mouse_cursor(MouseCursor::Default); self.set_mouse_cursor(MouseCursor::Default);
}, },
ansi::Mode::ReportCellMouseMotion => { ansi::Mode::ReportCellMouseMotion => {
self.mode.insert(mode::TermMode::MOUSE_DRAG); self.mode.insert(TermMode::MOUSE_DRAG);
self.set_mouse_cursor(MouseCursor::Default); self.set_mouse_cursor(MouseCursor::Default);
}, },
ansi::Mode::ReportAllMouseMotion => { ansi::Mode::ReportAllMouseMotion => {
self.mode.insert(mode::TermMode::MOUSE_MOTION); self.mode.insert(TermMode::MOUSE_MOTION);
self.set_mouse_cursor(MouseCursor::Default); self.set_mouse_cursor(MouseCursor::Default);
}, },
ansi::Mode::ReportFocusInOut => self.mode.insert(mode::TermMode::FOCUS_IN_OUT), ansi::Mode::ReportFocusInOut => self.mode.insert(TermMode::FOCUS_IN_OUT),
ansi::Mode::BracketedPaste => self.mode.insert(mode::TermMode::BRACKETED_PASTE), ansi::Mode::BracketedPaste => self.mode.insert(TermMode::BRACKETED_PASTE),
ansi::Mode::SgrMouse => self.mode.insert(mode::TermMode::SGR_MOUSE), ansi::Mode::SgrMouse => self.mode.insert(TermMode::SGR_MOUSE),
ansi::Mode::LineWrap => self.mode.insert(mode::TermMode::LINE_WRAP), ansi::Mode::LineWrap => self.mode.insert(TermMode::LINE_WRAP),
ansi::Mode::LineFeedNewLine => self.mode.insert(mode::TermMode::LINE_FEED_NEW_LINE), ansi::Mode::LineFeedNewLine => self.mode.insert(TermMode::LINE_FEED_NEW_LINE),
ansi::Mode::Origin => self.mode.insert(mode::TermMode::ORIGIN), ansi::Mode::Origin => self.mode.insert(TermMode::ORIGIN),
ansi::Mode::DECCOLM => self.deccolm(), ansi::Mode::DECCOLM => self.deccolm(),
ansi::Mode::Insert => self.mode.insert(mode::TermMode::INSERT), // heh ansi::Mode::Insert => self.mode.insert(TermMode::INSERT), // heh
ansi::Mode::BlinkingCursor => { ansi::Mode::BlinkingCursor => {
trace!("... unimplemented mode"); trace!("... unimplemented mode");
}, },
@ -2002,34 +2000,34 @@ impl ansi::Handler for Term {
match mode { match mode {
ansi::Mode::SwapScreenAndSetRestoreCursor => { ansi::Mode::SwapScreenAndSetRestoreCursor => {
if self.alt { if self.alt {
self.mode.remove(mode::TermMode::ALT_SCREEN); self.mode.remove(TermMode::ALT_SCREEN);
self.restore_cursor_position(); self.restore_cursor_position();
self.swap_alt(); self.swap_alt();
self.restore_cursor_position(); self.restore_cursor_position();
} }
}, },
ansi::Mode::ShowCursor => self.mode.remove(mode::TermMode::SHOW_CURSOR), ansi::Mode::ShowCursor => self.mode.remove(TermMode::SHOW_CURSOR),
ansi::Mode::CursorKeys => self.mode.remove(mode::TermMode::APP_CURSOR), ansi::Mode::CursorKeys => self.mode.remove(TermMode::APP_CURSOR),
ansi::Mode::ReportMouseClicks => { ansi::Mode::ReportMouseClicks => {
self.mode.remove(mode::TermMode::MOUSE_REPORT_CLICK); self.mode.remove(TermMode::MOUSE_REPORT_CLICK);
self.set_mouse_cursor(MouseCursor::Text); self.set_mouse_cursor(MouseCursor::Text);
}, },
ansi::Mode::ReportCellMouseMotion => { ansi::Mode::ReportCellMouseMotion => {
self.mode.remove(mode::TermMode::MOUSE_DRAG); self.mode.remove(TermMode::MOUSE_DRAG);
self.set_mouse_cursor(MouseCursor::Text); self.set_mouse_cursor(MouseCursor::Text);
}, },
ansi::Mode::ReportAllMouseMotion => { ansi::Mode::ReportAllMouseMotion => {
self.mode.remove(mode::TermMode::MOUSE_MOTION); self.mode.remove(TermMode::MOUSE_MOTION);
self.set_mouse_cursor(MouseCursor::Text); self.set_mouse_cursor(MouseCursor::Text);
}, },
ansi::Mode::ReportFocusInOut => self.mode.remove(mode::TermMode::FOCUS_IN_OUT), ansi::Mode::ReportFocusInOut => self.mode.remove(TermMode::FOCUS_IN_OUT),
ansi::Mode::BracketedPaste => self.mode.remove(mode::TermMode::BRACKETED_PASTE), ansi::Mode::BracketedPaste => self.mode.remove(TermMode::BRACKETED_PASTE),
ansi::Mode::SgrMouse => self.mode.remove(mode::TermMode::SGR_MOUSE), ansi::Mode::SgrMouse => self.mode.remove(TermMode::SGR_MOUSE),
ansi::Mode::LineWrap => self.mode.remove(mode::TermMode::LINE_WRAP), ansi::Mode::LineWrap => self.mode.remove(TermMode::LINE_WRAP),
ansi::Mode::LineFeedNewLine => self.mode.remove(mode::TermMode::LINE_FEED_NEW_LINE), ansi::Mode::LineFeedNewLine => self.mode.remove(TermMode::LINE_FEED_NEW_LINE),
ansi::Mode::Origin => self.mode.remove(mode::TermMode::ORIGIN), ansi::Mode::Origin => self.mode.remove(TermMode::ORIGIN),
ansi::Mode::DECCOLM => self.deccolm(), ansi::Mode::DECCOLM => self.deccolm(),
ansi::Mode::Insert => self.mode.remove(mode::TermMode::INSERT), ansi::Mode::Insert => self.mode.remove(TermMode::INSERT),
ansi::Mode::BlinkingCursor => { ansi::Mode::BlinkingCursor => {
trace!("... unimplemented mode"); trace!("... unimplemented mode");
}, },
@ -2047,13 +2045,13 @@ impl ansi::Handler for Term {
#[inline] #[inline]
fn set_keypad_application_mode(&mut self) { fn set_keypad_application_mode(&mut self) {
trace!("Setting keypad application mode"); trace!("Setting keypad application mode");
self.mode.insert(mode::TermMode::APP_KEYPAD); self.mode.insert(TermMode::APP_KEYPAD);
} }
#[inline] #[inline]
fn unset_keypad_application_mode(&mut self) { fn unset_keypad_application_mode(&mut self) {
trace!("Unsetting keypad application mode"); trace!("Unsetting keypad application mode");
self.mode.remove(mode::TermMode::APP_KEYPAD); self.mode.remove(TermMode::APP_KEYPAD);
} }
#[inline] #[inline]