-// vim:ts=8:expandtab
+// vim:ts=4:sw=4:expandtab
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <yajl/yajl_gen.h>
#include <yajl/yajl_version.h>
#include "i3status.h"
-static int local_timezone_init = 0;
+static bool local_timezone_init = false;
static const char *local_timezone = NULL;
static const char *current_timezone = NULL;
void set_timezone(const char *tz) {
- if (!local_timezone_init) {
- /* First call, initialize. */
- local_timezone = getenv("TZ");
- local_timezone_init = 1;
- }
- if (tz == NULL || tz[0] == '\0') {
- /* User wants localtime. */
- tz = local_timezone;
- }
- if (tz != current_timezone) {
- if (tz) {
- setenv("TZ", tz, 1);
- } else {
- unsetenv("TZ");
- }
- tzset();
- current_timezone = tz;
+ if (!local_timezone_init) {
+ /* First call, initialize. */
+ local_timezone = getenv("TZ");
+ local_timezone_init = true;
+ }
+ if (tz == NULL || tz[0] == '\0') {
+ /* User wants localtime. */
+ tz = local_timezone;
+ }
+ if (tz != current_timezone) {
+ if (tz) {
+ setenv("TZ", tz, 1);
+ } else {
+ unsetenv("TZ");
}
+ tzset();
+ current_timezone = tz;
+ }
}
-void print_time(yajl_gen json_gen, char *buffer, const char *format, const char *tz, time_t t) {
- char *outwalk = buffer;
- struct tm tm;
+void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, const char *format_time, time_t t) {
+ const char *walk;
+ char *outwalk = buffer;
+ struct tm tm;
+ char timebuf[1024];
+
+ if (title != NULL)
+ INSTANCE(title);
+
+ set_timezone(tz);
+ localtime_r(&t, &tm);
+
+ if (format_time == NULL) {
+ strftime(timebuf, sizeof(timebuf), format, &tm);
+ maybe_escape_markup(timebuf, &outwalk);
+ } else {
+ for (walk = format; *walk != '\0'; walk++) {
+ if (*walk != '%') {
+ *(outwalk++) = *walk;
+ continue;
+ }
+
+ if (BEGINS_WITH(walk + 1, "time")) {
+ strftime(timebuf, sizeof(timebuf), format_time, &tm);
+ maybe_escape_markup(timebuf, &outwalk);
+ walk += strlen("time");
+ }
+ }
+ }
- /* Convert time and format output. */
- set_timezone(tz);
- localtime_r(&t, &tm);
- outwalk += strftime(outwalk, 4095, format, &tm);
- *outwalk = '\0';
- OUTPUT_FULL_TEXT(buffer);
+ *outwalk = '\0';
+ OUTPUT_FULL_TEXT(buffer);
}