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

Zack's receent patch to Qt defaulting to ARGB visuals where possible

Browse source 
exposed a bug in our (ab)use of QX11Info::appDepth().  Make sure that
our buffers match the depth of the root window.

Thanks to Fredrik for the hint about DefaultDepth().


svn path=/trunk/KDE/kdebase/workspace/; revision=686998
This commit is contained in:
Philip Falkner 2007-07-12 16:50:52 +00:00
parent 28b7aaff53
commit 1fcb1967fe
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene_basic.cpp
View file

@ -34,7 +34,7 @@ SceneBasic::~SceneBasic()
void SceneBasic::paint( QRegion, ToplevelList windows ) void SceneBasic::paint( QRegion, ToplevelList windows )
{ {
Pixmap composite_pixmap = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), QX11Info::appDepth()); Pixmap composite_pixmap = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), DefaultDepth( display(), DefaultScreen( display())));
XGCValues val; XGCValues val;
val.foreground = WhitePixel( display(), DefaultScreen( display())); val.foreground = WhitePixel( display(), DefaultScreen( display()));
val.subwindow_mode = IncludeInferiors; val.subwindow_mode = IncludeInferiors;

23
scene_opengl.cpp
View file

@ -128,7 +128,9 @@ SceneOpenGL::SceneOpenGL( Workspace* ws )
int vis_buffer, vis_drawable; int vis_buffer, vis_drawable;
glXGetFBConfigAttrib( display(), fbcbuffer, GLX_VISUAL_ID, &vis_buffer ); glXGetFBConfigAttrib( display(), fbcbuffer, GLX_VISUAL_ID, &vis_buffer );
kDebug( 1212 ) << "Buffer visual (depth " << QX11Info::appDepth() << "): 0x" << QString::number( vis_buffer, 16 ) << endl; XVisualInfo* visinfo_buffer = glXGetVisualFromFBConfig( display(), fbcbuffer );
kDebug( 1212 ) << "Buffer visual (depth " << visinfo_buffer->depth << "): 0x" << QString::number( vis_buffer, 16 ) << endl;
XFree( visinfo_buffer );
for( int i = 0; i <= 32; i++ ) for( int i = 0; i <= 32; i++ )
{ {
if( fbcdrawableinfo[ i ].fbconfig == NULL ) if( fbcdrawableinfo[ i ].fbconfig == NULL )
@ -316,7 +318,7 @@ bool SceneOpenGL::initBuffer()
XSetWindowAttributes attrs; XSetWindowAttributes attrs;
attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, AllocNone ); attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, AllocNone );
buffer = XCreateWindow( display(), wspace->overlayWindow(), 0, 0, displayWidth(), displayHeight(), buffer = XCreateWindow( display(), wspace->overlayWindow(), 0, 0, displayWidth(), displayHeight(),
0, QX11Info::appDepth(), InputOutput, visual->visual, CWColormap, &attrs ); 0, visual->depth, InputOutput, visual->visual, CWColormap, &attrs );
if( hasGLXVersion( 1, 3 )) if( hasGLXVersion( 1, 3 ))
glxbuffer = glXCreateWindow( display(), fbcbuffer, buffer, NULL ); glxbuffer = glXCreateWindow( display(), fbcbuffer, buffer, NULL );
else else
@ -328,13 +330,15 @@ bool SceneOpenGL::initBuffer()
else if( fbcbuffer_nondb != NULL ) else if( fbcbuffer_nondb != NULL )
{ // cannot get any double-buffered drawable, will double-buffer using a pixmap { // cannot get any double-buffered drawable, will double-buffer using a pixmap
fbcbuffer = fbcbuffer_nondb; fbcbuffer = fbcbuffer_nondb;
db = false; XVisualInfo* visual = glXGetVisualFromFBConfig( display(), fbcbuffer );
XGCValues gcattr; XGCValues gcattr;
gcattr.subwindow_mode = IncludeInferiors; gcattr.subwindow_mode = IncludeInferiors;
gcroot = XCreateGC( display(), rootWindow(), GCSubwindowMode, &gcattr ); gcroot = XCreateGC( display(), rootWindow(), GCSubwindowMode, &gcattr );
buffer = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), buffer = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(),
QX11Info::appDepth()); visual->depth );
glxbuffer = glXCreatePixmap( display(), fbcbuffer, buffer, NULL ); glxbuffer = glXCreatePixmap( display(), fbcbuffer, buffer, NULL );
db = false;
XFree( visual );
} }
else else
{ {
@ -354,10 +358,7 @@ bool SceneOpenGL::initBufferConfigs()
for( int i = 0; i < 2; i++ ) for( int i = 0; i < 2; i++ )
{ {
int back, stencil, depth, caveat, alpha; int back, stencil, depth, caveat, alpha;
if( i > 0 ) back = i > 0 ? INT_MAX : 1;
back = INT_MAX;
else
back = 1;
stencil = INT_MAX; stencil = INT_MAX;
depth = INT_MAX; depth = INT_MAX;
caveat = INT_MAX; caveat = INT_MAX;
@ -371,14 +372,14 @@ bool SceneOpenGL::initBufferConfigs()
continue; continue;
visual_depth = vi->depth; visual_depth = vi->depth;
XFree( vi ); XFree( vi );
if( visual_depth != QX11Info::appDepth() ) if( visual_depth != DefaultDepth( display(), DefaultScreen( display())))
continue; continue;
int value; int value;
glXGetFBConfigAttrib( display(), fbconfigs[ j ], glXGetFBConfigAttrib( display(), fbconfigs[ j ],
GLX_ALPHA_SIZE, &alpha ); GLX_ALPHA_SIZE, &alpha );
glXGetFBConfigAttrib( display(), fbconfigs[ j ], glXGetFBConfigAttrib( display(), fbconfigs[ j ],
GLX_BUFFER_SIZE, &value ); GLX_BUFFER_SIZE, &value );
if( value != QX11Info::appDepth() && ( value - alpha ) != QX11Info::appDepth() ) if( value != visual_depth && ( value - alpha ) != visual_depth )
continue; continue;
int back_value; int back_value;
glXGetFBConfigAttrib( display(), fbconfigs[ j ], glXGetFBConfigAttrib( display(), fbconfigs[ j ],
@ -532,7 +533,7 @@ bool SceneOpenGL::initDrawableConfigs()
} }
if( cnt ) if( cnt )
XFree( fbconfigs ); XFree( fbconfigs );
if( fbcdrawableinfo[ QX11Info::appDepth() ].fbconfig == NULL ) if( fbcdrawableinfo[ DefaultDepth( display(), DefaultScreen( display())) ].fbconfig == NULL )
{ {
kDebug( 1212 ) << "Couldn't find framebuffer configuration for default depth!" << endl; kDebug( 1212 ) << "Couldn't find framebuffer configuration for default depth!" << endl;
return false; return false;

2
scene_xrender.cpp
View file

@ -129,7 +129,7 @@ void SceneXrender::createBuffer()
{ {
if( buffer != None ) if( buffer != None )
XRenderFreePicture( display(), buffer ); XRenderFreePicture( display(), buffer );
Pixmap pixmap = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), QX11Info::appDepth()); Pixmap pixmap = XCreatePixmap( display(), rootWindow(), displayWidth(), displayHeight(), DefaultDepth( display(), DefaultScreen( display())));
buffer = XRenderCreatePicture( display(), pixmap, format, 0, 0 ); buffer = XRenderCreatePicture( display(), pixmap, format, 0, 0 );
XFreePixmap( display(), pixmap ); // The picture owns the pixmap now XFreePixmap( display(), pixmap ); // The picture owns the pixmap now
} }