1
0
Commit Graph

480 Commits

Author SHA1 Message Date
David Demelier
f386a03a20 Support energy_now/power_now in battery_remaining
On some laptops (mostly thinkpads), the remaining time may be
expressed in µWh using energy_now and power_now files rather than µAh
for charge_now and current_now.

Add pick function to conditionally select appropriate one.
2018-05-20 22:12:44 +02:00
Tobias Tschinkowitz
1cd8a7b510 ip: fixed memory leak
free the interface list before returning from the function
2018-05-20 22:06:54 +02:00
Laslo Hunhold
b640cc489b Check return value of pclose() 2018-05-20 01:01:26 +02:00
Aaron Marcher
c12b9cc50b Refactor ram.c 2018-05-20 00:42:07 +02:00
Aaron Marcher
7873b3b132 Make temp more readable on Linux 2018-05-20 00:30:16 +02:00
Laslo Hunhold
951ea4e304 Refactor entropy.c 2018-05-20 00:19:52 +02:00
Aaron Marcher
3f45a5f7ca Remove initialization to 0 for static vars 2018-05-20 00:17:35 +02:00
Aaron Marcher
a7ade0dc6d Remove unnecessary "valid" variable in cpu_perc 2018-05-20 00:16:20 +02:00
Aaron Marcher
062f33f874 Add unit to temperature 2018-05-20 00:02:49 +02:00
Aaron Marcher
0bc6855741 Implement scaling for cpu_freq 2018-05-19 23:58:14 +02:00
Laslo Hunhold
46c4540dd2 Implement fmt_human_2() and fmt_human_10()
These functions take the raw number and a unit and automatically
print it out "scaled down" to a proper SI-prefix, for powers of 2
and 10 respectively.

Apply them to the 2-power cases and keep the 10-power for a later
commit.
2018-05-19 22:58:21 +02:00
Aaron Marcher
74c4f4ebda Add the percent sign to *_perc functions
Units should be added to the corresponding numbers
2018-05-19 20:33:06 +02:00
Laslo Hunhold
68a3902dc5 Increase precision in netspeeds.c
First dividing by interval before multiplying with 1000 decreases the
precision by +-(interval - 1) * 1000, as interval arithmetic always
applies the Gauß-function to the result.

This is not necessary and simply reordering the operations mitigates
this.
2018-05-19 20:14:09 +02:00
Laslo Hunhold
422cadfd5f Implement esnprintf() and make formatted calls more efficient
Within the components, snprintf() was unchecked and had inefficient
calls in some places.
We implement esnprintf() that does all the dirty laundry for us
and use it exclusively now.
2018-05-19 19:44:02 +02:00
Aaron Marcher
f31b113e7e Simplify ipv* functions 2018-05-19 13:34:18 +02:00
Aaron Marcher
d47d78255e Use int for flags 2018-05-19 13:29:21 +02:00
Aaron Marcher
74891945d8 Revert aac29e2 as it is nonsense 2018-05-19 13:25:35 +02:00
Aaron Marcher
06d4447f03 Set {r,t}xbytes 0 before incrementing them on OBSD 2018-05-19 13:19:53 +02:00
Aaron Marcher
a37224bf7b Missing assignment for last commit 2018-05-19 13:12:06 +02:00
Aaron Marcher
e3ccac3298 Unify and simplify netspeed logic and types 2018-05-19 13:07:05 +02:00
Tobias Tschinkowitz
2321aecff0 netspeeds: added error condition for openbsd
implemented additional error condition for openbsd netstat in case the
interface could not be found in the interface list or if_data is not
readable.
2018-05-19 12:20:25 +02:00
Aaron Marcher
0383146e5e uptime: Format function is static 2018-05-19 01:55:31 +02:00
Aaron Marcher
aac29e2bba battery: Move out struct as common code 2018-05-19 01:49:46 +02:00
Tobias Tschinkowitz
22175f0d57 implemented openbsd netspeed functions
implemented the netspeed functionality for openbsd.
furthermore the static keyword was removed of the interval variable in
config.def.h for usage as extern variable.
2018-05-19 01:44:36 +02:00
Aaron Marcher
176d8ff874 Add netspeeds to config.def.h 2018-05-19 00:40:59 +02:00
Aaron Marcher
0d05b3d13d Add network speed functions 2018-05-19 00:31:33 +02:00
Aaron Marcher
d0c68989cd Implement fmt_scaled for ram_* functions 2018-05-18 23:38:59 +02:00
Aaron Marcher
49d1e5fae2 Fix ram_free for Linux 2018-05-18 23:32:00 +02:00
Aaron Marcher
39ee31c242 Implement fmt_scaled for swap_* functions 2018-05-18 23:19:18 +02:00
Aaron Marcher
b3e56066ed Implement fmt_scaled for disk_* functions 2018-05-18 23:14:55 +02:00
Aaron Marcher
35219d39ca Add fmt_scaled util function 2018-05-18 23:14:10 +02:00
Aaron Marcher
f317819984 Use %d instead of accidentally %i 2018-05-18 19:58:51 +02:00
Aaron Marcher
f170028527 Port battery_remaining to Linux
Additionally unify the format of battery_state and uptime
2018-05-18 17:25:09 +02:00
Aaron Marcher
b04ca3ef45 Fix memory leak 2018-05-18 16:55:37 +02:00
Tobias Tschinkowitz
367f8a8c44 battery: fixed remaining time on connected AC
when an AC is connected apm_info shows a non-valid value for remaining
minutes. it was decided that in that case the function should return an
empty string.
2018-05-18 16:35:32 +02:00
Aaron Marcher
2604f25b16 Fix indentation
Tabs for indentation, spaces for alignment
2018-05-18 15:32:15 +02:00
Tobias Tschinkowitz
8c8326f793 Add battery_remaining function on OpenBSD
Implementation of a battery_remaining function which returns the
remaining battery time in HH:MM format. Linux function still needs
implementation.
Move common code to load_apm_power_info
2018-05-18 15:25:42 +02:00
Laslo Hunhold
80fc20d1d6 Add warn() and die()
Given slstatus is a tool that runs in the background, most likely run
from .xinitrc, it's important to prepend the name of the tool to error
messages so it becomes clear where the error is coming from.

To make this much more consistent, this commit adds warn() and die()
utility functions consistent with other suckless projects and adapts all
calls to fprintf(stderr, *) to the warn() and die() functions, greatly
increasing the readability of the code.
2018-05-18 11:13:05 +02:00
Laslo Hunhold
a4fe8c9741 Audit slstatus.c
1) Remove setlocale() (locales are harmful and any 'issues' shall
    be fixed in different ways that are expected).
 2) Disable buffering on stdout with setbuf() rather than flushing
    it each time.
 3) Make error messages more consistent.
 4) Add error checks where applicable.
 5) Make code a bit more readable where res is assigned.
 6) Use XFlush() rather than XSync() (we don't need to wait for the
    XServer to react, which could lead to long hangs on our side).
2018-05-18 10:08:03 +02:00
Laslo Hunhold
c83b388a3f Properly handle *snprintf() errors
Posix guarantees that the resulting string is null-terminated, even if
we have an overflow. Instead of doing what has already been done,
properly warn when there has been an error or overflow, so the user can
do something about it.
2018-05-17 23:26:56 +02:00
Aaron Marcher
b759662983 Remove UNUSED macro
Use variables named unused instead which is simpler
2018-05-17 20:05:57 +02:00
Aaron Marcher
fc8b6f81a5 Mark unused parameters, fix compiler warnings 2018-05-17 18:29:25 +02:00
Aaron Marcher
977be0cf4f wifi: Fix order and add missing header
<sys/select.h> is needed before <net80211/ieee80211_ioctl.h> on OpenBSD
to define NBBY and shut up compiler warnings.
2018-05-17 18:14:08 +02:00
Aaron Marcher
ca8a146f03 wifi: Change memmove to memcpy on OpenBSD 2018-05-17 18:08:31 +02:00
Aaron Marcher
7ab183c97f Unify type of in for loops 2018-05-17 18:05:38 +02:00
Aaron Marcher
1c44d404f6 wifi_essid: Fix coding style
Only initialize variables at the beginning of a block
2018-05-17 17:59:05 +02:00
Aaron Marcher
7be675f154 Unify type of i in for loops
int for normal indexes
size_t for usage with the LEN macro
2018-05-17 17:42:26 +02:00
Aaron Marcher
f9609f4ff4 Change done to int as it is the CPU's natural type 2018-05-17 17:28:32 +02:00
Aaron Marcher
11ce8ed013 Change interval to unsigned int 2018-05-17 17:25:31 +02:00
Aaron Marcher
0892a93dbd Add comments for battery_* functions on OpenBSD 2018-05-17 17:24:47 +02:00