Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump version, changelog for minor htop-3.0.2 release3.0.2 | Nathan Scott | 2020-09-15 | 2 | -6/+16 |
| | |||||
* | Revert the vim_mode setting for now, needs a rethink | Nathan Scott | 2020-09-15 | 4 | -29/+0 |
| | | | | | | | | | | | | | There have been too many bugs reported in vim_mode, and the proposed fixes are increasingly fragile - hence we have decided to back it out for now. For reference: https://github.com/htop-dev/htop/issues/69 https://github.com/htop-dev/htop/pull/37 https://github.com/htop-dev/htop/pull/106 The whitespace changes also arrived in commit 12805f61d not sure what that was about, but backed out as well. | ||||
* | Merge pull request #120 from cgzones/null | Nathan Scott | 2020-09-15 | 1 | -1/+1 |
|\ | | | | | Drop always true condition | ||||
| * | Drop always true condition | Christian Göttsche | 2020-09-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | `env` is allocated by checked allocation functions and can not be NULL. This checks confuses clang analyzer and causes a null-dereference warning on `env[size-1]`. | ||||
* | | Merge pull request #123 from hugomg/header-duplicates | Nathan Scott | 2020-09-14 | 22 | -159/+16 |
|\ \ | | | | | | | Clean up some code duplication in the header files | ||||
| * | | Remove some unused #includes | Hugo Musso Gualandi | 2020-09-12 | 3 | -7/+5 |
| | | | | | | | | | | | | As suggested by cppclean. | ||||
| * | | Merge identical ifdefs in Affinity.h | Hugo Musso Gualandi | 2020-09-12 | 1 | -7/+1 |
| | | | |||||
| * | | Alignment tweak | Hugo Musso Gualandi | 2020-09-12 | 1 | -2/+2 |
| | | | |||||
| * | | Clean up some code duplication in the header files | Hugo Musso Gualandi | 2020-09-12 | 20 | -143/+8 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | PR htop-dev/htop#70 got rid of the infrastructure for generating header files, but it left behind some code duplication. Some of cases are things that belong in the header file and don't need to be repeated in the C file. Other cases are things that belong in the C file and don't need to be in the header file. In this commit I tried to fix all of these that I could find. When given a choice I preferred keeping things out of the header file, unless they were being used by someone else. | ||||
* | | Merge pull request #127 from gh-fork-dump/openbsd-fix | Nathan Scott | 2020-09-14 | 1 | -1/+1 |
|\ \ | |/ |/| | fix building on openbsd due to remaining WhiteList | ||||
| * | fix building on openbsd due to remaining WhiteList | Stephen Gregoratto | 2020-09-14 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'BenBE-avoid-shadowing' | Nathan Scott | 2020-09-09 | 1 | -3/+3 |
|\ | |||||
| * | Merge branch 'avoid-shadowing' of https://github.com/BenBE/htop into ↵ | Nathan Scott | 2020-09-09 | 1 | -3/+3 |
|/| | | | | | | | BenBE-avoid-shadowing | ||||
| * | Avoid shadowing of variables | Benny Baumann | 2020-09-07 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'rgouicem-master' | Nathan Scott | 2020-09-09 | 1 | -7/+1 |
|\ \ | |||||
| * | | Merge branch 'master' of https://github.com/rgouicem/htop into rgouicem-master | Nathan Scott | 2020-09-09 | 1 | -7/+1 |
|/| | | |||||
| * | | fix unit (GHz -> MHz) | Redha Gouicem | 2020-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | fixed compilation error | Redha Gouicem | 2020-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | remove unused variable | Redha Gouicem | 2020-08-31 | 1 | -1/+0 |
| | | | |||||
| * | | always display frequency in MHz | Redha Gouicem | 2020-08-28 | 1 | -6/+1 |
| | | | |||||
* | | | Switch variable/field naming from WhiteList to MatchList | Nathan Scott | 2020-09-09 | 17 | -34/+34 |
| | | | |||||
* | | | Consolidate repeated macro definitions into one header | Nathan Scott | 2020-09-09 | 29 | -156/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear throughout the codebase with many re-definitions. Make a single copy of each in a common header file, and use the BSD variants of MINIMUM/MAXIMUM due to conflicts in the system <sys/param.h> headers. | ||||
* | | | Further, minor cleanups to headers post-MakeHeaders | Nathan Scott | 2020-09-08 | 63 | -246/+6 |
| | | | | | | | | | | | | | | | Remove leftover empty ifdef/endif pairs, whitespace. The generated htop.h file was also unused - removed. | ||||
* | | | Merge branch 'noheadergen' of https://github.com/zevweiss/htop into ↵ | Nathan Scott | 2020-09-08 | 154 | -2300/+259 |
|\ \ \ | |_|/ |/| | | | | | zevweiss-noheadergen | ||||
| * | | Remove duplicate jail_errmsg declaration. | Zev Weiss | 2020-09-03 | 1 | -3/+0 |
| | | | | | | | | | | | | Fixes: 11ecc65ebb1527e9a83f67bb5ac0dec455cb03e6 | ||||
| * | | Remove superfluous 'extern's from function declarations. | Zev Weiss | 2020-09-03 | 44 | -257/+257 |
| | | | | | | | | | | | | | | | | | | | | | | | | Applied via: $ find * -name '*.h' -exec sed -i -r 's/^extern (.+\()/\1/;' {} + Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com> | ||||
| * | | Axe automated header generation. | Zev Weiss | 2020-09-03 | 153 | -2040/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasoning: - implementation was unsound -- broke down when I added a fairly basic macro definition expanding to a struct initializer in a *.c file. - made it way too easy (e.g. via otherwise totally innocuous git commands) to end up with timestamps such that it always ran MakeHeader.py but never used its output, leading to overbuild noise when running what should be a null 'make'. - but mostly: it's just an awkward way of dealing with C code. | ||||
* | | | Merge branch 't6-patch-freebsd-ci' | Nathan Scott | 2020-09-07 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Merge branch 'patch-freebsd-ci' of https://github.com/t6/htop-1 into ↵ | Nathan Scott | 2020-09-07 | 1 | -0/+1 |
|/| | | | | | | | | | | | | | | | t6-patch-freebsd-ci | ||||
| * | | | Add FreeBSD to Travis | Tobias Kortkamp | 2020-09-03 | 1 | -0/+1 |
| |/ / | | | | | | | | | | Signed-off-by: Tobias Kortkamp <t@tobik.me> | ||||
* | | | fix for double symbol link error on solaris | Dominik Hassler | 2020-09-05 | 1 | -1/+1 |
| | | | |||||
* | | | htop should report the nice level properly | Dominik Hassler | 2020-09-05 | 1 | -1/+1 |
| | | | |||||
* | | | Fix regression in -u optional-argument handling | Nathan Scott | 2020-09-04 | 1 | -1/+1 |
|/ / | | | | | | | Resolves https://github.com/htop-dev/htop/issues/91 | ||||
* | | Merge pull request #86 from t6/patch-freebsd-fno-common | Nathan Scott | 2020-09-03 | 2 | -7/+10 |
|\ \ | | | | | | | Unbreak with -fno-common on FreeBSD | ||||
| * | | Unbreak with -fno-common on FreeBSD | Tobias Kortkamp | 2020-09-03 | 2 | -7/+10 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | GCC10 and Clang11 now default to -fno-common. ld: error: duplicate symbol: jail_errmsg >>> defined at Platform.c >>> freebsd/Platform.o:(jail_errmsg) >>> defined at FreeBSDProcessList.c >>> freebsd/FreeBSDProcessList.o:(.bss+0x90) Signed-off-by: Tobias Kortkamp <t@tobik.me> | ||||
* | | Bump version, changelog for minor htop-3.0.1 release3.0.1 | Nathan Scott | 2020-09-03 | 2 | -1/+14 |
| | | |||||
* | | Merge pull request #66 from ioquatix/patch-1 | Nathan Scott | 2020-09-03 | 1 | -7/+9 |
|\ \ | | | | | | | Fix image logo and titles. | ||||
| * | | Fix image logo and titles. | Samuel Williams | 2020-09-02 | 1 | -7/+9 |
| | | | |||||
* | | | Merge pull request #57 from matthiasbeyer/patch-1 | Nathan Scott | 2020-09-03 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Do not link INSTALL file, because link target does not exist | ||||
| * | | | Do not link INSTALL file, because link target does not exist | Matthias Beyer | 2020-09-01 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'eworm-de-unicode-runtime' | Nathan Scott | 2020-09-02 | 4 | -15/+27 |
|\ \ \ | |/ / |/| | | |||||
| * | | add option (-U, --no-unicode) to disable unicode at runtime | Christian Hesse | 2020-09-01 | 4 | -15/+27 |
|/ / | |||||
* | | Merge branch 'cgzones-oom2' | Nathan Scott | 2020-09-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | Merge branch 'oom2' of https://github.com/cgzones/htop into cgzones-oom2 | Nathan Scott | 2020-09-01 | 1 | -1/+1 |
|/| | | |||||
| * | | Reduce oom cast from long to int | Christian Göttsche | 2020-08-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Oom values should never be greater then INT_MAX, they should be in the range 0 - 1000. Improves: d9a5dd4b916636b5e7ba8631885427372f0cfcad | ||||
* | | | CRT: note about possible use of replacement for `+` glyph in tree | Bert Wesarg | 2020-08-31 | 1 | -1/+3 |
| | | | |||||
* | | | affinity panel: use the tree collapsing as in the process list | Bert Wesarg | 2020-08-31 | 1 | -12/+12 |
| | | | | | | | | | | | | With one exception, the root node does also have a `-`/`+` as a prefix. | ||||
* | | | affinity panel: show CPUs in the topology tree as `CPU x` | Bert Wesarg | 2020-08-31 | 1 | -2/+2 |
| | | | | | | | | | | | | As it is in the non-topology list. | ||||
* | | | Revert "Use UTF-8 for check buttons and tree open/closed" | Bert Wesarg | 2020-08-31 | 4 | -85/+34 |
|/ / | | | | | | | This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6. | ||||
* | | Merge branch 'configure' of https://github.com/cgzones/htop into ↵ | Nathan Scott | 2020-08-31 | 4 | -19/+28 |
|\ \ | | | | | | | | | | cgzones-configure |