diff options
| author | Daniel Lange <DLange@git.local> | 2021-01-11 20:43:27 +0100 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2021-01-11 20:43:27 +0100 |
| commit | c55320e9e2a8916e911bcd39ab37b79e3a7d03b2 (patch) | |
| tree | d6be9a09fdf7d6dc155de3429a70697ee2bb43b0 /MetersPanel.c | |
| parent | 65357c8c46154de4e4eca14075bfe5523bb5fc14 (diff) | |
| download | debian_htop-c55320e9e2a8916e911bcd39ab37b79e3a7d03b2.tar.gz debian_htop-c55320e9e2a8916e911bcd39ab37b79e3a7d03b2.tar.bz2 debian_htop-c55320e9e2a8916e911bcd39ab37b79e3a7d03b2.zip | |
New upstream version 3.0.5upstream/3.0.5
Diffstat (limited to 'MetersPanel.c')
| -rw-r--r-- | MetersPanel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/MetersPanel.c b/MetersPanel.c index 7e47ad8..30991a0 100644 --- a/MetersPanel.c +++ b/MetersPanel.c @@ -20,9 +20,9 @@ in the source distribution for its full text. // Note: In code the meters are known to have bar/text/graph "Modes", but in UI // we call them "Styles". -static const char* const MetersFunctions[] = {"Style ", "Move ", " ", "Delete", "Done ", NULL}; -static const char* const MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"}; -static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)}; +static const char* const MetersFunctions[] = {"Style ", "Move ", " ", "Delete", "Done ", NULL}; +static const char* const MetersKeys[] = {"Space", "Enter", "", "Del", "F10"}; +static const int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)}; // We avoid UTF-8 arrows ← → here as they might display full-width on Chinese // terminals, breaking our aligning. @@ -30,7 +30,7 @@ static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)}; // considered "Ambiguous characters". static const char* const MetersMovingFunctions[] = {"Style ", "Lock ", "Up ", "Down ", "Left ", "Right ", " ", "Delete", "Done ", NULL}; static const char* const MetersMovingKeys[] = {"Space", "Enter", "Up", "Dn", "<-", "->", " ", "Del", "F10"}; -static int MetersMovingEvents[] = {' ', 13, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, ERR, KEY_DC, KEY_F(10)}; +static const int MetersMovingEvents[] = {' ', 13, KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, ERR, KEY_DC, KEY_F(10)}; static FunctionBar* Meters_movingBar = NULL; void MetersPanel_cleanup() { @@ -55,13 +55,12 @@ void MetersPanel_setMoving(MetersPanel* this, bool moving) { selected->moving = moving; } if (!moving) { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]); + Panel_setSelectionColor(super, PANEL_SELECTION_FOCUS); Panel_setDefaultBar(super); } else { - Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOLLOW]); + Panel_setSelectionColor(super, PANEL_SELECTION_FOLLOW); super->currentBar = Meters_movingBar; } - FunctionBar_draw(this->super.currentBar); } static inline bool moveToNeighbor(MetersPanel* this, MetersPanel* neighbor, int selected) { |