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

Fix build with BUILD_X11 but without OWN_WINDOW

Browse Source
This commit is contained in:
Nikolas Garofil 2010-11-23 13:58:53 +01:00
parent 529392aef0
commit 5781e4f1e7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/x11.cc
View File

@ -41,7 +41,9 @@
#ifdef BUILD_IMLIB2 #ifdef BUILD_IMLIB2
#include "imlib2.h" #include "imlib2.h"
#endif /* BUILD_IMLIB2 */ #endif /* BUILD_IMLIB2 */
#ifndef OWN_WINDOW
#include <iostream>
#endif
#ifdef BUILD_XFT #ifdef BUILD_XFT
#include <X11/Xft/Xft.h> #include <X11/Xft/Xft.h>
#endif #endif
@ -198,6 +200,7 @@ conky::lua_traits<alignment>::Map conky::lua_traits<alignment>::map = {
{ "none", NONE } { "none", NONE }
}; };
#ifdef OWN_WINDOW
template<> template<>
conky::lua_traits<window_type>::Map conky::lua_traits<window_type>::map = { conky::lua_traits<window_type>::Map conky::lua_traits<window_type>::map = {
{ "normal", TYPE_NORMAL }, { "normal", TYPE_NORMAL },
@ -244,6 +247,7 @@ window_hints_traits::convert(lua::state &l, int index, const std::string &name)
} }
return {ret, true}; return {ret, true};
} }
#endif
namespace { namespace {
// used to set the default value for own_window_title // used to set the default value for own_window_title
@ -472,6 +476,7 @@ static Window find_desktop_window(Window *p_root, Window *p_desktop)
return win; return win;
} }
#ifdef OWN_WINDOW
namespace { namespace {
/* helper function for set_transparent_background() */ /* helper function for set_transparent_background() */
void do_set_background(Window win, int argb) void do_set_background(Window win, int argb)
@ -512,6 +517,7 @@ void set_transparent_background(Window win)
} }
#endif /* BUILD_ARGB */ #endif /* BUILD_ARGB */
} }
#endif
#ifdef BUILD_ARGB #ifdef BUILD_ARGB
static int get_argb_visual(Visual** visual, int *depth) { static int get_argb_visual(Visual** visual, int *depth) {
@ -854,6 +860,7 @@ static void init_window(lua::state &l, bool own)
ButtonPressMask | ButtonReleaseMask) : 0) ButtonPressMask | ButtonReleaseMask) : 0)
#endif #endif
); );
if(&l){}//make sure compiler doesn't complain about unused 'l' when compiled without OWN_WINDOW
} }
static Window find_subwindow(Window win, int w, int h) static Window find_subwindow(Window win, int w, int h)