diff options
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | solarized-colors.patch | 72 | ||||
| -rw-r--r-- | vim-keybindings-common.patch | 20 |
4 files changed, 39 insertions, 73 deletions
@@ -1,6 +1,6 @@ pkgbase = htop-vim-solarized pkgdesc = Interactive process viewer with solarized and vim keybindings patch - pkgver = 2.0.2 + pkgver = 2.1.0 pkgrel = 1 url = https://github.com/cprussin/htop-vim-solarized arch = i686 @@ -14,14 +14,14 @@ pkgbase = htop-vim-solarized provides = htop conflicts = htop options = !emptydirs - source = http://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz + source = http://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz source = solarized-colors.patch source = vim-keybindings-common.patch source = vim-keybindings-d-for-kill.patch source = vim-keybindings-x-for-kill.patch - sha384sums = 3b64dae53f248dbfb1cf5dafc066e6a27614a264ebc3487357d501f4a00abd149dffcfd3c5548341b1af20312c5d9a84 - sha384sums = ebc4339ff3d5d43606d9f5e398832cb9382bfa175b30e36cfbcaf6112206c33ea0d42e39246e3a73785d3f584cf88214 - sha384sums = 8325ae4f8e7732e9c1c067b94314da13adc86c6cb4747e78cf4332a432c7c4e12d368f7bb50ad1d404f127aa3afdb077 + sha384sums = 26e1a2a18775824d326d5918673d3bd04d062b4cfc1dffef29a8c590085bf0420a03c82ba38a781d96519445380201b0 + sha384sums = 3ffcf99a5d8ff9816340fd591859d3e5a1b710ad7f6e6ab5581a0d11573df1991533191366b86a0e6dfa80f8d4617020 + sha384sums = 3de0c03296baa0089380a3404a13e96b347b6caaf18380dacd6b5f9c81f3741940bdcd1f07f75bd13e05112e333d2635 sha384sums = 353a675f5453b5b1ab503f9cbcb02e45b32bf429797f11e3cea96848fb4ad931129da7afa52b373fd6871c41657d52af sha384sums = 3b2071d412a6a98bf5d4d3a4bc74f69b205f9464b00063aa21e9947b80df2a008bb82aff7f8168b0dfbac0647bc0cb76 @@ -21,7 +21,7 @@ kill_process_shortcut=x _pkgname=htop pkgname=htop-vim-solarized -pkgver=2.0.2 +pkgver=2.1.0 pkgrel=1 pkgdesc="Interactive process viewer with solarized and vim keybindings patch" arch=('i686' 'x86_64') @@ -35,15 +35,15 @@ provides=('htop') conflicts=('htop') options=('!emptydirs') source=( - 'http://hisham.hm/htop/releases/2.0.2/htop-2.0.2.tar.gz' + 'http://hisham.hm/htop/releases/2.1.0/htop-2.1.0.tar.gz' 'solarized-colors.patch' 'vim-keybindings-common.patch' 'vim-keybindings-d-for-kill.patch' 'vim-keybindings-x-for-kill.patch' ) -sha384sums=('3b64dae53f248dbfb1cf5dafc066e6a27614a264ebc3487357d501f4a00abd149dffcfd3c5548341b1af20312c5d9a84' - 'ebc4339ff3d5d43606d9f5e398832cb9382bfa175b30e36cfbcaf6112206c33ea0d42e39246e3a73785d3f584cf88214' - '8325ae4f8e7732e9c1c067b94314da13adc86c6cb4747e78cf4332a432c7c4e12d368f7bb50ad1d404f127aa3afdb077' +sha384sums=('26e1a2a18775824d326d5918673d3bd04d062b4cfc1dffef29a8c590085bf0420a03c82ba38a781d96519445380201b0' + '3ffcf99a5d8ff9816340fd591859d3e5a1b710ad7f6e6ab5581a0d11573df1991533191366b86a0e6dfa80f8d4617020' + '3de0c03296baa0089380a3404a13e96b347b6caaf18380dacd6b5f9c81f3741940bdcd1f07f75bd13e05112e333d2635' '353a675f5453b5b1ab503f9cbcb02e45b32bf429797f11e3cea96848fb4ad931129da7afa52b373fd6871c41657d52af' '3b2071d412a6a98bf5d4d3a4bc74f69b205f9464b00063aa21e9947b80df2a008bb82aff7f8168b0dfbac0647bc0cb76') diff --git a/solarized-colors.patch b/solarized-colors.patch index 1140d799f9bd..20da2dead03f 100644 --- a/solarized-colors.patch +++ b/solarized-colors.patch @@ -1,24 +1,17 @@ +diff --git a/CRT.c b/CRT.c +index 237e30e..fe68208 100644 --- a/CRT.c +++ b/CRT.c -@@ -183,7 +183,7 @@ - [LED_COLOR] = ColorPair(Green,Black), - [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black), - [PROCESS] = A_NORMAL, -- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black), -+ [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black), - [PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black), - [PROCESS_MEGABYTES] = ColorPair(Cyan,Black), - [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan,Black), -@@ -195,7 +195,7 @@ - [PROCESS_THREAD] = ColorPair(Green,Black), - [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Green,Black), - [BAR_BORDER] = A_BOLD, -- [BAR_SHADOW] = A_BOLD | ColorPair(Black,Black), -+ [BAR_SHADOW] = A_BOLD | ColorPair(Green,Black), - [SWAP] = ColorPair(Red,Black), - [GRAPH_1] = A_BOLD | ColorPair(Cyan,Black), - [GRAPH_2] = ColorPair(Cyan,Black), -@@ -342,10 +342,10 @@ +@@ -226,7 +226,7 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { + [CPU_NICE_TEXT] = A_BOLD | ColorPair(Blue,Black), + [CPU_NORMAL] = ColorPair(Green,Black), + [CPU_KERNEL] = ColorPair(Red,Black), +- [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black), ++ [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black), + [CPU_IRQ] = ColorPair(Yellow,Black), + [CPU_SOFTIRQ] = ColorPair(Magenta,Black), + [CPU_STEAL] = ColorPair(Cyan,Black), +@@ -351,10 +351,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [CPU_GUEST] = ColorPair(Cyan,White), }, [COLORSCHEME_LIGHTTERMINAL] = { @@ -32,7 +25,7 @@ [PANEL_HEADER_FOCUS] = ColorPair(Black,Green), [PANEL_HEADER_UNFOCUS] = ColorPair(Black,Green), [PANEL_SELECTION_FOCUS] = ColorPair(Black,Cyan), -@@ -356,11 +356,11 @@ +@@ -365,10 +365,10 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [BATTERY] = ColorPair(Yellow,Black), [LARGE_NUMBER] = ColorPair(Red,Black), [METER_TEXT] = ColorPair(Blue,Black), @@ -41,22 +34,11 @@ [LED_COLOR] = ColorPair(Green,Black), [TASKS_RUNNING] = ColorPair(Green,Black), - [PROCESS] = ColorPair(Black,Black), -- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black), + [PROCESS] = ColorPair(Green,Black), -+ [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black), + [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack, [PROCESS_TAG] = ColorPair(White,Blue), [PROCESS_MEGABYTES] = ColorPair(Blue,Black), - [PROCESS_BASENAME] = ColorPair(Green,Black), -@@ -372,7 +372,7 @@ - [PROCESS_THREAD] = ColorPair(Blue,Black), - [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue,Black), - [BAR_BORDER] = ColorPair(Blue,Black), -- [BAR_SHADOW] = ColorPair(Black,Black), -+ [BAR_SHADOW] = ColorPair(Green,Black), - [SWAP] = ColorPair(Red,Black), - [GRAPH_1] = A_BOLD | ColorPair(Cyan,Black), - [GRAPH_2] = ColorPair(Cyan,Black), -@@ -380,15 +380,15 @@ +@@ -389,25 +389,25 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [MEMORY_BUFFERS] = ColorPair(Cyan,Black), [MEMORY_BUFFERS_TEXT] = ColorPair(Cyan,Black), [MEMORY_CACHE] = ColorPair(Yellow,Black), @@ -77,8 +59,10 @@ [HOSTNAME] = ColorPair(White,Black), [CPU_NICE] = ColorPair(Cyan,Black), [CPU_NICE_TEXT] = ColorPair(Cyan,Black), -@@ -397,8 +397,8 @@ - [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black), + [CPU_NORMAL] = ColorPair(Green,Black), + [CPU_KERNEL] = ColorPair(Red,Black), +- [CPU_IOWAIT] = A_BOLD | ColorPair(Black, Black), ++ [CPU_IOWAIT] = A_BOLD | ColorPair(Green, Black), [CPU_IRQ] = A_BOLD | ColorPair(Blue,Black), [CPU_SOFTIRQ] = ColorPair(Blue,Black), - [CPU_STEAL] = ColorPair(Black,Black), @@ -88,21 +72,3 @@ }, [COLORSCHEME_MIDNIGHT] = { [RESET_COLOR] = ColorPair(White,Blue), -@@ -478,7 +478,7 @@ - [LED_COLOR] = ColorPair(Green,Black), - [TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black), - [PROCESS] = ColorPair(Cyan,Black), -- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black), -+ [PROCESS_SHADOW] = A_BOLD | ColorPair(Green,Black), - [PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black), - [PROCESS_MEGABYTES] = A_BOLD | ColorPair(Green,Black), - [PROCESS_BASENAME] = A_BOLD | ColorPair(Green,Black), -@@ -555,7 +555,7 @@ - - for (int i = 0; i < LAST_COLORELEMENT; i++) { - unsigned int color = CRT_colorSchemes[COLORSCHEME_DEFAULT][i]; -- CRT_colorSchemes[COLORSCHEME_BROKENGRAY][i] = color == (A_BOLD | ColorPair(Black,Black)) ? ColorPair(White,Black) : color; -+ CRT_colorSchemes[COLORSCHEME_BROKENGRAY][i] = color == (A_BOLD | ColorPair(Green,Black)) ? ColorPair(White,Black) : color; - } - - halfdelay(CRT_delay); diff --git a/vim-keybindings-common.patch b/vim-keybindings-common.patch index 2ef2ea398e1c..e8b10da0b13b 100644 --- a/vim-keybindings-common.patch +++ b/vim-keybindings-common.patch @@ -1,17 +1,17 @@ diff --git a/Action.c b/Action.c -index ee34a4b..effa033 100644 +index a6394ac..f82ff21 100644 --- a/Action.c +++ b/Action.c @@ -382,7 +382,7 @@ static Htop_Reaction actionRedraw() { } - static struct { const char* key; const char* info; } helpLeft[] = { + static const struct { const char* key; const char* info; } helpLeft[] = { - { .key = " Arrows: ", .info = "scroll process list" }, + { .key = " hjkl: ", .info = "scroll process list" }, { .key = " Digits: ", .info = "incremental PID search" }, { .key = " F3 /: ", .info = "incremental name search" }, { .key = " F4 \\: ",.info = "incremental name filtering" }, -@@ -411,11 +411,11 @@ static struct { const char* key; const char* info; } helpRight[] = { +@@ -411,11 +411,11 @@ static const struct { const char* key; const char* info; } helpRight[] = { #endif { .key = " e: ", .info = "show process environment" }, { .key = " i: ", .info = "set IO priority" }, @@ -19,7 +19,7 @@ index ee34a4b..effa033 100644 + { .key = " L: ", .info = "list open files with lsof" }, { .key = " s: ", .info = "trace syscalls with strace" }, { .key = " ", .info = "" }, - { .key = " F2 S: ", .info = "setup" }, + { .key = " F2 C S: ", .info = "setup" }, - { .key = " F1 h: ", .info = "show this help screen" }, + { .key = " F1 ?: ", .info = "show this help screen" }, { .key = " F10 q: ", .info = "quit" }, @@ -48,7 +48,7 @@ index ee34a4b..effa033 100644 keys['U'] = actionUntagAll; keys['c'] = actionTagAllChildren; diff --git a/Panel.c b/Panel.c -index 579a82c..c2a854c 100644 +index 8c4d44f..c00012c 100644 --- a/Panel.c +++ b/Panel.c @@ -376,10 +376,12 @@ bool Panel_onKey(Panel* this, int key) { @@ -92,15 +92,15 @@ index 579a82c..c2a854c 100644 case KEY_PPAGE: + case KEY_CTRL('B'): this->selected -= (this->h - 1); - this->scrollV -= (this->h - 1); + this->scrollV = MAX(0, this->scrollV - this->h + 1); this->needsRedraw = true; break; case KEY_NPAGE: + case KEY_CTRL('F'): this->selected += (this->h - 1); - this->scrollV = MIN(MAX(0, Vector_size(this->items) - this->h), this->selected - this->h); - this->needsRedraw = true; -@@ -454,7 +466,7 @@ bool Panel_onKey(Panel* this, int key) { + this->scrollV = MAX(0, MIN(Vector_size(this->items) - this->h, + this->scrollV + this->h - 1)); +@@ -455,7 +467,7 @@ bool Panel_onKey(Panel* this, int key) { if (this->selected < 0 || size == 0) { this->selected = 0; this->needsRedraw = true; @@ -110,7 +110,7 @@ index 579a82c..c2a854c 100644 this->needsRedraw = true; } diff --git a/README b/README -index 1af7377..92a76be 100644 +index 33a8739..e07bd58 100644 --- a/README +++ b/README @@ -17,6 +17,44 @@ but we also have code for running under FreeBSD and Mac OS X |