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

implement mousemark effect for xrender

Browse source 
BUG: 298338
FIXED-IN: 4.8.3
REVIEW: 104674
This commit is contained in:
Thomas Lübking 2012-04-19 20:25:27 +02:00
parent 93729709e6
commit b12279b6ed
2 changed files with 91 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
effects/mousemark/mousemark.cpp
View file

@ -65,19 +65,50 @@ MouseMarkEffect::~MouseMarkEffect()
effects->stopMousePolling();
}
static int width_2 = 1;
void MouseMarkEffect::reconfigure(ReconfigureFlags)
{
KConfigGroup conf = EffectsHandler::effectConfig("MouseMark");
width = conf.readEntry("LineWidth", 3);
width_2 = width / 2;
color = conf.readEntry("Color", QColor(Qt::red));
color.setAlphaF(1.0);
}
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
void MouseMarkEffect::addRect(const QPoint &p1, const QPoint &p2, XRectangle *r, XRenderColor *c)
{
r->x = qMin(p1.x(), p2.x()) - width_2;
r->y = qMin(p1.y(), p2.y()) - width_2;
r->width = qAbs(p1.x()-p2.x()) + 1 + width_2;
r->height = qAbs(p1.y()-p2.y()) + 1 + width_2;
// fast move -> large rect, <strike>tess...</strike> interpolate a line
if (r->width > 3*width/2 && r->height > 3*width/2) {
const int n = sqrt(r->width*r->width + r->height*r->height) / width;
XRectangle *rects = new XRectangle[n-1];
const int w = p1.x() < p2.x() ? r->width : -r->width;
const int h = p1.y() < p2.y() ? r->height : -r->height;
for (int i = 1; i < n; ++i) {
rects[i-1].x = p1.x() + i*w/n;
rects[i-1].y = p1.y() + i*h/n;
rects[i-1].width = rects[i-1].height = width;
}
XRenderFillRectangles(display(), PictOpSrc, effects->xrenderBufferPicture(), c, rects, n - 1);
delete [] rects;
r->x = p1.x();
r->y = p1.y();
r->width = r->height = width;
}
}
#endif
void MouseMarkEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
{
effects->paintScreen(mask, region, data); // paint normal screen
if (marks.isEmpty() && drawing.isEmpty())
return;
#ifdef KWIN_HAVE_OPENGL
if ( effects->compositingType() == OpenGLCompositing) {
#ifndef KWIN_HAVE_OPENGLES
glEnable(GL_LINE_SMOOTH);
#endif
@ -116,6 +147,32 @@ void MouseMarkEffect::paintScreen(int mask, QRegion region, ScreenPaintData& dat
glDisable(GL_LINE_SMOOTH);
#endif
}
#endif
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
if ( effects->compositingType() == XRenderCompositing) {
XRenderColor c = preMultiply(color);
for (int i = 0; i < marks.count(); ++i) {
const int n = marks[i].count() - 1;
if (n > 0) {
XRectangle *rects = new XRectangle[n];
for (int j = 0; j < marks[i].count()-1; ++j) {
addRect(marks[i][j], marks[i][j+1], &rects[j], &c);
}
XRenderFillRectangles(display(), PictOpSrc, effects->xrenderBufferPicture(), &c, rects, n);
delete [] rects;
}
}
const int n = drawing.count() - 1;
if (n > 0) {
XRectangle *rects = new XRectangle[n];
for (int i = 0; i < n; ++i)
addRect(drawing[i], drawing[i+1], &rects[i], &c);
XRenderFillRectangles(display(), PictOpSrc, effects->xrenderBufferPicture(), &c, rects, n);
delete [] rects;
}
}
#endif
}
void MouseMarkEffect::slotMouseChanged(const QPoint& pos, const QPoint&,
Qt::MouseButtons, Qt::MouseButtons,

4
effects/mousemark/mousemark.h
View file

@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kwineffects.h>
#include <kwinglutils.h>
#include <kwinxrenderutils.h>
namespace KWin
{
@ -46,6 +47,9 @@ private slots:
private:
typedef QVector< QPoint > Mark;
static Mark createArrow(QPoint arrow_start, QPoint arrow_end);
#ifdef KWIN_HAVE_XRENDER_COMPOSITING
void addRect(const QPoint &p1, const QPoint &p2, XRectangle *r, XRenderColor *c);
#endif
QVector< Mark > marks;
Mark drawing;
QPoint arrow_start;