Commit Graph

821 Commits

Author SHA1 Message Date
Felix Buehler
0a5f0ef115 use exact size for known strings 2020-02-21 15:23:37 +01:00
Ingo Bürk
a27ce763f4
Merge pull request #385 from Stunkymonkey/format_placeholder-cpu_temp
use format_placeholder for cpu_temperature
2020-02-20 08:47:27 +01:00
Felix Buehler
3ceb0b8fcf use format_placeholder for ddate 2020-02-18 20:22:36 +01:00
Felix Buehler
2ef1d7440a use format_placeholder for cpu_temperature 2020-02-18 17:51:12 +01:00
Ingo Bürk
b61e959a58
Merge pull request #381 from Stunkymonkey/format_wireless
add wireless format-options
2020-02-17 08:34:09 +01:00
Ingo Bürk
5b115d39f8
Merge pull request #380 from Stunkymonkey/percent-split
use format_placeholder(i3lib) for battery_info
2020-02-17 08:30:44 +01:00
Felix Buehler
42e7147291 add wireless format-options 2020-02-10 22:33:20 +01:00
Felix Buehler
b5a804d1af use format_placeholder for battery 2020-02-10 21:05:18 +01:00
Ingo Bürk
eccd4a7618
Merge pull request #373 from zsugabubus/fix-memory
print_mem: Fix overflow on 32-bit systems
2019-11-25 06:16:16 +01:00
zsugabubus
ad29f204b7
print_mem: Fix overflow on 32-bit systems
Values stored as `unsigned long` in "/proc/meminfo" but they were
handled as `long`.

On 32-bit systems with 4G memory it results in integer overflow.
2019-11-24 23:41:46 +01:00
grmat
abfe05c8bd Introduce format_percentage for battery (#371)
Allow custom output, backwards-compatible to integer_battery_capacity
2019-11-16 16:26:26 +01:00
Ingo Bürk
badef18c22
Merge pull request #369 from 31KM/master
Introduce memory options 'unit' and 'decimals'
2019-10-28 08:38:48 +01:00
MK13
572c96d63e Introduce memory options 'unit' and 'decimals'
Previously the format placeholders were auto-converted to the maximum possible
unit, e.g. /proc/meminfo reports MemTotal of 16307104kB which will get
converted to 15.6GiB. It is now possible to specifiy the target unit, e.g. Mi,
which will be used for the conversion - in the example it would lead to
15924.9MiB.

The resulting number can now be further formatted via the decimal option. It
allows to specify the number of decimals to use, e.g. 15.6GiB vs. 15GiB or
15924.9MiB vs. 15925MiB.
2019-10-26 15:32:32 +02:00
Sascha Wessel
3d6b1b576b wireless: update %signal and %quality based on station info on Linux (#368)
Use station info instead of bss info to update %signal and %quality.
Bss info is based on scan info and doesn't get updated often. Station
info get's updated with every beacon. Bss info still used as fallback.
2019-10-21 08:48:50 +02:00
Michael Stapelberg
807b72a8b1
Merge pull request #366 from duskCoder/patch-slurp
Fix propagation of read error from slurp.
2019-09-19 16:07:59 +02:00
Olivier Gayot
49cf3d7edb Mention the return value of the slurp function and the implications
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2019-09-19 15:48:59 +02:00
Olivier Gayot
4cf8bebf71 Do not return true from slurp() if it failed to read
Failing to read() some data into the destination buffer from the slurp()
function was not considered an error. This means that we were
potentially leaving the caller with an uninitialized destination buffer
without letting him know it's uninitialized.

It is quite unlikely that a single call to read() would ever fail right
after a successful call to open(..., O_RDONLY). However, one practical
example of this happening is when the file being opened is actually a
directory.

Fixed by propagating the error (i.e. returning false from slurp()) if
the call to read() fails.

Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2019-09-19 15:47:14 +02:00
Thomas Klausner
5aec4a5da3 Improve NetBSD port. (#361)
Detect and link against ossaudio.

Comment out unused code and functions.
2019-07-29 13:46:20 -07:00
Michael Stapelberg
e84f9588df print_cpu_usage: use buffered file API
fixes #343
fixes #344
2019-07-29 21:46:08 +02:00
Michael Stapelberg
23da59920c make pulseaudio an optional dependency, follow best practices
For my thoughts about optional dependencies, see
https://michael.stapelberg.ch/posts/2019-05-23-optional-dependencies/

This commit follows the best practices outlined in that article:

1. The travis config was modified to verify both code paths build and link/don’t
   link against pulseaudio.

2. If pulseaudio is missing, the build fails until packagers explicitly pass a
   --disable flag. In practice, I think the only situation when this flag should
   be set is in source-based linux distributions where users can express
   package-level compilation preferences (e.g. Gentoo USE flags).

3. The --version output now reflects the status of the optional dependency.

fixes #359
2019-07-29 21:07:40 +02:00
Ingo Bürk
40aeb7bc44
Merge pull request #360 from 0-wiz-0/master
On NetBSD, include sys/socket.h for AF_INET{,6}.
2019-07-22 10:09:56 +02:00
Thomas Klausner
667e38abab On NetBSD, include sys/socket.h for AF_INET{,6}. 2019-07-21 21:17:59 +02:00
Ingo Bürk
86a4ff0333
Merge pull request #355 from jasperla/header_fix
Fix headers meant for OpenBSD, but snuck in for FreeBSD
2019-07-21 15:28:40 +02:00
Michael Stapelberg
54e798e3a6 configure: disable pulse on OpenBSD and DragonFlyBSD
This matches the conditional compilation in the code and is more correct than
distinguishing linux vs. non-linux (which breaks on Debian’s kFreeBSD and hurd
variants).

Thanks to sdk for providing an OpenBSD 6.5 environment for verification. This
has not been tested on DragonFlyBSD.

related to #352
2019-07-12 14:46:55 +02:00
Michael Stapelberg
02a47cd196 battery: include sys/sysctl.h on OpenBSD
This is required so that CTL_HW and others are defined (ran into this on OpenBSD
6.5).
2019-07-12 14:44:03 +02:00
Michael Stapelberg
1999d5cf55 conditionally compile pulse.c only when using pulseaudio
fixes #352
2019-07-11 15:23:08 +02:00
Jasper Lievisse Adriaanse
70b954b122 Fix headers meant for OpenBSD, but snuck in for FreeBSD 2019-07-08 20:14:59 +02:00
Jasper Lievisse Adriaanse
3a51673c05 Extend battery handling on OpenBSD (#351)
If acpibat watts value is not available, try current (for batteries
that report in amps), then convert to watts.

originally submitted by @jcs
2019-07-08 17:53:25 +02:00
Michael Stapelberg
f791b4af3f release v2.13 2019-06-30 19:55:28 +02:00
Ingo Bürk
bd7de0c8ff
Merge pull request #347 from thrasymache/overflow
print_file_contents: allocate enough to include \0
2019-06-18 09:33:47 +02:00
Sam Newbold
300b31b2df
print_file_contents: allocate enough to include \0
related to #331
Previously, if max_chars was read, the null byte would be written
past the end of buf.
2019-06-10 16:36:18 +02:00
Dennis Vesterlund
9b5f6ae5f4 Added function to print content from file (#331)
Added a function to print file contents to status bar without newlines.
Added tests for print file contents function
Added manpage entry for file contents
2019-02-21 15:34:32 +01:00
Michael Stapelberg
9d28a661a7 configure.ac: complain when asciidoc cannot be found
related to #338
2019-02-11 21:45:20 +01:00
Michael Stapelberg
fd484c6c58 configure.ac: complain when xmlto cannot be found
related to #338
2019-02-11 21:43:35 +01:00
Michael Stapelberg
4c047e3aa4 Makefile.am: s/I3LOCK/I3STATUS/ 2019-02-11 19:52:19 +01:00
Michael Stapelberg
ee946d0d8c README: update build instructions 2019-02-11 09:52:23 +01:00
Ingo Bürk
49461ac56f
Merge pull request #336 from gokcehan/patch-1
default config: move disk info out of network info
2019-02-03 14:42:32 +01:00
gokcehan
478064800b
default config: move disk info out of network info
By default, disk info is found in a strange place in between ipv6 and wireless information. This commit puts it in between other performance meters. Settings in the file are also now sorted according to their places in the order.
2019-02-03 16:38:17 +03:00
Ingo Bürk
1f3fe73b36
Merge pull request #334 from stapelberg/speed
fix ethernet speed display for 100 Gbit/s cards
2019-01-27 22:40:46 +01:00
Michael Stapelberg
0e4fd9ad4a fix ethernet speed display for 100 Gbit/s cards
Before this fix, i3status would display 34464 Mbit/s instead of 100000 Mbit/s,
because it was only looking at ecmd.speed, ignoring ecmd.speed_hi.
2019-01-27 22:32:47 +01:00
Ingo Bürk
e36966d49c
Merge pull request #333 from stapelberg/sysconfdir
fix: use SYSCONFDIR in error message
2019-01-27 22:22:34 +01:00
Michael Stapelberg
0f4fbf70af fix: use SYSCONFDIR in error message 2019-01-27 22:19:12 +01:00
Orestis
3d5c908af5
Merge pull request #332 from eplanet/fix-macos-build
Fix non Linux build for #309
2019-01-23 11:59:09 +02:00
eplanet
96923a5bc0 Fix non Linux build for #309 2019-01-23 10:44:48 +01:00
Michael Stapelberg
a57cdc84e2
Switch to autotools (#316) 2019-01-23 08:56:40 +01:00
Denton Liu
7efbeeaf6c Implement %devicename specifier for volume module (#325)
This commit implements the %devicename specifier for the volume module
for both PulseAudio and ALSA. This way, i3status will be able to display
the specific device that corresponds to the volume indicator.

Note that this is not implemented for the OSS API but is left in a state
where someone can pick it up for the future.
2019-01-23 08:45:51 +01:00
Ingo Bürk
be0be599d9
Merge pull request #328 from jdevelop/fix/capture-volume-status
Fixed ALSA capture device monitoring.
2019-01-13 18:54:14 +01:00
Eugene Dzhurinsky
696ddf461f
Fixed ALSA capture device monitoring.
When using ALSA, the "Capture" mixer doesn't have the playback channel,
instead "capture"-related methods should be used to get information
about the current volume / state of the mixer.
2019-01-03 21:59:33 -05:00
Ingo Bürk
a84ad18fbf
Merge pull request #321 from eplanet/autodisplay-tz
Add timezone switch
2018-11-17 16:28:38 +01:00
eplanet
1b7501b7ea Corrections according to PR review 2018-11-15 22:27:23 +01:00