Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-28 22:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #330 from jonathandturner/disable_nonx11_rawkey

Browse source 
Disable rawkey on non-x11 linux
This commit is contained in:
Jonathan Turner 2019-08-22 18:17:19 +12:00 committed by GitHub
commit c4a4e5ffab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 113 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
src/plugins/textview.rs
View file

@ -125,6 +125,7 @@ fn paint_textview(
fn scroll_view_lines_if_needed(draw_commands: Vec<DrawCommand>, use_color_buffer: bool) { fn scroll_view_lines_if_needed(draw_commands: Vec<DrawCommand>, use_color_buffer: bool) {
let mut starting_row = 0; let mut starting_row = 0;
let rawkey = RawKey::new(); let rawkey = RawKey::new();
if let Ok(_raw) = RawScreen::into_raw_mode() { if let Ok(_raw) = RawScreen::into_raw_mode() {
@ -132,7 +133,30 @@ fn scroll_view_lines_if_needed(draw_commands: Vec<DrawCommand>, use_color_buffer
let _ = cursor.hide(); let _ = cursor.hide();
let input = crossterm::input(); let input = crossterm::input();
let _ = input.read_async();
let use_rawkey;
let mut sync_stdin = None;
#[cfg(target_os = "linux")]
{
// if we're in Linux but not X11, we need to avoid using rawkey for now
if std::env::var("DISPLAY").is_err() {
use_rawkey = false;
} else {
use_rawkey = true;
}
}
#[cfg(not(target_os = "linux"))]
{
use_rawkey = true
}
if use_rawkey {
let _ = input.read_async();
} else {
sync_stdin = Some(input.read_sync());
}
let terminal = terminal(); let terminal = terminal();
let mut size = terminal.terminal_size(); let mut size = terminal.terminal_size();
@ -143,42 +167,103 @@ fn scroll_view_lines_if_needed(draw_commands: Vec<DrawCommand>, use_color_buffer
// Only scroll if needed // Only scroll if needed
if max_bottom_line > height as usize { if max_bottom_line > height as usize {
loop { loop {
if rawkey.is_pressed(rawkey::KeyCode::Escape) { if use_rawkey {
break; if rawkey.is_pressed(rawkey::KeyCode::Escape) {
} break;
if rawkey.is_pressed(rawkey::KeyCode::UpArrow) { }
if starting_row > 0 { if rawkey.is_pressed(rawkey::KeyCode::UpArrow) {
starting_row -= 1; if starting_row > 0 {
starting_row -= 1;
max_bottom_line =
paint_textview(&draw_commands, starting_row, use_color_buffer);
}
}
if rawkey.is_pressed(rawkey::KeyCode::DownArrow) {
if starting_row < (max_bottom_line - height) {
starting_row += 1;
}
max_bottom_line = max_bottom_line =
paint_textview(&draw_commands, starting_row, use_color_buffer); paint_textview(&draw_commands, starting_row, use_color_buffer);
} }
} if rawkey.is_pressed(rawkey::KeyCode::PageUp) {
if rawkey.is_pressed(rawkey::KeyCode::DownArrow) { starting_row -= std::cmp::min(height, starting_row);
if starting_row < (max_bottom_line - height) { max_bottom_line =
starting_row += 1; paint_textview(&draw_commands, starting_row, use_color_buffer);
} }
max_bottom_line = if rawkey.is_pressed(rawkey::KeyCode::PageDown)
paint_textview(&draw_commands, starting_row, use_color_buffer); || rawkey.is_pressed(rawkey::KeyCode::Space)
} {
if rawkey.is_pressed(rawkey::KeyCode::PageUp) { if starting_row < (max_bottom_line - height) {
starting_row -= std::cmp::min(height, starting_row); starting_row += height;
max_bottom_line =
paint_textview(&draw_commands, starting_row, use_color_buffer);
}
if rawkey.is_pressed(rawkey::KeyCode::PageDown) || rawkey.is_pressed(rawkey::KeyCode::Space) {
if starting_row < (max_bottom_line - height) {
starting_row += height;
if starting_row > (max_bottom_line - height) { if starting_row > (max_bottom_line - height) {
starting_row = max_bottom_line - height; starting_row = max_bottom_line - height;
}
}
max_bottom_line =
paint_textview(&draw_commands, starting_row, use_color_buffer);
}
thread::sleep(Duration::from_millis(50));
} else {
use crossterm::{InputEvent, KeyEvent};
if let Some(ref mut sync_stdin) = sync_stdin {
if let Some(ev) = sync_stdin.next() {
match ev {
InputEvent::Keyboard(k) => match k {
KeyEvent::Esc => {
break;
}
KeyEvent::Up => {
if starting_row > 0 {
starting_row -= 1;
max_bottom_line = paint_textview(
&draw_commands,
starting_row,
use_color_buffer,
);
}
}
KeyEvent::Down => {
if starting_row < (max_bottom_line - height) {
starting_row += 1;
}
max_bottom_line = paint_textview(
&draw_commands,
starting_row,
use_color_buffer,
);
}
KeyEvent::PageUp => {
starting_row -= std::cmp::min(height, starting_row);
max_bottom_line = paint_textview(
&draw_commands,
starting_row,
use_color_buffer,
);
}
KeyEvent::PageDown | KeyEvent::Char(' ') => {
if starting_row < (max_bottom_line - height) {
starting_row += height;
if starting_row > (max_bottom_line - height) {
starting_row = max_bottom_line - height;
}
}
max_bottom_line = paint_textview(
&draw_commands,
starting_row,
use_color_buffer,
);
}
_ => {}
},
_ => {}
}
} }
} }
max_bottom_line =
paint_textview(&draw_commands, starting_row, use_color_buffer);
} }
thread::sleep(Duration::from_millis(50));
let new_size = terminal.terminal_size(); let new_size = terminal.terminal_size();
if size != new_size { if size != new_size {
size = new_size; size = new_size;