From 33abfe34a86863958e70a6b5109eab5740a6bc81 Mon Sep 17 00:00:00 2001 From: Kirill Chibisov Date: Wed, 15 Apr 2020 06:50:34 +0300 Subject: Add config option to set cursor thickness Fixes #3526. --- alacritty/src/event.rs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'alacritty/src/event.rs') diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs index e532ac12..3f2e3f77 100644 --- a/alacritty/src/event.rs +++ b/alacritty/src/event.rs @@ -49,13 +49,14 @@ use crate::window::Window; #[derive(Default, Clone, Debug, PartialEq)] pub struct DisplayUpdate { pub dimensions: Option>, - pub message_buffer: Option<()>, + pub message_buffer: bool, pub font: Option, + pub cursor: bool, } impl DisplayUpdate { fn is_empty(&self) -> bool { - self.dimensions.is_none() && self.font.is_none() && self.message_buffer.is_none() + self.dimensions.is_none() && self.font.is_none() && !self.message_buffer && !self.cursor } } @@ -255,7 +256,7 @@ impl<'a, N: Notify + 'a, T: EventListener> input::ActionContext for ActionCon } fn pop_message(&mut self) { - self.display_update_pending.message_buffer = Some(()); + self.display_update_pending.message_buffer = true; self.message_buffer.pop(); } @@ -526,7 +527,7 @@ impl Processor { Event::ConfigReload(path) => Self::reload_config(&path, processor), Event::Message(message) => { processor.ctx.message_buffer.push(message); - processor.ctx.display_update_pending.message_buffer = Some(()); + processor.ctx.display_update_pending.message_buffer = true; processor.ctx.terminal.dirty = true; }, Event::MouseCursorDirty => processor.reset_mouse_cursor(), @@ -659,7 +660,7 @@ impl Processor { T: EventListener, { processor.ctx.message_buffer.remove_target(LOG_TARGET_CONFIG); - processor.ctx.display_update_pending.message_buffer = Some(()); + processor.ctx.display_update_pending.message_buffer = true; let config = match config::reload_from(&path) { Ok(config) => config, @@ -671,6 +672,13 @@ impl Processor { processor.ctx.terminal.update_config(&config); + // Reload cursor if we've changed its thickness + if (processor.ctx.config.cursor.thickness() - config.cursor.thickness()).abs() + > std::f64::EPSILON + { + processor.ctx.display_update_pending.cursor = true; + } + if processor.ctx.config.font != config.font { // Do not update font size if it has been changed at runtime if *processor.ctx.font_size == processor.ctx.config.font.size { -- cgit