Merge lp:~mc-return/compiz/compiz.merge-text-improvements into lp:compiz/0.9.10

[MC Return]

Text, speed improvements:

Introduced
const float halfPi = PI / 2.0f; and
const float triHalfPi = halfPi * 3;
and used those to draw the rounded background.
Introduced
GLfloat xPlusWidth = x + width; and
GLfloat yMinusHeight = y - height;
and used those coordinates for the vertexData array.

Text, cleanup:

Declaration of local variables outside of loops.
Fixed indentation.

Note:
triHalfPi could be PI * 1.5f also.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3754
http://jenkins.qa.ubuntu.com/job/compiz-ci/240/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/281/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/240/rebuild

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

Unrelated Jenkins failure:

99% tests passed, 1 tests failed out of 1474

Total Test time (real) = 2507.01 sec

The following tests FAILED:
 1267 - DecorPixmapProtocol.PostDeleteCausesClientMessage (Failed)

[MC Return (mc-return)]

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/122/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-autolanding/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-autolanding/34/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-autolanding/34/console
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/838

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

The Jenkins failures seem to be unrelated - Re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'plugins/text/src/private.h'
--- plugins/text/src/private.h	2013-07-01 10:44:23 +0000
+++ plugins/text/src/private.h	2013-07-05 14:46:24 +0000
@@ -77,9 +77,9 @@
 	bool render (const CompText::Attrib &attrib,
 		     const CompString       &text);
 
-	int                  mWidth;
-	int                  mHeight;
-	Pixmap               mPixmap;
+	int    mWidth;
+	int    mHeight;
+	Pixmap mPixmap;
 
     private:
 

=== modified file 'plugins/text/src/text.cpp'
--- plugins/text/src/text.cpp	2013-05-17 13:15:13 +0000
+++ plugins/text/src/text.cpp	2013-07-05 14:46:24 +0000
@@ -109,25 +109,28 @@
  * Draw a rounded rectangle path
  */
 void
-TextSurface::drawBackground (int     x,
-			     int     y,
-			     int     width,
-			     int     height,
-			     int     radius)
+TextSurface::drawBackground (int x,
+			     int y,
+			     int width,
+			     int height,
+			     int radius)
 {
     int x0 = x;
     int y0 = y;
     int x1 = x + width;
     int y1 = y + height;
 
+    const float halfPi    = PI / 2.0f;
+    const float triHalfPi = halfPi * 3;
+
     cairo_new_path (cr);
-    cairo_arc (cr, x0 + radius, y1 - radius, radius, PI / 2, PI);
+    cairo_arc (cr, x0 + radius, y1 - radius, radius, halfPi, PI);
     cairo_line_to (cr, x0, y0 + radius);
-    cairo_arc (cr, x0 + radius, y0 + radius, radius, PI, 3 * PI / 2);
+    cairo_arc (cr, x0 + radius, y0 + radius, radius, PI, triHalfPi);
     cairo_line_to (cr, x1 - radius, y0);
-    cairo_arc (cr, x1 - radius, y0 + radius, radius, 3 * PI / 2, 2 * PI);
+    cairo_arc (cr, x1 - radius, y0 + radius, radius, triHalfPi, 2 * PI);
     cairo_line_to (cr, x1, y1 - radius);
-    cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, PI / 2);
+    cairo_arc (cr, x1 - radius, y1 - radius, radius, 0, halfPi);
     cairo_close_path (cr);
 }
 
@@ -502,10 +505,14 @@
 
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 
-    GLushort       colorData[4];
-    GLfloat        textureData[8];
-    GLfloat        vertexData[12];
-    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLushort          colorData[4];
+    GLfloat           textureData[8];
+    GLfloat           vertexData[12];
+    GLVertexBuffer    *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLTexture         *tex;
+    GLTexture::Matrix m;
+    GLfloat           xPlusWidth   = x + width;
+    GLfloat           yMinusHeight = y - height;
 
     colorData[0] = alpha * 65535;
     colorData[1] = alpha * 65535;
@@ -514,23 +521,23 @@
 
     for (unsigned int i = 0; i < texture.size (); ++i)
     {
-	GLTexture         *tex = texture[i];
-	GLTexture::Matrix m = tex->matrix ();
+	tex = texture[i];
+	m = tex->matrix ();
 
 	tex->enable (GLTexture::Good);
 
 	streamingBuffer->begin (GL_TRIANGLE_STRIP);
 
 	vertexData[0]  = x;
-	vertexData[1]  = y - height;
+	vertexData[1]  = yMinusHeight;
 	vertexData[2]  = 0;
 	vertexData[3]  = x;
 	vertexData[4]  = y;
 	vertexData[5]  = 0;
-	vertexData[6]  = x + width;
-	vertexData[7]  = y - height;
+	vertexData[6]  = xPlusWidth;
+	vertexData[7]  = yMinusHeight;
 	vertexData[8]  = 0;
-	vertexData[9]  = x + width;
+	vertexData[9]  = xPlusWidth;
 	vertexData[10] = y;
 	vertexData[11] = 0;