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

[Samuel thibault]

ezoom: Add option to choose between no smoothing and linear smoothing

This is to fix bug #1736446

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

ACK

review: Approve

=== modified file 'plugins/ezoom/ezoom.xml.in'
--- plugins/ezoom/ezoom.xml.in	2016-07-01 15:37:19 +0000
+++ plugins/ezoom/ezoom.xml.in	2017-12-05 14:52:40 +0000
@@ -70,6 +70,21 @@
 			    <alpha>0x4fff</alpha>
 			</default>
 		</option>
+		<option name="zoom_smoothing" type="int">
+			<_short>Zoom Smoothing Algorithm</_short>
+			<_long>Select algorithm for smoothing the zoom rendering</_long>
+			<min>0</min>
+			<max>1</max>
+			<default>1</default>
+			<desc>
+			    <value>0</value>
+			    <_name>None</_name>
+			</desc>
+			<desc>
+			    <value>1</value>
+			    <_name>Bilinear</_name>
+			</desc>
+		</option>
 	    </group>
 	    <group>
 		<_short>Mouse Behaviour</_short>

=== modified file 'plugins/ezoom/src/ezoom.cpp'
--- plugins/ezoom/src/ezoom.cpp	2016-07-01 15:37:19 +0000
+++ plugins/ezoom/src/ezoom.cpp	2017-12-05 14:52:40 +0000
@@ -140,6 +140,34 @@
     return false;
 }
 
+static inline GLenum
+setZoomSmoothing (GLScreen *gScreen)
+{
+    ZOOM_SCREEN (screen);
+
+    GLenum oldFilter = zs->gScreen->textureFilter ();
+    switch (zs->optionGetZoomSmoothing ())
+    {
+	case EzoomOptions::ZoomSmoothingNone:
+	    zs->gScreen->setTextureFilter (GL_NEAREST);
+	    break;
+
+	case EzoomOptions::ZoomSmoothingBilinear:
+	    zs->gScreen->setTextureFilter (GL_LINEAR);
+	    break;
+    }
+
+    return oldFilter;
+}
+
+static void
+restoreZoomSmoothing (GLScreen *gScreen, GLenum oldFilter)
+{
+    ZOOM_SCREEN (screen);
+
+    zs->gScreen->setTextureFilter (oldFilter);
+}
+
 /* Returns the distance to the defined edge in zoomed pixels.  */
 int
 EZoomScreen::distanceToEdge (int                   out,
@@ -502,6 +530,8 @@
     bool status;
     int  out = output->id ();
 
+    GLenum oldFilter = setZoomSmoothing (gScreen);
+
     if (isActive (out))
     {
 	GLScreenPaintAttrib sa         = attrib;
@@ -529,6 +559,8 @@
     if (grabIndex)
 	drawBox (transform, output, box);
 
+    restoreZoomSmoothing (gScreen, oldFilter);
+
     return status;
 }
 
@@ -1158,6 +1190,8 @@
 	    return;
 	}
 
+	GLenum oldFilter = setZoomSmoothing (gScreen);
+
 	GLMatrix       sTransform = transform;
 	float          scaleFactor;
 	int            ax, ay;
@@ -1220,6 +1254,8 @@
 
 	glBindTexture (GL_TEXTURE_2D, 0);
 	glDisable (GL_BLEND);
+
+	restoreZoomSmoothing (gScreen, oldFilter);
     }
 }