Merge lp:~samuel-thibault/compiz/guide-thick into lp:compiz/0.9.13

[Samuel thibault]

Unmerged revisions

4144. By Samuel thibault on 2018-05-03

showmouse: increase maximum guides width

20 is not enough for some people with low vision, so this changeset increases it
to 100.

Some OpenGL hardware implementations do not support so large values, so this
changeset also replaces the use of GL_LINES by GL_QUADS, to simply drop the
hardware constraint.

=== modified file 'plugins/showmouse/showmouse.xml.in'
--- plugins/showmouse/showmouse.xml.in	2017-03-02 07:54:06 +0000
+++ plugins/showmouse/showmouse.xml.in	2018-05-03 15:12:11 +0000
@@ -44,7 +44,7 @@
 					<_long>How thick mouse guides should be, in pixels.</_long>
 					<default>0</default>
 					<min>0</min>
-					<max>20</max><!-- search for "XML" in showmouse.cpp -->
+					<max>100</max><!-- search for "XML" in showmouse.cpp -->
 					<precision>1</precision>
 				</option>
 				<option name="guide_empty_radius" type="int">
@@ -52,7 +52,7 @@
 					<_long>Radius of the disk around the cursor which doesn't contain guides.</_long>
 					<default>20</default>
 					<min>0</min>
-					<max>100</max>
+					<max>200</max>
 					<precision>1</precision>
 				</option>
 				<option name="guide_color" type="color">

=== modified file 'plugins/showmouse/src/showmouse.cpp'
--- plugins/showmouse/src/showmouse.cpp	2017-04-20 13:04:22 +0000
+++ plugins/showmouse/src/showmouse.cpp	2018-05-03 15:12:11 +0000
@@ -579,17 +579,18 @@
 }
 
 void
-ShowmouseScreen::drawLine (const GLMatrix &transform,
+ShowmouseScreen::drawRect (const GLMatrix &transform,
                            double x1, double y1, double x2, double y2,
                            unsigned short *color)
 {
   GLVertexBuffer *stream = GLVertexBuffer::streamingBuffer ();
-  GLfloat vertices[6] =
-    {GLfloat(x1), GLfloat(y1), GLfloat(0), GLfloat(x2), GLfloat(y2), GLfloat(0)};
+  GLfloat vertices[12] =
+    {GLfloat(x1), GLfloat(y1), GLfloat(0), GLfloat(x1), GLfloat(y2), GLfloat(0),
+     GLfloat(x2), GLfloat(y2), GLfloat(0), GLfloat(x2), GLfloat(y1), GLfloat(0)};
 
-  stream->begin (GL_LINES);
+  stream->begin (GL_QUADS);
   stream->addColors (1, color);
-  stream->addVertices (2, vertices);
+  stream->addVertices (4, vertices);
   if (stream->end ())
     stream->render (transform);
 }
@@ -609,20 +610,19 @@
 
   if (thickness > 0)
   {
-    glLineWidth (thickness);
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     glEnable (GL_BLEND);
-    drawLine (transform, x, 0, x, y - r, color);
-    drawLine (transform, x, y + r, x, screen->height (), color);
-    drawLine (transform, 0, y, x - r, y, color);
-    drawLine (transform, x + r, y, screen->width (), y, color);
+    drawRect (transform, x-thickness/2, 0, x+thickness/2, y - r, color);
+    drawRect (transform, x-thickness/2, y + r, x+thickness/2, screen->height (), color);
+    drawRect (transform, 0, y-thickness/2, x - r, y+thickness/2, color);
+    drawRect (transform, x + r, y-thickness/2, screen->width (), y+thickness/2, color);
     glDisable (GL_BLEND);
   }
 
   // This has to be manually synchronized with the maximum value in
   // showmouse.xml.in.  The code generated from the XML file keeps
   // the value private.
-  thickness = 20;
+  thickness = 100;
   cScreen->damageRegion (CompRegion(0, y - thickness / 2 - 1,
                                     screen->width (), thickness + 1));
   cScreen->damageRegion (CompRegion(x - thickness / 2 - 1, 0,

=== modified file 'plugins/showmouse/src/showmouse.h'
--- plugins/showmouse/src/showmouse.h	2017-04-20 13:04:22 +0000
+++ plugins/showmouse/src/showmouse.h	2018-05-03 15:12:11 +0000
@@ -117,7 +117,7 @@
         drawGuides (const GLMatrix &transform);
 
         void
-        drawLine (const GLMatrix &transform,
+        drawRect (const GLMatrix &transform,
                   double x1, double y1, double x2, double y2,
                   unsigned short *color);