summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version, changelog for minor htop-3.0.2 release3.0.2Nathan Scott2020-09-152-6/+16
|
* Revert the vim_mode setting for now, needs a rethinkNathan Scott2020-09-154-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/nullNathan Scott2020-09-151-1/+1
|\ | | | | Drop always true condition
| * Drop always true conditionChristian Göttsche2020-09-121-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-duplicatesNathan Scott2020-09-1422-159/+16
|\ \ | | | | | | Clean up some code duplication in the header files
| * | Remove some unused #includesHugo Musso Gualandi2020-09-123-7/+5
| | | | | | | | | | | | As suggested by cppclean.
| * | Merge identical ifdefs in Affinity.hHugo Musso Gualandi2020-09-121-7/+1
| | |
| * | Alignment tweakHugo Musso Gualandi2020-09-121-2/+2
| | |
| * | Clean up some code duplication in the header filesHugo Musso Gualandi2020-09-1220-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-fixNathan Scott2020-09-141-1/+1
|\ \ | |/ |/| fix building on openbsd due to remaining WhiteList
| * fix building on openbsd due to remaining WhiteListStephen Gregoratto2020-09-141-1/+1
|/
* Merge branch 'BenBE-avoid-shadowing'Nathan Scott2020-09-091-3/+3
|\
| * Merge branch 'avoid-shadowing' of https://github.com/BenBE/htop into ↵Nathan Scott2020-09-091-3/+3
|/| | | | | | | BenBE-avoid-shadowing
| * Avoid shadowing of variablesBenny Baumann2020-09-071-3/+3
| |
* | Merge branch 'rgouicem-master'Nathan Scott2020-09-091-7/+1
|\ \
| * | Merge branch 'master' of https://github.com/rgouicem/htop into rgouicem-masterNathan Scott2020-09-091-7/+1
|/| |
| * | fix unit (GHz -> MHz)Redha Gouicem2020-08-311-1/+1
| | |
| * | fixed compilation errorRedha Gouicem2020-08-311-1/+1
| | |
| * | remove unused variableRedha Gouicem2020-08-311-1/+0
| | |
| * | always display frequency in MHzRedha Gouicem2020-08-281-6/+1
| | |
* | | Switch variable/field naming from WhiteList to MatchListNathan Scott2020-09-0917-34/+34
| | |
* | | Consolidate repeated macro definitions into one headerNathan Scott2020-09-0929-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-MakeHeadersNathan Scott2020-09-0863-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 Scott2020-09-08154-2300/+259
|\ \ \ | |_|/ |/| | | | | zevweiss-noheadergen
| * | Remove duplicate jail_errmsg declaration.Zev Weiss2020-09-031-3/+0
| | | | | | | | | | | | Fixes: 11ecc65ebb1527e9a83f67bb5ac0dec455cb03e6
| * | Remove superfluous 'extern's from function declarations.Zev Weiss2020-09-0344-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 Weiss2020-09-03153-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 Scott2020-09-071-0/+1
|\ \ \
| * | | Merge branch 'patch-freebsd-ci' of https://github.com/t6/htop-1 into ↵Nathan Scott2020-09-071-0/+1
|/| | | | | | | | | | | | | | | t6-patch-freebsd-ci
| * | | Add FreeBSD to TravisTobias Kortkamp2020-09-031-0/+1
| |/ / | | | | | | | | | Signed-off-by: Tobias Kortkamp <t@tobik.me>
* | | fix for double symbol link error on solarisDominik Hassler2020-09-051-1/+1
| | |
* | | htop should report the nice level properlyDominik Hassler2020-09-051-1/+1
| | |
* | | Fix regression in -u optional-argument handlingNathan Scott2020-09-041-1/+1
|/ / | | | | | | Resolves https://github.com/htop-dev/htop/issues/91
* | Merge pull request #86 from t6/patch-freebsd-fno-commonNathan Scott2020-09-032-7/+10
|\ \ | | | | | | Unbreak with -fno-common on FreeBSD
| * | Unbreak with -fno-common on FreeBSDTobias Kortkamp2020-09-032-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.1Nathan Scott2020-09-032-1/+14
| |
* | Merge pull request #66 from ioquatix/patch-1Nathan Scott2020-09-031-7/+9
|\ \ | | | | | | Fix image logo and titles.
| * | Fix image logo and titles.Samuel Williams2020-09-021-7/+9
| | |
* | | Merge pull request #57 from matthiasbeyer/patch-1Nathan Scott2020-09-031-1/+1
|\ \ \ | | | | | | | | Do not link INSTALL file, because link target does not exist
| * | | Do not link INSTALL file, because link target does not existMatthias Beyer2020-09-011-1/+1
| |/ /
* | | Merge branch 'eworm-de-unicode-runtime'Nathan Scott2020-09-024-15/+27
|\ \ \ | |/ / |/| |
| * | add option (-U, --no-unicode) to disable unicode at runtimeChristian Hesse2020-09-014-15/+27
|/ /
* | Merge branch 'cgzones-oom2'Nathan Scott2020-09-011-1/+1
|\ \
| * | Merge branch 'oom2' of https://github.com/cgzones/htop into cgzones-oom2Nathan Scott2020-09-011-1/+1
|/| |
| * | Reduce oom cast from long to intChristian Göttsche2020-08-311-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 treeBert Wesarg2020-08-311-1/+3
| | |
* | | affinity panel: use the tree collapsing as in the process listBert Wesarg2020-08-311-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 Wesarg2020-08-311-2/+2
| | | | | | | | | | | | As it is in the non-topology list.
* | | Revert "Use UTF-8 for check buttons and tree open/closed"Bert Wesarg2020-08-314-85/+34
|/ / | | | | | | This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6.
* | Merge branch 'configure' of https://github.com/cgzones/htop into ↵Nathan Scott2020-08-314-19/+28
|\ \ | | | | | | | | | cgzones-configure

© 2014-2024 Faster IT GmbH | imprint | privacy policy