tyler.durden/bottom
1
0
Fork 0
mirror of https://github.com/ClementTsang/bottom.git synced 2025-07-24 22:24:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

[skip travis] Add check to prevent improper dd while on another panel

Browse Source
This commit is contained in:
ClementTsang 2020-01-01 18:39:59 -05:00
parent 11a6d25d4a
commit 7208908413
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app.rs
View File

@ -116,13 +116,15 @@ impl App {
match caught_char { match caught_char {
'd' => { 'd' => {
if self.awaiting_second_char && self.second_char == 'd' { if let ApplicationPosition::Process = self.current_application_position {
self.awaiting_second_char = false; if self.awaiting_second_char && self.second_char == 'd' {
self.second_char = ' '; self.awaiting_second_char = false;
self.kill_highlighted_process().unwrap_or(()); // TODO: Return error to user? We have a dialog box... self.second_char = ' ';
} else { self.kill_highlighted_process().unwrap_or(()); // TODO: Return error to user? We have a dialog box...
self.awaiting_second_char = true; } else {
self.second_char = 'd'; self.awaiting_second_char = true;
self.second_char = 'd';
}
} }
} }
'g' => { 'g' => {
@ -278,7 +280,7 @@ impl App {
ApplicationPosition::Process => self.change_process_position(-1), ApplicationPosition::Process => self.change_process_position(-1),
ApplicationPosition::Temp => self.change_temp_position(-1), ApplicationPosition::Temp => self.change_temp_position(-1),
ApplicationPosition::Disk => self.change_disk_position(-1), ApplicationPosition::Disk => self.change_disk_position(-1),
ApplicationPosition::Cpu => self.change_cpu_table_position(-1), // TODO: Temporary ApplicationPosition::Cpu => self.change_cpu_table_position(-1), // TODO: Temporary, may change if we add scaling
_ => {} _ => {}
} }
self.scroll_direction = ScrollDirection::UP; self.scroll_direction = ScrollDirection::UP;
@ -290,7 +292,7 @@ impl App {
ApplicationPosition::Process => self.change_process_position(1), ApplicationPosition::Process => self.change_process_position(1),
ApplicationPosition::Temp => self.change_temp_position(1), ApplicationPosition::Temp => self.change_temp_position(1),
ApplicationPosition::Disk => self.change_disk_position(1), ApplicationPosition::Disk => self.change_disk_position(1),
ApplicationPosition::Cpu => self.change_cpu_table_position(1), // TODO: Temporary ApplicationPosition::Cpu => self.change_cpu_table_position(1), // TODO: Temporary, may change if we add scaling
_ => {} _ => {}
} }
self.scroll_direction = ScrollDirection::DOWN; self.scroll_direction = ScrollDirection::DOWN;

2
src/app/process_killer.rs
View File

@ -1,7 +1,7 @@
/// This file is meant to house (OS specific) implementations on how to kill processes. /// This file is meant to house (OS specific) implementations on how to kill processes.
use std::process::Command; use std::process::Command;
// TODO: Redo this, also make it update process list on freeze. // TODO: Make it update process list on freeze.
// Copied from SO: https://stackoverflow.com/a/55231715 // Copied from SO: https://stackoverflow.com/a/55231715
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]