Merge lp:~mc-return/compiz/compiz.merge-fix1048267-showmouse-does-not-work.1 into lp:compiz/0.9.9

[MC Return]

Added missing glEnable/glDisableClientState calls for GL_TEXTURE_COORD_ARRAY and GL_VERTEX_ARRAY to make showmouse work with the new codebase.

Credits and thanks for this patch go to Michail Bitzes.

(LP: #1048267)

> Nice, thanks. Please fix these though:
>
> 1. Separate typo fixes into a separate proposal. They are not related to the
> bug in question.

Ack. Here is proposal 1.

> 2. When you bzr commit remember --author "Michail Bitzes" to retain an
> accurate history. If there are previous revisions authored by other people
> such as yourself then the final merge will show multiple authors (which is
> probably correct).

Done here. Ack for the future.

Once this branch is merged, work will continue on this branch: https://code.launchpad.net/~mc-return/compiz/compiz.merge-fix1048267-showmouse-does-not-work/+merge/141444

[Daniel van Vugt (vanvugt)]

Works for me.

review: Approve

=== modified file 'plugins/showmouse/src/showmouse.cpp'
--- plugins/showmouse/src/showmouse.cpp	2012-12-01 17:46:23 +0000
+++ plugins/showmouse/src/showmouse.cpp	2013-01-04 10:18:22 +0000
@@ -262,7 +262,8 @@
 	    }
 	}
     }
-
+    glEnableClientState (GL_VERTEX_ARRAY);
+    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
     glEnableClientState (GL_COLOR_ARRAY);
 
     glTexCoordPointer (2, GL_FLOAT, 2 * sizeof (GLfloat), coords_cache.cache);
@@ -283,6 +284,8 @@
     glColorPointer (4, GL_FLOAT, 4 * sizeof (GLfloat), colors_cache.cache);
     glDrawArrays (GL_QUADS, 0, numActive);
     glDisableClientState (GL_COLOR_ARRAY);
+    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
+    glDisableClientState (GL_VERTEX_ARRAY);
 
     glPopMatrix ();
     glColor4usv (defaultColor);