mirror of https://github.com/xzeldon/htop.git
Added Ctrl+A and Ctrl+E to go to beginning and end of line.
(Also, '^' and '$') Closes #508.
This commit is contained in:
parent
1a13b4d0f4
commit
0128d222b9
|
@ -82,9 +82,9 @@ static HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) {
|
|||
result = HANDLED;
|
||||
break;
|
||||
case KEY_UP:
|
||||
case KEY_CTRLP:
|
||||
case KEY_CTRL('P'):
|
||||
case KEY_DOWN:
|
||||
case KEY_CTRLN:
|
||||
case KEY_CTRL('N'):
|
||||
case KEY_NPAGE:
|
||||
case KEY_PPAGE:
|
||||
case KEY_HOME:
|
||||
|
|
14
MainPanel.c
14
MainPanel.c
|
@ -105,20 +105,6 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
|
|||
} else {
|
||||
reaction |= HTOP_KEEP_FOLLOWING;
|
||||
}
|
||||
switch (ch) {
|
||||
case KEY_LEFT:
|
||||
case KEY_CTRLB:
|
||||
if (super->scrollH > 0) {
|
||||
super->scrollH -= CRT_scrollHAmount;
|
||||
super->needsRedraw = true;
|
||||
}
|
||||
return HANDLED;
|
||||
case KEY_RIGHT:
|
||||
case KEY_CTRLF:
|
||||
super->scrollH += CRT_scrollHAmount;
|
||||
super->needsRedraw = true;
|
||||
return HANDLED;
|
||||
}
|
||||
}
|
||||
|
||||
if (reaction & HTOP_REDRAW_BAR) {
|
||||
|
|
26
Panel.c
26
Panel.c
|
@ -61,6 +61,7 @@ struct Panel_ {
|
|||
Vector* items;
|
||||
int selected;
|
||||
int oldSelected;
|
||||
int selectedLen;
|
||||
void* eventHandlerState;
|
||||
int scrollV;
|
||||
short scrollH;
|
||||
|
@ -82,10 +83,7 @@ struct Panel_ {
|
|||
#define MAX(a,b) ((a)>(b)?(a):(b))
|
||||
#endif
|
||||
|
||||
#define KEY_CTRLN 0016 /* control-n key */
|
||||
#define KEY_CTRLP 0020 /* control-p key */
|
||||
#define KEY_CTRLF 0006 /* control-f key */
|
||||
#define KEY_CTRLB 0002 /* control-b key */
|
||||
#define KEY_CTRL(l) ((l)-'A'+1)
|
||||
|
||||
PanelClass Panel_class = {
|
||||
.super = {
|
||||
|
@ -327,6 +325,7 @@ void Panel_draw(Panel* this, bool focus) {
|
|||
if (selected) {
|
||||
attrset(selectionColor);
|
||||
RichString_setAttr(&item, selectionColor);
|
||||
this->selectedLen = itemLen;
|
||||
}
|
||||
mvhline(y + line, x, ' ', this->w);
|
||||
if (amt > 0)
|
||||
|
@ -352,6 +351,7 @@ void Panel_draw(Panel* this, bool focus) {
|
|||
RichString_begin(new);
|
||||
Object_display(newObj, &new);
|
||||
int newLen = RichString_sizeVal(new);
|
||||
this->selectedLen = newLen;
|
||||
mvhline(y+ this->oldSelected - first, x+0, ' ', this->w);
|
||||
if (scrollH < oldLen)
|
||||
RichString_printoffnVal(old, y+this->oldSelected - first, x,
|
||||
|
@ -376,11 +376,11 @@ bool Panel_onKey(Panel* this, int key) {
|
|||
int size = Vector_size(this->items);
|
||||
switch (key) {
|
||||
case KEY_DOWN:
|
||||
case KEY_CTRLN:
|
||||
case KEY_CTRL('N'):
|
||||
this->selected++;
|
||||
break;
|
||||
case KEY_UP:
|
||||
case KEY_CTRLP:
|
||||
case KEY_CTRL('P'):
|
||||
this->selected--;
|
||||
break;
|
||||
#ifdef KEY_C_DOWN
|
||||
|
@ -394,14 +394,14 @@ bool Panel_onKey(Panel* this, int key) {
|
|||
break;
|
||||
#endif
|
||||
case KEY_LEFT:
|
||||
case KEY_CTRLB:
|
||||
case KEY_CTRL('B'):
|
||||
if (this->scrollH > 0) {
|
||||
this->scrollH -= CRT_scrollHAmount;
|
||||
this->scrollH -= MAX(CRT_scrollHAmount, 0);
|
||||
this->needsRedraw = true;
|
||||
}
|
||||
break;
|
||||
case KEY_RIGHT:
|
||||
case KEY_CTRLF:
|
||||
case KEY_CTRL('F'):
|
||||
this->scrollH += CRT_scrollHAmount;
|
||||
this->needsRedraw = true;
|
||||
break;
|
||||
|
@ -436,6 +436,14 @@ bool Panel_onKey(Panel* this, int key) {
|
|||
case KEY_END:
|
||||
this->selected = size - 1;
|
||||
break;
|
||||
case KEY_CTRL('A'):
|
||||
case '^':
|
||||
this->scrollH = 0;
|
||||
break;
|
||||
case KEY_CTRL('E'):
|
||||
case '$':
|
||||
this->scrollH = MAX(this->selectedLen - this->w, 0);
|
||||
break;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
|
|
6
Panel.h
6
Panel.h
|
@ -50,6 +50,7 @@ struct Panel_ {
|
|||
Vector* items;
|
||||
int selected;
|
||||
int oldSelected;
|
||||
int selectedLen;
|
||||
void* eventHandlerState;
|
||||
int scrollV;
|
||||
short scrollH;
|
||||
|
@ -70,10 +71,7 @@ struct Panel_ {
|
|||
#define MAX(a,b) ((a)>(b)?(a):(b))
|
||||
#endif
|
||||
|
||||
#define KEY_CTRLN 0016 /* control-n key */
|
||||
#define KEY_CTRLP 0020 /* control-p key */
|
||||
#define KEY_CTRLF 0006 /* control-f key */
|
||||
#define KEY_CTRLB 0002 /* control-b key */
|
||||
#define KEY_CTRL(l) ((l)-'A'+1)
|
||||
|
||||
extern PanelClass Panel_class;
|
||||
|
||||
|
|
|
@ -279,7 +279,10 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
|
|||
continue;
|
||||
}
|
||||
case KEY_LEFT:
|
||||
case KEY_CTRLB:
|
||||
case KEY_CTRL('B'):
|
||||
if (this->panelCount < 2) {
|
||||
goto defaultHandler;
|
||||
}
|
||||
if (!this->allowFocusChange)
|
||||
break;
|
||||
tryLeft:
|
||||
|
@ -290,8 +293,11 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
|
|||
goto tryLeft;
|
||||
break;
|
||||
case KEY_RIGHT:
|
||||
case KEY_CTRLF:
|
||||
case KEY_CTRL('F'):
|
||||
case 9:
|
||||
if (this->panelCount < 2) {
|
||||
goto defaultHandler;
|
||||
}
|
||||
if (!this->allowFocusChange)
|
||||
break;
|
||||
tryRight:
|
||||
|
@ -307,6 +313,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
|
|||
quit = true;
|
||||
continue;
|
||||
default:
|
||||
defaultHandler:
|
||||
sortTimeout = resetSortTimeout;
|
||||
Panel_onKey(panelFocus, ch);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue