From 283707c5e5bc436b78ea23bf5500cb6b16a01148 Mon Sep 17 00:00:00 2001 From: Daniel Lange Date: Mon, 11 Apr 2016 13:00:27 +0200 Subject: Imported Upstream version 0.9 --- ScreenManager.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'ScreenManager.c') diff --git a/ScreenManager.c b/ScreenManager.c index 536ff03..2be94f6 100644 --- a/ScreenManager.c +++ b/ScreenManager.c @@ -1,6 +1,6 @@ /* htop -(C) 2004-2006 Hisham H. Muhammad +(C) 2004-2010 Hisham H. Muhammad Released under the GNU GPL, see the COPYING file in the source distribution for its full text. */ @@ -89,10 +89,10 @@ void ScreenManager_add(ScreenManager* this, Panel* item, FunctionBar* fuBar, int this->itemCount++; } -Panel* ScreenManager_remove(ScreenManager* this, int index) { - assert(this->itemCount > index); - Panel* panel = (Panel*) Vector_remove(this->items, index); - Vector_remove(this->fuBars, index); +Panel* ScreenManager_remove(ScreenManager* this, int idx) { + assert(this->itemCount > idx); + Panel* panel = (Panel*) Vector_remove(this->items, idx); + Vector_remove(this->fuBars, idx); this->fuBar = NULL; this->itemCount--; return panel; @@ -184,6 +184,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { continue; } case KEY_LEFT: + case KEY_CTRLB: tryLeft: if (focus > 0) focus--; @@ -192,6 +193,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { goto tryLeft; break; case KEY_RIGHT: + case KEY_CTRLF: case 9: tryRight: if (focus < this->itemCount - 1) -- cgit v1.2.3