Move to async keys for textview

This commit is contained in:
Jonathan Turner 2019-07-25 13:07:33 +12:00
parent f3fdda8d35
commit a6b79748d9

View File

@ -1,6 +1,6 @@
#![feature(option_flattening)] #![feature(option_flattening)]
use crossterm::{cursor, input, terminal, InputEvent, KeyEvent, RawScreen}; use crossterm::{cursor, terminal, InputEvent, KeyEvent, RawScreen};
use indexmap::IndexMap; use indexmap::IndexMap;
use nu::{ use nu::{
serve_plugin, CallInfo, CommandConfig, Plugin, Primitive, ShellError, SourceMap, SpanSource, serve_plugin, CallInfo, CommandConfig, Plugin, Primitive, ShellError, SourceMap, SpanSource,
@ -9,6 +9,7 @@ use nu::{
use std::io::Write; use std::io::Write;
use std::path::Path; use std::path::Path;
use std::{thread, time::Duration};
struct TextView; struct TextView;
@ -35,22 +36,13 @@ impl Plugin for TextView {
} }
} }
fn scroll_view_lines(lines: Vec<String>) { fn paint_textview(lines: &Vec<String>, starting_row: usize) -> (u16, u16) {
let mut starting_row = 0;
let terminal = terminal(); let terminal = terminal();
if let Ok(_raw) = RawScreen::into_raw_mode() {
let input = input();
let cursor = cursor(); let cursor = cursor();
let _ = cursor.hide();
let mut sync_stdin = input.read_sync();
loop {
let size = terminal.terminal_size();
let _ = terminal.clear(crossterm::ClearType::All); let _ = terminal.clear(crossterm::ClearType::All);
let size = terminal.terminal_size();
let _ = cursor.goto(0, 0); let _ = cursor.goto(0, 0);
let mut total_max_num_lines = 0; let mut total_max_num_lines = 0;
@ -79,11 +71,29 @@ fn scroll_view_lines(lines: Vec<String>) {
"{}", "{}",
ansi_term::Colour::Blue.paint("[ESC to quit, arrow keys to move]") ansi_term::Colour::Blue.paint("[ESC to quit, arrow keys to move]")
); );
print!("{}", crossterm::Attribute::Reset);
let _ = std::io::stdout().flush(); let _ = std::io::stdout().flush();
let event = sync_stdin.next(); size
}
if let Some(key_event) = event { fn scroll_view_lines(lines: Vec<String>) {
let mut starting_row = 0;
if let Ok(_raw) = RawScreen::into_raw_mode() {
let terminal = terminal();
let input = crossterm::input();
let cursor = cursor();
let _ = cursor.hide();
let mut async_stdin = input.read_async();
let _ = terminal.clear(crossterm::ClearType::All);
let mut size = paint_textview(&lines, starting_row);
loop {
if let Some(key_event) = async_stdin.next() {
match key_event { match key_event {
InputEvent::Keyboard(k) => match k { InputEvent::Keyboard(k) => match k {
KeyEvent::Esc => { KeyEvent::Esc => {
@ -92,6 +102,7 @@ fn scroll_view_lines(lines: Vec<String>) {
KeyEvent::Up => { KeyEvent::Up => {
if starting_row > 0 { if starting_row > 0 {
starting_row -= 1; starting_row -= 1;
size = paint_textview(&lines, starting_row);
} }
} }
KeyEvent::Down => { KeyEvent::Down => {
@ -99,16 +110,19 @@ fn scroll_view_lines(lines: Vec<String>) {
< (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize) < (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize)
{ {
starting_row += 1; starting_row += 1;
size = paint_textview(&lines, starting_row);
} }
} }
KeyEvent::PageUp => { KeyEvent::PageUp => {
starting_row -= std::cmp::min(starting_row, size.1 as usize); starting_row -= std::cmp::min(starting_row, size.1 as usize);
size = paint_textview(&lines, starting_row);
} }
KeyEvent::Char(c) if c == ' ' => { KeyEvent::Char(c) if c == ' ' => {
if starting_row if starting_row
< (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize) < (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize)
{ {
starting_row += size.1 as usize; starting_row += size.1 as usize;
size = paint_textview(&lines, starting_row);
} }
} }
KeyEvent::PageDown => { KeyEvent::PageDown => {
@ -116,6 +130,7 @@ fn scroll_view_lines(lines: Vec<String>) {
< (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize) < (std::cmp::max(size.1 as usize, lines.len()) - size.1 as usize)
{ {
starting_row += size.1 as usize; starting_row += size.1 as usize;
size = paint_textview(&lines, starting_row);
} }
} }
_ => {} _ => {}
@ -124,6 +139,8 @@ fn scroll_view_lines(lines: Vec<String>) {
_ => {} _ => {}
} }
} }
thread::sleep(Duration::from_millis(50));
} }
let _ = cursor.show(); let _ = cursor.show();