diff options
author | Clement Tsang <34804052+ClementTsang@users.noreply.github.com> | 2020-08-22 12:38:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-22 15:38:13 -0400 |
commit | 3394b9ee6699195c400d152cf82cd9ab92585164 (patch) | |
tree | 9ec9dfe2910b5d3f64dd183a774ae6407c44d475 /src/constants.rs | |
parent | c82f4d40b40649ae53037701fadc2f5c1be9e901 (diff) |
feature: allow searching by state, add more keyword variants
Allows searching by state (`state = sleep`), and adds more keyword variants for searching: `cpu%`, `mem%`, `r/s`, `w/s`, matching the columns.
Diffstat (limited to 'src/constants.rs')
-rw-r--r-- | src/constants.rs | 172 |
1 files changed, 87 insertions, 85 deletions
diff --git a/src/constants.rs b/src/constants.rs index e0338ea7..f8852cc9 100644 --- a/src/constants.rs +++ b/src/constants.rs @@ -55,123 +55,125 @@ pub const HELP_CONTENTS_TEXT: [&str; 8] = [ pub const GENERAL_HELP_TEXT: [&str; 29] = [ "1 - General\n", - "q, Ctrl-c Quit\n", - "Esc Close dialog windows, search, widgets, or exit expanded mode\n", - "Ctrl-r Reset display and any collected data\n", - "f Freeze/unfreeze updating with new data\n", - "Ctrl-Left, \n", - "Shift-Left, Move widget selection left\n", - "H, A \n", - "Ctrl-Right, \n", - "Shift-Right, Move widget selection right\n", - "L, D \n", - "Ctrl-Up, \n", - "Shift-Up, Move widget selection up\n", - "K, W \n", - "Ctrl-Down, \n", - "Shift-Down, Move widget selection down\n", - "J, S \n", - "Left, h Move left within widget\n", - "Down, j Move down within widget\n", - "Up, k Move up within widget\n", - "Right, l Move right within widget\n", - "? Open help menu\n", - "gg Jump to the first entry\n", - "G Jump to the last entry\n", - "e Expand the currently selected widget\n", - "+ Zoom in on chart (decrease time range)\n", - "- Zoom out on chart (increase time range)\n", - "= Reset zoom\n", - "Mouse scroll Scroll through the tables or zoom in/out of charts by scrolling up/down", + "q, Ctrl-c Quit\n", + "Esc Close dialog windows, search, widgets, or exit expanded mode\n", + "Ctrl-r Reset display and any collected data\n", + "f Freeze/unfreeze updating with new data\n", + "Ctrl-Left, \n", + "Shift-Left, Move widget selection left\n", + "H, A \n", + "Ctrl-Right, \n", + "Shift-Right, Move widget selection right\n", + "L, D \n", + "Ctrl-Up, \n", + "Shift-Up, Move widget selection up\n", + "K, W \n", + "Ctrl-Down, \n", + "Shift-Down, Move widget selection down\n", + "J, S \n", + "Left, h Move left within widget\n", + "Down, j Move down within widget\n", + "Up, k Move up within widget\n", + "Right, l Move right within widget\n", + "? Open help menu\n", + "gg Jump to the first entry\n", + "G Jump to the last entry\n", + "e Expand the currently selected widget\n", + "+ Zoom in on chart (decrease time range)\n", + "- Zoom out on chart (increase time range)\n", + "= Reset zoom\n", + "Mouse scroll Scroll through the tables or zoom in/out of charts by scrolling up/down", ]; pub const CPU_HELP_TEXT: [&str; 2] = [ "2 - CPU widget\n", - "Mouse scroll Scrolling over an CPU core/average shows only that entry on the chart", + "Mouse scroll Scrolling over an CPU core/average shows only that entry on the chart", ]; // TODO [Help]: Search in help? // TODO [Help]: Move to using tables for easier formatting? pub const PROCESS_HELP_TEXT: [&str; 12] = [ "3 - Process widget\n", - "dd Kill the selected process\n", - "c Sort by CPU usage, press again to reverse sorting order\n", - "m Sort by memory usage, press again to reverse sorting order\n", - "p Sort by PID name, press again to reverse sorting order\n", - "n Sort by process name, press again to reverse sorting order\n", - "Tab Group/un-group processes with the same name\n", - "Ctrl-f, / Open process search widget\n", - "P Toggle between showing the full path or just the process name\n", - "s, F6 Open process sort widget\n", - "I Invert current sort\n", - "% Toggle between values and percentages for memory usage", + "dd Kill the selected process\n", + "c Sort by CPU usage, press again to reverse sorting order\n", + "m Sort by memory usage, press again to reverse sorting order\n", + "p Sort by PID name, press again to reverse sorting order\n", + "n Sort by process name, press again to reverse sorting order\n", + "Tab Group/un-group processes with the same name\n", + "Ctrl-f, / Open process search widget\n", + "P Toggle between showing the full path or just the process name\n", + "s, F6 Open process sort widget\n", + "I Invert current sort\n", + "% Toggle between values and percentages for memory usage", ]; -pub const SEARCH_HELP_TEXT: [&str; 44] = [ +pub const SEARCH_HELP_TEXT: [&str; 46] = [ "4 - Process search widget\n", - "Tab Toggle between searching for PID and name\n", - "Esc Close the search widget (retains the filter)\n", - "Ctrl-a Skip to the start of the search query\n", - "Ctrl-e Skip to the end of the search query\n", - "Ctrl-u Clear the current search query\n", - "Backspace Delete the character behind the cursor\n", - "Delete Delete the character at the cursor\n", - "Alt-c/F1 Toggle matching case\n", - "Alt-w/F2 Toggle matching the entire word\n", - "Alt-r/F3 Toggle using regex\n", - "Left, Alt-h Move cursor left\n", - "Right, Alt-l Move cursor right\n", + "Tab Toggle between searching for PID and name\n", + "Esc Close the search widget (retains the filter)\n", + "Ctrl-a Skip to the start of the search query\n", + "Ctrl-e Skip to the end of the search query\n", + "Ctrl-u Clear the current search query\n", + "Backspace Delete the character behind the cursor\n", + "Delete Delete the character at the cursor\n", + "Alt-c/F1 Toggle matching case\n", + "Alt-w/F2 Toggle matching the entire word\n", + "Alt-r/F3 Toggle using regex\n", + "Left, Alt-h Move cursor left\n", + "Right, Alt-l Move cursor right\n", "\n", - "Search keywords:\n", - "pid ex: pid 825\n", - "cpu ex: cpu > 4.2\n", - "mem ex: mem < 4.2\n", - "memb ex: memb < 100 kb\n", - "read ex: read >= 1 b\n", - "write ex: write <= 1 tb\n", - "tread ex: tread = 1\n", - "twrite ex: twrite = 1\n", + "Supported search types:\n", + "<by name/cmd> ex: btm\n", + "pid ex: pid 825\n", + "cpu, cpu% ex: cpu > 4.2\n", + "mem, mem% ex: mem < 4.2\n", + "memb ex: memb < 100 kb\n", + "read, r/s ex: read >= 1 b\n", + "write, w/s ex: write <= 1 tb\n", + "tread, t.read ex: tread = 1\n", + "twrite, t.write ex: twrite = 1\n", + "state ex: state = running\n", "\n", "Comparison operators:\n", - "= ex: cpu = 1\n", - "> ex: cpu > 1\n", - "< ex: cpu < 1\n", - ">= ex: cpu >= 1\n", - "<= ex: cpu <= 1\n", + "= ex: cpu = 1\n", + "> ex: cpu > 1\n", + "< ex: cpu < 1\n", + ">= ex: cpu >= 1\n", + "<= ex: cpu <= 1\n", "\n", "Logical operators:\n", - "and/&&/<Space> ex: btm and cpu > 1 and mem > 1\n", - "or/|| ex: btm or firefox\n", + "and/&&/<Space> ex: btm and cpu > 1 and mem > 1\n", + "or/|| ex: btm or firefox\n", "\n", "Supported units:\n", - "B ex: read > 1 b\n", - "KB ex: read > 1 kb\n", - "MB ex: read > 1 mb\n", - "TB ex: read > 1 tb\n", - "KiB ex: read > 1 kib\n", - "MiB ex: read > 1 mib\n", - "GiB ex: read > 1 gib\n", - "TiB ex: read > 1 tib", + "B ex: read > 1 b\n", + "KB ex: read > 1 kb\n", + "MB ex: read > 1 mb\n", + "TB ex: read > 1 tb\n", + "KiB ex: read > 1 kib\n", + "MiB ex: read > 1 mib\n", + "GiB ex: read > 1 gib\n", + "TiB ex: read > 1 tib", ]; pub const SORT_HELP_TEXT: [&str; 6] = [ "5 - Sort widget\n", - "Down, 'j' Scroll down in list\n", - "Up, 'k' Scroll up in list\n", - "Mouse scroll Scroll through sort widget\n", - "Esc Close the sort widget\n", - "Enter Sort by current selected column", + "Down, 'j' Scroll down in list\n", + "Up, 'k' Scroll up in list\n", + "Mouse scroll Scroll through sort widget\n", + "Esc Close the sort widget\n", + "Enter Sort by current selected column", ]; pub const BATTERY_HELP_TEXT: [&str; 3] = [ "6 - Battery widget\n", - "Left Go to previous battery\n", - "Right Go to next battery", + "Left Go to previous battery\n", + "Right Go to next battery", ]; pub const BASIC_MEM_HELP_TEXT: [&str; 2] = [ "7 - Basic memory widget\n", - "% Toggle between values and percentages for memory usage", + "% Toggle between values and percentages for memory usage", ]; lazy_static! { |