lucic71
/
i3status
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Ingo Bürk 2018-03-27 09:26:55 +02:00 committed by GitHub
parent 9212ee658b 279e2fccf4
commit 4345fa9d97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
man/i3status.man
View File

@ -299,7 +299,9 @@ network interface found on the system (excluding devices starting with "lo").
*Example order*: +wireless wlan0+
*Example format*: +W: (%quality at %essid, %bitrate / %frequency) %ip+
*Example format_up*: +W: (%quality at %essid, %bitrate / %frequency) %ip+
*Example format_down*: +W: down+
=== Ethernet
@ -313,7 +315,9 @@ network interface found on the system (excluding devices starting with "lo").
*Example order*: +ethernet eth0+
*Example format*: +E: %ip (%speed)+
*Example format_up*: +E: %ip (%speed)+
*Example format_down*: +E: down+
=== Battery

1
src/first_network_device.c
View File

@ -127,6 +127,7 @@ static net_type_t iface_type(const char *ifname) {
return NET_TYPE_OTHER;
#endif
return NET_TYPE_OTHER;
}
const char *first_eth_interface(const net_type_t type) {

11
src/print_volume.c
View File

@ -211,6 +211,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
#if defined(__OpenBSD__)
int oclass_idx = -1, master_idx = -1, master_mute_idx = -1;
int master_next = AUDIO_MIXER_LAST;
mixer_devinfo_t devinfo, devinfo2;
mixer_ctrl_t vinfo;
@ -228,12 +229,17 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
devinfo2.index = 0;
while (ioctl(mixfd, AUDIO_MIXER_DEVINFO, &devinfo2) >= 0) {
if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) == 0))
if ((devinfo2.type == AUDIO_MIXER_VALUE) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmaster, MAX_AUDIO_DEV_LEN) == 0)) {
master_idx = devinfo2.index;
master_next = devinfo2.next;
}
if ((devinfo2.type == AUDIO_MIXER_ENUM) && (devinfo2.mixer_class == oclass_idx) && (strncmp(devinfo2.label.name, AudioNmute, MAX_AUDIO_DEV_LEN) == 0))
master_mute_idx = devinfo2.index;
if (master_next == devinfo2.index)
master_mute_idx = devinfo2.index;
if (master_next != AUDIO_MIXER_LAST)
master_next = devinfo2.next;
devinfo2.index++;
}
@ -246,6 +252,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
vinfo.dev = master_idx;
vinfo.type = AUDIO_MIXER_VALUE;
vinfo.un.value.num_channels = devinfo.un.v.num_channels;
if (ioctl(mixfd, AUDIO_MIXER_READ, &vinfo) == -1)
goto out;