zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
548 Commits 1 Branch 38 Tags 5.9 MiB
Commit Graph

548 Commits

Author SHA1 Message Date
Hisham Muhammad 2ed83d6902 Merge branch 'master' of https://github.com/hishamhm/htop 2015-08-12 17:11:28 -03:00
Hisham Muhammad 041fa9ffa6 Update Settings.h 2015-08-12 17:11:07 -03:00
Hisham Muhammad c34b574073 Merge pull request #223 from eworm-de/langinfo 
simplify UTF-8 detection
 2015-08-12 17:11:03 -03:00
Hisham Muhammad e42d78007e Merge pull request #230 from maksqwe/cstime_fix 
Fix sort by cstime
 2015-08-12 17:08:26 -03:00
Hisham Muhammad c33d32e66b Merge pull request #235 from peter-warhzner/patch-1 
Fix typo in comment
 2015-08-04 16:36:26 -03:00
peter-warhzner 6f6f0e36ad Fix typo in comment 2015-08-04 18:48:34 +05:00
Christian Hesse cea591181d initialize locale for LC_CTYPE only 
htop uses scanf functions to parse values from proc filesystem. This
breaks when initializing locale for LC_NUMERIC because of unexpected
commas. So initialize locale for LC_CTYPE only.
 2015-07-29 11:28:15 +02:00
Maks Naumov 1bdee6b6ba Fix sort by cstime 2015-07-23 14:24:39 +03:00
Christian Hesse 77df258636 remove duplicate code 2015-07-16 08:17:12 +02:00
Christian Hesse 1728483aa2 simplify UTF-8 detection 2015-07-16 08:12:48 +02:00
Christian Hesse 016dbbe6a4 initialize locale 
This has two effects:

* The locale may have impact on string formatting. So depending on the
  locale we may end up with different decimal point.
* We can use nl_langinfo() for UTF-8 detection.
 2015-07-16 08:08:18 +02:00
Hisham Muhammad e5f810e0a2 Merge pull request #226 from eworm-de/nice 
paint PROCESS_LOW_PRIORITY in green
 2015-07-14 23:16:11 -03:00
Christian Hesse a588c6d179 paint PROCESS_LOW_PRIORITY in green 
... and thus make it use a different color than PROCESS_HIGH_PRIORITY.
 2015-07-14 12:43:38 +02:00
Hisham Muhammad b1aea7f748 Merge pull request #207 from eworm-de/settings 
write header length (number of columns) back to configuration
 2015-06-16 16:13:50 -03:00
Hisham Muhammad 5f60486002 Merge pull request #211 from eworm-de/empty-meter 
ignore enter, delete and space on empty panel
 2015-06-16 16:12:00 -03:00
Hisham Muhammad 67a88ae11d Merge pull request #205 from EliteTK/issue-201 
Change all displayed memory size specifiers to use GNU Coreutils style size specifiers
 2015-06-16 16:09:32 -03:00
Christian Hesse b796362e90 ignore enter, delete and space on empty panel 2015-06-15 11:09:32 +02:00
Christian Hesse a804f1f848 write header length (number of columns) back to configuration 2015-06-12 01:35:12 +02:00
Tomasz Kramkowski 03826fbc54 Added information about memory sizes to man page 
The man page now contains the section "MEMORY SIZES" which talks about
the convention used for representing memory sizes and why it was chosen.
 2015-06-09 00:11:43 +01:00
Tomasz Kramkowski 16d8cc7c38 Changed MemoryMeter and SwapMeter to use short memory sizes 
The MemoryMeter and SwapMeter now use the short GNU Coreutils style
format to represent memory sizes.
 2015-06-09 00:08:06 +01:00
Hisham Muhammad abe165fe5c Merge pull request #194 from eworm-de/warnings 
fix compiler warnings
 2015-06-08 15:26:24 -03:00
Hisham Muhammad 2351fdea31 Merge pull request #195 from eworm-de/gitignore 
add */.dirstamp to .gitignore
 2015-06-08 15:24:55 -03:00
Hisham Muhammad 75d0eda6f9 Merge pull request #196 from sherpya/master 
added missing defines for android
 2015-06-08 15:23:12 -03:00
Hisham Muhammad d7c3dc748f Merge pull request #203 from Lance0312/fix-freebsd-compilation-errors 
Fix several FreeBSD compilation errors
 2015-06-08 15:22:10 -03:00
Lance Chen 5a5dc71770
Cast FreeBSDProcess_new to Process_New 
`Process_new_fn` had been renamed to `Process_New` in
d880def0e9
 2015-06-07 17:31:05 +08:00
Lance Chen 1efa544e1b
Re-run MakeHeader.py on freebsd/FreeBSDProcess.c 
Several functions and struct had changed in
b291fba02b
 2015-06-07 17:30:55 +08:00
sherpya a8e1c1c63f added missing defines for android 2015-05-20 04:30:11 +02:00
Christian Hesse 867dece8fe add */.dirstamp to .gitignore 2015-05-15 11:38:16 +02:00
Christian Hesse 08829cbc3b fix compiler warnings 
gcc gives warnings like this:

warning: ignoring return value of ‘fscanf’, declared with attribute
warn_unused_result

Assign value to a variable, cast to (void) to discard it.
 2015-05-15 11:33:25 +02:00
Hisham Muhammad f1e8a074f2 store cpuCount in an attribute 2015-05-13 15:13:55 -03:00
Hisham Muhammad f4f6d54ffd Fix compilation of OpenVZ support. 
Closes #185.
Closes #190.
 2015-05-13 15:00:58 -03:00
Hisham Muhammad 64ecba2583 update bar when clicking header. 2015-04-09 16:02:14 -03:00
Hisham Muhammad ac8b934498 Fix failing stuff. 2015-04-09 15:56:43 -03:00
Hisham Muhammad 01737ed66b Reset to the default scheme, not the last one. 2015-04-09 15:44:26 -03:00
Hisham Muhammad 2f45008477 Enable OOM support unconditionally on Linux. 
Read OOM data only if column is enabled.
Make sort ordering more consistent. Closes #182.
 2015-04-09 15:41:21 -03:00
Hisham Muhammad b291fba02b Fixes to use platform-specific compare routines. 2015-04-09 15:40:46 -03:00
Hisham Muhammad dc4576d327 Fix saving new color scheme. 2015-04-09 15:19:31 -03:00
Hisham Muhammad b1f934c5d5 Visual tweaks: change color when following, add Broken Gray theme. 2015-04-09 15:17:20 -03:00
Hisham Muhammad 01a29f0267 84.9% test coverage in the wip branch! 2015-04-08 21:27:52 -03:00
Hisham Muhammad 094ddc4051 This assert is no longer valid. 2015-04-08 21:27:36 -03:00
Hisham Muhammad d4256d6300 Keep following status when no key is pressed. 2015-04-08 21:25:31 -03:00
Hisham Muhammad fde3457235 Make test more robust. 2015-04-08 19:07:41 -03:00
Hisham Muhammad 86d5750451 Merge branch 'master' into wip 2015-04-08 18:47:01 -03:00
Hisham Muhammad e3d1ca0d20 83.9% test coverage! 2015-04-02 03:33:12 -03:00
Hisham Muhammad 4e29cad4fe Merge branch 'master' into wip 2015-04-02 02:13:18 -03:00
Hisham Muhammad e5b08447fe Better support for testing under wip branch 2015-04-02 02:13:07 -03:00
Hisham Muhammad d880def0e9 Merge branch 'master' into wip 
Conflicts:
	Process.c
	Process.h
	htop.c
	linux/LinuxProcess.c
	linux/LinuxProcess.h
	test_spec.lua
 2015-04-02 01:57:37 -03:00
Hisham Muhammad 4315e0c2a0 78.8% test coverage! 2015-04-02 01:44:44 -03:00
Hisham Muhammad 1179906e95 Add test, change env variable name 2015-04-02 01:41:52 -03:00
Hisham Muhammad cb8ac6b0f1 Ignore coverage files. 2015-03-31 23:24:06 -03:00