Merge lp:~samuel-thibault/compiz/clone into lp:compiz/0.9.13

[Samuel thibault]

[Andrea Azzarone (azzar1)]

Please take a looks to the inline comments. What do you think?

review: Needs Fixing

[lp:~samuel-thibault/compiz/clone]

4145. By Samuel thibault on 2018-07-06

Move zoomareas at redirection into a helper, update callers

Unmerged revisions

4145. By Samuel thibault on 2018-07-06

Move zoomareas at redirection into a helper, update callers

4144. By Samuel thibault on 2018-07-05

Fix ezooom when randr is in clone mode

- This adds CompScreenImpl::outputDev which returns the CompOutput corresponding
to a CompOutput id, but special-case id ~0 and return the fullscreen CompOutput
in that case.
- This makes ezoom use it instead of indexing within screen->outputDevs.
- This makes out < 0 a valid output
- This redirect zooms.at () to use ZoomArea 0 when out < 0 (fullscreen output case).

=== modified file 'include/core/screen.h'
--- include/core/screen.h	2017-06-29 17:19:00 +0000
+++ include/core/screen.h	2018-07-06 09:09:42 +0000
@@ -310,6 +310,7 @@
     virtual bool grabsEmpty() const = 0;
     virtual void sizePluginClasses(unsigned int size) = 0;
     virtual CompOutput::vector & outputDevs () = 0;
+    virtual CompOutput & outputDev (unsigned int id) = 0;
     virtual void setWindowState (unsigned int state, Window id) = 0;
     virtual bool XShape () = 0;
     virtual std::vector<XineramaScreenInfo> & screenInfo () = 0;

=== modified file 'plugins/ezoom/src/ezoom.cpp'
--- plugins/ezoom/src/ezoom.cpp	2017-12-05 14:45:06 +0000
+++ plugins/ezoom/src/ezoom.cpp	2018-07-06 09:09:42 +0000
@@ -99,13 +99,24 @@
     ZOOM_SCREEN (screen);
 
     if (out < 0)
-	return false;
+	/* This is the fullscreen output */
+	return true;
     else if ((unsigned int) out >= zs->zooms.size ())
 	zs->zooms.resize (screen->outputDevs ().size ());
 
     return true;
 }
 
+static inline EZoomScreen::ZoomArea&
+getZoomArea (std::vector <EZoomScreen::ZoomArea>& zooms, int out)
+{
+    if (out < 0)
+	/* Use ZoomArea 0 for fullscreen output */
+	return zooms.at (0);
+    else
+	return zooms.at (out);
+};
+
 /* Check if zoom is active on the output specified */
 static inline bool
 isActive (int out)
@@ -115,7 +126,7 @@
     if (!outputIsZoomArea (out))
 	return false;
 
-    if (zs->grabbed & (1 << zs->zooms.at (out).output))
+    if (zs->grabbed & (1 << getZoomArea(zs->zooms, out).output))
 	return true;
 
     return false;
@@ -132,9 +143,9 @@
     if (!outputIsZoomArea (out))
 	return false;
 
-    if (zs->zooms.at (out).currentZoom != 1.0f	||
-	zs->zooms.at (out).newZoom     != 1.0f	||
-	zs->zooms.at (out).zVelocity   != 0.0f)
+    if (getZoomArea(zs->zooms, out).currentZoom != 1.0f	||
+	getZoomArea(zs->zooms, out).newZoom     != 1.0f	||
+	getZoomArea(zs->zooms, out).zVelocity   != 0.0f)
 	return true;
 
     return false;
@@ -173,7 +184,7 @@
 EZoomScreen::distanceToEdge (int                   out,
 			     EZoomScreen::ZoomEdge edge)
 {
-    CompOutput *o = &screen->outputDevs ().at (out);
+    CompOutput *o = &screen->outputDev (out);
 
     if (!isActive (out))
 	return 0;
@@ -211,17 +222,17 @@
 bool
 EZoomScreen::isInMovement (int out)
 {
-    if (zooms.at (out).currentZoom == 1.0f  &&
-	zooms.at (out).newZoom     == 1.0f  &&
-	zooms.at (out).zVelocity   == 0.0f)
+    if (getZoomArea(zooms, out).currentZoom == 1.0f  &&
+	getZoomArea(zooms, out).newZoom     == 1.0f  &&
+	getZoomArea(zooms, out).zVelocity   == 0.0f)
 	return false;
 
-    if (zooms.at (out).currentZoom != zooms.at (out).newZoom	    ||
-	zooms.at (out).xVelocity				    ||
-	zooms.at (out).yVelocity				    ||
-	zooms.at (out).zVelocity				    ||
-	zooms.at (out).xTranslate != zooms.at (out).realXTranslate  ||
-	zooms.at (out).yTranslate != zooms.at (out).realYTranslate)
+    if (getZoomArea(zooms, out).currentZoom != getZoomArea(zooms, out).newZoom	    ||
+	getZoomArea(zooms, out).xVelocity				    ||
+	getZoomArea(zooms, out).yVelocity				    ||
+	getZoomArea(zooms, out).zVelocity				    ||
+	getZoomArea(zooms, out).xTranslate != getZoomArea(zooms, out).realXTranslate  ||
+	getZoomArea(zooms, out).yTranslate != getZoomArea(zooms, out).realYTranslate)
 	return true;
 
     return false;
@@ -270,7 +281,7 @@
 EZoomScreen::adjustZoomVelocity (int   out,
 				 float chunk)
 {
-    float d      = (zooms.at (out).newZoom - zooms.at (out).currentZoom) * 75.0f;
+    float d      = (getZoomArea(zooms, out).newZoom - getZoomArea(zooms, out).currentZoom) * 75.0f;
     float adjust = d * 0.002f;
     float amount = fabs (d);
 
@@ -279,17 +290,19 @@
     else if (amount > 5.0f)
 	amount = 5.0f;
 
-    zooms.at (out).zVelocity = (amount * zooms.at (out).zVelocity + adjust) /
-			       (amount + 1.0f);
+    getZoomArea(zooms, out).zVelocity =
+	(amount * getZoomArea(zooms, out).zVelocity + adjust) /
+	(amount + 1.0f);
 
-    if (fabs (d) < 0.1f && fabs (zooms.at (out).zVelocity) < 0.005f)
+    if (fabs (d) < 0.1f && fabs (getZoomArea(zooms, out).zVelocity) < 0.005f)
     {
-	zooms.at (out).currentZoom = zooms.at (out).newZoom;
-	zooms.at (out).zVelocity   = 0.0f;
+	getZoomArea(zooms, out).currentZoom = getZoomArea(zooms, out).newZoom;
+	getZoomArea(zooms, out).zVelocity   = 0.0f;
     }
     else
-	zooms.at (out).currentZoom += (zooms.at (out).zVelocity * chunk) /
-				      cScreen->redrawTime ();
+	getZoomArea(zooms, out).currentZoom +=
+	    (getZoomArea(zooms, out).zVelocity * chunk) /
+	    cScreen->redrawTime ();
 }
 
 /* Adjust the X/Y velocity based on target translation and real
@@ -298,13 +311,13 @@
 EZoomScreen::adjustXYVelocity (int   out,
 			       float chunk)
 {
-    zooms.at (out).xVelocity /= 1.25f;
-    zooms.at (out).yVelocity /= 1.25f;
+    getZoomArea(zooms, out).xVelocity /= 1.25f;
+    getZoomArea(zooms, out).yVelocity /= 1.25f;
 
     float xdiff =
-	(zooms.at (out).xTranslate - zooms.at (out).realXTranslate) * 75.0f;
+	(getZoomArea(zooms, out).xTranslate - getZoomArea(zooms, out).realXTranslate) * 75.0f;
     float ydiff =
-	(zooms.at (out).yTranslate - zooms.at (out).realYTranslate) * 75.0f;
+	(getZoomArea(zooms, out).yTranslate - getZoomArea(zooms, out).realYTranslate) * 75.0f;
 
     float xadjust = xdiff * 0.002f;
     float yadjust = ydiff * 0.002f;
@@ -321,25 +334,25 @@
     else if (yamount > 5.0)
 	yamount = 5.0f;
 
-    zooms.at (out).xVelocity =
-	(xamount * zooms.at (out).xVelocity + xadjust) / (xamount + 1.0f);
-    zooms.at (out).yVelocity =
-	(yamount * zooms.at (out).yVelocity + yadjust) / (yamount + 1.0f);
+    getZoomArea(zooms, out).xVelocity =
+	(xamount * getZoomArea(zooms, out).xVelocity + xadjust) / (xamount + 1.0f);
+    getZoomArea(zooms, out).yVelocity =
+	(yamount * getZoomArea(zooms, out).yVelocity + yadjust) / (yamount + 1.0f);
 
-    if ((fabs(xdiff) < 0.1f && fabs (zooms.at (out).xVelocity) < 0.005f) &&
-	(fabs(ydiff) < 0.1f && fabs (zooms.at (out).yVelocity) < 0.005f))
+    if ((fabs(xdiff) < 0.1f && fabs (getZoomArea(zooms, out).xVelocity) < 0.005f) &&
+	(fabs(ydiff) < 0.1f && fabs (getZoomArea(zooms, out).yVelocity) < 0.005f))
     {
-	zooms.at (out).realXTranslate = zooms.at (out).xTranslate;
-	zooms.at (out).realYTranslate = zooms.at (out).yTranslate;
-	zooms.at (out).xVelocity      = 0.0f;
-	zooms.at (out).yVelocity      = 0.0f;
+	getZoomArea(zooms, out).realXTranslate = getZoomArea(zooms, out).xTranslate;
+	getZoomArea(zooms, out).realYTranslate = getZoomArea(zooms, out).yTranslate;
+	getZoomArea(zooms, out).xVelocity      = 0.0f;
+	getZoomArea(zooms, out).yVelocity      = 0.0f;
 	return;
     }
 
-    zooms.at (out).realXTranslate +=
-	(zooms.at (out).xVelocity * chunk) / cScreen->redrawTime ();
-    zooms.at (out).realYTranslate +=
-	(zooms.at (out).yVelocity * chunk) / cScreen->redrawTime ();
+    getZoomArea(zooms, out).realXTranslate +=
+	(getZoomArea(zooms, out).xVelocity * chunk) / cScreen->redrawTime ();
+    getZoomArea(zooms, out).realYTranslate +=
+	(getZoomArea(zooms, out).yVelocity * chunk) / cScreen->redrawTime ();
 }
 
 /* Animate the movement (if any) in preparation of a paint screen. */
@@ -365,12 +378,12 @@
 
 		adjustXYVelocity (out, chunk);
 		adjustZoomVelocity (out, chunk);
-		zooms.at (out).updateActualTranslates ();
+		getZoomArea(zooms, out).updateActualTranslates ();
 
 		if (!isZoomed (out))
 		{
-		    zooms.at (out).xVelocity = zooms.at (out).yVelocity = 0.0f;
-		    grabbed &= ~(1 << zooms.at (out).output);
+		    getZoomArea(zooms, out).xVelocity = getZoomArea(zooms, out).yVelocity = 0.0f;
+		    grabbed &= ~(1 << getZoomArea(zooms, out).output);
 
 		    if (!grabbed)
 		    {
@@ -540,11 +553,11 @@
 	mask &= ~PAINT_SCREEN_REGION_MASK;
 	mask |= PAINT_SCREEN_CLEAR_MASK;
 
-	zTransform.scale (1.0f / zooms.at (out).currentZoom,
-			  1.0f / zooms.at (out).currentZoom,
+	zTransform.scale (1.0f / getZoomArea(zooms, out).currentZoom,
+			  1.0f / getZoomArea(zooms, out).currentZoom,
 			  1.0f);
-	zTransform.translate (zooms.at (out).xtrans,
-			      zooms.at (out).ytrans,
+	zTransform.translate (getZoomArea(zooms, out).xtrans,
+			      getZoomArea(zooms, out).ytrans,
 			      0);
 
 	mask |= PAINT_SCREEN_TRANSFORMED_MASK;
@@ -574,15 +587,15 @@
 
     for (unsigned int out = 0; out < zs->zooms.size (); ++out)
     {
-	if (zs->zooms.at (out).xTranslate > 0.5f)
-	    zs->zooms.at (out).xTranslate = 0.5f;
-	else if (zs->zooms.at (out).xTranslate < -0.5f)
-	    zs->zooms.at (out).xTranslate = -0.5f;
+	if (getZoomArea(zs->zooms, out).xTranslate > 0.5f)
+	    getZoomArea(zs->zooms, out).xTranslate = 0.5f;
+	else if (getZoomArea(zs->zooms, out).xTranslate < -0.5f)
+	    getZoomArea(zs->zooms, out).xTranslate = -0.5f;
 
-	if (zs->zooms.at (out).yTranslate > 0.5f)
-	    zs->zooms.at (out).yTranslate = 0.5f;
-	else if (zs->zooms.at (out).yTranslate < -0.5f)
-	    zs->zooms.at (out).yTranslate = -0.5f;
+	if (getZoomArea(zs->zooms, out).yTranslate > 0.5f)
+	    getZoomArea(zs->zooms, out).yTranslate = 0.5f;
+	else if (getZoomArea(zs->zooms, out).yTranslate < -0.5f)
+	    getZoomArea(zs->zooms, out).yTranslate = -0.5f;
     }
 }
 
@@ -606,23 +619,23 @@
 			bool instant)
 {
     int         out = screen->outputDeviceForPoint (x, y);
-    CompOutput  *o  = &screen->outputDevs ().at (out);
+    CompOutput  *o  = &screen->outputDev (out);
 
-    if (zooms.at (out).locked)
+    if (getZoomArea(zooms, out).locked)
 	return;
 
-    zooms.at (out).xTranslate = (float)
+    getZoomArea(zooms, out).xTranslate = (float)
 	((x - o->x1 ()) - o->width ()  / 2) / (o->width ());
-    zooms.at (out).yTranslate = (float)
+    getZoomArea(zooms, out).yTranslate = (float)
 	((y - o->y1 ()) - o->height () / 2) / (o->height ());
 
     if (instant)
     {
-	zooms.at (out).realXTranslate = zooms.at (out).xTranslate;
-	zooms.at (out).realYTranslate = zooms.at (out).yTranslate;
-	zooms.at (out).yVelocity = 0.0f;
-	zooms.at (out).xVelocity = 0.0f;
-	zooms.at (out).updateActualTranslates ();
+	getZoomArea(zooms, out).realXTranslate = getZoomArea(zooms, out).xTranslate;
+	getZoomArea(zooms, out).realYTranslate = getZoomArea(zooms, out).yTranslate;
+	getZoomArea(zooms, out).yVelocity = 0.0f;
+	getZoomArea(zooms, out).xVelocity = 0.0f;
+	getZoomArea(zooms, out).updateActualTranslates ();
     }
 
     if (optionGetZoomMode () == EzoomOptions::ZoomModePanArea)
@@ -641,27 +654,27 @@
     CompWindow::Geometry outGeometry (x, y, width, height, 0);
     int out = screen->outputDeviceForGeometry (outGeometry);
 
-    if (zooms.at (out).newZoom == 1.0f ||
-	zooms.at (out).locked)
+    if (getZoomArea(zooms, out).newZoom == 1.0f ||
+	getZoomArea(zooms, out).locked)
 	return;
 
-    CompOutput *o = &screen->outputDevs ().at (out);
+    CompOutput *o = &screen->outputDev (out);
 
-    zooms.at (out).xTranslate =
+    getZoomArea(zooms, out).xTranslate =
 	 (float) -((o->width () / 2) - (x + (width / 2) - o->x1 ()))
 	/ (o->width ());
-    zooms.at (out).xTranslate /= (1.0f - zooms.at (out).newZoom);
-    zooms.at (out).yTranslate =
+    getZoomArea(zooms, out).xTranslate /= (1.0f - getZoomArea(zooms, out).newZoom);
+    getZoomArea(zooms, out).yTranslate =
 	(float) -((o->height () / 2) - (y + (height / 2) - o->y1 ()))
 	/ (o->height ());
-    zooms.at (out).yTranslate /= (1.0f - zooms.at (out).newZoom);
+    getZoomArea(zooms, out).yTranslate /= (1.0f - getZoomArea(zooms, out).newZoom);
     constrainZoomTranslate ();
 
     if (instant)
     {
-	zooms.at (out).realXTranslate = zooms.at (out).xTranslate;
-	zooms.at (out).realYTranslate = zooms.at (out).yTranslate;
-	zooms.at (out).updateActualTranslates ();
+	getZoomArea(zooms, out).realXTranslate = getZoomArea(zooms, out).xTranslate;
+	getZoomArea(zooms, out).realYTranslate = getZoomArea(zooms, out).yTranslate;
+	getZoomArea(zooms, out).updateActualTranslates ();
     }
 
     if (optionGetZoomMode () == EzoomOptions::ZoomModePanArea)
@@ -690,8 +703,8 @@
 
     for (unsigned int out = 0; out < zooms.size (); ++out)
     {
-	zooms.at (out).xTranslate += panFactor * xvalue * zooms.at (out).currentZoom;
-	zooms.at (out).yTranslate += panFactor * yvalue * zooms.at (out).currentZoom;
+	getZoomArea(zooms, out).xTranslate += panFactor * xvalue * getZoomArea(zooms, out).currentZoom;
+	getZoomArea(zooms, out).yTranslate += panFactor * yvalue * getZoomArea(zooms, out).currentZoom;
     }
 
     constrainZoomTranslate ();
@@ -715,7 +728,7 @@
 EZoomScreen::setScale (int   out,
 		       float value)
 {
-    if (zooms.at (out).locked)
+    if (getZoomArea(zooms, out).locked)
 	return;
 
     if (value >= 1.0f)
@@ -725,21 +738,21 @@
 	if (!pollHandle.active ())
 	    enableMousePolling ();
 
-	grabbed |= (1 << zooms.at (out).output);
+	grabbed |= (1 << getZoomArea(zooms, out).output);
 	cursorZoomActive (out);
     }
 
     if (value == 1.0f)
     {
-	zooms.at (out).xTranslate = 0.0f;
-	zooms.at (out).yTranslate = 0.0f;
+	getZoomArea(zooms, out).xTranslate = 0.0f;
+	getZoomArea(zooms, out).yTranslate = 0.0f;
 	cursorZoomInactive ();
     }
 
     if (value < optionGetMinimumZoom ())
 	value = optionGetMinimumZoom ();
 
-    zooms.at (out).newZoom = value;
+    getZoomArea(zooms, out).newZoom = value;
     cScreen->damageScreen();
 }
 
@@ -773,16 +786,16 @@
     if (!isInMovement (out))
 	return;
 
-    CompOutput *o = &screen->outputDevs ().at (out);
+    CompOutput *o = &screen->outputDev (out);
 
-    int x = (int) ((zooms.at (out).realXTranslate * o->width ()) +
+    int x = (int) ((getZoomArea(zooms, out).realXTranslate * o->width ()) +
 		   (o->width () / 2) + o->x1 ());
-    int y = (int) ((zooms.at (out).realYTranslate * o->height ()) +
+    int y = (int) ((getZoomArea(zooms, out).realYTranslate * o->height ()) +
 		   (o->height () / 2) + o->y1 ());
 
     if ((x != mouse.x () || y != mouse.y ())	&&
 	grabbed					&&
-	zooms.at (out).newZoom != 1.0f)
+	getZoomArea(zooms, out).newZoom != 1.0f)
     {
 	screen->warpPointer (x - pointerX , y - pointerY );
 	mouse.setX (x);
@@ -804,8 +817,8 @@
 	*resultY = y;
     }
 
-    CompOutput *o          = &screen->outputDevs ()[out];
-    ZoomArea   &za         = zooms.at (out);
+    CompOutput *o          = &screen->outputDev (out);
+    ZoomArea   &za         = getZoomArea(zooms, out);
     int        oWidth      = o->width ();
     int        oHeight     = o->height ();
     int        halfOWidth  = oWidth  / 2;
@@ -840,8 +853,8 @@
 	*resultY = y;
     }
 
-    CompOutput *o          = &screen->outputDevs ().at (out);
-    ZoomArea   &za         = zooms.at (out);
+    CompOutput *o          = &screen->outputDev (out);
+    ZoomArea   &za         = getZoomArea(zooms, out);
     int        oWidth      = o->width ();
     int        oHeight     = o->height ();
     int        halfOWidth  = oWidth  / 2;
@@ -876,12 +889,12 @@
 
     int zoomX, zoomY;
     convertToZoomedTarget (out, x, y, &zoomX, &zoomY);
-    ZoomArea &za = zooms.at (out);
+    ZoomArea &za = getZoomArea(zooms, out);
 
     if (za.locked)
 	return false;
 
-    CompOutput *o = &screen->outputDevs ().at (out);
+    CompOutput *o = &screen->outputDev (out);
 
 #define FACTOR (za.newZoom / (1.0f - za.newZoom))
     if (zoomX + margin > o->x2 ())
@@ -924,10 +937,10 @@
 				   ZoomGravity gravity)
 {
     int        out  = screen->outputDeviceForPoint (x1 + (x2 - x1 / 2), y1 + (y2 - y1 / 2));
-    CompOutput *o   = &screen->outputDevs ().at (out);
+    CompOutput *o   = &screen->outputDev (out);
 
-    bool widthOkay  = (float)(x2-x1) / (float)o->width ()  < zooms.at (out).newZoom;
-    bool heightOkay = (float)(y2-y1) / (float)o->height () < zooms.at (out).newZoom;
+    bool widthOkay  = (float)(x2-x1) / (float)o->width ()  < getZoomArea(zooms, out).newZoom;
+    bool heightOkay = (float)(y2-y1) / (float)o->height () < getZoomArea(zooms, out).newZoom;
 
     if (widthOkay &&
 	heightOkay)
@@ -948,12 +961,12 @@
 	    if (widthOkay)
 		targetW = x2 - x1;
 	    else
-		targetW = o->width () * zooms.at (out).newZoom;
+		targetW = o->width () * getZoomArea(zooms, out).newZoom;
 
 	    if (heightOkay)
 		targetH = y2 - y1;
 	    else
-		targetH = o->height () * zooms.at (out).newZoom;
+		targetH = o->height () * getZoomArea(zooms, out).newZoom;
 
 	    break;
 
@@ -967,14 +980,14 @@
 	    }
 	    else
 	    {
-		targetX = x2 - o->width () * zooms.at (out).newZoom;
-		targetW = o->width () * zooms.at (out).newZoom;
+		targetX = x2 - o->width () * getZoomArea(zooms, out).newZoom;
+		targetW = o->width () * getZoomArea(zooms, out).newZoom;
 	    }
 
 	    if (heightOkay)
 		targetH = y2-y1;
 	    else
-		targetH = o->height () * zooms.at (out).newZoom;
+		targetH = o->height () * getZoomArea(zooms, out).newZoom;
 
 	    break;
 
@@ -984,7 +997,7 @@
 	    if (widthOkay)
 		targetW = x2-x1;
 	    else
-		targetW = o->width () * zooms.at (out).newZoom;
+		targetW = o->width () * getZoomArea(zooms, out).newZoom;
 
 	    if (heightOkay)
 	    {
@@ -993,8 +1006,8 @@
 	    }
 	    else
 	    {
-		targetY = y2 - (o->width () * zooms.at (out).newZoom);
-		targetH = o->width () * zooms.at (out).newZoom;
+		targetY = y2 - (o->width () * getZoomArea(zooms, out).newZoom);
+		targetH = o->width () * getZoomArea(zooms, out).newZoom;
 	    }
 
 	    break;
@@ -1007,7 +1020,7 @@
 	    }
 	    else
 	    {
-		targetW = o->width () * zooms.at (out).newZoom;
+		targetW = o->width () * getZoomArea(zooms, out).newZoom;
 		targetX = x2 - targetW;
 	    }
 
@@ -1018,7 +1031,7 @@
 	    }
 	    else
 	    {
-		targetH = o->height () * zooms.at (out).newZoom;
+		targetH = o->height () * getZoomArea(zooms, out).newZoom;
 		targetY = y2 - targetH;
 	    }
 
@@ -1047,16 +1060,16 @@
 {
     int         x1, y1, x2, y2;
     int         diffX = 0, diffY = 0;
-    CompOutput  *o = &screen->outputDevs ().at (out);
+    CompOutput  *o = &screen->outputDev (out);
 
-    float z      = zooms.at (out).newZoom;
+    float z      = getZoomArea(zooms, out).newZoom;
     int   margin = optionGetRestrainMargin ();
     int   north  = distanceToEdge (out, NORTH);
     int   south  = distanceToEdge (out, SOUTH);
     int   east   = distanceToEdge (out, EAST);
     int   west   = distanceToEdge (out, WEST);
 
-    if (zooms.at (out).currentZoom == 1.0f)
+    if (getZoomArea(zooms, out).currentZoom == 1.0f)
     {
 	lastChange = time(NULL);
 	mouse = MousePoller::getCurrentPosition ();
@@ -1205,7 +1218,7 @@
 	sTransform.translate ((float) ax, (float) ay, 0.0f);
 
 	if (optionGetScaleMouseDynamic ())
-	    scaleFactor = 1.0f / zooms.at (out).currentZoom;
+	    scaleFactor = 1.0f / getZoomArea(zooms, out).currentZoom;
 	else
 	    scaleFactor = 1.0f / optionGetScaleMouseStatic ();
 
@@ -1386,7 +1399,7 @@
     if (!optionGetScaleMouse ()					&&
 	optionGetZoomMode () == EzoomOptions::ZoomModeSyncMouse &&
 	optionGetHideOriginalMouse ()				&&
-	!zooms.at (out).locked)
+	!getZoomArea(zooms, out).locked)
 	return;
 
     if (!cursorInfoSelected)
@@ -1399,7 +1412,7 @@
 
     if (canHideCursor &&
 	!cursorHidden &&
-	(optionGetHideOriginalMouse () || zooms.at (out).locked))
+	(optionGetHideOriginalMouse () || getZoomArea(zooms, out).locked))
     {
 	cursorHidden = true;
 	XFixesHideCursor (screen->dpy (), screen->root ());
@@ -1444,7 +1457,7 @@
     int  height   = y2 - y1;
 
     setZoomArea (x1, y1, width, height, false);
-    CompOutput *o = &screen->outputDevs (). at(out);
+    CompOutput *o = &screen->outputDev (out);
 
     if (scale && width && height)
 	setScaleBigger (out, width  / static_cast <float> (o->width ()),
@@ -1494,7 +1507,7 @@
     if (x2 >= 0 && y2 >= 0)
 	ensureVisibility (x2, y2, margin);
 
-    CompOutput *o = &screen->outputDevs (). at(out);
+    CompOutput *o = &screen->outputDev (out);
 
     int width  = x2 - x1;
     int height = y2 - y1;
@@ -1565,7 +1578,7 @@
 	CompWindow::Geometry outGeometry (x, y, width, height, 0);
 
 	int        out = screen->outputDeviceForGeometry (outGeometry);
-	CompOutput *o  = &screen->outputDevs (). at (out);
+	CompOutput *o  = &screen->outputDev (out);
 	setScaleBigger (out, width  / static_cast <float> (o->width ()),
 			     height / static_cast <float> (o->height ()));
 	setZoomArea (x, y, width, height, false);
@@ -1589,7 +1602,7 @@
 	!isInMovement (out))
 	setCenter (pointerX, pointerY, true);
 
-    setScale (out, zooms.at (out).newZoom / optionGetZoomFactor ());
+    setScale (out, getZoomArea(zooms, out).newZoom / optionGetZoomFactor ());
 
     toggleFunctions (true);
 
@@ -1604,7 +1617,7 @@
 			     CompOption::Vector options)
 {
     int out = screen->outputDeviceForPoint (pointerX, pointerY);
-    zooms.at (out).locked = !zooms.at (out).locked;
+    getZoomArea(zooms, out).locked = !getZoomArea(zooms, out).locked;
 
     return true;
 }
@@ -1695,7 +1708,7 @@
 	    return false;
     }
 
-    if ((zoom_level == zooms.at (out).newZoom) ||
+    if ((zoom_level == getZoomArea(zooms, out).newZoom) ||
 	screen->otherGrabExist (NULL))
 	return false;
 
@@ -1736,7 +1749,7 @@
     int        width  = w->width ()  + w->border ().left + w->border ().right;
     int        height = w->height () + w->border ().top  + w->border ().bottom;
     int        out    = screen->outputDeviceForGeometry (w->geometry ());
-    CompOutput *o     = &screen->outputDevs ().at (out);
+    CompOutput *o     = &screen->outputDev (out);
 
     setScaleBigger (out, width  / static_cast <float> (o->width ()),
 			 height / static_cast <float> (o->height ()));
@@ -1770,11 +1783,11 @@
     screen->warpPointer ((int) (screen->outputDevs ().at (out).width () / 2 +
 				screen->outputDevs ().at (out).x1 () - pointerX)
 			 + ((float) screen->outputDevs ().at (out).width () *
-			    -zooms.at (out).xtrans),
+			    -getZoomArea(zooms, out).xtrans),
 			 (int) (screen->outputDevs ().at (out).height () / 2 +
 				screen->outputDevs ().at (out).y1 () - pointerY)
 			 + ((float) screen->outputDevs ().at (out).height () *
-			    zooms.at (out).ytrans));
+			    getZoomArea(zooms, out).ytrans));
     return true;
 }
 
@@ -1801,10 +1814,10 @@
     xwc.y   = w->serverY ();
 
     xwc.width  = (int) (screen->outputDevs ().at (out).width () *
-			zooms.at (out).currentZoom -
+			getZoomArea(zooms, out).currentZoom -
 			(int) ((w->border ().left + w->border ().right)));
     xwc.height = (int) (screen->outputDevs ().at (out).height () *
-			zooms.at (out).currentZoom -
+			getZoomArea(zooms, out).currentZoom -
 			(int) ((w->border ().top + w->border ().bottom)));
 
     w->constrainNewWindowSize (xwc.width,
@@ -1854,7 +1867,7 @@
     int out = screen->outputDeviceForPoint (pointerX, pointerY);
 
     setScale (out,
-	      zooms.at (out).newZoom *
+	      getZoomArea(zooms, out).newZoom *
 	      optionGetZoomFactor ());
 
     toggleFunctions (true);
@@ -1871,7 +1884,7 @@
 
     if (grabbed)
     {
-	zooms.at (out).newZoom = 1.0f;
+	getZoomArea(zooms, out).newZoom = 1.0f;
 	cScreen->damageScreen ();
     }
 

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2017-06-29 17:19:00 +0000
+++ src/privatescreen.h	2018-07-06 09:09:42 +0000
@@ -1053,6 +1053,7 @@
 
 	CompOutput::vector & outputDevs ();
 	CompOutput & currentOutputDev () const;
+	CompOutput & outputDev (unsigned int id);
 
 	const CompRect & workArea () const;
 

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2017-10-26 17:02:38 +0000
+++ src/screen.cpp	2018-07-06 09:09:42 +0000
@@ -4703,6 +4703,15 @@
     return const_cast<PrivateScreen&>(privateScreen).outputDevices.getCurrentOutputDev ();
 }
 
+CompOutput &
+CompScreenImpl::outputDev (unsigned int id)
+{
+    if (id == ~0u)
+	return fullscreenOutput ();
+    else
+	return outputDevs ().at (id);
+}
+
 const CompRect &
 CompScreenImpl::workArea () const
 {