aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2018-06-11Merge pull request #286 from duskCoder/#283Ingo Bürk1-11/+43
Fix issue #283 (shown IP belonging to wrong network interface)
2018-06-11Fix shown IP address belonging to wrong interfaceOlivier Gayot1-2/+31
The following commit: 6a75ea9 Show IP address when address has a label introduced a way to show the IP address of an interface when a label is associated to the IP. When a label is associated to an IP, the structure returned by getifaddrs() has the label concatenated to the interface name in the .ifa_name field as in the following example: struct ifaddrs ifaddr = { .ifa_name = "eth0:mylabel", }; As a consequence, using a strict comparison between the interface name and the .ifa_name field yields a falsy result. However, checking if the .ifa_name starts with the interface name (e.g. eth0) does not work either because other network interfaces can have a name which starts with eth0. This commit solves the issue by stripping out the optional label from the .ifa_name field before making a strict comparison with the interface name. Fix #283 Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-06-04Simplify the algorithm used to determine the IP addressOlivier Gayot1-10/+13
Signed-off-by: Olivier Gayot <olivier.gayot@sigexec.com>
2018-05-22Merge pull request #282 from Stunkymonkey/mem-supportIngo Bürk1-2/+2
fix wrong memory-documentation
2018-05-22fix wrong memory-documentationFelix Buehler1-2/+2
2018-05-19Merge pull request #270 from Stunkymonkey/mem-supportIngo Bürk5-0/+300
initial support of memory-usage for linux
2018-05-15Merge pull request #281 from eplanet/fix_warningsOrestis1-0/+1
Fix MacOS build
2018-05-15Fix MacOS buildeplanet1-0/+1
2018-05-11release v2.12Michael Stapelberg4-3/+30
2018-05-04Simplify the memory thresholdsBenedikt Heine5-77/+96
2018-05-04Rename ram variables consistentlyBenedikt Heine1-44/+45
2018-04-11Implement support for memory-usage on LinuxFelix Buehler4-0/+280
2018-04-08Merge pull request #275 from winks/patch-2Ingo Bürk1-2/+4
Fix NULL value on OpenBSD when there is no acpitz0
2018-04-06Fix NULL value on OpenBSD when there is no acpitz0Florian Anderiasch1-2/+4
Using %degrees on OpenBSD resulted in garbage values if sysctl doesn't know about any cpu temperature sensors.
2018-03-29Merge pull request #213 from dlrobertson/addr_descriptionIngo Bürk1-2/+3
Show IP address when address has a label
2018-03-29Show IP address when address has a labelDan Robertson1-2/+3
If an address has been added with a label, ensure the correct address is shown.
2018-03-27Merge pull request #264 from foutaise/masterIngo Bürk1-19/+21
Make iface_type() work on FreeBSD
2018-03-27Merge branch 'master' into masterIngo Bürk3-4/+16
2018-03-27Merge pull request #251 from tomaskrizek/man-eth-wireless-formatIngo Bürk1-2/+6
man: explicitly use format_up/format_down in ethernet, wireless conf
2018-03-27Merge pull request #243 from jasperla/fei_errorIngo Bürk1-4/+1
Remove overly aggressive #error
2018-02-12Merge pull request #266 from moreais/masterIngo Bürk1-2/+9
OpenBSD: fix volume display on some hardware
2018-02-13OpenBSD: fix volume display on some hardwareCarlin Bingham1-2/+9
On some hardware the AUDIO_MIXER_READ ioctl requires the current number of channels to be set, and the mute device found needs to be checked if it belongs to the master output device.
2018-02-07Make iface_type() work on FreeBSDGerome Fournier1-22/+20
2018-02-06Merge pull request #262 from foutaise/masterIngo Bürk1-0/+5
Add check for interval value
2018-02-06Add check for interval valuefoutaise1-0/+5
2018-02-03Merge pull request #261 from tylerbrazier/no-slocIngo Bürk1-7/+6
Remove SLOC comment from man page
2018-02-02Remove SLOC comment from man pageTyler Brazier1-7/+6
This changed happened for the readme in 73620dc876d7f76b9a6771048c5ad0ade94e5bd7
2018-01-28Treat zero battery capacity as "not available" (#259)johcgt7-4/+31
`print_battery_info` computes `batt_info.percentage_remaining` by dividing batt_info.remaining by `full`. If `full` is `0` then the battery remaining will be reported as "inf". Before this, it tries to set `full` to either the design capacity or to the last known good charge. It determines if these values are available by checking whether their fields in `batt_info` are non-negative. As it initialized `batt_info` with values of `-1`, a non-negative value implies that something has provided a value. `slurp_all_batteries` and `add_battery_info` however initialize these fields to zero, so if these functions are called then `batt_info.full_design` will always be used. This means that on systems that don't provide a value for design capacity the percentage remaining will be reported as "inf", unless the user has set `last_full_capacity` to `true` in their `i3status.conf`. This patch changes `print_battery_info` to expect values for the battery capacity to be strictly greater than zero. This seems reasonable as a battery with a capacity of zero isn't useful. An alternative solution would be to change `slurp_all_batteries` and `add_battery_info` to initialize `batt_info` with `-1`, as `print_battery_info` does. This is less appealing as `add_battery_info` is accumulating the values, so using `-1` would introduce off-by-one errors without additional code to avoid them.
2017-12-12Merge pull request #255 from eplanet/update_readmeIngo Bürk1-6/+6
Get rid of the SLOC comment
2017-12-11Get rid of the SLOC commenteplanet1-6/+6
2017-12-11Update comment as in #247 (#254)Emeric Planet1-1/+4
2017-12-11Add IPv6 address when IPv4 isn't available (#247)Emeric Planet6-26/+113
2017-12-09Merge pull request #253 from eplanet/always_reload_tzIngo Bürk1-1/+1
Call tzset at each time print
2017-12-09Call tzset at each time printeplanet1-1/+1
2017-12-09Merge pull request #252 from GuyOfThePery/patch-1Ingo Bürk1-3/+3
Fixed minor typos
2017-12-09Fixed minor typosGuyOfThePery1-3/+3
"you can chose" -> "you can choose" "You can either disable the default separator altogether setting it to the empty string." -> " You can also disable the default separator altogether by setting it to the empty string."
2017-12-03man: explicitly use format_up/format_down in ethernet, wireless confTomas Krizek1-2/+6
Clearly indicate format_up and format_down are used for configuring ethernet and wireless sections instead of format. Signed-off-by: Tomas Krizek <tomas.krizek@mailbox.org>
2017-11-20Add network test cases (#246)Emeric Planet4-0/+22
2017-10-05Merge pull request #237 from kousu/215-batteryMichael Stapelberg1-7/+26
Be more cautious about handling invalid battery measurements.
2017-10-05Fix CPU unit tests (#239)Emeric Planet12-12/+112
Support any amount of available cores on testing machine.
2017-09-18Makefile: make PKG_CONFIG overridable (patch by Helmut Grohne)Michael Stapelberg1-2/+3
2017-09-04Remove overly aggressive #errorJasper Lievisse Adriaanse1-4/+1
Change-Id: I8c20606d386d713cac51b620d1fcdb479a3622fe
2017-08-29Fix CPU unit tests (#239)Emeric Planet13-13/+113
Support any amount of available cores on testing machine.
2017-08-24Repair test case.kousu1-1/+1
This was introduced in #236. It looks like Travis never ran on that PR? Anyway it's blocking me submitting this now so I'm fixing it.
2017-08-24Be more cautious about handling invalid battery measurements.kousu1-7/+26
2017-08-19Use local timezone for battery %emptytime (#236)Emeric Planet1-0/+1
2017-04-16Merge pull request #219 from flammi/masterIngo Bürk1-0/+19
Add check for virtual ethernet devices
2017-04-13Add battery capacity parsing (#216)Emeric Planet7-0/+49
The Linux power supply class defines three entries to provide battery status. One of them wasn't used: POWER_SUPPLY_CAPACITY. https://www.kernel.org/doc/Documentation/power/power_supply_class.txt
2017-04-13Added bracesFabian Franzen1-1/+2
Added braces to the if-statement as requested.
2017-04-12Fix memory leak/Use BEGINS_WITH macroFabian Franzen1-5/+5
The orignal proposed code had a memory leak when returning true. Furthermore I included the handy BEGINS_WITH macro of i3 which makes the code (IMHO) a lot more readable.