Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/element_program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,13 @@ impl ElementProgram {
event = event_stream.next() => {
match event {
Some(Ok(ct_event)) => {
let ev: Event = ct_event.into();
let msg: M::Msg = ev.into();
if let Some(cmd) = model.update(msg) {
Self::dispatch_cmd(cmd, msg_tx.clone(), quit_flag.clone());
if let Some(ev) = Event::from_crossterm(ct_event) {
let msg: M::Msg = ev.into();
if let Some(cmd) = model.update(msg) {
Self::dispatch_cmd(cmd, msg_tx.clone(), quit_flag.clone());
}
dirty = true;
}
dirty = true;
}
Some(Err(_)) => break,
None => break,
Expand Down
44 changes: 43 additions & 1 deletion src/event.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! Terminal event types (keyboard, mouse, resize, focus).

use crossterm::event::{KeyCode, KeyModifiers, MouseEventKind as CtMouseEventKind};
use crossterm::event::{KeyCode, KeyEventKind, KeyModifiers, MouseEventKind as CtMouseEventKind};

/// A terminal event.
#[derive(Debug, Clone, PartialEq, Eq)]
Expand Down Expand Up @@ -120,6 +120,15 @@ impl From<crossterm::event::Event> for Event {
}
}

impl Event {
pub fn from_crossterm(event: crossterm::event::Event) -> Option<Self> {
match event {
crossterm::event::Event::Key(key) if key.kind == KeyEventKind::Release => None,
event => Some(event.into()),
}
}
}

fn convert_mouse_button(button: crossterm::event::MouseButton) -> MouseButton {
match button {
crossterm::event::MouseButton::Left => MouseButton::Left,
Expand All @@ -145,6 +154,39 @@ fn convert_mouse_kind(kind: CtMouseEventKind) -> MouseEventKind {
mod tests {
use super::*;

#[test]
fn crossterm_key_release_is_ignored() {
let event = crossterm::event::Event::Key(crossterm::event::KeyEvent::new_with_kind(
KeyCode::Char('a'),
KeyModifiers::NONE,
crossterm::event::KeyEventKind::Release,
));

assert_eq!(Event::from_crossterm(event), None);
}

#[test]
fn crossterm_key_press_and_repeat_are_kept() {
for kind in [
crossterm::event::KeyEventKind::Press,
crossterm::event::KeyEventKind::Repeat,
] {
let event = crossterm::event::Event::Key(crossterm::event::KeyEvent::new_with_kind(
KeyCode::Char('a'),
KeyModifiers::NONE,
kind,
));

assert_eq!(
Event::from_crossterm(event),
Some(Event::Key(KeyEvent {
code: KeyCode::Char('a'),
modifiers: KeyModifiers::NONE,
}))
);
}
}

#[test]
fn is_char() {
let e = KeyEvent {
Expand Down
11 changes: 6 additions & 5 deletions src/program.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,16 @@ impl Program {
event = event_stream.next() => {
match event {
Some(Ok(ct_event)) => {
immediate = true;
// A resize shifts every row — force a full clear+redraw.
if matches!(ct_event, crossterm::event::Event::Resize(_, _)) {
renderer.invalidate();
}
let ev: Event = ct_event.into();
let msg: M::Msg = ev.into();
if let Some(cmd) = model.update(msg) {
Self::dispatch_cmd(cmd, msg_tx.clone(), quit_flag.clone());
if let Some(ev) = Event::from_crossterm(ct_event) {
immediate = true;
let msg: M::Msg = ev.into();
if let Some(cmd) = model.update(msg) {
Self::dispatch_cmd(cmd, msg_tx.clone(), quit_flag.clone());
}
}
}
Some(Err(_)) => break,
Expand Down