From 42a4d364c20ab4ed9ff0db0829b492d0581426dc Mon Sep 17 00:00:00 2001
From: Rivo Laks <rivolaks@hot.ee>
Date: Wed, 4 Jul 2007 20:33:35 +0000
Subject: [PATCH] Add a generic function to render a box with rounded corners. 
  Algorithm is basically same as for shadow, perhaps even shadow will use it.

svn path=/trunk/KDE/kdebase/workspace/; revision=683514
---
 effects/CMakeLists.txt  |   1 +
 effects/data/circle.png | Bin 0 -> 2730 bytes
 lib/kwinglutils.cpp     |  70 ++++++++++++++++++++++++++++++++++++++++
 lib/kwinglutils.h       |   7 ++++
 4 files changed, 78 insertions(+)
 create mode 100644 effects/data/circle.png

diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 069619ee72..b3490ed076 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -92,6 +92,7 @@ if(OPENGL_FOUND)
         data/sharpen.frag
         data/sharpen.vert
         data/shadow-texture.png
+        data/circle.png
         DESTINATION  ${DATA_INSTALL_DIR}/kwin )
 
     # config modules
diff --git a/effects/data/circle.png b/effects/data/circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..6df7f991e01c8adf77e4d7d68c29e8161afdbfb4
GIT binary patch
literal 2730
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

literal 0
HcmV?d00001

diff --git a/lib/kwinglutils.cpp b/lib/kwinglutils.cpp
index dd63e3681d..c3c4de3265 100644
--- a/lib/kwinglutils.cpp
+++ b/lib/kwinglutils.cpp
@@ -16,6 +16,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "kwineffects.h"
 
 #include "kdebug.h"
+#include <kstandarddirs.h>
 
 #include <QPixmap>
 #include <QImage>
@@ -250,6 +251,75 @@ void renderGLGeometryImmediate( int count, const float* vertices, const float* t
     glEnd();
 }
 
+void addQuadVertices(QVector<float>& verts, float x1, float y1, float x2, float y2)
+{
+    verts << x1 << y1;
+    verts << x1 << y2;
+    verts << x2 << y2;
+    verts << x2 << y1;
+}
+
+void renderRoundBox( const QRect& area, float roundness, GLTexture* texture )
+{
+    static GLTexture* circleTexture = 0;
+    if( !texture && !circleTexture )
+        {
+        QString texturefile =  KGlobal::dirs()->findResource("data", "kwin/circle.png");
+        circleTexture = new GLTexture(texturefile);
+        }
+    if( !texture )
+        {
+        texture = circleTexture;
+        }
+
+    glPushAttrib( GL_CURRENT_BIT | GL_ENABLE_BIT | GL_TEXTURE_BIT );
+    glEnable( GL_BLEND );
+    glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
+
+    glPushMatrix();
+
+    QVector<float> verts, texcoords;
+    // center
+    addQuadVertices(verts, area.left() + roundness, area.top() + roundness, area.right() - roundness, area.bottom() - roundness);
+    addQuadVertices(texcoords, 0.5, 0.5, 0.5, 0.5);
+    // sides
+    // left
+    addQuadVertices(verts, area.left(), area.top() + roundness, area.left() + roundness, area.bottom() - roundness);
+    addQuadVertices(texcoords, 0.0, 0.5, 0.5, 0.5);
+    // top
+    addQuadVertices(verts, area.left() + roundness, area.top(), area.right() - roundness, area.top() + roundness);
+    addQuadVertices(texcoords, 0.5, 0.0, 0.5, 0.5);
+    // right
+    addQuadVertices(verts, area.right() - roundness, area.top() + roundness, area.right(), area.bottom() - roundness);
+    addQuadVertices(texcoords, 0.5, 0.5, 1.0, 0.5);
+    // bottom
+    addQuadVertices(verts, area.left() + roundness, area.bottom() - roundness, area.right() - roundness, area.bottom());
+    addQuadVertices(texcoords, 0.5, 0.5, 0.5, 1.0);
+    // corners
+    // top-left
+    addQuadVertices(verts, area.left(), area.top(), area.left() + roundness, area.top() + roundness);
+    addQuadVertices(texcoords, 0.0, 0.0, 0.5, 0.5);
+    // top-right
+    addQuadVertices(verts, area.right() - roundness, area.top(), area.right(), area.top() + roundness);
+    addQuadVertices(texcoords, 0.5, 0.0, 1.0, 0.5);
+    // bottom-left
+    addQuadVertices(verts, area.left(), area.bottom() - roundness, area.left() + roundness, area.bottom());
+    addQuadVertices(texcoords, 0.0, 0.5, 0.5, 1.0);
+    // bottom-right
+    addQuadVertices(verts, area.right() - roundness, area.bottom() - roundness, area.right(), area.bottom());
+    addQuadVertices(texcoords, 0.5, 0.5, 1.0, 1.0);
+
+    texture->bind();
+    glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+    // We have two elements per vertex in the verts array
+    int verticesCount = verts.count() / 2;
+    renderGLGeometry( verticesCount, verts.data(), texcoords.data() );
+    texture->unbind();
+
+    glPopMatrix();
+    glPopAttrib();
+}
+
 //****************************************
 // GLTexture
 //****************************************
diff --git a/lib/kwinglutils.h b/lib/kwinglutils.h
index e3f7a7db7c..c38f64cba6 100644
--- a/lib/kwinglutils.h
+++ b/lib/kwinglutils.h
@@ -30,6 +30,9 @@ namespace KWin
 {
 
 
+class GLTexture;
+
+
 // Initializes GLX function pointers
 void KWIN_EXPORT initGLX();
 // Initializes OpenGL stuff. This includes resolving function pointers as
@@ -87,6 +90,10 @@ KWIN_EXPORT void renderGLGeometryImmediate( int count,
     const float* vertices, const float* texture = 0, const float* color = 0,
     int dim = 2, int stride = 0 );
 
+
+KWIN_EXPORT void renderRoundBox( const QRect& area, float roundness = 10.0f, GLTexture* texture = 0 );
+
+
 class KWIN_EXPORT GLTexture
     {
     public: