[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kwin
Subject:    Re: Huge problems with kwin from trunk
From:       Philip Falkner <philip.falkner () gmail ! com>
Date:       2007-07-11 21:13:21
Message-ID: 200707111713.22544.philip.falkner () gmail ! com
[Download RAW message or body]

On Wednesday 11 July 2007 16:55:54 Tim Beaulen wrote:
> On 7/11/07, Philip Falkner <philip.falkner@gmail.com> wrote:
> > So even with the depth fix, it's still broken?
>
> Yes.
> It doesn't matter, both QX11Info::appDepth() or visual->depth give the
> exact same result.

Not just the visual->depth change, I meant the entire patch I posted in the 
other thread.

> _______________________________________________
> Kwin mailing list
> Kwin@kde.org
> https://mail.kde.org/mailman/listinfo/kwin



-- 
Philip Falkner

["unbreak-depth-v2.patch" (text/x-diff)]

Index: scene_basic.cpp
===================================================================
--- scene_basic.cpp	(revision 686570)
+++ scene_basic.cpp	(working copy)
@@ -34,7 +34,7 @@ SceneBasic::~SceneBasic()
     
 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;
     val.foreground = WhitePixel( display(), DefaultScreen( display()));
     val.subwindow_mode = IncludeInferiors;
Index: scene_opengl.cpp
===================================================================
--- scene_opengl.cpp	(revision 686570)
+++ scene_opengl.cpp	(working copy)
@@ -128,7 +128,9 @@ SceneOpenGL::SceneOpenGL( Workspace* ws 
 
     int vis_buffer, vis_drawable;
     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++ )
         {
         if( fbcdrawableinfo[ i ].fbconfig == NULL )
@@ -316,7 +318,7 @@ bool SceneOpenGL::initBuffer()
         XSetWindowAttributes attrs;
         attrs.colormap = XCreateColormap( display(), rootWindow(), visual->visual, \
                AllocNone );
         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 ))
             glxbuffer = glXCreateWindow( display(), fbcbuffer, buffer, NULL );
         else
@@ -328,13 +330,15 @@ bool SceneOpenGL::initBuffer()
     else if( fbcbuffer_nondb != NULL )
         { // cannot get any double-buffered drawable, will double-buffer using a \
pixmap  fbcbuffer = fbcbuffer_nondb;
-        db = false;
+        XVisualInfo* visual = glXGetVisualFromFBConfig( display(), fbcbuffer );
         XGCValues gcattr;
         gcattr.subwindow_mode = IncludeInferiors;
         gcroot = XCreateGC( display(), rootWindow(), GCSubwindowMode, &gcattr );
         buffer = XCreatePixmap( display(), rootWindow(), displayWidth(), \
                displayHeight(),
-            QX11Info::appDepth());
+            visual->depth );
         glxbuffer = glXCreatePixmap( display(), fbcbuffer, buffer, NULL );
+        db = false;
+        XFree( visual );
         }
     else
         {
@@ -354,10 +358,7 @@ bool SceneOpenGL::initBufferConfigs()
     for( int i = 0; i < 2; i++ )
         {
         int back, stencil, depth, caveat, alpha;
-        if( i > 0 )
-            back = INT_MAX;
-        else
-            back = 1;
+        back = i > 0 ? INT_MAX : 1;
         stencil = INT_MAX;
         depth = INT_MAX;
         caveat = INT_MAX;
@@ -371,14 +372,14 @@ bool SceneOpenGL::initBufferConfigs()
                 continue;
             visual_depth = vi->depth;
             XFree( vi );
-            if( visual_depth != QX11Info::appDepth() )
+            if( visual_depth != DefaultDepth( display(), DefaultScreen( display())))
                 continue;
             int value;
             glXGetFBConfigAttrib( display(), fbconfigs[ j ],
                                   GLX_ALPHA_SIZE, &alpha );
             glXGetFBConfigAttrib( display(), fbconfigs[ j ],
                                   GLX_BUFFER_SIZE, &value );
-            if( value != QX11Info::appDepth() && ( value - alpha ) != \
QX11Info::appDepth() ) +            if( value != visual_depth && ( value - alpha ) != \
visual_depth )  continue;
             int back_value;
             glXGetFBConfigAttrib( display(), fbconfigs[ j ],
@@ -532,7 +533,7 @@ bool SceneOpenGL::initDrawableConfigs()
         }
     if( cnt )
         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;  return false;
Index: scene_xrender.cpp
===================================================================
--- scene_xrender.cpp	(revision 686570)
+++ scene_xrender.cpp	(working copy)
@@ -129,7 +129,7 @@ void SceneXrender::createBuffer()
     {
     if( buffer != None )
         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 );  XFreePixmap( display(), pixmap ); // The picture owns the pixmap now
     }



_______________________________________________
Kwin mailing list
Kwin@kde.org
https://mail.kde.org/mailman/listinfo/kwin


[prev in list] [next in list] [prev in thread] [next in thread]