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

Config option for whether zooming should be smooth or fast.

Browse source 
svn path=/branches/work/kwin_composite/; revision=610138
This commit is contained in:
Luboš Luňák 2006-12-03 13:38:57 +00:00
parent a643ff2b00
commit 4607cab829
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
options.cpp
View file

@ -195,6 +195,8 @@ unsigned long Options::updateSettings()
onlyDecoTranslucent = config->readEntry("OnlyDecoTranslucent", QVariant(false)).toBool(); onlyDecoTranslucent = config->readEntry("OnlyDecoTranslucent", QVariant(false)).toBool();
refreshRate = config->readEntry( "RefreshRate", 0 ); refreshRate = config->readEntry( "RefreshRate", 0 );
smoothScale = qBound( -1, config->readEntry( "SmoothScale", -1 ), 1 );
QString glmode = config->readEntry("GLMode", "TFP" ).upper(); QString glmode = config->readEntry("GLMode", "TFP" ).upper();
if( glmode == "TFP" ) if( glmode == "TFP" )
glMode = GLTFP; glMode = GLTFP;

2
options.h
View file

@ -301,6 +301,8 @@ class Options : public KDecorationOptions
bool onlyDecoTranslucent; bool onlyDecoTranslucent;
uint refreshRate; uint refreshRate;
int smoothScale; // 0 = no, 1 = yes, -1 = auto
enum GLMode { GLTFP, GLSHM, GLFallback }; enum GLMode { GLTFP, GLSHM, GLFallback };
GLMode glMode; GLMode glMode;
bool glAlwaysRebind; bool glAlwaysRebind;

10
scene_opengl.cpp
View file

@ -806,6 +806,16 @@ void SceneOpenGL::Window::enableTexture()
assert( bound_pixmap != None ); assert( bound_pixmap != None );
glXBindTexImageEXT( display(), bound_glxpixmap, GLX_FRONT_LEFT_EXT, NULL ); glXBindTexImageEXT( display(), bound_glxpixmap, GLX_FRONT_LEFT_EXT, NULL );
} }
if( options->smoothScale != 0 ) // default to yes
{
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
}
else
{
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
glTexParameteri( GL_TEXTURE_RECTANGLE_ARB, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
}
} }
void SceneOpenGL::Window::disableTexture() void SceneOpenGL::Window::disableTexture()

4
scene_xrender.cpp
View file

@ -394,6 +394,8 @@ void SceneXrender::Window::performPaint( int mask, QRegion region, WindowPaintDa
XRenderSetPictureTransform( display(), pic, &xform ); XRenderSetPictureTransform( display(), pic, &xform );
width = (int)(width * xscale); width = (int)(width * xscale);
height = (int)(height * yscale); height = (int)(height * yscale);
if( options->smoothScale == 1 ) // only when forced, it's slow
XRenderSetPictureFilter( display(), pic, "good", NULL, 0 );
} }
if( opaque ) if( opaque )
{ {
@ -414,6 +416,8 @@ void SceneXrender::Window::performPaint( int mask, QRegion region, WindowPaintDa
{ XDoubleToFixed( 0 ), XDoubleToFixed( 0 ), XDoubleToFixed( 1 ) } { XDoubleToFixed( 0 ), XDoubleToFixed( 0 ), XDoubleToFixed( 1 ) }
}}; }};
XRenderSetPictureTransform( display(), pic, &xform ); XRenderSetPictureTransform( display(), pic, &xform );
if( options->smoothScale == 1 )
XRenderSetPictureFilter( display(), pic, "fast", NULL, 0 );
} }
XFixesSetPictureClipRegion( display(), buffer, 0, 0, None ); XFixesSetPictureClipRegion( display(), buffer, 0, 0, None );
} }