marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass the "instance" JSON property key for tztime blocks

Browse Source 
fixes #10
This commit is contained in:
Ingo Bürk 2015-03-23 21:42:52 +01:00
parent 3f9d4c6d89
commit 0a84bcb74a
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
i3status.c
View File

@ -627,13 +627,13 @@ int main(int argc, char *argv[]) {
CASE_SEC("time") { CASE_SEC("time") {
SEC_OPEN_MAP("time"); SEC_OPEN_MAP("time");
print_time(json_gen, buffer, cfg_getstr(sec, "format"), NULL, tv.tv_sec); print_time(json_gen, buffer, NULL, cfg_getstr(sec, "format"), NULL, tv.tv_sec);
SEC_CLOSE_MAP; SEC_CLOSE_MAP;
} }
CASE_SEC_TITLE("tztime") { CASE_SEC_TITLE("tztime") {
SEC_OPEN_MAP("tztime"); SEC_OPEN_MAP("tztime");
print_time(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getstr(sec, "timezone"), tv.tv_sec); print_time(json_gen, buffer, title, cfg_getstr(sec, "format"), cfg_getstr(sec, "timezone"), tv.tv_sec);
SEC_CLOSE_MAP; SEC_CLOSE_MAP;
} }

2
include/i3status.h
View File

@ -183,7 +183,7 @@ const char *first_eth_interface(const net_type_t type);
void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down); void print_ipv6_info(yajl_gen json_gen, char *buffer, const char *format_up, const char *format_down);
void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *format_not_mounted, const char *prefix_type, const char *threshold_type, const double low_threshold); void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const char *format, const char *format_not_mounted, const char *prefix_type, const char *threshold_type, const double low_threshold);
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_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 *format, const char *tz, time_t t); 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); 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();
void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down); void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down);

5
src/print_time.c
View File

@ -33,10 +33,13 @@ void set_timezone(const char *tz) {
} }
} }
void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t) { void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t) {
char *outwalk = buffer; char *outwalk = buffer;
struct tm tm; struct tm tm;
if (title != NULL)
INSTANCE(title);
/* Convert time and format output. */ /* Convert time and format output. */
set_timezone(tz); set_timezone(tz);
localtime_r(&t, &tm); localtime_r(&t, &tm);