Merge lp:~ksamak/compiz/switcher_add_size_multiplier into lp:compiz/0.9.13

[ksamak]

switcher: adds a size multiplier for A11Y purposes (sight impaired people)

this patch adds a size modifier to the base switcher, for sight impaired people.
It allows to set a variable in ccsm that will make the switchWindow bigger

[Marco Trevisan (Treviño) (3v1n0)]

I see some indentation issues, but a part from that it looks ok

[ksamak (ksamak)]

On Tue, Jul 05, 2016 at 10:38:13AM -0000, Marco Trevisan (Treviño) wrote:
> I see some indentation issues, but a part from that it looks ok

You want me to have a look, and try to straighten that?
i guess should re-request a merge then.
--
Ksamak
hypra.fr Team

[Marco Trevisan (Treviño) (3v1n0)]

No need to re-request a merge. Just update this branch; MP will update automatically.

Just comment here once you've done.

[lp:~ksamak/compiz/switcher_add_size_multiplier]

4065. By ksamak <ksamak@ksalaptop> on 2016-07-05

indentation modifs

4066. By ksamak <ksamak@ksalaptop> on 2016-07-05

indentation modifs

[ksamak (ksamak)]

indents modifs done.
I just remember i need to set noexpandtab in my vim. differences didn't appear in my buffer.
don't know if you can squash commits with bzr too (like in git) to get rid of parasite revisions.

[lp:~ksamak/compiz/switcher_add_size_multiplier]

4067. By ksamak <ksamak@ksalaptop> on 2016-07-20

switcher: fixed coding style, minor refactoring

4068. By ksamak <ksamak@ksalaptop> on 2016-07-20

switcher: fixed coding style

4069. By ksamak <ksamak@ksalaptop> on 2016-07-20

switcher: fixed indentation

4070. By ksamak <ksamak@ksalaptop> on 2016-07-20

switcher: fixed typo

Unmerged revisions

=== modified file 'plugins/switcher/src/switcher.cpp'
--- plugins/switcher/src/switcher.cpp	2015-08-22 21:46:01 +0000
+++ plugins/switcher/src/switcher.cpp	2016-07-05 14:10:56 +0000
@@ -20,7 +20,9 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <[e-mail]>
+ * Author(s):
+ *  - David Reveman <[e-mail]>
+ *  - Auboyneau Vincent <[e-mail]> (size multiplier for A11Y)
  */
 
 #include "switcher.h"
@@ -35,36 +37,6 @@
 
 #define XWINDOWCHANGES_INIT {0, 0, 0, 0, 0, None, 0}
 
-static float _boxVertices[] =
-{
-    -(WIDTH >> 1), BOX_WIDTH, 0.0f,
-     (WIDTH >> 1), BOX_WIDTH, 0.0f,
-    -(WIDTH >> 1), 0.0f,      0.0f,
-    -(WIDTH >> 1), 0.0f,      0.0f,
-     (WIDTH >> 1), BOX_WIDTH, 0.0f,
-     (WIDTH >> 1), 0.0f,      0.0f,
-
-    -(WIDTH >> 1),             HEIGHT - BOX_WIDTH, 0.0f,
-    -(WIDTH >> 1) + BOX_WIDTH, HEIGHT - BOX_WIDTH, 0.0f,
-    -(WIDTH >> 1),             BOX_WIDTH,          0.0f,
-    -(WIDTH >> 1),             BOX_WIDTH,          0.0f,
-    -(WIDTH >> 1) + BOX_WIDTH, HEIGHT - BOX_WIDTH, 0.0f,
-    -(WIDTH >> 1) + BOX_WIDTH, BOX_WIDTH,          0.0f,
-
-     (WIDTH >> 1) - BOX_WIDTH, HEIGHT - BOX_WIDTH, 0.0f,
-     (WIDTH >> 1),             HEIGHT - BOX_WIDTH, 0.0f,
-     (WIDTH >> 1) - BOX_WIDTH, BOX_WIDTH,          0.0f,
-     (WIDTH >> 1) - BOX_WIDTH, BOX_WIDTH,          0.0f,
-     (WIDTH >> 1),             HEIGHT - BOX_WIDTH, 0.0f,
-     (WIDTH >> 1),             BOX_WIDTH,          0.0f,
-
-    -(WIDTH >> 1), HEIGHT,             0.0f,
-     (WIDTH >> 1), HEIGHT,             0.0f,
-    -(WIDTH >> 1), HEIGHT - BOX_WIDTH, 0.0f,
-    -(WIDTH >> 1), HEIGHT - BOX_WIDTH, 0.0f,
-     (WIDTH >> 1), HEIGHT,             0.0f,
-     (WIDTH >> 1), HEIGHT - BOX_WIDTH, 0.0f,
-};
 
 void
 SwitchScreen::updateWindowList (int count)
@@ -78,7 +50,7 @@
 	    count = 3;
     }
 
-    pos  = ((count >> 1) - (int)windows.size ()) * WIDTH;
+    pos  = ((count >> 1) - (int)windows.size ()) * static_cast<int>(WIDTH * sm);
     move = 0;
 
     selectedWindow = windows.front ();
@@ -184,9 +156,9 @@
 SwitchScreen::handleSelectionChange (bool toNext, int nextIdx)
 {
     if (toNext)
-	move -= WIDTH;
+	move -= static_cast<int>(WIDTH * sm);
     else
-	move += WIDTH;
+	move += static_cast<int>(WIDTH * sm);
 
     moreAdjust = true;
 }
@@ -532,7 +504,7 @@
 
 	updateWindowList (count);
 
-	allWindowsWidth = windows.size () * WIDTH;
+	allWindowsWidth = windows.size () * static_cast<int>(WIDTH * sm);
 
 	foreach (CompWindow *win, windows)
 	{
@@ -541,7 +513,7 @@
 	    if (selectedWindow == selected)
 		break;
 
-	    pos -= WIDTH;
+	    pos -= static_cast<int>(WIDTH * sm);
 	    if (pos < -allWindowsWidth)
 		pos += allWindowsWidth;
 	}
@@ -650,7 +622,7 @@
 	float amount, chunk;
 	int   allWindowsWidth;
 
-	allWindowsWidth = windows.size () * WIDTH;
+	allWindowsWidth = windows.size () * static_cast<int>(WIDTH * sm);
 
 	amount = msSinceLastPaint * 0.05f * optionGetSpeed ();
 	steps  = amount / (0.5f * optionGetTimestep ());
@@ -878,10 +850,10 @@
     				  mask,
     				  x,
     				  y,
-    				  WIDTH  - (SPACE << 1),
-    				  HEIGHT - (SPACE << 1),
-    				  WIDTH  - (WIDTH  >> 2),
-    				  HEIGHT - (HEIGHT >> 2));
+				  static_cast<int>(WIDTH * sm)  - (SPACE << 1),
+				  static_cast<int>(HEIGHT * sm) - (SPACE << 1),
+				  static_cast<int>(WIDTH * sm)  - (static_cast<int>(WIDTH * sm)  >> 2),
+				  static_cast<int>(HEIGHT * sm) - (static_cast<int>(HEIGHT * sm) >> 2));
 }
 
 void
@@ -901,8 +873,8 @@
     else
 	sAttrib.xScale = sAttrib.yScale;
 
-    wx = x + WIDTH  - icon->width ()  * sAttrib.xScale - SPACE;
-    wy = y + HEIGHT - icon->height () * sAttrib.yScale - SPACE;
+    wx = x + static_cast<int>(WIDTH * sm)  - icon->width ()  * sAttrib.xScale - SPACE;
+    wy = y + static_cast<int>(HEIGHT * sm) - icon->height () * sAttrib.yScale - SPACE;
 }
 
 void
@@ -931,8 +903,8 @@
     width  = icon->width ()  * sAttrib.xScale;
     height = icon->height () * sAttrib.yScale;
 
-    wx = x + SPACE + ((WIDTH  - (SPACE << 1)) - width)  / 2;
-    wy = y + SPACE + ((HEIGHT - (SPACE << 1)) - height) / 2;
+    wx = x + SPACE + ((static_cast<int>(WIDTH * sm)  - (SPACE << 1)) - width)  / 2;
+    wy = y + SPACE + ((static_cast<int>(HEIGHT * sm) - (SPACE << 1)) - height) / 2;
 }
 
 void
@@ -943,8 +915,8 @@
 			     float width,
 			     float height)
 {
-    wx = x + SPACE + ((WIDTH  - (SPACE << 1)) - width)  / 2;
-    wy = y + SPACE + ((HEIGHT - (SPACE << 1)) - height) / 2;
+    wx = x + SPACE + ((static_cast<int>(WIDTH * sm)  - (SPACE << 1)) - width)  / 2;
+    wy = y + SPACE + ((static_cast<int>(HEIGHT * sm) - (SPACE << 1)) - height) / 2;
 }
 
 
@@ -971,6 +943,7 @@
 	int            x, y, x1, x2, cx;
 	unsigned short color[4];
 
+	sm = sScreen->sm;
 	const CompWindow::Geometry &g = window->geometry ();
 
 	if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK ||
@@ -991,23 +964,25 @@
 	glEnable (GL_SCISSOR_TEST);
 	glScissor (x1, 0, x2 - x1, screen->height ());
 
-	foreach (CompWindow *w, sScreen->windows)
-	{
-	    if (x + WIDTH > x1)
-		SwitchWindow::get (w)->paintThumb (gWindow->lastPaintAttrib (),
-		                                   transform, mask, x, y);
-	    x += WIDTH;
-	}
-
-	foreach (CompWindow *w, sScreen->windows)
-	{
-	    if (x > x2)
-		break;
-
-            SwitchWindow::get (w)->paintThumb (gWindow->lastPaintAttrib (),
-	                                       transform, mask, x, y);
-	    x += WIDTH;
-	}
+    foreach (CompWindow *w, sScreen->windows)
+    {
+        if (x + static_cast<int>(WIDTH * sm) > x1) {
+            auto switchWin = SwitchWindow::get(w);
+            switchWin->sm = sm;
+            switchWin->paintThumb (gWindow->lastPaintAttrib (), transform, mask, x, y);
+        }
+        x += static_cast<int>(WIDTH * sm);
+    }
+
+    foreach (CompWindow *w, sScreen->windows)
+    {
+        if (x > x2) { break; }
+
+        auto switchWin = SwitchWindow::get(w);
+        switchWin->sm = sm;
+        switchWin->paintThumb (gWindow->lastPaintAttrib (), transform, mask, x, y);
+        x += static_cast<int>(WIDTH * sm);
+    }
 
 	glDisable (GL_SCISSOR_TEST);
 
@@ -1025,7 +1000,7 @@
 	streamingBuffer->begin (GL_TRIANGLES);
 
 	streamingBuffer->addColors (1, color);
-	streamingBuffer->addVertices (24, _boxVertices);
+	streamingBuffer->addVertices (24, sScreen->_boxVertices);
 
 	streamingBuffer->end ();
 	streamingBuffer->render (wTransform, attrib);
@@ -1102,6 +1077,58 @@
 
 }
 
+void SwitchScreen::setSizeMultiplier() {
+    sm = optionGetSizeMultiplier();
+    float width = (WIDTH >> 1) * sm;
+    float height = HEIGHT * sm;
+    float box_width = BOX_WIDTH * sm;
+    float boxVertices[72] =
+    {
+        -width, box_width,  0.0f,
+        width,  box_width,  0.0f,
+        -width, 0.0f,       0.0f,
+        -width, 0.0f,       0.0f,
+        width,  box_width,  0.0f,
+        width,  0.0f,       0.0f,
+
+        -width,             height - box_width, 0.0f,
+        -width + box_width, height - box_width, 0.0f,
+        -width,             box_width,          0.0f,
+        -width,             box_width,          0.0f,
+        -width + box_width, height - box_width, 0.0f,
+        -width + box_width, box_width,          0.0f,
+
+        width - box_width,  height - box_width, 0.0f,
+        width,              height - box_width, 0.0f,
+        width - box_width,  box_width,          0.0f,
+        width - box_width,  box_width,          0.0f,
+        width,              height - box_width, 0.0f,
+        width,              box_width,          0.0f,
+
+        -width, height,             0.0f,
+        width, height,             0.0f,
+        -width, height - box_width, 0.0f,
+        -width, height - box_width, 0.0f,
+        width, height,             0.0f,
+        width, height - box_width, 0.0f,
+    };
+    std::copy(boxVertices, boxVertices + 72, _boxVertices);
+
+	foreach (CompWindow *w, windows)
+	{
+        auto switchWin = SwitchWindow::get(w);
+        switchWin->resetGraphics();
+	}
+}
+
+void SwitchWindow::resetGraphics() {
+    sm = sScreen->optionGetSizeMultiplier();
+    if (sScreen->popupWindow && sScreen->popupWindow == window->id ()) {
+        gWindow->glPaintSetEnabled (this, false);
+        gWindow->glPaintSetEnabled (this, true);
+    }
+}
+
 SwitchScreen::SwitchScreen (CompScreen *screen) :
     BaseSwitchScreen (screen),
     PluginClassHandler<SwitchScreen,CompScreen> (screen),
@@ -1115,14 +1142,16 @@
     pos (0),
     move (0),
     translate (0.0),
-    sTranslate (0.0)
+    sTranslate (0.0),
+    sm(1)
 {
     zoom = optionGetZoom () / 30.0f;
-
     zooming = (optionGetZoom () > 0.05f);
-
     optionSetZoomNotify (boost::bind (&SwitchScreen::setZoom, this));
 
+    setSizeMultiplier();
+    optionSetSizeMultiplierNotify(boost::bind(&SwitchScreen::setSizeMultiplier, this));
+
     auto bgUpdater = [=] (...){ this->updateBackground (this->optionGetUseBackgroundColor (), this->optionGetBackgroundColor ());};
     optionSetUseBackgroundColorNotify (bgUpdater);
     optionSetBackgroundColorNotify (bgUpdater);
@@ -1182,8 +1211,10 @@
     BaseSwitchWindow (dynamic_cast<BaseSwitchScreen *>
     		      (SwitchScreen::get (screen)), window),
     PluginClassHandler<SwitchWindow,CompWindow> (window),
+    sm(1),
     sScreen (SwitchScreen::get (screen))
 {
+    sm = sScreen->optionGetSizeMultiplier();
     GLWindowInterface::setHandler (gWindow, false);
     CompositeWindowInterface::setHandler (cWindow, false);
 

=== modified file 'plugins/switcher/src/switcher.h'
--- plugins/switcher/src/switcher.h	2015-08-22 21:46:01 +0000
+++ plugins/switcher/src/switcher.h	2016-07-05 14:10:56 +0000
@@ -20,7 +20,9 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * Author: David Reveman <[e-mail]>
+ * Author(s):
+ *  - David Reveman <[e-mail]>
+ *  - Auboyneau Vincent <[e-mail]> (size multiplier for A11Y)
  */
 
 #include <stdio.h>
@@ -96,6 +98,11 @@
 
 	float translate;
 	float sTranslate;
+
+	void setSizeMultiplier();
+	float sm;
+	float _boxVertices[72];
+
 };
 
 class SwitchWindow :
@@ -115,6 +122,8 @@
 	bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, unsigned int);
 
+	void resetGraphics();
+
 	void paintThumb (const GLWindowPaintAttrib &attrib,
 			 const GLMatrix            &transform,
 			 unsigned int              mask,
@@ -143,6 +152,8 @@
 
 	IconMode getIconMode ();
 
+	float sm; // sizeMultiplier
+
 	SwitchScreen    *sScreen;
 };
 
@@ -160,8 +171,8 @@
 
 extern const unsigned short BOX_WIDTH;
 
-#define WINDOW_WIDTH(count) (WIDTH * (count) + (SPACE << 1))
-#define WINDOW_HEIGHT (HEIGHT + (SPACE << 1))
+#define WINDOW_WIDTH(count) (static_cast<int>(WIDTH * optionGetSizeMultiplier()) * (count) + (SPACE << 1))
+#define WINDOW_HEIGHT (static_cast<int>(HEIGHT * optionGetSizeMultiplier()) + (SPACE << 1))
 
 #define SWITCH_SCREEN(s) \
     SwitchScreen *ss = SwitchScreen::get (s)

=== modified file 'plugins/switcher/switcher.xml.in'
--- plugins/switcher/switcher.xml.in	2015-08-22 21:46:01 +0000
+++ plugins/switcher/switcher.xml.in	2016-07-05 14:10:56 +0000
@@ -98,6 +98,14 @@
 		<max>50</max>
 		<precision>0.1</precision>
 	    </option>
+	    <option name="size_multiplier" type="float">
+		<_short>Size multiplier</_short>
+		<_long>adjusts the size of the switch windows</_long>
+		<default>1</default>
+		<min>0.1</min>
+		<max>10</max>
+		<precision>0.1</precision>
+	    </option>
 	    <option name="window_match" type="match">
 		<_short>Switcher windows</_short>
 		<_long>Windows that should be shown in switcher</_long>