yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make error messages about compositing use kError(), so that they show up

Browse source 
even in release builds. Point to release notes in case of error.


svn path=/trunk/KDE/kdebase/workspace/; revision=768132
This commit is contained in:
Luboš Luňák 2008-01-29 14:23:26 +00:00
parent 414d59ea16
commit 4b792d000e
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
composite.cpp
View file

@ -84,7 +84,7 @@ void Workspace::setupCompositing()
}
else if( !CompositingPrefs::compositingPossible() )
{
kWarning( 1212 ) << "Compositing is not possible";
kError( 1212 ) << "Compositing is not possible";
return;
}
if( scene != NULL )
@ -147,7 +147,8 @@ void Workspace::setupCompositing()
}
if( scene == NULL || scene->initFailed())
{
kError( 1212 ) << "Failed to initialize compositing, compositing disabled" << endl;
kError( 1212 ) << "Failed to initialize compositing, compositing disabled";
kError( 1212 ) << "Consult http://techbase.kde.org/Projects/KWin/4.0-release-notes#Setting_up";
delete scene;
scene = NULL;
delete cm_selection;

14
scene_opengl.cpp
View file

@ -125,7 +125,7 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
!glXGetVisualFromFBConfig || !glXCreatePixmap || !glXDestroyPixmap ||
!glXCreateWindow || !glXDestroyWindow )
{
kWarning( 1212 ) << "GLX_SGIX_fbconfig or required GLX functions missing";
kError( 1212 ) << "GLX_SGIX_fbconfig or required GLX functions missing";
return; // error
}
if( !selectMode())
@ -139,7 +139,7 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
if( !hasGLExtension( "GL_ARB_texture_non_power_of_two" )
&& !hasGLExtension( "GL_ARB_texture_rectangle" ))
{
kWarning( 1212 ) << "GL_ARB_texture_non_power_of_two and GL_ARB_texture_rectangle missing";
kError( 1212 ) << "GL_ARB_texture_non_power_of_two and GL_ARB_texture_rectangle missing";
return; // error
}
if( db )
@ -156,7 +156,7 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
glLoadIdentity();
if( checkGLError( "Init" ))
{
kWarning( 1212 ) << "OpenGL compositing setup failed";
kError( 1212 ) << "OpenGL compositing setup failed";
return; // error
}
kDebug( 1212 ) << "DB:" << db << ", TFP:" << tfp_mode << ", SHM:" << shm_mode
@ -377,7 +377,7 @@ bool SceneOpenGL::initBuffer()
}
else
{
kWarning( 1212 ) << "Couldn't create output buffer (failed to create overlay window?) !";
kError( 1212 ) << "Couldn't create output buffer (failed to create overlay window?) !";
return false; // error
}
int vis_buffer;
@ -468,7 +468,7 @@ bool SceneOpenGL::initBufferConfigs()
XFree( fbconfigs );
if( fbcbuffer_db == NULL && fbcbuffer_nondb == NULL )
{
kWarning( 1212 ) << "Couldn't find framebuffer configuration for buffer!";
kError( 1212 ) << "Couldn't find framebuffer configuration for buffer!";
return false;
}
for( int i = 0; i <= 32; i++ )
@ -593,12 +593,12 @@ bool SceneOpenGL::initDrawableConfigs()
XFree( fbconfigs );
if( fbcdrawableinfo[ DefaultDepth( display(), DefaultScreen( display())) ].fbconfig == NULL )
{
kWarning( 1212 ) << "Couldn't find framebuffer configuration for default depth!";
kError( 1212 ) << "Couldn't find framebuffer configuration for default depth!";
return false;
}
if( fbcdrawableinfo[ 32 ].fbconfig == NULL )
{
kWarning( 1212 ) << "Couldn't find framebuffer configuration for depth 32!";
kError( 1212 ) << "Couldn't find framebuffer configuration for depth 32 (no ARGB GLX visual)!";
return false;
}
return true;

6
scene_xrender.cpp
View file

@ -87,12 +87,12 @@ SceneXrender::SceneXrender( Workspace* ws )
{
if( !Extensions::renderAvailable())
{
kWarning( 1212 ) << "No XRender extension available";
kError( 1212 ) << "No XRender extension available";
return;
}
if( !Extensions::fixesRegionAvailable())
{
kWarning( 1212 ) << "No XFixes v3+ extension available";
kError( 1212 ) << "No XFixes v3+ extension available";
return;
}
KXErrorHandler xerr;
@ -114,7 +114,7 @@ SceneXrender::SceneXrender( Workspace* ws )
createBuffer();
init_ok = !xerr.error( true );
if( !init_ok )
kWarning( 1212 ) << "XRender compositing setup failed";
kError( 1212 ) << "XRender compositing setup failed";
}
SceneXrender::~SceneXrender()