Commit Graph

430 Commits

Author SHA1 Message Date
Emeric Planet ca9bee8b88 Use local timezone for battery %emptytime (#236) 2017-08-19 14:56:30 +02:00
Ingo Bürk 0e406a1f3b Merge pull request #219 from flammi/master
Add check for virtual ethernet devices
2017-04-16 07:43:30 +02:00
Emeric Planet c7dea74751 Add battery capacity parsing (#216)
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-13 21:46:21 +02:00
Fabian Franzen 6a19709e65 Added braces
Added braces to the if-statement as requested.
2017-04-13 12:51:29 +02:00
Fabian Franzen ad3fac03c3 Fix memory leak/Use BEGINS_WITH macro
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.
2017-04-12 13:11:34 +02:00
Fabian Franzen f45581f8d8 Add check for virtual ethernet devices
The _first_ option for ethernet devices now uses the link in sysfs to determine
if it's a real device or just a virtual one (i.e veth** devices created by docker).
2017-04-12 03:46:04 +02:00
eplanet 94651257ce Multiple CPU support for cpu_usage (#209)
This change addresses the issue #199 asking for multiple CPU support. It
takes an arbitrary CPU number and outputs its usage using the same
arithmetics as for CPU aggregation. It currently doesn't support
FreeBSD.
2017-03-26 06:54:07 -04:00
Kenneth Lyons 8e12ad8308 disk: don't remove trailing slash if path is a single character 2017-03-10 11:24:56 -08:00
Ingo Bürk 09c758eed5 Merge pull request #208 from stapelberg/warning
remove useless checks (we use char, not unsigned char)
2017-03-08 22:26:33 +01:00
Michael Stapelberg eee4ace092 remove useless checks (we use char, not unsigned char)
fixes compilation warnings
2017-03-08 19:24:09 +01:00
Michael Stapelberg 27952b11f7 disk: sanitize trailing slashes
fixes #200
2017-03-08 19:22:22 +01:00
Ingo Bürk 37e73e77b0 Merge pull request #202 from jasperla/openbsd_fdleak
Plug an fd leak in the OpenBSD-specific code for _first_
2017-02-07 20:47:06 +01:00
Jasper Lievisse Adriaanse 3c6d5ac3d7 Plug an fd leak in the OpenBSD-specific code for _first_ 2017-02-07 19:29:01 +01:00
Jasper Lievisse Adriaanse 9166765803 Suppress printing :00 seconds of remaining battery lifetime, as apm(4)'s
estimate only has a granularity of minutes.

From tb@openbsd.org
2017-02-07 19:25:03 +01:00
Baptiste Daroussin 93576bccc3 Fix the deciKelvin to Celsius conversion on FreeBSD (#195)
Change from ceiled value to floored value to be consistent with the
FreeBSD kernel

https://svnweb.freebsd.org/base?view=revision&revision=300421
2017-02-01 11:28:01 -08:00
Jasper Lievisse Adriaanse e09186fa19 Make first_eth_interface() work on OpenBSD: (#197)
- use a define for loopback interface device
- use an approach similar to ifconfig(8) for determining device type
2017-01-31 23:28:38 -08:00
Jasper Lievisse Adriaanse 897d03ed5e Include sys/select.h on OpenBSD (#198)
Fixes a compilation error:
/usr/include/net80211/ieee80211_ioctl.h:339: warning: implicit declaration of function 'howmany'
/usr/include/net80211/ieee80211_ioctl.h:339: error: 'NBBY' undeclared here (not in a function)
/usr/include/net80211/ieee80211_ioctl.h:339: error: variably modified 'nr_rxmcs' at file scope
2017-01-31 23:26:13 -08:00
Mihai Coman 9375959b68 Add 'format_below_threshold' option for 'disk' module
Add 'format_above_threshold' option for 'cpu_temperature' module
Add 'format_above_threshold' option for 'cpu_usage' module
Add 'format_above_threshold' option for 'load' module
2016-11-15 01:09:05 +02:00
Jon Bernard 220b9e1565 Use blank padding for wireless quality (#166) (#167) 2016-11-12 06:39:41 -08:00
Björn Lindström be87c5ac38 Setting of custom locale in tztime configuration. (#168)
To be able to show my birth country's time zone in that country's locale, and my local time in my current locale.
2016-10-24 08:43:04 +02:00
Stu Zhao 707ceffc8b Detect batteries using glob (#163) 2016-10-23 21:20:31 +02:00
Watcom 8d2ef5f99b pulse device may be specified by name (#126) (#162) 2016-09-14 09:26:45 +02:00
Tommie Gannert dc072f9f53 Implement aggregates for batteries.
Using title number all, this enables aggregates. Note that FreeBSD and
OpenBSD previously only reported aggregates, so this is bringing Linux
and NetBSD that functionality.

Changes the default battery reporting to the aggregate since most
users probably don't care about individual batteries. For single-battery
systems there should be no change.

Fixes one obvious memory leak in NetBSD.
2016-08-28 14:29:08 +01:00
Tommie Gannert ac8998ef03 Match trailing equal sign in slurp_battery_info.
Should make it more resilient to future ambiguities in uevent.
2016-08-22 21:18:31 +01:00
Cihangir Akturk 15de209cba Parse uevent file to detect network device type (#153)
Currently i3status differentiates wireless and wired devices based
on the existence of wireless directory inside the device's sysfs
directory. This approach seems to cause 3g modems to be incorrectly
identified as the first ethernet device.

This commit solves this problem by using DEVTYPE variable from
uevent file.

Signed-off-by: Cihangir Akturk <cakturk@gmail.com>
2016-08-22 10:23:59 -07:00
Michael Stapelberg ef16acfca5 print_wireless_info: fix FTBFS on hurd and kfreebsd
Patch by Axel Beckert.
2016-08-22 08:49:19 +02:00
tnnn a2fd4bd074 Added missing ampere to watt conversion for last full capacity. (#158)
Signed-off-by: Tomasz Nitecki <tnnn@tnnn.pl>
2016-08-21 13:11:19 -07:00
eplanet fde5ebfa1e Print empty string for not mounted disks. (#148)
An empty string becomes the default value for format_not_mounted parameter
for any disk entry. This avoids printing erroneous values when a
filesystem is not mounted.
2016-08-16 00:29:08 -07:00
tommie 7ce0044a03 Move time and ratio computations out of slurp_battery_info. (#151)
This allows OSes that support reporting multiple batteries to simply
sum into full_design,full_last,remaining and let print_battery_info
make computations.
2016-08-14 23:52:20 -07:00
Tommie Gannert d74bc90bfe Move full_design and full_last into struct battery_info.
This is in preparation for moving the ratio computation code out of
slurp_battery_info to support aggregating multiple batteries.
2016-08-14 20:44:54 +01:00
Tommie Gannert 9970af67e5 Also capture charge rate in NetBSD.
For time estimates when charging.
2016-08-14 20:44:54 +01:00
Tommie Gannert eb0b6412af Fix warnings about using a char array index on NetBSD.
The isspace macro is just a table lookup.
2016-08-14 12:37:38 +01:00
Tommie Gannert a937693cef Simplify string comparisons in slurp_battery_info for NetBSD.
Doing strlen(a) == strlen(b) && strncmp(a, b, N) seems to have no
benefits compared to just strcmp(a, b). The NetBSD cstring properties
come from the kernel, not the user.

The test for units did a prefix match, but that looked like a bug, the
unit is "Watt hour" in my Virtual box.
2016-08-14 12:20:43 +01:00
Tommie Gannert 7728cff370 Make print_disk_info, print_eth_info and print_wireless_info compile on NetBSD without warnings. 2016-08-14 11:52:27 +01:00
Tommie Gannert 185d70ecbb Remove warnings about unused variables in slurp_battery_info on OpenBSD. 2016-08-14 11:52:27 +01:00
Tommie Gannert 4189824ffb Define IW_ESSID_MAX_SIZE for OpenBSD.
Also fixes a signedness warning.
2016-08-14 11:52:27 +01:00
Tommie Gannert 77f097dcca Move OS-specific code to slurp_battery_info. 2016-08-03 23:27:04 +01:00
Tommie Gannert a537d1503a Introduce a struct battery_info to carry information from data retrieval to the output formatter. 2016-08-03 23:27:04 +01:00
Tommie Gannert 0b16860145 Refactor common seconds_remaining code in print_battery_info. 2016-08-03 23:09:16 +01:00
Tommie Gannert 52f0dd6a36 Remove an END_COLOR in print_battery_info for OpenBSD.
This was probably a bug since it makes no sense to have here.
2016-08-03 23:09:15 +01:00
Tommie Gannert 6d3e9991de Move START_COLOR to after OS-specific code.
This uses the more direct tests of whether percentage_remaining and
seconds_remaining are available or not (rather than looking at
present_rate).
2016-08-03 23:09:02 +01:00
Tommie Gannert 47ec48b85d Remove consumptionbuf from print_battery_info. 2016-08-03 20:13:10 +01:00
Tommie Gannert b890d2e416 Remove emptytimebuf from print_battery_info.
This changes the behavior for NetBSD: previously this time was not
shown while charging. On Linux it was treated as "full time". This
change makes all OSes behave the same.

OpenBSD and FreeBSD did not support emptytime previously.
2016-08-03 20:13:10 +01:00
Tommie Gannert 63724e2fa5 Remove remainingbuf from print_battery_info. 2016-08-03 08:24:24 +01:00
Tommie Gannert 0390dbf2e0 Remove percentagebuf from print_battery_info. 2016-08-01 00:34:31 +01:00
Tommie Gannert 88a0c6923c Remove statusbuf from print_battery_info. 2016-08-01 00:24:40 +01:00
Michael Stapelberg 8e852fa945 Merge pull request #139 from Gjum/wb-colored-cpu-usage
Add CPU usage color thresholds
2016-07-30 19:23:20 +02:00
Alexis Hildebrandt 0a2d4d8a04 Add ifdef to compile wireless_info on Mac (#127) 2016-05-13 09:50:09 +02:00
Watcom 4807be8b5f reconnect to PulseAudio if connection is lost (fixes #124) (#125) 2016-05-08 00:19:30 +02:00
Mark Schreiber 1e8dab273d Add CPU usage color thresholds
CPU usage had previously not supported the color option.  Add support
for a "degraded" state above which the degraded color is used, and a
higher "bad" state above which the "bad" color is used.  One possible
use for these might be indicating whether one or all cores are
saturated.

Unlike the color settings for other, these are set high enough to be
disabled by default.  This is done because i3status determines CPU
usage over only the last display interval, which means that, a user
with a low refresh rate might see frequent, potentially-annoying color
changes.
2016-04-13 09:11:32 -07:00
eoin d59589bf9e Added status_unk to battery_info 2016-03-21 22:41:22 +00:00
eplanet a8aa5d608c Adding glob check to cpu temperature fixes #55 2016-03-20 11:47:56 +01:00
Clayton Craft 430b053326 This removes the 'remaining' time when the battery is full, since the remaining time is always 00:00:00. When the battery is discharging, the remaining time will show up again if the user has set their format correctly. 2016-01-25 00:38:13 -08:00
Watcom Hecht dd75c260f8 revert back to using nanosleep
Fixes #93
2016-01-12 11:46:42 -02:00
Michael Stapelberg fad9c8237c Bugfix: check that format_not_mounted is not NULL before using it
This issue was introduced with commit 75a83574.

fixes #92
2016-01-12 09:50:44 +01:00
David b54623a56d format detection: recognise swaybar 2015-12-27 15:59:32 +11:00
Kenneth Lyons dcd0518e25 Added support for Pango markup. 2015-12-04 10:27:18 -08:00
Michael Stapelberg 876c1cef8d fix compilation on FreeBSD
fixes #83
2015-11-24 19:26:07 +01:00
Michael Stapelberg 3e14e6e5f3 first_eth_interface: ignore MAC addresses, look for IPv4/IPv6 addresses 2015-11-16 22:41:18 +01:00
Stefan Bader 9e6e0d4f8f Correctly calculate Wireless link quality
Wireless quality was stuck at 100% due to
a signed with unsigned integer division.
2015-10-12 20:46:22 +02:00
Jakub Klinkovský 611e863ace Volume percentage should be obtained by float division and rounded to int.
Fixes #75
2015-10-12 09:44:13 +02:00
Michael Stapelberg 1935110ef3 Merge pull request #71 from bsdjhb/freebsd_wifi_buildfix
Fix build under FreeBSD after recent changes for Linux.
2015-10-09 09:11:16 -07:00
John Baldwin 9ebde24df1 Fix build under FreeBSD after recent changes for Linux. 2015-10-08 13:20:02 -07:00
John Baldwin 5e33d9fe74 Properly detect the battery charging status under FreeBSD.
The hw.acpi.battery.state sysctl returns a bitmask of flags as
defined in <dev/acpica/acpiio.h>.  Use constants from this header
to examine the state and check for the charging flag to determine
if the battery is charging.
2015-10-08 13:15:38 -07:00
Brendan Van Hook a13b2e7288 Added support for lemonbar 2015-10-04 14:52:32 -04:00
Michael Stapelberg f3125fdfde document code origins
fixes #65
2015-09-25 11:40:07 +02:00
Michael Stapelberg 06a133135f Fix comparison between signed/unsigned warning for real 2015-09-25 11:05:51 +02:00
Michael Stapelberg b8b07511b1 use proper unsigned type for ESSID length 2015-09-25 10:49:14 +02:00
Michael Stapelberg 45ccd84309 use nlmsg_data instead of the too-new genlmsg_hdr 2015-09-25 10:49:01 +02:00
Michael Stapelberg e1203ca62a use NL80211_RATE_INFO_BITRATE (16-bit)
NL80211_RATE_INFO_BITRATE32 is not available widely enough yet (the libc
used by travis doesn’t have it yet, for example).
2015-09-25 10:42:30 +02:00
Michael Stapelberg 668bf2079f wireless (linux): switch from libiw to libnl
Based on http://cr.i3wm.org/patch/692/ by Alexander Monakov

fixes #32
fixes #52
2015-09-24 21:47:02 +02:00
Michael Stapelberg fb57fca5c2 Merge pull request #59 from bsdjhb/freebsd_wifi
Fix various issues with wireless information under FreeBSD:
2015-09-16 14:06:48 +02:00
John Baldwin 85618dc8e8 Fix various issues with wireless information under FreeBSD:
- Instead of hoping that the currently associated AP will show up as
  the first AP in the list of scan results, fetch the BSSID of the
  currently associated AP and use that to fetch station info for the
  AP.  This provides more frequently updated signal strength
  information than scan results and reliably provides information when
  multiple APs are in range.
- Do not treat the RSSI value as a raw signal value in dBm.  Instead, use
  the same formula as ifconfig(8) to compute a signal value.
- Do not report the beacon interval value as a signal quality level.
2015-09-15 13:39:01 -07:00
John Baldwin dee6d52720 Fix some issues with displaying Ethernet media status on recent FreeBSD kernels.
- Don't apply IFM_SUBTYPE to the raw subtype in the description table.
  IFM_SUBTYPE() requires a fully populated word and was truncating values
  in the table when comparing resulting in false matches (notably
  "10GBase-KX4" for the no media case) after recent changes to add extended
  Ethernet media states in FreeBSD.
- Explicitly check for IFM_ETHER.
- Use SIOCGIFXMEDIA when present to obtain extended media states on newer
  kernels.
- Explicitly handle "no carrier".
2015-09-15 10:48:16 -07:00
Dmitrij D. Czarkoff 9b238a8d65 Use "color_degraded" when interface has no IP
On laptops one may want to have all interfaces up in order to let network
prioritization manage switching between wired and wireless connection.  In such
cases lack of IP address is a useful hint about currently used interface, and
color-coding makes it stand out more.
2015-08-06 17:20:29 +02:00
Dmitrij D. Czarkoff 15f2279592 Use SndIO for volume module on OpenBSD
* add audio(4) code by Robert Nagy
 * disable PulseAudio

While at OpenBSD support, add "-pthread" to LIBS.
2015-08-01 17:35:09 +02:00
Alexis Hildebrandt 80e7b83d54 Add ifdef to compile print_disk_info on Mac 2015-07-06 15:48:39 +02:00
Alexis Hildebrandt d1cec2632d Fix undeclared identifier thermal_zone error
when THERMAL_ZONE is not defined.
2015-07-06 15:47:44 +02:00
Viktor Stanchev a2b8529043 add apostrophe to error message to fix grammar 2015-06-12 23:08:46 -04:00
Ingo Bürk 75a835742e Use format_not_mounted if the directory for a disk_info block does not exist.
This is useful for dynamically mounted devices like thumb drives that get mounted into a directory such as
'/media/$UID/$NAME'.

fixes #33
2015-05-29 08:43:29 +02:00
Michael Stapelberg d1aa135d28 Clamp the percentage at 100% when last_full_capacity is enabled. 2015-05-20 19:17:23 +02:00
Nicholas Helke d7f0d64c40 Changed battery info output to HH:MM for consistency accross all platforms 2015-05-05 10:51:57 +01:00
Watcom Hecht f779da1a59 PulseAudio muted volume support (fixes #27) 2015-04-19 13:28:26 -03:00
Jasper Lievisse Adriaanse e91891729e Use the maximum rssi, not the scaled percentage for the signal level.
This makes the value for %signal match ifconfig(8) in all cases.
2015-04-04 10:56:58 +02:00
Michael Stapelberg 9abe0a9d59 Merge pull request #7 from Watcom/master
PulseAudio support for volume input
2015-04-03 14:45:40 -07:00
Watcom Hecht 1710c206cf PulseAudio support for volume input 2015-04-03 17:57:40 -03:00
Michael Stapelberg d00a0e087c Merge pull request #17 from chrko/format_down
Adding format_down option to path_exists and run_watch
2015-04-02 13:42:47 -07:00
Christian Kohlstedde 5c094a5493 Adding the option "format_down" to path_exists and run_watch.
This fixes #1.
2015-04-02 22:31:06 +02:00
Jasper Lievisse Adriaanse ae50bbe257 sys/dkstat.h has been removed from OpenBSD and it's functionality actually lived/lives in sys/sched.h 2015-04-02 20:31:17 +02:00
Watcom Hecht b12e11237b refactoring to avoid code duplication 2015-03-29 17:05:26 -03:00
Baptiste Daroussin c9dc67e054 print_cpu_usage: Fix warnings on non linux
Move linux variable under LINUX boundaries
2015-03-25 08:19:13 +01:00
Baptiste Daroussin 0b882f36b5 print_eth_info: fix warnings on FreeBSD 2015-03-25 08:18:23 +01:00
Baptiste Daroussin eaf5d6bf80 print_volume: don’t return, complete the buffer first
Follow the changed done for Linux on f0cd726b
2015-03-25 08:13:47 +01:00
Baptiste Daroussin e9fc4c1c06 Fix build on FreeBSD 2015-03-25 08:03:23 +01:00
Ingo Bürk 0a84bcb74a Pass the "instance" JSON property key for tztime blocks
fixes #10
2015-03-23 21:42:52 +01:00
Michael Stapelberg d74e904bf4 clang-format-3.5 -i **/*.[ch], update modeline
From here on, we’ll use clang-format to automatically format the source.

This has worked well in i3, so we are introducing it for i3status.
2015-03-16 10:01:07 +01:00
Christian Kohlstedde 562a879f7c removing Yoda-Style
adding some words in the manpage
2015-02-22 18:25:12 +01:00
Christian Kohlstedde 85bb373095 Adding optional configuration option to "print_disk_info". 2015-02-18 23:43:25 +01:00
Christian Kohlstedde f7b25a15dd Excluding the code on BSD systems. 2015-02-18 22:11:57 +01:00
Christian Kohlstedde 014e66563f Make the code more readable. 2015-02-18 22:11:16 +01:00
Christian Kohlstedde e70ea4247f Modify print_disk_info. Now there is no output if the path is no mountpoint. 2015-02-18 16:53:24 +01:00
Alexander Monakov 05273b03fd Avoid use of uninitialized variable in print_battery_info
The boolean flag 'watt_as_unit' may be used without being initialized if the
configured battery path does not contain expected statistics (for example if
it is misconfigured and points to AC adapter info or simply an unrelated file).

Even though it does not cause ill effects, it causes a warning (true positive)
when running i3status under Valgrind.  Initialize the variable to make code
well-defined.
2014-12-22 09:19:40 +01:00
Michael Stapelberg b219f47f39 support the special interface name _first_ for ethernet/wireless
Since we have deterministic device names in Linux, these strings are a
much better default in the i3status config than "eth0" and "wlan0" (what
we used before).
2014-12-07 15:17:31 +01:00
Tuomas Tynkkynen 7bdfb5b72e i3status: Support %frequency for wireless interfaces
In many public WiFis, the 2.4 GHz wireless band is slow due to
congestion, while there is still plenty of bandwidth available on the
5 GHz area. So when debugging wireless issues it's convenient to have
i3status display the frequency of the access point that the interface is
connected to.

This patch adds support for the %frequency tag for wireless interfaces,
so for example:
    format_up = "WLAN: %essid - %quality / %frequency"
would result in:
    "WLAN: eduroam - 074% / 2.4 GHz"
2014-12-03 08:14:21 +01:00
Cyril Andreatta 8e22f3839d Created three individual Strings for each battery status (charging, dicharching, full)
Replaced hard coded status strings (CHR, BAT, FULL) in
print_battery_info.c with user defined strings. The new strings are
'status_chr', 'status_bat' and 'status_full' and can be set in i3status.conf.
e.g.
status_chr = " CHR"

If any of the new status strings is omitted the standard strings (CHR,
BAT, FULL) are used.
2014-10-07 18:52:01 +02:00
Michael Stapelberg 8a57208b1d Bugfix: fix wrong color tags with xmobar
fixes #1353
2014-08-26 20:54:04 +02:00
Klemen Košir fcd95c2408 Fix battery indicator on systems without POWER_SUPPLY_VOLTAGE_NOW.
In my case, the voltage variable would stay initialized as -1,
which caused the calculation of battery charge percentage to be
incorrect (I would get the message that there is no battery present
or even -0% charge).

I have no idea how this would affect other systems, since I don't
have a chance to test this.
2014-08-25 19:36:02 +02:00
Robin Hahling d73ca2fa82 Fix Dragonfly BSD CPU temperature gauge
This patch fixes CPU temperature gauge for DragonFly BSD.
Commit 0eeded8 assumed that fetching CPU temperature for DragonFly
BSD was similar to that of FreeBSD but this assumption is false.
2014-08-08 11:57:01 +02:00
Michael Stapelberg 2158128ea0 Use the absolute values for (dis)charging rates
Apparently some notebooks report a negative current, whereas most don’t.

fixes #1249
2014-05-31 14:01:18 +02:00
Michael Stapelberg 653505a3bb run_watch: check all matching pid files (until first valid one) (Thanks brotbart)
fixes #1245
2014-05-15 21:51:01 +02:00
Alexander Vasarab b26b118d76 Fix NetBSD CPU temp gauge bug
This patch fixes a bug in which multiple (conflicting) CPU temps may be
included in the output for the "cpu temperature" module.

The bug is due to the way that the code parsed the envsys(4)-returned data,
and would manifest itself on x86-based NetBSD machines, since those use
cputemp(4) as well as acpitz(4), thereby creating multiple envsys(4) entries
with identical descriptions but which refer to different physical sensors.

Instead of matching the description attribute of each device returned by
envsys(4) against the target format, this patch throws away non-matching keys
in the first instruction inside the dict walk. This has the benefit of sparing
unnecessary CPU cycles, and preventing other sensors from being included
erroneously.

Additionally, the THERMAL_ZONE format is now joined with OpenBSD in that it
uses acpitz(4) explicitly. This is prefered since it is much older (dating
back to NetBSD 2.0), and does not exclude x86-based users (as with cputemp(4)).
2014-04-30 09:28:09 +02:00
Alexander Vasarab 628149b227 Implement battery functionality for NetBSD users
This patch takes a similar approach as the NetBSD CPU temperature
code in that it uses proplib(3) to walk dictionaries supplied by
envsys(4).

In addition to providing the basic functionality, it:

* Provides all existing format specifiers (%emptytime %consumption
  %status %percentage %remaining)
* Respects all existing config options (hide_seconds, low_threshold,
  integer_battery_capacity, last_full_capacity)
* Projects "time until full" when battery status is CS_CHARGING
2014-04-30 09:23:17 +02:00
Mats 4f7da73885 Unify use of string comparisons
* strncmp(s1, s2, strlen(s2)) → BEGINS_WITH(s1, s2)
* strncmp(s1, s2, strlen(s1)) → strcmp(s1, s2)
* Prefer case-insensitive comparison for options
2014-03-12 08:28:16 +01:00
Jasper Lievisse Adriaanse 52814295a0 For the %percentage display of batteries, drop the leading '0' for values < 10. 2014-03-12 08:27:00 +01:00
Mats bc0bd8c9e0 disk: Colorize output when below given threshold
New disk module options:
* threshold_type: ^(percentage|[kmgt]?bytes)_(free|avail)$
* low_threshold: <double>

fixes #912
2014-03-09 22:57:19 +01:00
Marco Hunsicker 0c2b518b8a Typo in function name
Fixes the typo in print_seperator()
2014-03-01 22:35:37 +01:00
Marco Hunsicker 7b021d3eb2 i3status: Allow customization of module separator
This patch adds the ability to customize the separator that is placed
between modules.

Specifically this patch:

* adds the "separator" general directive
* moves the definition of the default separator for the different
  output formats (excluding color formatting) to src/i3status.c
* updates the SEC_CLOSE_MAP macro to disable the separator for the
  i3bar output format if the separator directive dictates so
* changes print_seperator() in src/output.c to take a separator
  parameter in order to disable the output of the separator if
  the separator is empty and to use the provided separator
  otherwise
* updates the manpage to explain the new directive
2014-03-01 10:21:11 +01:00
Marco Hunsicker 26faed4c2f i3status: Bugfix: Reading multiple temperature sensors not possible
This patch inlines the creation of the thermal zone string in order
to force computation on each invocation. This is necessary to be able
to read the values of several temperature sensors.
2014-02-26 22:32:32 +01:00
Iakov Davydov c01a8110a4 Add hide_seconds option
fixes: #1134
2014-02-08 20:36:59 +01:00
Mats 596f2264f4 disk: Distinguish between IEC, SI and custom prefixes
* IEC: Ki, Mi, Gi, Ti (powers of 1024)
* SI: k, M, G, T (powers of 1000)
* custom: K, M, G, T (powers of 1024)
2013-12-10 21:18:14 +01:00
Kinware AB 717484184f Add support for path_exists directive. 2013-11-22 15:52:27 +01:00
Gereon Kremer 4bd0ba88c8 Added different format string for volume in case it is muted.
If the volume is muted, the volume level would simply be displayed as zero and the color changed to color_degraded.
This patch lets the user define a custom format string for when the volume is muted.
The default value is "♪: 0%" ("♪: %volume" being the usual format).
2013-11-18 22:31:42 +01:00
Michael Stapelberg 14b43bdec2 format detection: simplify code, handle "sh" processes in the hierarchy
i3 starts processes using /bin/sh now, not $SHELL. This increases the
likelihood with which we are started by dash, which tends to leave its
processes in the hierarchy, e.g.:

michael       1524  i3bar --bar_id=bar-0 --socket=/run/user/1000/i3/ipc-s
michael       1525   \_ /bin/sh -c i3status
michael       1526       \_ i3status

This case is now handled correctly — when the parent is “sh”, the parent
of sh will be used instead.
2013-11-09 14:37:05 +01:00
Michael Stapelberg 31509b0d56 fix slurp(), it needs to read size-1 for the trailing NUL 2013-11-09 14:37:04 +01:00
Michael Stapelberg ebfafc5dac print_cpu_temperature: fix memory leak (Thanks kuba) 2013-10-24 19:19:21 +02:00
Arnaud Degroote c6e9fc84c6 Add support for cpu temperature on NetBSD (using envsys(4)) 2013-10-07 19:32:50 +02:00
Arnaud Degroote 32551729e8 Allow to print cpu usage on NetBSD 2013-10-07 19:31:01 +02:00
Arnaud Degroote cf2fb61911 Allow to print eth information on NetBSD 2013-10-07 19:30:51 +02:00
M. Kory Woods 41be50a983 allow load to be a float 2013-07-09 23:22:26 +02:00
Axel Wagner 7a372b0f46 Implement term-output-format 2013-05-19 19:51:01 +02:00
oblique 8445d6a929 print_volume(linux): Open a new mixer every time.
This fix the following bug:
    If you switch your sound card on-the-fly, print_volume continued to
    use the old sound card.
2013-05-19 19:48:07 +02:00
Jonas Cleve 6a84138251 fix #1017: i3status uses generic battery instance 2013-05-04 17:53:20 +02:00
Baptiste Daroussin 13ebebeb7a Support colored output for CPU temperature on FreeBSD 2013-03-20 11:16:53 +01:00
Michael Stapelberg f0cd726bf0 print_volume: don’t return, complete the buffer first
Otherwise, i3bar will display “SPEC VIOLATION” because full_text is
missing in the block.
2013-03-19 19:56:44 +01:00
Baptiste Daroussin 8dbadb6d4e Enable colored output for battery on FreeBSD 2013-03-19 19:54:15 +01:00
Baptiste Daroussin f30ec89b79 Support mixer_idx with OSS
make mixer_idx load the default mixer
2013-03-19 19:53:26 +01:00
Baptiste Daroussin 7f83d0a197 Show degraded colors in case volume is muted with OSS 2013-03-19 18:36:49 +01:00
Christoph Göttschkes 5e0b8812bf Added format_down option for battery if no battery is available. 2013-03-09 11:43:55 +01:00
Jakob Haufe d62e10c56d Fix FTBFS on Hurd
On GNU/Hurd, THERMAL_ZONE is undefined. This makes compilation fail as
outwalk is declared inside of #ifdef THERMAL_ZONE, but it's used outside
of it (by OUTPUT_FULL_TEXT).

This moves the declaration outside the #ifdef to allow for successful
compilation on Hurd again.
2013-03-02 13:48:43 +01:00
Michael Stapelberg b6c4d4ee46 wireless: call START_COLOR only once (Thanks XTaran) 2013-02-26 00:32:24 +01:00
Michael Stapelberg 4a282a4978 battery: initialize colorful_output to false 2013-02-23 18:05:08 +01:00
Michael Stapelberg d52b9f82ca ipv6: properly handle colors for output_format == xmobar 2013-02-23 18:04:52 +01:00
Raphael Michel 6279964c6b Add colorized output for load avg 2013-02-22 14:09:58 +01:00
Julien Lequertier 67c2c1a7ea Added option to show battery capacity without decimals 2013-02-14 19:35:15 +01:00
Michael Stapelberg 8c273e54b8 use stdbool instead of (int)1 and (int)0 directly 2013-02-10 17:21:46 +01:00
Michael Stapelberg 78cd0e1e01 s/\<timezone\>/tz/ in order to not shadow the timezone var from time.h 2013-02-10 17:19:56 +01:00
Emil Mikulic 2ebe1f3726 Add tztime module to support multiple different timezones. 2013-02-10 17:18:32 +01:00
Michael Stapelberg 68e447d3f6 Bugfix: output auto detect: properly detect ambiguous situations (Thanks mist)
fixes #940
2013-02-04 21:36:55 +01:00
Michael Stapelberg a5a43af186 retab! print_cpu_temperature 2013-01-28 11:37:23 +01:00
Emil Mikulic a87b63c3e9 Make sure colorful_output variable is initialized. 2013-01-28 11:36:23 +01:00
Adrien Schildknecht d43664235a wifi: properly display ad-hoc networks
No statistics are displayed with ad-hoc networks since none are available.
2013-01-24 15:22:00 +01:00
Gereon Kremer 6147e2b268 changing volume color from bad to degraded if muted 2013-01-05 08:37:20 +01:00
Scott Tincman 0eeded8bc0 DragonFlyBSD support added 2012-11-15 12:31:17 +01:00
Deiz 638156c8b2 Teen ordinal numbers always use a 'th' suffix. 2012-11-06 00:26:47 +01:00
Deiz e10d38fea0 Reduce the season day to 0-9 to properly print ordinal suffixes 2012-10-19 19:36:53 +02:00
Simon Elsbrock 35f3bcb348 bugfix: colorize output even without discharge rate (thanks f8l)
On some systems, the discharge rate may be missing, although the battery
is still working. This leads to an edge case on Linux systems in which
the output may not be colorized although a threshold was defined.

This commit fixes the behavior by colorizing output if threshold_type is
set to "percentage". Since we cannot calculate remaining time without
discharge rate, output is still uncolorized in case of threshold_type
set to "time".
2012-10-16 22:49:22 +02:00
Michael Stapelberg 450424f97a implement max_threshold for linux, too 2012-10-16 10:52:57 +02:00
Jasper Lievisse Adriaanse ae4873bac7 i3status - More temperature related fixes for OpenBSD, and a general feature
- Temperature sensors can now set a 'max_threshold' value to color the output red if exceeded.
- Allow for arbitrary temperature sensors nodes to be selected with 'path' on OpenBSD.
2012-10-16 10:51:15 +02:00
Jasper Lievisse Adriaanse 1c2517a399 i3status - Default to acpitz(4) instead of cpu(4) for OpenBSD temperature readings
The acpitz(4) values are eventually used by the kernel to determine if the machine
is getting too hot.
2012-10-16 10:48:44 +02:00
Jasper Lievisse Adriaanse ed03d2450c i3status - Handle down wireless interfaces just like ethernet interfaces (e.g. colors) 2012-10-16 10:48:29 +02:00
Deiz 04dc34f27d Skip a day in the Discordian calendar when St. Tib's Day has passed 2012-10-16 09:25:38 +02:00
Jasper Lievisse Adriaanse 794151cfe7 Implement %essid and %signal for wireless on OpenBSD. 2012-10-10 08:24:29 +02:00
Jasper Lievisse Adriaanse 11c4ab9870 Implement %speed for Ethernet on OpenBSD. 2012-10-10 08:24:04 +02:00
Jasper Lievisse Adriaanse 8da0452d2c Various fixes for the OpenBSD section of the battery backend.
- fix the battery status printing in %status.
- fix remaining time when we're charging.
- use colors to indicate battery status.
- small cleanups.
2012-10-10 08:23:14 +02:00
Michael Stapelberg 7dcc961fa2 Bugfix: Move the pbval definition outside the ifdef (Thanks XTaran)
This fixes compilation on !linux
2012-10-03 15:12:49 +02:00
Michael Stapelberg 5c615f7074 Save the DNS lookup for K.root-servers.net (Thanks barfoos)
This avoids running into a timeout when there is no connectivity on
i3status startup.
2012-09-29 00:08:56 +02:00
Simon Elsbrock 59d52ad787 print_battery.c: do END_COLOR only if START_COLOR was used 2012-09-05 23:28:31 +02:00
Simon Elsbrock 1c4677a644 turn volume into red if muted
fixes #743
2012-09-05 23:28:27 +02:00
Michael Stapelberg d6b8a4efc1 introduce percentages for all values, document them 2012-08-31 14:16:58 +02:00
gereon 50ad0334f6 adding percentage format string for disk info module
explicit cast to double, changed format string to percentage
2012-08-31 14:07:46 +02:00
Piotr Domagalski fa4e9cdfb3 Eat unnecessary space from the battery format str.
If the battery is not discharging it may be not possible to give information on
remaining time or consumption. The resulting strings (%remaining, %consumption,
%emptytime) are empty then. But because they are in the format string, the
output string contains unnecessary spaces in this case.

This commit makes i3status strip these spaces.
2012-08-31 12:08:24 +02:00
Simon Elsbrock 68f438ec9e add additional battery threshold type "percentage"
The battery threshold can now be configured as type "time" or
"percentage", but defaults to "time" to prevent unexpected behavior.
Also, low_threshold was set to a more reasonable default of 30.
2012-08-28 18:05:11 +02:00
Philipp Schaefer 3baf27bf1d use correct units for battery calculation 2012-08-13 01:44:40 +02:00
Michael Stapelberg dea8703aba Bugfix: Properly skip "consumption", not "consumptionbuf" (Thanks mloskot)
Fixes #752
2012-07-12 08:16:40 +02:00
Michael Stapelberg 141f45e792 small style fix in src/print_battery_info.c (move comment) 2012-07-11 19:11:29 +02:00
Marcel Hellwig 1271ff2aa4 Calculate the consumption if POWER_SUPPLY_POWER_NOW does not exist in uevent 2012-07-11 19:11:08 +02:00
Lars Kumbier f5c96008b0 colorful ipv6 status message 2012-07-10 20:37:54 +02:00
Marcel Hellwig c01e87b269 Added consumption to battery info 2012-07-09 15:13:05 +02:00
Marcel Hellwig ccc31f0b80 Added condition, for red color, when battery-time is low, namely battery is discharging 2012-07-09 15:12:43 +02:00
Mateusz Poszwa 859a7690a6 Avoid division by zero when calculating CPU usage. 2012-06-28 12:05:01 +02:00
Mateusz Loskot 10ed9efff4 Moved translation of wireless status code to text from multiple places into single BATT_STATUS_NAME macro. It simplifies customisation of the hard-wired status text. 2012-06-11 12:00:24 +02:00
Simon Elsbrock 7c02c10b72 colorize battery output if remaining time below threshold 2012-05-25 09:53:49 +02:00
Michael Stapelberg 7a77472a81 battery info: output errors in JSON in every case
This hopefully fixes http://bugs.i3wm.org/707
2012-05-15 12:30:23 +02:00
Michael Stapelberg 296eb5e706 Error handling: Never output null as full_text (JSON), prefix messages with i3status (Thanks Artemis)
The former made i3bar crash, the latter is helpful for debugging.
2012-05-09 18:56:57 +02:00
Michael Stapelberg 4ef47541b9 Improve error message when the cpu temperature cannot be read 2012-05-09 18:39:41 +02:00
Michael Stapelberg 4ddd115af8 Use (void) instead of () for functions without args (Thanks fernandotcl)
See also:
http://article.gmane.org/gmane.linux.kernel/1268792

The C compiler will handle (void) as "no arguments" and () as "variadic
function" (equivalent to (...)) which might lead to subtle errors.
2012-05-07 08:28:04 +02:00
Jasper Lievisse Adriaanse 6b447f7f1b - Remove some superfluous #ifdef clutter - If we're compiling on !(Linux or FreeBSD), just emit a '?'. 2012-05-04 16:10:19 +02:00
Ewgenij Starostin b5f89c83cc Handle %d with non-default CPU temperature path. 2012-05-04 12:29:02 +02:00
Michael Stapelberg 7dc10f4205 Fix harmless format string mistake (Thanks loblik) 2012-05-02 17:42:51 +02:00
Jasper Lievisse Adriaanse 2847f83402 Implement displaying battery status on OpenBSD. 2012-04-30 13:00:49 +02:00
Jasper Lievisse Adriaanse 1c3fb04fb9 Implement basic fetching of cpu temperature on OpenBSD. 2012-04-30 13:00:46 +02:00
Jasper Lievisse Adriaanse aabac78fd0 Print the volume on OpenBSD too. Add missing library to Makefile accordingly. 2012-04-29 11:13:29 +02:00
Jasper Lievisse Adriaanse 688d300646 Fix disk usage on OpenBSD. 2012-04-29 11:13:14 +02:00
Jasper Lievisse Adriaanse 75a741484e Fix CPU usage on OpenBSD. Currently only takes the first cpu into account, but works fine otherwise. 2012-04-29 11:13:06 +02:00
Jasper Lievisse Adriaanse 6eac8bee58 Fix include order; fixes build on OpenBSD. 2012-04-28 10:08:37 +02:00
Michael Stapelberg 1b3aa40485 add yajl compat code 2012-04-08 14:05:47 +02:00
Michael Stapelberg 12b1bfa9b8 Properly output JSON with libyajl 2012-03-25 22:05:00 +02:00
Michael Stapelberg d5b4c8e368 Implement the i3bar JSON protocol
This hardcodes all the JSON parts. Strings are not properly escaped currently.
The best/easiest way to fix this is by actually using libyajl.
2012-02-16 23:30:54 +00:00
Baptiste Daroussin be61907ad5 FreeBSD: fix disk usage print 2011-12-09 23:39:01 +00:00
Michael Stapelberg 3471ff39f8 battery: implement "path" option for batteries with non-standard paths 2011-11-26 18:26:38 +00:00