Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-25 12:10:03 +00:00
Code Issues Releases Activity

convert tztime to generic object payload

Browse Source
This commit is contained in:
Phil Sutter 2009-10-03 17:09:13 +02:00
parent 8165a91f0a
commit 1d73d82b87
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/text_object.h
View File

@ -455,11 +455,6 @@ struct text_object {
char *output; char *output;
} mboxscan; } mboxscan;
struct {
char *tz; /* timezone variable */
char *fmt; /* time display formatting */
} tztime;
struct { struct {
struct fs_stat *fs; struct fs_stat *fs;
int w, h; int w, h;

55
src/timeinfo.c
View File

@ -31,14 +31,20 @@
#include "text_object.h" #include "text_object.h"
#include <locale.h> #include <locale.h>
struct tztime_s {
char *tz; /* timezone variable */
char *fmt; /* time display formatting */
};
void scan_time(struct text_object *obj, const char *arg) void scan_time(struct text_object *obj, const char *arg)
{ {
obj->data.s = strndup(arg ? arg : "%F %T", text_buffer_size); obj->data.opaque = strndup(arg ? arg : "%F %T", text_buffer_size);
} }
void scan_tztime(struct text_object *obj, const char *arg) void scan_tztime(struct text_object *obj, const char *arg)
{ {
char buf1[256], buf2[256], *fmt, *tz; char buf1[256], buf2[256], *fmt, *tz;
struct tztime_s *ts;
fmt = tz = NULL; fmt = tz = NULL;
if (arg) { if (arg) {
@ -52,8 +58,11 @@ void scan_tztime(struct text_object *obj, const char *arg)
} }
} }
obj->data.tztime.fmt = strndup(fmt ? fmt : "%F %T", text_buffer_size); ts = malloc(sizeof(struct tztime_s));
obj->data.tztime.tz = tz ? strndup(tz, text_buffer_size) : NULL; memset(ts, 0, sizeof(struct tztime_s));
ts->fmt = strndup(fmt ? fmt : "%F %T", text_buffer_size);
ts->tz = tz ? strndup(tz, text_buffer_size) : NULL;
obj->data.opaque = ts;
} }
void print_time(struct text_object *obj, char *p, int p_max_size) void print_time(struct text_object *obj, char *p, int p_max_size)
@ -62,7 +71,7 @@ void print_time(struct text_object *obj, char *p, int p_max_size)
struct tm *tm = localtime(&t); struct tm *tm = localtime(&t);
setlocale(LC_TIME, ""); setlocale(LC_TIME, "");
strftime(p, p_max_size, obj->data.s, tm); strftime(p, p_max_size, (char *)obj->data.opaque, tm);
} }
void print_utime(struct text_object *obj, char *p, int p_max_size) void print_utime(struct text_object *obj, char *p, int p_max_size)
@ -71,7 +80,7 @@ void print_utime(struct text_object *obj, char *p, int p_max_size)
struct tm *tm = gmtime(&t); struct tm *tm = gmtime(&t);
setlocale(LC_TIME, ""); setlocale(LC_TIME, "");
strftime(p, p_max_size, obj->data.s, tm); strftime(p, p_max_size, (char *)obj->data.opaque, tm);
} }
void print_tztime(struct text_object *obj, char *p, int p_max_size) void print_tztime(struct text_object *obj, char *p, int p_max_size)
@ -79,17 +88,21 @@ void print_tztime(struct text_object *obj, char *p, int p_max_size)
char *oldTZ = NULL; char *oldTZ = NULL;
time_t t; time_t t;
struct tm *tm; struct tm *tm;
struct tztime_s *ts = obj->data.opaque;
if (obj->data.tztime.tz) { if (!ts)
return;
if (ts->tz) {
oldTZ = getenv("TZ"); oldTZ = getenv("TZ");
setenv("TZ", obj->data.tztime.tz, 1); setenv("TZ", ts->tz, 1);
tzset(); tzset();
} }
t = time(NULL); t = time(NULL);
tm = localtime(&t); tm = localtime(&t);
setlocale(LC_TIME, ""); setlocale(LC_TIME, "");
strftime(p, p_max_size, obj->data.tztime.fmt, tm); strftime(p, p_max_size, ts->fmt, tm);
if (oldTZ) { if (oldTZ) {
setenv("TZ", oldTZ, 1); setenv("TZ", oldTZ, 1);
tzset(); tzset();
@ -101,20 +114,24 @@ void print_tztime(struct text_object *obj, char *p, int p_max_size)
void free_time(struct text_object *obj) void free_time(struct text_object *obj)
{ {
if (!obj->data.s) if (!obj->data.opaque)
return; return;
free(obj->data.s); free(obj->data.opaque);
obj->data.s = NULL; obj->data.opaque = NULL;
} }
void free_tztime(struct text_object *obj) void free_tztime(struct text_object *obj)
{ {
if (obj->data.tztime.tz) { struct tztime_s *ts = obj->data.opaque;
free(obj->data.tztime.tz);
obj->data.tztime.tz = NULL; if (!ts)
} return;
if (obj->data.tztime.fmt) {
free(obj->data.tztime.fmt); if (ts->tz)
obj->data.tztime.fmt = NULL; free(ts->tz);
} if (ts->fmt)
free(ts->fmt);
free(obj->data.opaque);
obj->data.opaque = NULL;
} }