Skip to content

Commit

Permalink
Merge pull request #10 from anotherlusitano/fix-duplicate-key-event
Browse files Browse the repository at this point in the history 
Fix duplicate key event on Windows
  • Loading branch information
@anotherlusitano
anotherlusitano authored Aug 1, 2024
2 parents b6cb7d5 + 243c75c commit 610d644
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 75 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "selthi"
version = "0.2.4"
version = "0.2.5"
edition = "2021"
author = "João Ribeiro"
repository = "https://github.com/anotherlusitano/selthi"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cargo add selthi
\* If you want to support images, add the feature `with_images`

```
selthi = { version = "0.2.4", features = ["with_images"] }
selthi = { version = "0.2.5", features = ["with_images"] }
```

## Prompts
Expand Down
89 changes: 48 additions & 41 deletions src/input.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,57 +67,64 @@ impl<'a> Input<'a> {
let cursor_pos = crossterm::cursor::position().unwrap().0;

match read().unwrap() {
Event::Key(event) => match event.code {
KeyCode::Enter => {
if answer.trim().chars().count() as u16 >= self.minimum_chars {
stdout.queue(ResetColor).unwrap();
stdout.queue(Clear(ClearType::All)).unwrap();
stdout.queue(cursor::MoveTo(0, 0)).unwrap();
terminal::disable_raw_mode().unwrap();

return Some(answer.trim().to_string());
}
}
KeyCode::Esc => {
quit = true;
Event::Key(event) => {
#[cfg(target_os = "windows")]
if event.kind != KeyEventKind::Press {
break;
}
KeyCode::Left => {
if cursor_pos > message_len {
stdout.queue(cursor::MoveLeft(1)).unwrap();

match event.code {
KeyCode::Enter => {
if answer.trim().chars().count() as u16 >= self.minimum_chars {
stdout.queue(ResetColor).unwrap();
stdout.queue(Clear(ClearType::All)).unwrap();
stdout.queue(cursor::MoveTo(0, 0)).unwrap();
terminal::disable_raw_mode().unwrap();

return Some(answer.trim().to_string());
}
}
}
KeyCode::Right => {
let whole_text = message_len + answer.chars().count() as u16;
let cursor_in_end_of_text = cursor_pos == whole_text;
KeyCode::Esc => {
quit = true;
}
KeyCode::Left => {
if cursor_pos > message_len {
stdout.queue(cursor::MoveLeft(1)).unwrap();
}
}
KeyCode::Right => {
let whole_text = message_len + answer.chars().count() as u16;
let cursor_in_end_of_text = cursor_pos == whole_text;

if !cursor_in_end_of_text {
stdout.queue(cursor::MoveRight(1)).unwrap();
if !cursor_in_end_of_text {
stdout.queue(cursor::MoveRight(1)).unwrap();
}
}
}
KeyCode::Backspace | KeyCode::Delete => {
let cursor_in_begin_of_answer = cursor_pos == message_len;
KeyCode::Backspace | KeyCode::Delete => {
let cursor_in_begin_of_answer = cursor_pos == message_len;

if !answer.is_empty() && !cursor_in_begin_of_answer {
self.delete_char(&mut answer);
stdout.queue(cursor::MoveLeft(1)).unwrap();
stdout.queue(cursor::SavePosition).unwrap();
self.draw_text(&mut stdout, &answer);
stdout.queue(cursor::RestorePosition).unwrap();
}
}
KeyCode::Char(x) => {
if event.modifiers.contains(KeyModifiers::CONTROL) && x == 'c' {
quit = true
}

if !answer.is_empty() && !cursor_in_begin_of_answer {
self.delete_char(&mut answer);
stdout.queue(cursor::MoveLeft(1)).unwrap();
stdout.queue(cursor::MoveRight(1)).unwrap();
stdout.queue(cursor::SavePosition).unwrap();
self.insert_char(x, &mut answer);
self.draw_text(&mut stdout, &answer);
stdout.queue(cursor::RestorePosition).unwrap();
}
_ => {}
}
KeyCode::Char(x) => {
if event.modifiers.contains(KeyModifiers::CONTROL) && x == 'c' {
quit = true
}

stdout.queue(cursor::MoveRight(1)).unwrap();
stdout.queue(cursor::SavePosition).unwrap();
self.insert_char(x, &mut answer);
self.draw_text(&mut stdout, &answer);
stdout.queue(cursor::RestorePosition).unwrap();
}
_ => {}
},
}

_ => quit = true,
}
Expand Down
69 changes: 38 additions & 31 deletions src/select.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,46 +205,53 @@ impl<'a> Select<'a> {

self.draw_image(&ueberzug, (width, height));
}
Event::Key(event) => match event.code {
KeyCode::Up => {
self.option_up(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
Event::Key(event) => {
#[cfg(target_os = "windows")]
if event.kind != KeyEventKind::Press {
break;
}
KeyCode::Char('k') => {
if self.vim_mode {

match event.code {
KeyCode::Up => {
self.option_up(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
}
}
KeyCode::Down => {
self.option_down(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
}
KeyCode::Char('j') => {
if self.vim_mode {
KeyCode::Char('k') => {
if self.vim_mode {
self.option_up(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
}
}
KeyCode::Down => {
self.option_down(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
}
}
KeyCode::Enter => {
stdout.queue(ResetColor).unwrap();
stdout.queue(Show).unwrap();
stdout.queue(Clear(ClearType::All)).unwrap();
stdout.queue(cursor::MoveTo(0, 0)).unwrap();
terminal::disable_raw_mode().unwrap();

return Some(self.options[self.current_option]);
}
KeyCode::Esc => {
quit = true;
}
KeyCode::Char(x) => {
if event.modifiers.contains(KeyModifiers::CONTROL) && x == 'c' {
quit = true
KeyCode::Char('j') => {
if self.vim_mode {
self.option_down(&mut stdout, &mut page);
self.draw_options(&mut stdout, page);
}
}
KeyCode::Enter => {
stdout.queue(ResetColor).unwrap();
stdout.queue(Show).unwrap();
stdout.queue(Clear(ClearType::All)).unwrap();
stdout.queue(cursor::MoveTo(0, 0)).unwrap();
terminal::disable_raw_mode().unwrap();

return Some(self.options[self.current_option]);
}
KeyCode::Esc => {
quit = true;
}
KeyCode::Char(x) => {
if event.modifiers.contains(KeyModifiers::CONTROL) && x == 'c' {
quit = true
}
}
_ => {}
}
_ => {}
},
}

_ => quit = true,
}
Expand Down

0 comments on commit 610d644

Please sign in to comment.