Skip to content

Commit

Permalink
add redraw command (#6949)
Browse files Browse the repository at this point in the history
Co-authored-by: Roberto Vidal <vidal.roberto.j@gmail.com>
  • Loading branch information
dovahcrow and jrvidal authored Sep 8, 2023
1 parent c0fd8bc commit 8017bb2
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 0 deletions.
1 change: 1 addition & 0 deletions book/src/generated/typable-cmd.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,4 @@
| `:run-shell-command`, `:sh` | Run a shell command |
| `:reset-diff-change`, `:diffget`, `:diffg` | Reset the diff change at the cursor position. |
| `:clear-register` | Clear given register. If no argument is provided, clear all registers. |
| `:redraw` | Clear and re-render the whole UI |
5 changes: 5 additions & 0 deletions helix-term/src/application.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,11 @@ impl Application {
}

async fn render(&mut self) {
if self.compositor.full_redraw {
self.terminal.clear().expect("Cannot clear the terminal");
self.compositor.full_redraw = false;
}

let mut cx = crate::compositor::Context {
editor: &mut self.editor,
jobs: &mut self.jobs,
Expand Down
30 changes: 30 additions & 0 deletions helix-term/src/commands/typed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2291,6 +2291,29 @@ fn clear_register(
Ok(())
}

fn redraw(
cx: &mut compositor::Context,
_args: &[Cow<str>],
event: PromptEvent,
) -> anyhow::Result<()> {
if event != PromptEvent::Validate {
return Ok(());
}

let callback = Box::pin(async move {
let call: job::Callback =
job::Callback::EditorCompositor(Box::new(|_editor, compositor| {
compositor.need_full_redraw();
}));

Ok(call)
});

cx.jobs.callback(callback);

Ok(())
}

pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
TypableCommand {
name: "quit",
Expand Down Expand Up @@ -2877,6 +2900,13 @@ pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
fun: clear_register,
signature: CommandSignature::none(),
},
TypableCommand {
name: "redraw",
aliases: &[],
doc: "Clear and re-render the whole UI",
fun: redraw,
signature: CommandSignature::none(),
},
];

pub static TYPABLE_COMMAND_MAP: Lazy<HashMap<&'static str, &'static TypableCommand>> =
Expand Down
6 changes: 6 additions & 0 deletions helix-term/src/compositor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ pub struct Compositor {
area: Rect,

pub(crate) last_picker: Option<Box<dyn Component>>,
pub(crate) full_redraw: bool,
}

impl Compositor {
Expand All @@ -88,6 +89,7 @@ impl Compositor {
layers: Vec::new(),
area,
last_picker: None,
full_redraw: false,
}
}

Expand Down Expand Up @@ -206,6 +208,10 @@ impl Compositor {
.find(|component| component.id() == Some(id))
.and_then(|component| component.as_any_mut().downcast_mut())
}

pub fn need_full_redraw(&mut self) {
self.full_redraw = true;
}
}

// View casting, taken straight from Cursive
Expand Down

0 comments on commit 8017bb2

Please sign in to comment.