diff options
| author | Daniel Lange <DLange@git.local> | 2016-07-25 18:25:28 +0200 |
|---|---|---|
| committer | Daniel Lange <DLange@git.local> | 2016-07-25 18:25:28 +0200 |
| commit | 31b71b67011fa52f091df6fe536a11d6d0bfb256 (patch) | |
| tree | 31cb222871017376af8b7435d24cf4961863fa93 /ScreenManager.c | |
| parent | 8c82a38002ce09db2a0b83dab8b598cf1ab0596c (diff) | |
| download | debian_htop-31b71b67011fa52f091df6fe536a11d6d0bfb256.tar.gz debian_htop-31b71b67011fa52f091df6fe536a11d6d0bfb256.tar.bz2 debian_htop-31b71b67011fa52f091df6fe536a11d6d0bfb256.zip | |
Imported Upstream version 2.0.2upstream/2.0.2
Diffstat (limited to 'ScreenManager.c')
| -rw-r--r-- | ScreenManager.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ScreenManager.c b/ScreenManager.c index db3fdee..05e1c02 100644 --- a/ScreenManager.c +++ b/ScreenManager.c @@ -189,7 +189,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) { } int prevCh = ch; - ESCDELAY = 25; + set_escdelay(25); ch = getch(); HandlerResult result = IGNORED; @@ -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; |