em/slstatus
1
0
Fork 0
Code Releases Activity
575 Commits 2 Branches 0 Tags 588 KiB
d7ea986299
Commit Graph

178 Commits

Author SHA1 Message Date
Tobias Tschinkowitz
5db729fedb ram: fixed int overflow on pagetok macro 2018-05-24 14:51:30 +02:00
Laslo Hunhold
f17f39d0a2 Refactor keymap.c 
- Get rid of camel-casing
 - Don't use all-caps for variable names
 - use LEN()-macro
 - use strncmp() rather than strstr() for prefix-checking
 - clean up the tokenizer-loop and don't use copies
 - make the loop more readable by separating different breaking
   conditions
 - stricter error-checking and cleanup
 - store the layout directly with bprintf rather than having
   a separate buffer
 2018-05-23 19:56:16 +02:00
Aaron Marcher
d6ad87ce06 keymap: Add braces for for loop 2018-05-23 13:30:45 +02:00
Michael Buch
943b42de05 Add keymap component 
Adding a new keymap component that will
indicate the current keyboard layout (language)
and variant if any was set. I use the
standard X11 XKB APIs to retrieve and parse
the xkb_symbols set with setxkbmap.
 2018-05-23 10:09:13 +02:00
Aaron Marcher
825f637e20 netspeeds: Fix indentation 2018-05-22 12:42:31 +02:00
David Demelier
37724ac2c3 Add basic backlight percentage support 
At the moment linux only, but will add support for OpenBSD as well.
 2018-05-22 12:40:31 +02:00
Aaron Marcher
cbbf59fd3d Change to fmt_human in netspeeds on OpenBSD 
Thanks to Hiltjo
 2018-05-22 12:21:52 +02:00
Laslo Hunhold
7f91ce265e swap.c: Refactor getstats() and its usage 
Add a return value so we are able to check any errors and actually fail
when there has been a critical error instead of carrying on uselessly.
 2018-05-21 23:05:39 +02:00
Aaron Marcher
10dbc9543e Merge fmt_human_2 and fmt_human_10 to one function 
Now only one function, fmt_human, takes an additional argument "base".
 2018-05-21 14:44:21 +02:00
Aaron Marcher
fc0dde5a60 Remove fmt from load_avgs for consistency 
In a later commit something like that will be enabled for every
component
 2018-05-21 14:14:45 +02:00
Aaron Marcher
aa8654795d battery_remaining: check for division by zero 2018-05-21 00:42:06 +02:00
Aaron Marcher
a546d4b585 battery_remaining: Change float to double 2018-05-21 00:41:03 +02:00
Aaron Marcher
103945e7bb battery: Minor coding style fixes 
- Line length
- Spacing and indentation
- No explicit checks for NULL
 2018-05-21 00:38:13 +02:00
Aaron Marcher
bae576cd22 Increase readability for load_uvmexp return 2018-05-21 00:29:54 +02:00
Aaron Marcher
ec5c35ec9f Remove units from numbers 
This is a first step to decouple formatting from information because of
two reasons:

 1. The components should only gather and return the values by design
 2. Fine grained user control should be a focus

Scaling will be implemented in a different way in a later commit.
 2018-05-21 00:16:54 +02:00
Aaron Marcher
4bd234c7ef swap_perc: check for division by zero on obsd too 2018-05-21 00:02:33 +02:00
Aaron Marcher
806815778f swap_perc: check for division by zero 2018-05-20 23:53:26 +02:00
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
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
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
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
Tobias Tschinkowitz
0f46c675d3 corrected calculations for disk space on openbsd 2018-05-17 14:36:37 +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
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
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
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
Aaron Marcher
dcffaeaf57 Fix disk_perc by casting it to int 2018-05-07 12:14:46 +02:00
Aaron Marcher
4fc4983502 disk_perc: Simplify 2018-05-07 11:44:15 +02:00
Aaron Marcher
b3330d849d cpu: Simplify functions 2018-05-07 11:39:59 +02:00
Aaron Marcher
16a97fbca1 Unify header includes 
- Sort Alphabetically
- Same indentation for preprocessor clauses
 2018-05-07 11:21:59 +02:00
Aaron Marcher
fbbe300f4d entropy: Small fix 2018-05-06 23:09:36 +02:00
Aaron Marcher
fd14804d6f entropy: Port to OpenBSD 
OpenBSD's entropy design is superior to Linux.
 2018-05-06 22:54:32 +02:00
Aaron Marcher
62563a5a0d datetime: Add <stdio.h> for fprintf 2018-05-06 22:41:56 +02:00
Aaron Marcher
932f65c373 datetime: Add error message 2018-05-06 22:38:29 +02:00
Aaron Marcher
ee5ec75621 Fix coding style 
- Use block for single statement ifs
- Keep lines to reasonable length (current debate as to reasonable)
- When functions return -1 for error test against 0 not -1
- Do not indent cases another level
- Do not test against NULL and 0 explicitly
- Use tabs for indentation, use spaces for alignment
 2018-05-06 22:28:56 +02:00
Aaron Marcher
66a7fb16fc Remove cpu_iowait 
The third value from load_avg (idle) gives us almost the same
information as cpu_iowait. Plus OpenBSD does not offer an iowait value
as Linux and thus the corresponding function would not be portable.
 2018-05-06 21:11:50 +02:00
Aaron Marcher
235fa3c306 cpu_perc: Documentation and readbility improvements 2018-05-06 21:10:02 +02:00
Aaron Marcher
2b82bf0248 cpu_perc: Port to OpenBSD 
In OpenBSD the CPU usage in percent is now computed using KERN_CPTIME
sysctl.
 2018-05-06 17:48:37 +02:00
Aaron Marcher
efb41724b5 swap_*: Port to OpenBSD 2018-05-06 01:20:46 +02:00
Aaron Marcher
417f473fe2 battery: Remove full indicator 
It does not respect charging thresholds and it is not trivial to
implement the indicator in OpenBSD.
 2018-05-04 18:04:53 +02:00
Aaron Marcher
699f6734d9 wifi_perc: Fix file descriptor leak 2018-05-02 19:41:53 +02:00
Aaron Marcher
54ebd0dabe uptime: Add missing brace 2018-05-02 12:08:54 +02:00
parazyd
34010907a6 volume: Cast SOUND_MIXER_READ_DEVMASK to int to avoid warning. 2018-05-02 11:49:15 +02:00
Aaron Marcher
f7a6d6c8f7 wifi: Various cleanups 2018-05-02 08:49:06 +02:00
Aaron Marcher
709549b4bd user: Only declare variables in the beginning 2018-05-02 08:42:55 +02:00
Aaron Marcher
e43c3a16f0 uptime: Simplifiy and clean up 2018-05-02 08:41:06 +02:00
Aaron Marcher
f007007156 run_command: Clean up 2018-05-02 08:29:36 +02:00
Aaron Marcher
7c11f890a5 keyboard_indicators: Clean up opening display 2018-05-02 08:26:23 +02:00
Aaron Marcher
b2b6eb638e ip: Sort headers alphabetically 2018-05-02 08:21:32 +02:00
Aaron Marcher
2bd581a47b battery_state: Unify unknown state with "?" symbol 2018-05-02 08:16:21 +02:00
Aaron Marcher
4f5ac5d9fe Remove battery_power for various reasons 
- Battery power cannot be easily gatherable via apm(4)
- IMHO it does not represent essential information
 2018-05-01 21:01:25 +02:00
Aaron Marcher
41deabf2ec battery_perc: Port to OpenBSD 2018-05-01 20:45:29 +02:00
Laslo Hunhold
19343ff343 components/swap.c | move duplicated code to separate function 2018-05-01 20:24:13 +02:00