Commit Graph

272 Commits

Author SHA1 Message Date
Matt McCormick
3fad77c3ac Use target_include_directories 2018-04-14 09:47:35 -04:00
Matt McCormick
abe7290511
Merge pull request #52 from jmmweismiller/master
Updated used memory calculation.
2018-04-13 23:35:56 -04:00
John Weismiller
22f4db4b0e Updated used memory calculation.
Changed used memory calculation to account for shared memory in accordance with this:
https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716
2018-01-18 13:25:54 -06:00
Matt McCormick
75b9ea756e Merge pull request #49 from qqshfox/patch-1
fix tmux init
2017-04-22 09:37:52 -04:00
Hanfei Shen
26b53ea94b fix tmux init 2017-04-22 20:38:09 +08:00
Matt McCormick
0e227c1e88 Merge pull request #47 from NHDaly/tmux-error-messages
Added error message printing to the tmux plugin.
2016-09-27 21:28:45 -04:00
Nathan Daly
5c37494d11 Added error message printing to the tmux plugin:
Added output error messsages to the tmux plugin file so that if either
cmake or make fail, you can find out why.

For example, if cmake is missing, the output looks like this:

```
'cmake /usr/local/google/home/nhdaly/.tmux/plugins/tmux-mem-cpu-load' failed.
/usr/local/google/home/nhdaly/.tmux/plugins//tmux-mem-cpu-load/tmux-mem-cpu-load.plugin.tmux: line 23: cmake: command not found
```

If there is some error during make, the output looks like this:

```
tmux-mem-cpu-load failed to build.
make: <make output error message>
```
2016-09-27 18:24:13 -05:00
Matt McCormick
35fea56625 Merge pull request #46 from NHDaly/master
Reordered install instructions: moved `tpm` higher && adds nhdaly to Contributions
2016-09-08 22:12:04 -04:00
Nathan Daly
8018a0c761 Reordered install instructions: moved tpm higher.
Since it's the most tmux-native install option, I've moved it higher in
the list of installation options.

Also adds @nhdaly to the Contributions section per @thewtex's suggestion
in
[#43](https://github.com/thewtex/tmux-mem-cpu-load/issues/43#issuecomment-244767735).
2016-09-08 19:36:19 -05:00
Matt McCormick
d1f95acada Improve package manager command markup 2016-09-04 15:44:16 -04:00
Matt McCormick
8b1f07ccca Document how to install with package managers 2016-09-04 15:38:49 -04:00
Matt McCormick
d7db6d8c8b Merge pull request #44 from NHDaly/master
Added .tmux script so the plugin works with tpm.
2016-09-04 15:22:41 -04:00
Nathan Daly
58564ae6b7 Added .tmux script so the plugin works with tpm.
Now the plugin can be installed via tmux-plugins/tpm in addition to
being installed through zsh's antigen package manager.

It now only calls `make install` when installed through antigen; the
tmux plugin automatically compiles the binary, but leaves it in the
plugin directory.

This also allows skipping the "if exists" check, which means plugin
updates can also automatically rebuild any changes to the compiled part
of the plugin.

Updated the README to reflect this new install option.

This is part of Issue #43.
2016-08-24 11:13:23 -05:00
Matt McCormick
54fdf3c68c Version bump to 3.4.0 v3.4.0 2016-08-02 18:51:47 -04:00
Matt McCormick
e5595e21f4 Fix memory background color with --powerline-right 2016-08-02 18:48:43 -04:00
Matt McCormick
13c3205ec0 Remove extra spaces with --powerline-right 2016-08-02 18:41:13 -04:00
Matt McCormick
1b11c308ac Remove extra space with --powerline-left 2016-08-01 12:46:31 -04:00
Matt McCormick
dcadec63a2 Remove implementation details from --powerline- docs 2016-07-31 22:06:56 -04:00
Matt McCormick
0941898c02 Document --powerline-left 2016-07-31 22:03:18 -04:00
Matt McCormick
1456c16cf8 Test --powerline-left 2016-07-31 21:59:52 -04:00
Matt McCormick
6960e27dc4 Implement --powerline-left 2016-07-31 21:57:56 -04:00
Matt McCormick
a26f0ae59d Recognize the documented -p flag 2016-07-28 21:25:58 -04:00
Matt McCormick
18b4ed638a Merge pull request #40 from jodavies/cpu-mode
Cpu mode
2016-06-30 13:11:12 -04:00
jodavies
8af6dc22b8 Update README.rst 2016-06-30 07:56:55 +01:00
Josh Davies
b7d2d2a73e Print CPU usage without decimal point if >= 100
Also:
add --colours shortopt to help/readme,
Conform to coding style.
2016-06-27 08:00:09 +01:00
Josh Davies
4a2c4efb9a Added tests for "cpu-mode", short opt --colour
Also fixed (properly) ad83d9b
2016-06-26 14:47:02 +01:00
Josh Davies
ad83d9b3a9 Fix: allow -c short option for --color 2016-06-26 14:33:05 +01:00
Josh Davies
c623ca889d Added cpu-mode option
Default as before, full load = 100%.
Option 1, full load = 100% * number of cpu threads.
2016-06-26 14:31:34 +01:00
Matt McCormick
3e12a64309 Merge pull request #36 from jasperla/openbsd_mem
Simplify memory calculations on OpenBSD by using uvmexp.pageshift
2016-05-15 07:52:33 -04:00
Matt McCormick
0bc57a9ac8 Tweak description to avoid redundancy.
RAM memory -> RAM.
2016-05-06 09:25:33 -04:00
Matt McCormick
ce9de3f9aa Merge pull request #35 from compilenix/master
added averages-count option
2016-05-06 09:24:10 -04:00
Compilenix
710be9e355 Added tests for "averages-count" 2016-05-06 09:03:18 +02:00
Jasper Lievisse Adriaanse
3f647a9b2b Simplify memory calculations on OpenBSD by using uvmexp.pageshift 2016-05-03 20:33:43 +02:00
Compilenix
97a655c856 cleanup 2016-04-28 22:27:19 +02:00
Compilenix
cbe3074c6b Update README.rst and AUTHORS 2016-04-28 22:13:05 +02:00
Compilenix
1d1a516eda added averages-count option 2016-04-28 22:05:43 +02:00
Matt McCormick
34b9d39b57 Merge pull request #34 from golinski/master
Adding powerline support
2016-04-14 07:01:33 -04:00
Michał Goliński
bac831cd69 Code refactoring for merging
- license header in new files
- changed "powerline" into "powerline-right"
- added braces around one-liners
- small fixes concerning whitespace
2016-04-14 12:30:20 +02:00
golinski
e9a3726de7 Change CMakeLists.txt, so it builds on all systems, not only on Linux 2016-03-07 15:14:32 +01:00
Matt McCormick
6e1dbc6b1f Version bump to 3.3.0. v3.3.0 2016-03-06 20:33:34 -05:00
Matt McCormick
b8594ecb82 Correct total memory output for the default mode. 2016-03-06 10:57:38 -05:00
Michał Goliński
159051079b Changes in README.rst 2016-03-05 19:34:37 +01:00
Michał Goliński
cc59b4952f Powerline support 2016-03-05 11:19:31 +01:00
Matt McCormick
68fd497108 Update README with mem-mode instructions. 2016-02-15 00:02:58 -05:00
Matt McCormick
be0b914c49 Merge pull request #32 from thewtex/mem-mode-all-platforms
Mem mode all platforms
2016-02-15 00:00:11 -05:00
Matt McCormick
6938941b99 Add help for memory display mode. 2016-02-14 23:52:56 -05:00
Matt McCormick
42275e094d Memory mode output for platforms other than osx.
Refactor status string generation into a common function.
2016-02-14 23:47:02 -05:00
Matt McCormick
fb8e3c6ad0 Add .gitattributes to check whitespace errors. 2016-02-10 16:59:39 -05:00
Matt McCormick
e50d34873f Add header guard to conversions.h 2016-02-10 16:54:09 -05:00
Matt McCormick
7eef3670e0 Fix whitespace in osx/memory.cc. 2016-02-10 16:48:37 -05:00