zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #414 from Explorer09/meters-panel-edit 

Mouse-friendly functions bar for meters panel
This commit is contained in:
Hisham Muhammad 2017-04-24 23:48:13 -03:00 committed by GitHub
parent 0c168471b6 0108117d0b
commit b1028e03c5
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MetersPanel.c
View File

@ -31,13 +31,19 @@ struct MetersPanel_ {
}*/ }*/
static const char* MetersFunctions[] = {"Type ", "Move ", "Delete", "Done ", NULL}; // Note: In code the meters are known to have bar/text/graph "Modes", but in UI
static const char* MetersKeys[] = {"Space", "Enter", "Del", "Esc"}; // we call them "Styles".
static int MetersEvents[] = {' ', 13, KEY_DC, 27}; static const char* MetersFunctions[] = {"Style ", "Move ", " ", "Delete", "Done ", NULL};
static const char* MetersKeys[] = {"Space", "Enter", " ", "Del", "F10"};
static int MetersEvents[] = {' ', 13, ERR, KEY_DC, KEY_F(10)};
static const char* MetersMovingFunctions[] = {"Up ", "Down ", "Left ", "Right ", "Confirm", "Delete", "Done ", NULL}; // We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
static const char* MetersMovingKeys[] = {"Up", "Dn", "Lt", "Rt", "Enter", "Del", "Esc"}; // terminals, breaking our aligning.
static int MetersMovingEvents[] = {KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, 13, KEY_DC, 27}; // In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
// considered "Ambiguous characters".
static const char* MetersMovingFunctions[] = {"Style ", "Lock ", "Up ", "Down ", "Left ", "Right ", " ", "Delete", "Done ", NULL};
static const char* 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 FunctionBar* Meters_movingBar = NULL; static FunctionBar* Meters_movingBar = NULL;
static void MetersPanel_delete(Object* object) { static void MetersPanel_delete(Object* object) {

6
MetersPanel.h
View File

@ -27,6 +27,12 @@ struct MetersPanel_ {
}; };
// Note: In code the meters are known to have bar/text/graph "Modes", but in UI
// we call them "Styles".
// We avoid UTF-8 arrows ← → here as they might display full-width on Chinese
// terminals, breaking our aligning.
// In <http://unicode.org/reports/tr11/>, arrows (U+2019..U+2199) are
// considered "Ambiguous characters".
void MetersPanel_setMoving(MetersPanel* this, bool moving); void MetersPanel_setMoving(MetersPanel* this, bool moving);