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

Replace the opacity hack from glcompmgr with code from compiz.

Browse source 
svn path=/branches/work/kwin_composite/; revision=591143
This commit is contained in:
Luboš Luňák 2006-10-01 21:11:45 +00:00
parent e4d66a5a4d
commit a283f9f9c0
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scene_opengl.cpp
View file

@ -227,19 +227,12 @@ void SceneOpenGL::Window::bindTexture()
glXMakeContextCurrent( display(), pixmap, pixmap, context ); glXMakeContextCurrent( display(), pixmap, pixmap, context );
glReadBuffer( GL_FRONT ); glReadBuffer( GL_FRONT );
glDrawBuffer( GL_FRONT ); glDrawBuffer( GL_FRONT );
if( !toplevel->hasAlpha() && toplevel->opacity() != 1.0 )
{
// TODO this doesn't quite work with the decoration
glColorMask( 0, 0, 0, 1 );
glClearColor( 0, 0, 0, toplevel->opacity());
glClear( GL_COLOR_BUFFER_BIT );
glColorMask( 1, 1, 1, 1 );
}
if( texture == None ) if( texture == None )
{ {
glGenTextures( 1, &texture ); glGenTextures( 1, &texture );
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, texture );
glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, glCopyTexImage2D( GL_TEXTURE_RECTANGLE_ARB, 0,
toplevel->hasAlpha() ? GL_RGBA : GL_RGB,
0, 0, toplevel->width(), toplevel->height(), 0 ); 0, 0, toplevel->width(), toplevel->height(), 0 );
} }
else else
@ -297,12 +290,25 @@ void SceneOpenGL::Window::draw()
glXMakeContextCurrent( display(), glxroot, glxroot, context ); glXMakeContextCurrent( display(), glxroot, glxroot, context );
glPushMatrix(); glPushMatrix();
glTranslatef( glX(), glY(), depth ); glTranslatef( glX(), glY(), depth );
if( toplevel->opacity() != 1.0 )
{
glEnable( GL_BLEND );
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE );
glColor4f( toplevel->opacity(), toplevel->opacity(), toplevel->opacity(),
toplevel->opacity());
}
glEnable( GL_TEXTURE_RECTANGLE_ARB ); glEnable( GL_TEXTURE_RECTANGLE_ARB );
glBegin( GL_QUADS ); glBegin( GL_QUADS );
foreach( QRect r, shape().rects()) foreach( QRect r, shape().rects())
quadDraw( r.x(), height() - r.y() - r.height(), r.width(), r.height()); quadDraw( r.x(), height() - r.y() - r.height(), r.width(), r.height());
glEnd(); glEnd();
glPopMatrix(); glPopMatrix();
if( toplevel->opacity() != 1.0 )
{
glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE );
glColor4f( 0, 0, 0, 0 );
glDisable( GL_BLEND );
}
glDisable( GL_TEXTURE_RECTANGLE_ARB ); glDisable( GL_TEXTURE_RECTANGLE_ARB );
glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 ); glBindTexture( GL_TEXTURE_RECTANGLE_ARB, 0 );
} }