Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-27 17:18:33 +00:00
Code Issues Releases Activity

Couple minor fixes.

Browse Source 
Make X11_initialise() work as it should, clarified IBM/Lenovo aka smapi
support in configure script.
This commit is contained in:
Brenden Matthews 2009-03-19 13:40:49 -06:00
parent d399a128c9
commit 4c77eed1c3
2 changed files with 50 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac.in
View File

@ -183,7 +183,7 @@ if test x$want_ibm = xyes; then
AC_MSG_NOTICE([support for IBM/Lenovo notebooks not supported on $uname... disabling])
want_ibm=no
else
AC_DEFINE(IBM, 1, [Define if you want support for IBM/Lenovo notebooks])
AC_DEFINE(IBM, 1, [Define if you want support for IBM/Lenovo notebooks (SMAPI)])
fi
fi

28
src/conky.c
View File

@ -6171,6 +6171,7 @@ static void reload_config(void)
set_font();
// clear the window first
XClearWindow(display, RootWindow(display, screen));
x_initialised = NO;
#endif /* X11 */
extract_variable_text(global_text);
@ -6465,6 +6466,7 @@ static _Bool append_works(const char *path)
#ifdef X11
static void X11_initialisation(void)
{
if (x_initialised == YES) return;
output_methods |= TO_X;
init_X11();
set_default_configurations_for_x();
@ -6609,7 +6611,6 @@ static void load_config_file(const char *f)
}
}
CONF("color0") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6620,7 +6621,6 @@ static void load_config_file(const char *f)
}
}
CONF("color1") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6631,7 +6631,6 @@ static void load_config_file(const char *f)
}
}
CONF("color2") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6642,7 +6641,6 @@ static void load_config_file(const char *f)
}
}
CONF("color3") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6653,7 +6651,6 @@ static void load_config_file(const char *f)
}
}
CONF("color4") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6664,7 +6661,6 @@ static void load_config_file(const char *f)
}
}
CONF("color5") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6675,7 +6671,6 @@ static void load_config_file(const char *f)
}
}
CONF("color6") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6686,7 +6681,6 @@ static void load_config_file(const char *f)
}
}
CONF("color7") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6697,7 +6691,6 @@ static void load_config_file(const char *f)
}
}
CONF("color8") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6708,7 +6701,6 @@ static void load_config_file(const char *f)
}
}
CONF("color9") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6738,7 +6730,6 @@ static void load_config_file(const char *f)
TEMPLATE_CONF(8)
TEMPLATE_CONF(9)
CONF("default_color") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6749,7 +6740,6 @@ static void load_config_file(const char *f)
}
}
CONF3("default_shade_color", "default_shadecolor") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6760,7 +6750,6 @@ static void load_config_file(const char *f)
}
}
CONF3("default_outline_color", "default_outlinecolor") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6931,7 +6920,6 @@ static void load_config_file(const char *f)
use_xft = string_to_bool(value);
}
CONF("font") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -6942,7 +6930,6 @@ static void load_config_file(const char *f)
}
}
CONF("xftalpha") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value && font_count >= 0) {
@ -6953,7 +6940,6 @@ static void load_config_file(const char *f)
}
}
CONF("xftfont") {
if(x_initialised == NO)
X11_initialisation();
if (use_xft) {
#else
@ -7050,7 +7036,6 @@ static void load_config_file(const char *f)
#ifdef X11
#ifdef OWN_WINDOW
CONF("own_window") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7061,7 +7046,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_class") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7074,7 +7058,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_title") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7086,7 +7069,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_transparent") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7097,7 +7079,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_colour") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7109,7 +7090,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_hints") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7145,7 +7125,6 @@ static void load_config_file(const char *f)
}
}
CONF("own_window_type") {
if(x_initialised == NO)
X11_initialisation();
if (x_initialised == YES) {
if (value) {
@ -7232,8 +7211,9 @@ static void load_config_file(const char *f)
CONF("text") {
#ifdef X11
//initialize X11 if nothing X11-related is mentioned before TEXT (and if X11 is the default outputmethod)
if(output_methods & TO_X)
if(output_methods & TO_X) {
X11_initialisation();
}
#endif
if (global_text) {
free(global_text);