X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fi3status.h;h=037e1545eda3e7df6af7595317fbf6493116bc66;hb=a13b2e7288e943359ccb37be86efb716efbe98c8;hp=f2a262c035fae8b1e193e76e452e64df18fd1f25;hpb=1710c206cf82330815b6db82316eb422f8be5370;p=i3%2Fi3status

diff --git a/include/i3status.h b/include/i3status.h
index f2a262c..037e154 100644
--- a/include/i3status.h
+++ b/include/i3status.h
@@ -4,9 +4,12 @@
 enum { O_DZEN2,
        O_XMOBAR,
        O_I3BAR,
+       O_LEMONBAR,
        O_TERM,
        O_NONE } output_format;
 
+char *pct_mark;
+
 #include <stdbool.h>
 #include <confuse.h>
 #include <time.h>
@@ -21,6 +24,9 @@ enum { O_DZEN2,
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
 #define DEFAULT_SINK_INDEX UINT32_MAX
+#define COMPOSE_VOLUME_MUTE(vol, mute) ((vol) | ((mute) ? (1 << 30) : 0))
+#define DECOMPOSE_VOLUME(cvol) ((cvol) & ~(1 << 30))
+#define DECOMPOSE_MUTED(cvol) (((cvol) & (1 << 30)) != 0)
 
 #if defined(LINUX)
 
@@ -53,7 +59,7 @@ enum { O_DZEN2,
 /* Allows for the definition of a variable without opening a new scope, thus
  * suited for usage in a macro. Idea from wmii. */
 #define with(type, var, init) \
-    for (type var = (type)-1; (var == (type)-1) && ((var = (init)) || 1);)
+    for (type var = (type)-1; (var == (type)-1) && ((var = (init)) || 1); var = (type)1)
 
 #define CASE_SEC(name)              \
     if (BEGINS_WITH(current, name)) \
@@ -189,10 +195,10 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
 void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds);
 void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t);
 void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t);
-const char *get_ip_addr();
+const char *get_ip_addr(const char *interface);
 void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);
-void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format);
-void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format);
+void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format, const char *format_down);
+void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format, const char *format_down);
 void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int);
 void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format);
 void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);