Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-06 22:18:36 +00:00
Code Issues Releases Activity

make extra_newline a lua setting

Browse Source
This commit is contained in:
Pavel Labath 2010-03-05 20:58:39 +01:00
parent 48346c8325
commit 667b0d1d8c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conky.cc
View File

@ -155,7 +155,7 @@ int top_io;
#endif #endif
int top_running; int top_running;
int output_methods; int output_methods;
static int extra_newline; static conky::simple_config_setting<bool> extra_newline("extra_newline", false, false);
enum x_initialiser_state x_initialised = NO; enum x_initialiser_state x_initialised = NO;
static volatile int g_signal_pending; static volatile int g_signal_pending;
/* Update interval */ /* Update interval */
@ -1128,7 +1128,7 @@ static void draw_string(const char *s)
} }
if ((output_methods & TO_STDOUT) && draw_mode == FG) { if ((output_methods & TO_STDOUT) && draw_mode == FG) {
printf("%s\n", s_with_newlines); printf("%s\n", s_with_newlines);
if (extra_newline) fputc('\n', stdout); if (extra_newline.get(*state)) fputc('\n', stdout);
fflush(stdout); /* output immediately, don't buffer */ fflush(stdout); /* output immediately, don't buffer */
} }
if ((output_methods & TO_STDERR) && draw_mode == FG) { if ((output_methods & TO_STDERR) && draw_mode == FG) {
@ -2989,9 +2989,6 @@ char load_config_file(const char *f)
output_methods &= ~TO_STDOUT; output_methods &= ~TO_STDOUT;
} }
} }
CONF("extra_newline") {
extra_newline = string_to_bool(value);
}
CONF("disable_auto_reload") { CONF("disable_auto_reload") {
disable_auto_reload = string_to_bool(value); disable_auto_reload = string_to_bool(value);
} }