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

implement xrender support for snaphelper

Browse source 
REVIEW: 104203
This commit is contained in:
Thomas Lübking 2012-03-09 07:21:28 +01:00
parent f62bb93185
commit 74078d7a91
2 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
effects/snaphelper/snaphelper.cpp
View file

@ -21,13 +21,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "snaphelper.h"
#include "kwinglutils.h"
//#include "kwinxrenderutils.h"
#include "kwinxrenderutils.h"
namespace KWin
{
KWIN_EFFECT(snaphelper, SnapHelperEffect)
KWIN_EFFECT_SUPPORTED(snaphelper, SnapHelperEffect::supported())
SnapHelperEffect::SnapHelperEffect()
: m_active(false)
@ -59,11 +58,6 @@ void SnapHelperEffect::reconfigure(ReconfigureFlags)
m_timeline.setDuration(animationTime(250));
}
bool SnapHelperEffect::supported()
{
return effects->compositingType() == OpenGLCompositing;
}
void SnapHelperEffect::prePaintScreen(ScreenPrePaintData &data, int time)
{
double oldValue = m_timeline.currentValue();
@ -139,50 +133,48 @@ void SnapHelperEffect::postPaintScreen()
glPopAttrib();
#endif
}
/*if ( effects->compositingType() == XRenderCompositing )
{ // TODO
for ( int i = 0; i < effects->numScreens(); i++ )
{
if ( effects->compositingType() == XRenderCompositing ) {
for ( int i = 0; i < effects->numScreens(); i++ ) {
const QRect& rect = effects->clientArea( ScreenArea, i, 0 );
int midX = rect.x() + rect.width() / 2;
int midY = rect.y() + rect.height() / 2 ;
int halfWidth = m_window->width() / 2;
int halfHeight = m_window->height() / 2;
XSegment segments[6];
XRectangle rects[6];
// Center lines
segments[0].x1 = rect.x() + rect.width() / 2;
segments[0].y1 = rect.y();
segments[0].x2 = rect.x() + rect.width() / 2;
segments[0].y2 = rect.y() + rect.height();
segments[1].x1 = rect.x();
segments[1].y1 = rect.y() + rect.height() / 2;
segments[1].x2 = rect.x() + rect.width();
segments[1].y2 = rect.y() + rect.height() / 2;
rects[0].x = rect.x() + rect.width() / 2 - 2;
rects[0].y = rect.y();
rects[0].width = 4;
rects[0].height = rect.height();
rects[1].x = rect.x();
rects[1].y = rect.y() + rect.height() / 2 - 2;
rects[1].width = rect.width();
rects[1].height = 4;
// Window outline
// The +/- 2 is to prevent line overlap
segments[2].x1 = midX - halfWidth + 2;
segments[2].y1 = midY - halfHeight;
segments[2].x2 = midX + halfWidth + 2;
segments[2].y2 = midY - halfHeight;
segments[3].x1 = midX + halfWidth;
segments[3].y1 = midY - halfHeight + 2;
segments[3].x2 = midX + halfWidth;
segments[3].y2 = midY + halfHeight + 2;
segments[4].x1 = midX + halfWidth - 2;
segments[4].y1 = midY + halfHeight;
segments[4].x2 = midX - halfWidth - 2;
segments[4].y2 = midY + halfHeight;
segments[5].x1 = midX - halfWidth;
segments[5].y1 = midY + halfHeight - 2;
segments[5].x2 = midX - halfWidth;
segments[5].y2 = midY - halfHeight - 2;
// The +/- 4 is to prevent line overlap
rects[2].x = midX - halfWidth + 4;
rects[2].y = midY - halfHeight;
rects[2].width = 2*halfWidth - 4;
rects[2].height = 4;
rects[3].x = midX + halfWidth - 4;
rects[3].y = midY - halfHeight + 4;
rects[3].width = 4;
rects[3].height = 2*halfHeight - 4;
rects[4].x = midX - halfWidth;
rects[4].y = midY + halfHeight - 4;
rects[4].width = 2*halfWidth - 4;
rects[4].height = 4;
rects[5].x = midX - halfWidth;
rects[5].y = midY - halfHeight;
rects[5].width = 4;
rects[5].height = 2*halfHeight - 4;
XDrawSegments( display(), effects->xrenderBufferPicture(), m_gc, segments, 6 );
}
}*/
XRenderColor c = preMultiply(QColor(128, 128, 128, m_timeline.currentValue()*128));
XRenderFillRectangles(display(), PictOpOver, effects->xrenderBufferPicture(), &c, rects, 6);
}
}
} else if (m_window && !m_active) {
if (m_window->isDeleted())
m_window->unrefWindow();

2
effects/snaphelper/snaphelper.h
View file

@ -41,8 +41,6 @@ public:
virtual void postPaintScreen();
virtual bool isActive() const;
static bool supported();
public Q_SLOTS:
void slotWindowClosed(EffectWindow *w);
void slotWindowStartUserMovedResized(EffectWindow *w);