Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-18 02:55:12 +00:00
Code Issues Releases Activity

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Browse Source 
Conflicts:
	configure.ac.in
This commit is contained in:
Brenden Matthews 2009-07-19 23:45:55 -06:00
commit 64394fa7da
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,8 +1,11 @@
2009-07-19
* Fixed out-of-tree builds
2009-07-18
* Update MPD elapsed/progress when stopped (sf.net #2792113)
2009-07-18
* add compilation switch --enable-xoap to be able to use
* Added compilation switch --enable-xoap to be able to use
www.weather.com as a source of weather data (this avoids adding
libxml2 as a required dependency for users that wish to use noaa
and not weather.com)

2
configure.ac.in
View File

@ -363,8 +363,8 @@ AC_ARG_ENABLE([xoap],
[want_xoap="$enableval"], [want_xoap=no])
#
AM_CONDITIONAL(BUILD_WEATHER, test x$want_weather = xyes)
AM_CONDITIONAL(BUILD_XOAP, test x$want_xoap = xyes)
if test x$want_weather = xyes; then
AM_CONDITIONAL(BUILD_XOAP, test x$want_xoap = xyes)
if test x$want_xoap = xyes; then
want_libxml2=yes
AC_DEFINE(XOAP, 1, [Define if you want weather xoap support])

4
lua/Makefile.am
View File

@ -35,7 +35,7 @@ libcairo_la_CFLAGS = $(cairo_CFLAGS) $(cairo_xlib_CFLAGS)
libcairo_la_LIBADD = $(cairo_LIBS) $(cairo_xlib_LIBS) -ltolua++
cairo.c: cairo.pkg
${toluapp} -n cairo -o cairo.c cairo.pkg
${toluapp} -n cairo -o cairo.c $(srcdir)/cairo.pkg
endif # BUILD_LUA_CAIRO
@ -47,7 +47,7 @@ libimlib2_la_CFLAGS = $(Imlib2_CFLAGS)
libimlib2_la_LIBADD = $(Imlib2_LIBS) -ltolua++
imlib2.c: imlib2.pkg
${toluapp} -n imlib2 -o imlib2.c imlib2.pkg
${toluapp} -n imlib2 -o imlib2.c $(srcdir)/imlib2.pkg
endif # BUILD_LUA_IMLIB2
pkglib_LTLIBRARIES = $(libcairo) $(libimlib2)

4
src/Makefile.am
View File

@ -43,7 +43,7 @@ BUILT_SOURCES = $(config_output)
CLEANFILES = $(config_output)
$(config_output): ${config_input}
sh ../text2c.sh ${config_input} $@ defconfig
sh $(srcdir)/../text2c.sh ${config_input} $@ defconfig
endif # BUILD_CONFIG_OUTPUT
if BUILD_AUDACIOUS
@ -252,4 +252,4 @@ EXTRA_DIST = \
ccurl_thread.h
# vi:set ts=4 sw=4 noet ai nocindent syntax=automake:
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

15
src/conky.c
View File

@ -455,10 +455,10 @@ int check_contains(char *f, char *s)
return ret;
}
#ifdef X11
#define SECRIT_MULTILINE_CHAR '\x02'
#ifdef X11
static inline int calc_text_width(const char *s, int l)
{
if ((output_methods & TO_X) == 0) {
@ -5822,8 +5822,10 @@ static void generate_text_internal(char *p, int p_max_size,
if(buf[obj->data.scroll.start] == 0){
obj->data.scroll.start = 0;
}
#ifdef X11
//reset color when scroll is finished
new_fg(p + strlen(p), obj->data.scroll.resetcolor);
#endif
}
OBJ(combine) {
char buf[2][max_user_text];
@ -6108,18 +6110,16 @@ static inline int get_string_width(const char *s)
return strlen(s);
}
#ifdef X11
static int get_string_width_special(char *s, int special_index)
{
#ifdef X11
char *p, *final;
int idx = 1;
int width = 0;
long i;
if ((output_methods & TO_X) == 0) {
#endif /* X11 */
return (s) ? strlen(s) : 0;
#ifdef X11
}
if (!s) {
@ -6154,10 +6154,8 @@ static int get_string_width_special(char *s, int special_index)
}
free(final);
return width;
#endif /* X11 */
}
#ifdef X11
static int text_size_updater(char *s, int special_index);
int last_font_height;
@ -6907,7 +6905,8 @@ static int draw_line(char *s, int special_index)
if ((output_methods & TO_X) == 0) {
#endif /* X11 */
draw_string(s);
return 0;
//'special_index - special_index' instead of 0 otherwise gcc complains about not using special_index when build without X11
return special_index - special_index;
#ifdef X11
}