TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Add new build option WITH_XCOMPOSITE

Browse Source 
Fix build without xcomposite
This resolves Bug 1289
pull/16/head
Alexander Golubev 12 years ago committed by Slávek Banko
parent 4626871a9d
commit 6e81fa9ce1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File

14
CMakeLists.txt
Unescape Escape View File

@ -96,6 +96,7 @@ OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KD
OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} ) OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF ) OPTION( WITH_LIBBFD "Enable pretty backtraces with libbfd from GNU binutils" OFF )
OPTION( WITH_XRANDR "Build the tderandr library" ON ) OPTION( WITH_XRANDR "Build the tderandr library" ON )
OPTION( WITH_XCOMPOSITE "Enable xcomposite support" ON )
OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF ) OPTION( WITH_KDE4_MENU_SUFFIX "Add [KDE4] tag to KDE4 menu items" OFF )
OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
@ -621,10 +622,15 @@ endif( XRENDER_FOUND )
##### check for xcomposite ######################### ##### check for xcomposite #########################
pkg_search_module( XCOMPOSITE xcomposite ) if( WITH_XCOMPOSITE )
if( XCOMPOSITE_FOUND ) pkg_search_module( XCOMPOSITE xcomposite )
set( HAVE_XCOMPOSITE 1 ) if( XCOMPOSITE_FOUND )
endif( XCOMPOSITE_FOUND ) set( HAVE_XCOMPOSITE 1 )
else( WITH_XCOMPOSITE )
tde_message_fatal( "xcomposite support was requested, but xcomposite was not found on your system" )
endif( XCOMPOSITE_FOUND )
endif( WITH_XCOMPOSITE )
##### check for libxml-2.0 ###################### ##### check for libxml-2.0 ######################

12
tdecore/tdeapplication.cpp
Unescape Escape View File

@ -201,7 +201,7 @@ static Atom atom_NetSupported;
static Atom kde_xdnd_drop; static Atom kde_xdnd_drop;
#endif #endif
#ifdef Q_WS_X11 #if defined(Q_WS_X11) && defined(COMPOSITE)
static int composite_event, composite_error, composite_opcode; static int composite_event, composite_error, composite_opcode;
static bool x11_composite_error_generated; static bool x11_composite_error_generated;
static int x11_error(Display *dpy, XErrorEvent *ev) { static int x11_error(Display *dpy, XErrorEvent *ev) {
@ -2114,7 +2114,7 @@ bool TDEApplication::isCompositionManagerAvailable() {
return false; return false;
} }
bool TDEApplication::detectCompositionManagerAvailable(bool force_available) { bool TDEApplication::detectCompositionManagerAvailable(bool force_available, bool available) {
const char *home; const char *home;
struct passwd *p; struct passwd *p;
p = getpwuid(getuid()); p = getpwuid(getuid());
@ -2156,21 +2156,17 @@ Display* TDEApplication::openX11RGBADisplay() {
return 0; return 0;
} }
Qt::HANDLE TDEApplication::getX11RGBAVisual(char *display) { Qt::HANDLE TDEApplication::getX11RGBAVisual(Display *dpy) {
return 0; return 0;
} }
Qt::HANDLE TDEApplication::getX11RGBAColormap(char *display) { Qt::HANDLE TDEApplication::getX11RGBAColormap(Display *dpy) {
return 0; return 0;
} }
bool TDEApplication::isX11CompositionAvailable() { bool TDEApplication::isX11CompositionAvailable() {
return false; return false;
} }
TDEApplication TDEApplication::KARGBApplication( bool allowStyles ) {
return TDEApplication::TDEApplication(allowStyles, true);
}
#endif #endif
static bool kapp_block_user_input = false; static bool kapp_block_user_input = false;

Write Preview
Loading…
Cancel
Save