Commit Graph

561 Commits

Author SHA1 Message Date
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
Tobias Tschinkowitz 1cb5af98e5 added comment for temp function (openbsd) 2018-05-17 17:13:28 +02:00
Tobias Tschinkowitz 0f46c675d3 corrected calculations for disk space on openbsd 2018-05-17 14:36:37 +02:00
Aaron Marcher 1b3fafd77e Update README 2018-05-16 23:19:33 +02:00
Aaron Marcher bb61392386 wifi: Fix coding style
Use block for single statement ifs
When functions return -1 for error test against 0 not -1
Newlines
2018-05-16 23:17:30 +02:00
Aaron Marcher 9d967498be load_ieee80211_nodereq: Fix typo 2018-05-16 23:08:33 +02:00
Aaron Marcher f3c23f08bb wifi: Move out common headers 2018-05-16 22:57:13 +02:00
Tobias Tschinkowitz 1fc5cf0016 added wifi functionality for openbsd
display ESSID and signal strength percentage
2018-05-16 22:52:14 +02:00
Tobias Tschinkowitz c1f79d741a corrected calculation for swap on openbsd
The swapctl(2) function fills the swapent struct with 512KB blocks.
As we want to display in GB, i just modified the calculation for this to
get the expected output.
2018-05-16 19:17:49 +02:00
Tobias Tschinkowitz 82eb6e3832 consistent calculation of ram_* on openbsd 2018-05-16 12:24:43 +02:00
Aaron Marcher ca02afb1d9 Add he4d to LICENSE 2018-05-16 08:13:09 +02:00
Tobias Tschinkowitz 0f9a1a8367 updated ram_total and ram_free (obsd) 2018-05-16 08:08:48 +02:00
Aaron Marcher 6464cea333 Cast CPU percentage to int and fix indenation 2018-05-14 20:54:48 +02:00
Josuah Demangeon 7e29da026b fflush(stdout) to print line by line if stdout is not a tty
To reproduce the issue:
	$ slstatus -s | tee

then it would print only when the stdout buffer is full, by block
of multiple lines.

fflush() makes sure the line is printed at every loop iteration
2018-05-08 15:18:32 +02:00
Aaron Marcher 0f7a34fa31 Add josuah to LICENSE 2018-05-08 15:06:55 +02:00
Josuah Demangeon ea2e2bd004 include <sys/time.h> before <sys/sensors.h> for time struct timeval
sys/sensors.h has two structs struct timeval: sensor and ksensor:

	struct sensor {
		...
		struct timeval tv;		/* sensor value last change time */
		...
	};
2018-05-08 15:05:29 +02:00
Aaron Marcher 666f285201 Only variable declarations at top of block 2018-05-07 15:57:32 +02:00
Aaron Marcher 6123f482e3 Fix indents (spaces for alignment) 2018-05-07 13:48:43 +02:00
Aaron Marcher 6c6c144be6 wifi_perc: Simplify 2018-05-07 12:25:34 +02:00
Aaron Marcher 0a287616b2 num_files: Variable declarations at top of block 2018-05-07 12:17:13 +02:00