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

make times_in_seconds a lua setting

Browse Source
This commit is contained in:
Pavel Labath 2010-03-05 14:20:04 +01:00
parent b713536dad
commit 48346c8325
5 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.cc
View File

@ -211,7 +211,7 @@ void format_seconds(char *buf, unsigned int n, long seconds)
long days; long days;
int hours, minutes; int hours, minutes;
if (times_in_seconds()) { if (times_in_seconds.get(*state)) {
snprintf(buf, n, "%ld", seconds); snprintf(buf, n, "%ld", seconds);
return; return;
} }
@ -235,7 +235,7 @@ void format_seconds_short(char *buf, unsigned int n, long seconds)
long days; long days;
int hours, minutes; int hours, minutes;
if (times_in_seconds()) { if (times_in_seconds.get(*state)) {
snprintf(buf, n, "%ld", seconds); snprintf(buf, n, "%ld", seconds);
return; return;
} }

5
src/conky.cc
View File

@ -2585,8 +2585,6 @@ static void set_default_configurations(void)
stuff_in_uppercase = 0; stuff_in_uppercase = 0;
info.users.number = 1; info.users.number = 1;
set_times_in_seconds(0);
#ifdef BUILD_PORT_MONITORS #ifdef BUILD_PORT_MONITORS
/* set default connection limit */ /* set default connection limit */
tcp_portmon_set_max_connections(0); tcp_portmon_set_max_connections(0);
@ -2981,9 +2979,6 @@ char load_config_file(const char *f)
utf8_mode = string_to_bool(value); utf8_mode = string_to_bool(value);
} }
#endif /* BUILD_X11 */ #endif /* BUILD_X11 */
CONF("times_in_seconds") {
set_times_in_seconds(string_to_bool(value));
}
CONF("max_text_width") { CONF("max_text_width") {
max_text_width = atoi(value); max_text_width = atoi(value);
} }

2
src/mpd.cc
View File

@ -313,7 +313,7 @@ static inline void format_media_player_time(char *buf, const int size,
{ {
int days, hours, minutes; int days, hours, minutes;
if (times_in_seconds()) { if (times_in_seconds.get(*state)) {
snprintf(buf, size, "%d", seconds); snprintf(buf, size, "%d", seconds);
return; return;
} }

18
src/timeinfo.cc
View File

@ -28,6 +28,10 @@
* *
*/ */
#include "config.h"
#include "timeinfo.h"
#include "conky.h" #include "conky.h"
#include "text_object.h" #include "text_object.h"
#include <locale.h> #include <locale.h>
@ -38,22 +42,12 @@
#include <memory> #include <memory>
char print_times_in_seconds = 0;
struct tztime_s { struct tztime_s {
char *tz; /* timezone variable */ char *tz; /* timezone variable */
char *fmt; /* time display formatting */ char *fmt; /* time display formatting */
}; };
void set_times_in_seconds(char val) conky::simple_config_setting<bool> times_in_seconds("times_in_seconds", false, false);
{
print_times_in_seconds = val;
}
char times_in_seconds(void)
{
return print_times_in_seconds;
}
void scan_time(struct text_object *obj, const char *arg) void scan_time(struct text_object *obj, const char *arg)
{ {
@ -171,7 +165,7 @@ static void do_format_time(struct text_object *obj, char *p, unsigned int p_max_
int minutes, hours, days, weeks; int minutes, hours, days, weeks;
char show_minutes = 0, show_hours = 0, show_days = 0, show_weeks = 0, hidestring; char show_minutes = 0, show_hours = 0, show_days = 0, show_weeks = 0, hidestring;
if (!times_in_seconds()) { if (not times_in_seconds.get(*state)) {
NORM_ERR("Enable \"times_in_seconds\" to use $format_time"); NORM_ERR("Enable \"times_in_seconds\" to use $format_time");
return; return;
} }

6
src/timeinfo.h
View File

@ -30,9 +30,9 @@
#ifndef _TIMEINFO_H #ifndef _TIMEINFO_H
#define _TIMEINFO_H #define _TIMEINFO_H
/* for the times_in_seconds configuration variable and it's users */ #include "setting.hh"
void set_times_in_seconds(char);
char times_in_seconds(void); extern conky::simple_config_setting<bool> times_in_seconds;
/* since time and utime are quite equal, certain functions /* since time and utime are quite equal, certain functions
* are shared in between both text object types. */ * are shared in between both text object types. */