Merge lp:~unity-team/compiz/x-sru5 into lp:compiz/xenial

[Marco Trevisan (Treviño)]

Releasing SRU5 for Ubuntu 16.04

[lp:~unity-team/compiz/x-sru5]

4027. By Marco Trevisan (Treviño) on 2017-06-28

unity-lowgfx: use better effect for grid

4028. By Marco Trevisan (Treviño) on 2017-06-28

debian/changelog: add missing bug references

4029. By Alberts Muktupāvels on 2017-07-04

Use AnyPropertyType when getting _MOTIF_WM_HINTS property.

4030. By Marco Trevisan (Treviño) on 2017-07-03

move: damage all the border area in outline mode and ignore transparent colors

Also we don't really need to damage at every X event. It's just about doing it
right the firs time, by including the exceeding space.
Also optimize damanging in outline-mode, by only touching such regions

Plus add some optimizations when not blending, as we don't care about the alpha channel

4031. By Marco Trevisan (Treviño) on 2017-07-03

grid: ignore alpha in colors when not blending, and fix animations

The fade-out animation was still happening when the duration was set to 1,
while it was broken when it was 0. Fixed both.

In unity-lowgfx.ini set the animation duration to 0 in grid and d not
draw stretched windows. Enable blending again as it's really not
expensive in this case, while not having it, really makes the user
experience a lot poorer.

4032. By Marco Trevisan (Treviño) on 2017-07-03

resize: add support for disabling transparency and avoid over-damaging in outline mode

4033. By Marco Trevisan (Treviño) on 2017-07-03

Screen: add averageColor to get the current desktop average color

We get the value from the root window and we parse it using regex.
Also use this in 'move', 'resize' and 'grid' plugins by default, doing the
appropriate lightening / darkening to make this working properly
on the desktop surface

4034. By Marco Trevisan (Treviño) on 2017-07-04

Bumping micro version

4035. By Marco Trevisan (Treviño) on 2017-07-07

debian: go back setting COMPIZ_CONFIG_PROFILE in X11 scripts

4036. By Marco Trevisan (Treviño) on 2017-07-20

debian: tune unity-lowgfx profile and add upgrades

[Andrea Azzarone (azzar1)]

+1

review: Approve

[Amr Ibrahim (amribrahim1987)]

Ping!
SRU into Xenial.

[lp:~unity-team/compiz/x-sru5]

4037. By Marco Trevisan (Treviño) on 2017-11-16

unity-lowgfx.ini: remove unsupported unity option

=== modified file 'VERSION'
--- VERSION	2015-08-19 15:50:54 +0000
+++ VERSION	2017-11-16 22:42:49 +0000
@@ -1,1 +1,1 @@
-0.9.12.2
+0.9.12.3
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-08-23 16:06:02 +0000
+++ debian/changelog	2017-11-16 22:42:49 +0000
@@ -1,3 +1,31 @@
+compiz (1:0.9.12.3) UNRELEASED; urgency=medium
+
+  [ Eleni Maria Stea ]
+  * Added option to disable blend in grid plugin (LP: #1700859)
+  * Move: add options for showing only the window shape (filled or not)
+    (LP: #1700859)
+
+  [ Alberts Muktupāvels ]
+  * Ensure that surfaces used by metacity theme have device scale set to
+    1 . (LP: #1530277) (LP: #1530277)
+  * Use AnyPropertyType when getting _MOTIF_WM_HINTS property. (LP:
+    #1702297)
+
+  [ Martin Wimpress ]
+  * mate: Avoid artefacts of Windows Thumbnail Previews (LP: #1606369)
+
+  [ Marco Trevisan (Treviño) ]
+  * move: damage all the border area in outline mode and ignore
+    transparent colors (LP: #1700859)
+  * grid: ignore alpha in colors when not blending, and fix animations
+    (LP: #1700859)
+  * resize: add support for disabling transparency and avoid over-
+    damaging in outline mode (LP: #1700859)
+  * Screen: add averageColor to get the current desktop average color
+  * unity-lowgfx.ini: remove unsupported unity option
+
+ -- Marco Trevisan <[e-mail]>  Tue, 27 Jun 2017 18:49:59 +0200
+
 compiz (1:0.9.12.2+16.04.20160823-0ubuntu1) xenial; urgency=medium
 
   [ Andrea Azzarone ]
 
=== modified file 'debian/mate.ini'
--- debian/mate.ini	2016-04-07 11:50:19 +0000
+++ debian/mate.ini	2017-11-16 22:42:49 +0000
@@ -50,17 +50,17 @@
 s0_active_shadow_radius = 13.000000
 s0_active_shadow_opacity = 0.225000
 s0_active_shadow_color = #00000080
-s0_active_shadow_x_offset = 6
-s0_active_shadow_y_offset = 6
+s0_active_shadow_x_offset = 2
+s0_active_shadow_y_offset = 2
 s0_inactive_shadow_radius = 13.000000
 s0_inactive_shadow_opacity = 0.225000
 s0_inactive_shadow_color = #000000ff
-s0_inactive_shadow_x_offset = 6
-s0_inactive_shadow_y_offset = 6
-s0_mipmap = true
+s0_inactive_shadow_x_offset = 2
+s0_inactive_shadow_y_offset = 2
+s0_mipmap = false
 
 [expo]
-s0_expo_key = <Super>a
+s0_expo_key = <Super>s
 s0_selected_color = #34422eff
 s0_reflection = true
 s0_ground_color1 = #343631cc
@@ -162,12 +162,12 @@
 s0_manual_only = false
 
 [thumbnail]
-s0_thumb_size = 280
+s0_thumb_size = 256
 s0_fade_speed = 0.000000
-s0_border = 12
+s0_border = 15
 s0_thumb_color = #34363130
 s0_window_like = false
-s0_mipmap = true
+s0_mipmap = false
 s0_current_viewport = false
 s0_title_enabled = false
 s0_font_bold = false
 
=== added file 'debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade'
--- debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade	1970-01-01 00:00:00 +0000
+++ debian/profile_upgrades/com.canonical.unity.unity-lowgfx.01.upgrade	2017-11-16 22:42:49 +0000
@@ -0,0 +1,12 @@
+[grid]
++s0_animation_duration = 0
++s0_draw_stretched_window = false
+
+[move]
++s0_mode = 2
++s0_increase_border_contrast = true
++s0_lazy_positioning = true
+
+[resize]
++s0_mode = 2
++s0_increase_border_contrast = true
 
=== modified file 'debian/unity-lowgfx.ini'
--- debian/unity-lowgfx.ini	2016-07-14 15:51:05 +0000
+++ debian/unity-lowgfx.ini	2017-11-16 22:42:49 +0000
@@ -12,10 +12,17 @@
 s0_fade_time = 1
 
 [grid]
-s0_animation_duration = 1
+s0_animation_duration = 0
+s0_draw_stretched_window = false
+
+[move]
+s0_mode = 2
+s0_lazy_positioning = true
+s0_increase_border_contrast = true
 
 [resize]
 s0_mode = 2
+s0_increase_border_contrast = true
 
 [opengl]
 s0_texture_filter = 0
@@ -24,7 +31,6 @@
 s0_skip_animation = true
 
 [unityshell]
-s0_low_graphics_mode = true
 s0_dash_blur_experimental = 0
 
 s0_override_decoration_theme = true
 
=== modified file 'debian/unity.ini'
--- debian/unity.ini	2014-03-10 15:21:11 +0000
+++ debian/unity.ini	2017-11-16 22:42:49 +0000
@@ -1,3 +1,2 @@
 [core]
 s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;commands;unityshell
-
 
=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-02-29 13:41:59 +0000
+++ gtk/window-decorator/decorator.c	2017-11-16 22:42:49 +0000
@@ -603,6 +603,8 @@
     else
 	buffer_surface = create_surface (d->width, d->height, d->frame->style_window_rgba);
 
+    // FIXME: this should match the current monitor scaling!
+    cairo_surface_set_device_scale (buffer_surface, 1, 1);
     gdk_flush ();
 
     /* Handle failure */
 
=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2016-03-17 17:47:36 +0000
+++ gtk/window-decorator/metacity.c	2017-11-16 22:42:49 +0000
@@ -697,6 +697,8 @@
     else
         surface = create_surface (fgeom.width, fgeom.height, d->frame->style_window_rgba);
 
+    // FIXME: this should match the current monitor scaling!
+    cairo_surface_set_device_scale (surface, 1, 1);
     cr = cairo_create (surface);
     gdk_cairo_set_source_rgba (cr, &bg_rgba);
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
 
=== modified file 'gtk/window-decorator/util.c'
--- gtk/window-decorator/util.c	2016-03-17 17:47:36 +0000
+++ gtk/window-decorator/util.c	2017-11-16 22:42:49 +0000
@@ -75,7 +75,7 @@
     gdk_error_trap_push ();
 
     result = XGetWindowProperty (xdisplay, xwindow, mwm_hints_atom,
-				 0L, 20L, FALSE, mwm_hints_atom,
+				 0L, 20L, FALSE, AnyPropertyType,
 				 &actual, &format, &n, &left, &data);
 
     err = gdk_error_trap_pop ();
 
=== modified file 'include/core/abiversion.h'
--- include/core/abiversion.h	2015-10-13 11:33:31 +0000
+++ include/core/abiversion.h	2017-11-16 22:42:49 +0000
@@ -5,6 +5,6 @@
 #  error Conflicting definitions of CORE_ABIVERSION
 #endif
 
-#define CORE_ABIVERSION 20151010
+#define CORE_ABIVERSION 20170630
 
 #endif // COMPIZ_ABIVERSION_H
 
=== modified file 'include/core/atoms.h'
--- include/core/atoms.h	2015-02-17 14:54:10 +0000
+++ include/core/atoms.h	2017-11-16 22:42:49 +0000
@@ -158,6 +158,8 @@
 
     extern Atom startupId;
 
+    extern Atom gnomeRepresentativeColors;
+
     void init (Display *dpy);
 };
 
 
=== modified file 'include/core/screen.h'
--- include/core/screen.h	2016-05-17 02:52:07 +0000
+++ include/core/screen.h	2017-11-16 22:42:49 +0000
@@ -156,6 +156,8 @@
 	virtual void addSupportedAtoms (std::vector<Atom>& atoms);
 
 	virtual void cursorChangeNotify (const CompString& theme, int size);
+
+	virtual void averageColorChangeNotify (const unsigned short *color);
 };
 
 namespace compiz { namespace private_screen {
@@ -221,7 +223,7 @@
 }
 
 class CompScreen :
-    public WrapableHandler<ScreenInterface, 19>,
+    public WrapableHandler<ScreenInterface, 20>,
     public PluginClassStorage, // TODO should be an interface here
     public CompSize,
     public virtual ::compiz::DesktopWindowCount,
@@ -273,6 +275,8 @@
 		  std::vector<Atom>& atoms);
     WRAPABLE_HND (18, ScreenInterface, void, cursorChangeNotify,
 		  const CompString&, int);
+    WRAPABLE_HND (19, ScreenInterface, void, averageColorChangeNotify,
+		  const unsigned short *);
 
     unsigned int allocPluginClassIndex ();
     void freePluginClassIndex (unsigned int index);
@@ -418,6 +422,7 @@
     virtual CompWindow * getTopServerWindow() const = 0;
     virtual CoreOptions& getCoreOptions() = 0;
     virtual Colormap colormap() const = 0;
+    virtual const unsigned short * averageColor() const = 0;
     virtual void setCurrentDesktop (unsigned int desktop) = 0;
     virtual Window activeWindow() const = 0;
     virtual void updatePassiveButtonGrabs(Window serverFrame) = 0;
@@ -453,6 +458,7 @@
     virtual void _matchPropertyChanged(CompWindow *) = 0;
     virtual void _outputChangeNotify() = 0;
     virtual void _cursorChangeNotify(const CompString&, int) = 0;
+    virtual void _averageColorChangeNotify(const unsigned short*) = 0;
 };
 
 #endif
 
=== modified file 'include/core/string.h'
--- include/core/string.h	2011-10-31 13:51:00 +0000
+++ include/core/string.h	2017-11-16 22:42:49 +0000
@@ -28,12 +28,15 @@
 
 #include <string>
 #include <list>
+#include <vector>
 #include <cstdarg>
 
 typedef std::string CompString;
 typedef std::list<CompString> CompStringList;
+typedef std::vector<CompString> CompStringVector;
 
 CompString compPrintf (const char *format, ...);
 CompString compPrintf (const char *format, va_list ap);
+CompStringVector compGetRegexMatches (const CompString& regexStr, const CompString& string);
 
 #endif
 
=== modified file 'plugins/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/grid/grid.xml.in	2017-11-16 22:42:49 +0000
@@ -569,6 +569,11 @@
 			<default>350</default>
 			<min>0</min>
 		</option>
+		<option name="use_desktop_average_color" type="bool">
+		    <_short>Use Desktop average color</_short>
+		    <_long>Try to use the desktop average color if defined by your DE.</_long>
+		    <default>true</default>
+		</option>
 		<option name="outline_color" type="color">
 			<_short>Preview Outline Color</_short>
 			<_long>Color and opacity of the resize indicator preview outline.</_long>
@@ -589,6 +594,11 @@
 			    <alpha>0x4f4f</alpha>
 			</default>
 		</option>
+		<option name="disable_blend" type="bool">
+			<_short>Disable Transparency</_short>
+			<_long>Disable blending.</_long>
+			<default>false</default>
+		</option>
 	    </group>
 	</options>
     </plugin>
 
=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2015-04-06 13:14:51 +0000
+++ plugins/grid/src/grid.cpp	2017-11-16 22:42:49 +0000
@@ -488,8 +488,10 @@
     GLVertexBuffer  *streamingBuffer = GLVertexBuffer::streamingBuffer ();
     GLfloat         vertexData[12];
     GLushort        colorData[4];
-    GLushort        *color;
+    unsigned short *color, *fillColor, *outlineColor;
+    unsigned short  averageFillColor[4], averageOutlineColor[4];
     GLboolean       isBlendingEnabled;
+    bool            blend = !optionGetDisableBlend ();
 
     const float MaxUShortFloat = std::numeric_limits <unsigned short>::max ();
 
@@ -500,16 +502,51 @@
 
     sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-    glGetBooleanv (GL_BLEND, &isBlendingEnabled);
-    glEnable (GL_BLEND);
+    if (blend)
+    {
+	glGetBooleanv (GL_BLEND, &isBlendingEnabled);
+	glEnable (GL_BLEND);
+    }
+
+    fillColor = optionGetFillColor ();
+    outlineColor = optionGetOutlineColor ();
+
+    if (optionGetUseDesktopAverageColor ())
+    {
+	const unsigned short *averageColor = screen->averageColor ();
+
+	if (averageColor)
+	{
+	    memcpy (averageFillColor, averageColor, 4 * sizeof (unsigned short));
+	    averageFillColor[3] = MaxUShortFloat * 0.6;
+	    fillColor = averageFillColor;
+
+	    // Generate a lighter color based on border to create more contrast
+	    unsigned int averageColorLevel = (averageColor[0] + averageColor[1] + averageColor[2]) / 3;
+	    unsigned short *oc = averageOutlineColor;
+
+	    float colorMultiplier;
+	    if (averageColorLevel > MaxUShortFloat * 0.3)
+		colorMultiplier = 0.7; // make it darker
+	    else
+		colorMultiplier = 2.0; // make it lighter
+
+	    oc[3] = averageColor[3];
+	    oc[0] = MIN(MaxUShortFloat, ((float) averageColor[0]) * colorMultiplier) * oc[3] / MaxUShortFloat;
+	    oc[1] = MIN(MaxUShortFloat, ((float) averageColor[1]) * colorMultiplier) * oc[3] / MaxUShortFloat;
+	    oc[2] = MIN(MaxUShortFloat, ((float) averageColor[2]) * colorMultiplier) * oc[3] / MaxUShortFloat;
+
+	    outlineColor = averageOutlineColor;
+	}
+    }
 
     for (iter = animations.begin (); iter != animations.end () && animating; ++iter)
     {
 	Animation& anim = *iter;
 
 	float curve = powf (CURVE_ANIMATION, -anim.progress);
-	float alpha = (optionGetFillColorAlpha () / MaxUShortFloat) * anim.opacity;
-	color = optionGetFillColor ();
+	float alpha = blend ? (fillColor[3] / MaxUShortFloat) * anim.opacity : 0.85;
+	color = fillColor;
 
 	colorData[0] = alpha * color[0];
 	colorData[1] = alpha * color[1];
@@ -546,8 +583,8 @@
 				      anim.currentRect.height () - 2);
 
 	/* draw outline */
-	alpha = (optionGetOutlineColorAlpha () / MaxUShortFloat) * anim.opacity;
-	color = optionGetOutlineColor ();
+	alpha = blend ? (outlineColor[3] / MaxUShortFloat) * anim.opacity : 1;
+	color = outlineColor;
 
 	colorData[0] = alpha * color[0];
 	colorData[1] = alpha * color[1];
@@ -579,8 +616,8 @@
     if (!animating)
     {
 	/* draw filled rectangle */
-	float alpha = optionGetFillColorAlpha () / MaxUShortFloat;
-	color = optionGetFillColor ();
+	float alpha = blend ? fillColor[3] / MaxUShortFloat : 0.85;
+	color = fillColor;
 
 	colorData[0] = alpha * color[0];
 	colorData[1] = alpha * color[1];
@@ -614,8 +651,8 @@
 			  rect.height () - 2);
 
 	/* draw outline */
-	alpha = optionGetOutlineColorAlpha () / MaxUShortFloat;
-	color = optionGetOutlineColor ();
+	alpha = outlineColor[3] / MaxUShortFloat;
+	color = outlineColor;
 
 	colorData[0] = alpha * color[0];
 	colorData[1] = alpha * color[1];
@@ -641,8 +678,11 @@
 	streamingBuffer->render (sTransform);
     }
 
-    if (!isBlendingEnabled)
-	glDisable (GL_BLEND);
+    if (blend)
+    {
+	if (!isBlendingEnabled)
+	    glDisable (GL_BLEND);
+    }
 }
 
 bool
@@ -858,7 +898,7 @@
 		    animations.at (current).fromRect = w->serverBorderRect ();
 		    animations.at (current).currentRect	= w->serverBorderRect ();
 		    animations.at (current).duration = optionGetAnimationDuration ();
-		    animations.at (current).timer = animations.at (current).duration;
+		    animations.at (current).progress = 0.0f;
 		    animations.at (current).targetRect = desiredSlot;
 		    animations.at (current).window = w->id();
 
@@ -1172,18 +1212,24 @@
     for (iter = animations.begin (); iter != animations.end (); ++iter)
     {
 	Animation& anim = *iter;
-	anim.timer -= msSinceLastPaint;
+	GLfloat msSinceLastPaintFloat = static_cast<GLfloat>(msSinceLastPaint);
+	GLfloat animDurationFloat = static_cast<GLfloat>(anim.duration);
+	GLfloat progress_delta = 1.0f;
 
-	if (anim.timer < 0)
-	    anim.timer = 0;
+	if (animDurationFloat > 0.0f)
+	    progress_delta = msSinceLastPaintFloat / animDurationFloat;
 
 	if (anim.fadingOut)
-	    anim.opacity -= msSinceLastPaint * 0.002;
+	{
+	    anim.opacity -= progress_delta;
+	}
 	else
+	{
 	    if (anim.opacity < 1.0f)
 		anim.opacity = anim.progress * anim.progress;
 	    else
 		anim.opacity = 1.0f;
+	}
 
 	if (anim.opacity < 0)
 	{
@@ -1192,10 +1238,10 @@
 	    anim.complete = true;
 	}
 
-	anim.progress =	(anim.duration - anim.timer) / anim.duration;
+	anim.progress = std::min<GLfloat>(anim.progress + progress_delta, 1.0);
     }
 
-    if (optionGetDrawStretchedWindow ())
+    if (optionGetDrawStretchedWindow () && !optionGetDisableBlend ())
     {
 	CompWindow *cw = screen->findWindow (CompOption::getIntOptionNamed (o, "window"));
 
@@ -1265,7 +1311,6 @@
     targetRect = CompRect (0, 0, 0, 0);
     currentRect = CompRect (0, 0, 0, 0);
     opacity = 0.0f;
-    timer = 0.0f;
     duration = 0;
     complete = false;
     fadingOut = false;
@@ -1373,7 +1418,7 @@
     {
 	Animation& anim = *iter;
 
-	if (anim.timer > 0.0f && anim.window == window->id())
+	if (anim.progress < 1.0f && anim.window == window->id())
 	{
 	    GLWindowPaintAttrib wAttrib(attrib);
 	    GLMatrix wTransform (matrix);
 
=== modified file 'plugins/grid/src/grid.h'
--- plugins/grid/src/grid.h	2013-04-30 00:18:41 +0000
+++ plugins/grid/src/grid.h	2017-11-16 22:42:49 +0000
@@ -96,7 +96,6 @@
 	CompRect targetRect;
 	CompRect currentRect;
 	GLfloat  opacity;
-	GLfloat  timer;
 	Window   window;
 	int      duration;
 	bool     complete;
 
=== modified file 'plugins/move/move.xml.in'
--- plugins/move/move.xml.in	2013-04-14 11:46:28 +0000
+++ plugins/move/move.xml.in	2017-11-16 22:42:49 +0000
@@ -70,6 +70,64 @@
 		<_long>Do not update the server-side position of windows until finished moving.</_long>
 		<default>false</default>
 	    </option>
+
+	    <group>
+	    <_short>Appearance</_short>
+		<option name="mode" type="int">
+		    <_short>Default Moving Window Mode</_short>
+		    <_long>Default mode used for window moving.</_long>
+		    <default>0</default>
+		    <min>0</min>
+		    <max>2</max>
+		    <desc>
+			<value>0</value>
+			<_name>Normal</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Outline</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Rectangle</_name>
+		    </desc>
+		</option>
+		    <option name="increase_border_contrast" type="bool">
+		    <_short>Use a double-border in 'Rectangle' and 'Outline' modes</_short>
+		    <_long>Increase the contrast of the border using a lighter color.</_long>
+		    <default>true</default>
+		</option>
+		<option name="use_desktop_average_color" type="bool">
+		    <_short>Use Desktop average colors</_short>
+		    <_long>Try to use the desktop average color if defined by your DE (overrides custom colors).</_long>
+		    <default>true</default>
+		</option>
+		<option name="border_color" type="color">
+		    <_short>Border Color</_short>
+		    <_long>Border color used for outline and rectangle moving modes</_long>
+		    <default>
+			<red>0xfbfb</red>
+			<green>0x8b8b</green>
+			<blue>0x0</blue>
+			<alpha>0x9f9f</alpha>
+		    </default>
+		</option>
+		<option name="fill_color" type="color">
+		    <_short>Fill Color</_short>
+		    <_long>Fill color used for rectangle moving mode</_long>
+		    <default>
+			<red>0xfbfb</red>
+			<green>0x8b8b</green>
+			<blue>0x0</blue>
+			<alpha>0x1919</alpha>
+		    </default>
+		</option>
+		<option name="blend" type="bool">
+		    <_short>Enable Transparency</_short>
+		    <_long>Enable or disable blending.</_long>
+		    <default>true</default>
+		</option>
+	    </group>
 	</options>
     </plugin>
 </compiz>
 
=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2015-10-20 15:11:54 +0000
+++ plugins/move/src/move.cpp	2017-11-16 22:42:49 +0000
@@ -34,6 +34,9 @@
 
 COMPIZ_PLUGIN_20090315 (move, MovePluginVTable)
 
+static const int defaultBorderWidth = 2;
+static const int biggerBorderWidthMultiplier = 2;
+
 static bool
 moveInitiate (CompAction         *action,
 	      CompAction::State  state,
@@ -142,6 +145,19 @@
 		s->warpPointer (xRoot - pointerX, yRoot - pointerY);
 	    }
 
+	    if (ms->optionGetMode () != MoveOptions::ModeNormal)
+	    {
+		Box box;
+
+		ms->gScreen->glPaintOutputSetEnabled (ms, true);
+		ms->paintRect = true;
+		ms->rectX = 0;
+		ms->rectY = 0;
+
+		if (ms->getMovingRectangle (&box))
+		    ms->damageMovingRectangle (&box);
+	    }
+
 	    if (ms->moveOpacity != OPAQUE)
 	    {
 		MOVE_WINDOW (w);
@@ -177,9 +193,18 @@
     {
 	MOVE_WINDOW (ms->w);
 
+	if (ms->paintRect)
+	{
+	    ms->paintRect = false;
+	    ms->gScreen->glPaintOutputSetEnabled (ms, false);
+	    mw->window->move (ms->rectX, ms->rectY, true);
+	}
+
 	if (state & CompAction::StateCancel)
+	{
 	    ms->w->move (ms->savedX - ms->w->geometry ().x (),
 			 ms->savedY - ms->w->geometry ().y (), false);
+	}
 
 	/* update window attributes as window constraints may have
 	   changed - needed e.g. if a maximized window was moved
@@ -318,6 +343,7 @@
 
 	int wX      = w->geometry ().x ();
 	int wY      = w->geometry ().y ();
+
 	int wWidth  = w->geometry ().widthIncBorders ();
 	int wHeight = w->geometry ().heightIncBorders ();
 
@@ -522,8 +548,15 @@
 
 	if (dx || dy)
 	{
-	    w->move (wX + dx - w->geometry ().x (),
-		     wY + dy - w->geometry ().y (), false);
+	    if (ms->optionGetMode () == MoveOptions::ModeNormal)
+	    {
+		w->move (wX + dx - w->geometry ().x (), wY + dy - w->geometry ().y (), false);
+	    }
+	    else
+	    {
+		ms->rectX += wX + dx - w->geometry ().x ();
+		ms->rectY += wY + dy - w->geometry ().y ();
+	    }
 
 	    ms->x -= dx;
 	    ms->y -= dy;
@@ -704,11 +737,15 @@
 MoveScreen::MoveScreen (CompScreen *screen) :
     PluginClassHandler<MoveScreen,CompScreen> (screen),
     cScreen (CompositeScreen::get (screen)),
+    gScreen (GLScreen::get (screen)),
     w (0),
     region (NULL),
     status (RectangleOut),
     releaseButton (0),
     grab (NULL),
+    paintRect(false),
+    rectX(0),
+    rectY(0),
     hasCompositing (false),
     yConstrained (false)
 {
@@ -734,6 +771,9 @@
     optionSetInitiateKeyTerminate (moveTerminate);
 
     ScreenInterface::setHandler (screen);
+    GLScreenInterface::setHandler (gScreen);
+
+    gScreen->glPaintOutputSetEnabled (this, false);
 }
 
 MoveScreen::~MoveScreen ()
@@ -743,6 +783,290 @@
 }
 
 bool
+MoveScreen::getMovingRectangle (BoxPtr pBox)
+{
+    MOVE_SCREEN (screen);
+
+    CompWindow *w = ms->w;
+    if (!w)
+	return false;
+
+    int wX      = w->geometry ().x () - w->border ().left;
+    int wY      = w->geometry ().y () - w->border ().top;
+    int wWidth  = w->geometry ().widthIncBorders () + w->border ().left + w->border ().right;
+    int wHeight = w->geometry ().heightIncBorders () + w->border ().top + w->border ().bottom;
+
+    pBox->x1 = wX + ms->rectX;
+    pBox->y1 = wY + ms->rectY;
+
+    pBox->x2 = pBox->x1 + wWidth;
+    pBox->y2 = pBox->y1 + wHeight;
+
+    return true;
+}
+
+bool
+MoveScreen::damageMovingRectangle (BoxPtr pBox)
+{
+    CompRegion damageRegion;
+    int borderWidth;
+
+    if (!cScreen || !pBox)
+	return false;
+
+    borderWidth = defaultBorderWidth;
+
+    if (optionGetIncreaseBorderContrast ())
+	borderWidth *= biggerBorderWidthMultiplier;
+
+    if (optionGetMode () == MoveOptions::ModeRectangle)
+    {
+	    CompRect damage (pBox->x1 - borderWidth,
+			     pBox->y1 - borderWidth,
+			     pBox->x2 - pBox->x1 + borderWidth * 2,
+			     pBox->y2 - pBox->y1 + borderWidth * 2);
+	    damageRegion += damage;
+    }
+    else if (optionGetMode () == MoveOptions::ModeOutline)
+    {
+	    // Top
+	    damageRegion += CompRect (pBox->x1 - borderWidth,
+				      pBox->y1 - borderWidth,
+				      pBox->x2 - pBox->x1 + borderWidth * 2,
+				      borderWidth * 2);
+	    // Right
+	    damageRegion += CompRect (pBox->x2 - borderWidth,
+				      pBox->y1 - borderWidth,
+				      borderWidth + borderWidth / 2,
+				      pBox->y2 - pBox->y1 + borderWidth * 2);
+	    // Bottom
+	    damageRegion += CompRect (pBox->x1 - borderWidth,
+				      pBox->y2 - borderWidth,
+				      pBox->x2 - pBox->x1 + borderWidth * 2,
+				      borderWidth * 2);
+	    // Left
+	    damageRegion += CompRect (pBox->x1 - borderWidth,
+				      pBox->y1 - borderWidth,
+				      borderWidth + borderWidth / 2,
+				      pBox->y2 - pBox->y1 + borderWidth * 2);
+    }
+
+    if (!damageRegion.isEmpty ())
+    {
+	cScreen->damageRegion (damageRegion);
+	return true;
+    }
+
+    return false;
+}
+
+bool MoveScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
+				const GLMatrix &transform,
+				const CompRegion &region,
+				CompOutput *output,
+				unsigned int mask)
+{
+    bool status = gScreen->glPaintOutput (attrib, transform, region, output, mask);
+
+    if (status && paintRect)
+    {
+	unsigned short *borderColor = optionGetBorderColor ();
+	unsigned short *fillColor = NULL;
+
+	if (optionGetMode() == MoveOptions::ModeRectangle)
+	    fillColor = optionGetFillColor ();
+
+	return glPaintMovingRectangle (transform, output, borderColor, fillColor);
+    }
+
+    return status;
+}
+
+bool
+MoveScreen::glPaintMovingRectangle (const GLMatrix &transform,
+				    CompOutput *output,
+				    unsigned short *borderColor,
+				    unsigned short *fillColor)
+{
+    BoxRec box;
+    if (!getMovingRectangle(&box))
+	return false;
+
+    const unsigned short MaxUShort = std::numeric_limits <unsigned short>::max ();
+    const float MaxUShortFloat = MaxUShort;
+    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLMatrix sTransform (transform);
+    bool usingAverageColors = false;
+
+    GLfloat vertexData[12];
+    GLfloat vertexData2[24];
+    GLushort fc[4], bc[4], averageFillColor[4];
+    GLint origSrc, origDst;
+#ifdef USE_GLES
+    GLint origSrcAlpha, origDstAlpha;
+#endif
+
+    if (optionGetUseDesktopAverageColor ())
+    {
+	const unsigned short *averageColor = screen->averageColor ();
+
+	if (averageColor)
+	{
+	    usingAverageColors = true;
+	    borderColor = const_cast<unsigned short *>(averageColor);
+	    memcpy (averageFillColor, averageColor, 4 * sizeof (unsigned short));
+	    averageFillColor[3] = MaxUShort * 0.6;
+
+	    if (fillColor)
+		fillColor = averageFillColor;
+	}
+    }
+
+    bool blend = optionGetBlend ();
+
+    if (blend && borderColor[3] == MaxUShort)
+    {
+	if (optionGetMode () == MoveOptions::ModeOutline || fillColor[3] == MaxUShort)
+	    blend = false;
+    }
+
+    if (blend)
+    {
+#ifdef USE_GLES
+	glGetIntegerv (GL_BLEND_SRC_RGB, &origSrc);
+	glGetIntegerv (GL_BLEND_DST_RGB, &origDst);
+	glGetIntegerv (GL_BLEND_SRC_ALPHA, &origSrcAlpha);
+	glGetIntegerv (GL_BLEND_DST_ALPHA, &origDstAlpha);
+#else
+	glGetIntegerv (GL_BLEND_SRC, &origSrc);
+	glGetIntegerv (GL_BLEND_DST, &origDst);
+#endif
+    }
+
+    vertexData[0] = box.x1;
+    vertexData[1] = box.y1;
+    vertexData[2] = 0.0f;
+    vertexData[3] = box.x1;
+    vertexData[4] = box.y2;
+    vertexData[5] = 0.0f;
+    vertexData[6] = box.x2;
+    vertexData[7] = box.y1;
+    vertexData[8] = 0.0f;
+    vertexData[9] = box.x2;
+    vertexData[10] = box.y2;
+    vertexData[11] = 0.0f;
+
+    vertexData2[0] = box.x1;
+    vertexData2[1] = box.y1;
+    vertexData2[2] = 0.0f;
+    vertexData2[3] = box.x1;
+    vertexData2[4] = box.y2;
+    vertexData2[5] = 0.0f;
+    vertexData2[6] = box.x1;
+    vertexData2[7] = box.y2;
+    vertexData2[8] = 0.0f;
+    vertexData2[9] = box.x2;
+    vertexData2[10] = box.y2;
+    vertexData2[11] = 0.0f;
+    vertexData2[12] = box.x2;
+    vertexData2[13] = box.y2;
+    vertexData2[14] = 0.0f;
+    vertexData2[15] = box.x2;
+    vertexData2[16] = box.y1;
+    vertexData2[17] = 0.0f;
+    vertexData2[18] = box.x2;
+    vertexData2[19] = box.y1;
+    vertexData2[20] = 0.0f;
+    vertexData2[21] = box.x1;
+    vertexData2[22] = box.y1;
+    vertexData2[23] = 0.0f;
+
+    sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
+
+    if (blend)
+    {
+	glEnable (GL_BLEND);
+	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    }
+
+    /* fill rectangle */
+    if (fillColor)
+    {
+	fc[3] = blend ? fillColor[3] : 0.85f * MaxUShortFloat;
+	fc[0] = fillColor[0] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[1] = fillColor[1] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[2] = fillColor[2] * (unsigned long) fc[3] / MaxUShortFloat;
+
+	streamingBuffer->begin (GL_TRIANGLE_STRIP);
+	streamingBuffer->addColors (1, fc);
+	streamingBuffer->addVertices (4, &vertexData[0]);
+	streamingBuffer->end ();
+	streamingBuffer->render (sTransform);
+    }
+
+    /* draw outline */
+    int borderWidth = defaultBorderWidth;
+
+    if (optionGetIncreaseBorderContrast() || usingAverageColors)
+    {
+	// Generate a lighter color based on border to create more contrast
+	unsigned int averageColorLevel = (borderColor[0] + borderColor[1] + borderColor[2]) / 3;
+
+	float colorMultiplier;
+	if (averageColorLevel > MaxUShort * 0.3)
+	    colorMultiplier = 0.7; // make it darker
+	else
+	    colorMultiplier = 2.0; // make it lighter
+
+	bc[3] = borderColor[3];
+	bc[0] = MIN(MaxUShortFloat, ((float) borderColor[0]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+	bc[1] = MIN(MaxUShortFloat, ((float) borderColor[1]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+	bc[2] = MIN(MaxUShortFloat, ((float) borderColor[2]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+
+	if (optionGetIncreaseBorderContrast ())
+	{
+	    borderWidth *= biggerBorderWidthMultiplier;
+
+	    glLineWidth (borderWidth);
+	    streamingBuffer->begin (GL_LINES);
+	    streamingBuffer->addVertices (8, &vertexData2[0]);
+	    streamingBuffer->addColors (1, bc);
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
+	} else if (usingAverageColors) {
+	    borderColor = bc;
+	}
+    }
+
+    bc[3] = blend ? borderColor[3] : MaxUShortFloat;
+    bc[0] = borderColor[0] * bc[3] / MaxUShortFloat;
+    bc[1] = borderColor[1] * bc[3] / MaxUShortFloat;
+    bc[2] = borderColor[2] * bc[3] / MaxUShortFloat;
+
+    glLineWidth (defaultBorderWidth);
+    streamingBuffer->begin (GL_LINES);
+    streamingBuffer->addColors (1, bc);
+    streamingBuffer->addVertices (8, &vertexData2[0]);
+    streamingBuffer->end ();
+    streamingBuffer->render (sTransform);
+
+    if (blend)
+    {
+	glDisable (GL_BLEND);
+#ifdef USE_GLES
+	glBlendFuncSeparate (origSrc, origDst,
+			     origSrcAlpha, origDstAlpha);
+#else
+	glBlendFunc (origSrc, origDst);
+#endif
+    }
+
+    damageMovingRectangle (&box);
+
+    return true;
+}
+
+bool
 MovePluginVTable::init ()
 {
     if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
 
=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2015-10-20 15:11:54 +0000
+++ plugins/move/src/move.h	2017-11-16 22:42:49 +0000
@@ -32,7 +32,6 @@
 #include <composite/composite.h>
 #include <opengl/opengl.h>
 
-
 #define NUM_KEYS (sizeof (mKeys) / sizeof (mKeys[0]))
 
 struct _MoveKeys
@@ -49,6 +48,7 @@
 };
 
 class MoveScreen :
+    public GLScreenInterface,
     public ScreenInterface,
     public CompositeScreenInterface,
     public PluginClassHandler<MoveScreen,CompScreen>,
@@ -59,6 +59,7 @@
 	~MoveScreen ();
 
 	CompositeScreen *cScreen;
+	GLScreen *gScreen;
 
 	void updateOpacity ();
 
@@ -67,6 +68,16 @@
 	bool registerPaintHandler (compiz::composite::PaintHandler *pHnd);
 	void unregisterPaintHandler ();
 
+	bool glPaintOutput (const GLScreenPaintAttrib &,
+			    const GLMatrix &,
+			    const CompRegion &,
+			    CompOutput *,
+			    unsigned int);
+
+	bool getMovingRectangle (BoxPtr pbox);
+	bool damageMovingRectangle (BoxPtr pbox);
+	bool glPaintMovingRectangle (const GLMatrix &transform, CompOutput *output, unsigned short *borderColor, unsigned short *fillColor);
+
 	CompWindow *w;
 	int        savedX;
 	int        savedY;
@@ -84,6 +95,10 @@
 
 	unsigned int origState;
 
+	bool    paintRect;
+	int     rectX;
+	int     rectY;
+
 	int	snapOffX;
 	int	snapBackX;
 
 
=== modified file 'plugins/neg/neg.xml.in'
--- plugins/neg/neg.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/neg/neg.xml.in	2017-11-16 22:42:49 +0000
@@ -21,6 +21,11 @@
 		<_long>Toggle active window negative</_long>
 		<default>&lt;Super&gt;n</default>
 	    </option>
+	    <option name="activate_at_startup" type="bool">
+	    <_short>plugin should be active at startup</_short>
+	    <_long>if active, the plugin will start active, with windows inverted</_long>
+	    <default>false</default>
+	    </option>
 	    <option name="screen_toggle_key" type="key">
 		<_short>Toggle Screen Negative</_short>
 		<_long>Toggle screen negative</_long>
 
=== modified file 'plugins/neg/src/neg.cpp'
--- plugins/neg/src/neg.cpp	2013-05-09 13:43:07 +0000
+++ plugins/neg/src/neg.cpp	2017-11-16 22:42:49 +0000
@@ -437,7 +437,7 @@
     NegOptions (),
     negFunction (0),
     negAlphaFunction (0),
-    isNeg (false),
+    isNeg (optionGetActivateAtStartup()),
     gScreen (GLScreen::get (screen))
 {
     optionSetWindowToggleKeyInitiate (boost::bind (&NegScreen::toggle, this,
 
=== modified file 'plugins/resize/resize.xml.in'
--- plugins/resize/resize.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/resize/resize.xml.in	2017-11-16 22:42:49 +0000
@@ -58,6 +58,16 @@
 	        <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long>
 	        <default>true</default>
 	    </option>
+	    <option name="increase_border_contrast" type="bool">
+		<_short>Use a double-border in 'Rectangle' and 'Outline' modes</_short>
+		<_long>Increase the contrast of the border using a lighter color.</_long>
+		<default>true</default>
+	    </option>
+	    <option name="use_desktop_average_color" type="bool">
+		<_short>Use Desktop average colors</_short>
+		<_long>Try to use the desktop average color if defined by your DE (overrides custom colors).</_long>
+		<default>true</default>
+	    </option>
 	    <option name="border_color" type="color">
 		<_short>Border Color</_short>
 		<_long>Border color used for outline and rectangle resize modes</_long>
@@ -78,6 +88,11 @@
 		    <alpha>0x1919</alpha>
 		</default>
 	    </option>
+	    <option name="disable_blend" type="bool">
+		<_short>Disable Transparency</_short>
+		<_long>Disable blending.</_long>
+		<default>false</default>
+	    </option>
 	    <subgroup>
 			<_short>Specific Window Matches</_short>
 			<option name="normal_match" type="match">
 
=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2016-03-03 14:22:25 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2017-11-16 22:42:49 +0000
@@ -487,13 +487,13 @@
 	che = he;
 
 	if (w->constrainNewWindowSize (wi, he, &cwi, &che) &&
-	    mode != ResizeOptions::ModeNormal)
+	    mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    Box box;
 
 	    /* Also, damage relevant paint rectangles */
-	    if (mode == ResizeOptions::ModeRectangle ||
-	        mode == ResizeOptions::ModeOutline)
+	    if (mode == ResizeOptions::ModeRectangle)
 		getPaintRectangle (&box);
 	    else if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -518,7 +518,8 @@
 					     xRoot, yRoot,
 					     wX, wY, wWidth, wHeight); /*in*/
 
-	if (mode != ResizeOptions::ModeNormal)
+	if (mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -532,7 +533,8 @@
 
 	computeGeometry (wi, he);
 
-	if (mode != ResizeOptions::ModeNormal)
+	if (mode != ResizeOptions::ModeNormal &&
+	    mode != ResizeOptions::ModeOutline)
 	{
 	    if (mode == ResizeOptions::ModeStretch)
 		getStretchRectangle (&box);
@@ -541,7 +543,7 @@
 
 	    damageRectangle (&box);
 	}
-	else
+	else if (mode == ResizeOptions::ModeNormal)
 	{
 	    updateWindowSize ();
 	}
 
=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2015-10-20 15:01:58 +0000
+++ plugins/resize/src/resize.cpp	2017-11-16 22:42:49 +0000
@@ -70,8 +70,8 @@
 
 static bool
 resizeTerminate (CompAction         *action,
-	         CompAction::State  state,
-	         CompOption::Vector &options)
+		 CompAction::State  state,
+		 CompOption::Vector &options)
 {
     RESIZE_SCREEN (screen);
     return rs->logic.terminateResize(action, state, options);
@@ -85,30 +85,57 @@
 				unsigned short            *fillColor)
 {
     GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    const unsigned short MaxUShort = std::numeric_limits <unsigned short>::max ();
+    const float MaxUShortFloat = MaxUShort;
+    bool usingAverageColors = false;
 
     BoxRec   	   box;
+    CompRegion     damageRegion;
     GLMatrix 	   sTransform (transform);
     GLfloat         vertexData [12];
     GLfloat         vertexData2[24];
-    GLint    	   origSrc, origDst;
-    GLushort	    fc[4], bc[4];
-
-#ifdef USE_GLES
-    GLint           origSrcAlpha, origDstAlpha;
-    glGetIntegerv (GL_BLEND_SRC_RGB, &origSrc);
-    glGetIntegerv (GL_BLEND_DST_RGB, &origDst);
-    glGetIntegerv (GL_BLEND_SRC_ALPHA, &origSrcAlpha);
-    glGetIntegerv (GL_BLEND_DST_ALPHA, &origDstAlpha);
+    GLint          origSrc, origDst;
+#ifdef USE_GLES
+    GLint          origSrcAlpha, origDstAlpha;
+#endif
+    GLushort	    fc[4], bc[4], averageFillColor[4];
+
+    if (optionGetUseDesktopAverageColor ())
+    {
+	const unsigned short *averageColor = screen->averageColor ();
+
+	if (averageColor)
+	{
+	    usingAverageColors = true;
+	    borderColor = const_cast<unsigned short *>(averageColor);
+	    memcpy (averageFillColor, averageColor, 4 * sizeof (unsigned short));
+	    averageFillColor[3] = MaxUShort * 0.6;
+
+	    if (fillColor)
+	        fillColor = averageFillColor;
+	}
+    }
+
+    bool blend = !optionGetDisableBlend ();
+
+    if (blend && borderColor[3] == MaxUShort)
+    {
+	if (optionGetMode () == ResizeOptions::ModeOutline || fillColor[3] == MaxUShort)
+	    blend = false;
+    }
+
+    if (blend)
+    {
+#ifdef USE_GLES
+	glGetIntegerv (GL_BLEND_SRC_RGB, &origSrc);
+	glGetIntegerv (GL_BLEND_DST_RGB, &origDst);
+	glGetIntegerv (GL_BLEND_SRC_ALPHA, &origSrcAlpha);
+	glGetIntegerv (GL_BLEND_DST_ALPHA, &origDstAlpha);
 #else
-    glGetIntegerv (GL_BLEND_SRC, &origSrc);
-    glGetIntegerv (GL_BLEND_DST, &origDst);
+	glGetIntegerv (GL_BLEND_SRC, &origSrc);
+	glGetIntegerv (GL_BLEND_DST, &origDst);
 #endif
-
-    /* Premultiply the alpha values */
-    bc[3] = (float) borderColor[3] / (float) 65535.0f;
-    bc[0] = ((float) borderColor[0] / 65535.0f) * bc[3];
-    bc[1] = ((float) borderColor[1] / 65535.0f) * bc[3];
-    bc[2] = ((float) borderColor[2] / 65535.0f) * bc[3];
+    }
 
     logic.getPaintRectangle (&box);
 
@@ -159,16 +186,19 @@
 
     sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-    glEnable (GL_BLEND);
-    glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    if (blend)
+    {
+	glEnable (GL_BLEND);
+	glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    }
 
     /* fill rectangle */
     if (fillColor)
     {
-	fc[3] = fillColor[3];
-	fc[0] = fillColor[0] * (unsigned long)fc[3] / 65535;
-	fc[1] = fillColor[1] * (unsigned long)fc[3] / 65535;
-	fc[2] = fillColor[2] * (unsigned long)fc[3] / 65535;
+	fc[3] = blend ? fillColor[3] : 0.85f * MaxUShortFloat;
+	fc[0] = fillColor[0] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[1] = fillColor[1] * (unsigned long) fc[3] / MaxUShortFloat;
+	fc[2] = fillColor[2] * (unsigned long) fc[3] / MaxUShortFloat;
 
 	streamingBuffer->begin (GL_TRIANGLE_STRIP);
 	streamingBuffer->addColors (1, fc);
@@ -178,28 +208,98 @@
     }
 
     /* draw outline */
-    static const int borderWidth = 2;
-    glLineWidth (borderWidth);
+    static const int defaultBorderWidth = 2;
+    int borderWidth = defaultBorderWidth;
+
+    if (optionGetIncreaseBorderContrast() || usingAverageColors)
+    {
+	// Generate a lighter color based on border to create more contrast
+	unsigned int averageColorLevel = (borderColor[0] + borderColor[1] + borderColor[2]) / 3;
+
+	float colorMultiplier;
+	if (averageColorLevel > MaxUShort * 0.3)
+	    colorMultiplier = 0.7; // make it darker
+	else
+	    colorMultiplier = 2.0; // make it lighter
+
+	bc[3] = borderColor[3];
+	bc[0] = MIN(MaxUShortFloat, ((float) borderColor[0]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+	bc[1] = MIN(MaxUShortFloat, ((float) borderColor[1]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+	bc[2] = MIN(MaxUShortFloat, ((float) borderColor[2]) * colorMultiplier) * bc[3] / MaxUShortFloat;
+
+	if (optionGetIncreaseBorderContrast ())
+	{
+	    borderWidth *= 2;
+
+	    glLineWidth (borderWidth);
+	    streamingBuffer->begin (GL_LINES);
+	    streamingBuffer->addVertices (8, &vertexData2[0]);
+	    streamingBuffer->addColors (1, bc);
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
+	} else if (usingAverageColors) {
+	    borderColor = bc;
+	}
+    }
+
+    bc[3] = blend ? borderColor[3] : MaxUShortFloat;
+    bc[0] = borderColor[0] * bc[3] / MaxUShortFloat;
+    bc[1] = borderColor[1] * bc[3] / MaxUShortFloat;
+    bc[2] = borderColor[2] * bc[3] / MaxUShortFloat;
+
+    glLineWidth (defaultBorderWidth);
     streamingBuffer->begin (GL_LINES);
-    streamingBuffer->addColors (1, borderColor);
+    streamingBuffer->addColors (1, bc);
     streamingBuffer->addVertices (8, &vertexData2[0]);
     streamingBuffer->end ();
     streamingBuffer->render (sTransform);
 
-    glDisable (GL_BLEND);
+    if (blend)
+    {
+	glDisable (GL_BLEND);
 #ifdef USE_GLES
-    glBlendFuncSeparate (origSrc, origDst,
-                         origSrcAlpha, origDstAlpha);
+	glBlendFuncSeparate (origSrc, origDst,
+			     origSrcAlpha, origDstAlpha);
 #else
-    glBlendFunc (origSrc, origDst);
+	glBlendFunc (origSrc, origDst);
 #endif
+    }
 
     CompositeScreen *cScreen = CompositeScreen::get (screen);
-    CompRect damage (box.x1 - borderWidth,
-                     box.y1 - borderWidth,
-                     box.x2 - box.x1 + 2 * borderWidth,
-                     box.y2 - box.y1 + 2 * borderWidth);
-    cScreen->damageRegion (damage);
+
+    if (optionGetMode () == ResizeOptions::ModeOutline)
+    {
+	// Top
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y1 - borderWidth,
+				  box.x2 - box.x1 + borderWidth * 2,
+				  borderWidth * 2);
+	// Right
+	damageRegion += CompRect (box.x2 - borderWidth,
+				  box.y1 - borderWidth,
+				  borderWidth + borderWidth / 2,
+				  box.y2 - box.y1 + borderWidth * 2);
+	// Bottom
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y2 - borderWidth,
+				  box.x2 - box.x1 + borderWidth * 2,
+				  borderWidth * 2);
+	// Left
+	damageRegion += CompRect (box.x1 - borderWidth,
+				  box.y1 - borderWidth,
+				  borderWidth + borderWidth / 2,
+				  box.y2 - box.y1 + borderWidth * 2);
+    }
+    else
+    {
+	CompRect damage (box.x1 - borderWidth,
+			 box.y1 - borderWidth,
+			 box.x2 - box.x1 + borderWidth * 2,
+			 box.y2 - box.y1 + borderWidth * 2);
+	damageRegion += damage;
+    }
+
+    cScreen->damageRegion (damageRegion);
 }
 
 bool
 
=== modified file 'src/atoms.cpp'
--- src/atoms.cpp	2015-02-17 14:54:10 +0000
+++ src/atoms.cpp	2017-11-16 22:42:49 +0000
@@ -155,6 +155,8 @@
 
     Atom startupId;
 
+    Atom gnomeRepresentativeColors;
+
     void init (Display *dpy)
     {
 	supported         = XInternAtom (dpy, "_NET_SUPPORTED", 0);
@@ -325,5 +327,7 @@
 	atomPair  = XInternAtom (dpy, "ATOM_PAIR", 0);
 
 	startupId = XInternAtom (dpy, "_NET_STARTUP_ID", 0);
+
+	gnomeRepresentativeColors = XInternAtom (dpy, "_GNOME_BACKGROUND_REPRESENTATIVE_COLORS", 0);
     }
 };
 
=== modified file 'src/event.cpp'
--- src/event.cpp	2016-05-17 02:52:07 +0000
+++ src/event.cpp	2017-11-16 22:42:49 +0000
@@ -1821,6 +1821,11 @@
 	    if (w)
 		w->priv->updateStartupId ();
 	}
+	else if (event->xproperty.atom == Atoms::gnomeRepresentativeColors)
+	{
+	    if (event->xproperty.window == privateScreen.rootWindow())
+		privateScreen.updateAverageColor (event->xproperty.atom);
+	}
 	else if (event->xproperty.atom == XA_WM_CLASS)
 	{
 	    w = findWindow (event->xproperty.window);
 
=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2016-05-17 02:52:07 +0000
+++ src/privatescreen.h	2017-11-16 22:42:49 +0000
@@ -692,6 +692,8 @@
 
 	void updateResources ();
 
+	void updateAverageColor (Atom atom);
+
 	Window getActiveWindow (Window root);
 
 	void setWindowState (unsigned int state, Window id);
@@ -777,6 +779,8 @@
     unsigned int nDesktop;
     unsigned int currentDesktop;
 
+    std::vector<unsigned short> averageColor;
+
     CompOutput fullscreenOutput;
     CompScreenEdge screenEdge[SCREEN_EDGE_NUM];
 
@@ -1092,6 +1096,7 @@
 	virtual CompWindow * getTopServerWindow() const;
 	virtual CoreOptions& getCoreOptions();
 	virtual Colormap colormap() const;
+	virtual const unsigned short * averageColor() const;
 	virtual void setCurrentDesktop (unsigned int desktop);
 	virtual Window activeWindow() const;
 	virtual bool grabWindowIsNot(Window w) const;
@@ -1187,6 +1192,7 @@
         virtual void _matchPropertyChanged(CompWindow *);
         virtual void _outputChangeNotify();
         virtual void _cursorChangeNotify(const CompString&, int);
+        virtual void _averageColorChangeNotify(const unsigned short*);
 
 	void grabServer ();
 	void ungrabServer ();
 
=== modified file 'src/privatescreen/tests/test-privatescreen.cpp'
--- src/privatescreen/tests/test-privatescreen.cpp	2016-05-17 02:52:07 +0000
+++ src/privatescreen/tests/test-privatescreen.cpp	2017-11-16 22:42:49 +0000
@@ -82,6 +82,7 @@
     MOCK_METHOD1(_matchPropertyChanged, void (CompWindow *));
     MOCK_METHOD0(_outputChangeNotify, void ());
     MOCK_METHOD2(_cursorChangeNotify, void (const CompString&, int));
+    MOCK_METHOD1(_averageColorChangeNotify, void (const unsigned short*));
 
     MOCK_METHOD0(outputDevs, CompOutput::vector & ());
     MOCK_METHOD2(setWindowState, void (unsigned int state, Window id));
@@ -199,6 +200,7 @@
     MOCK_CONST_METHOD0(getTopServerWindow, CompWindow * ());
     MOCK_METHOD0(getCoreOptions, CoreOptions& ());
     MOCK_CONST_METHOD0(colormap, Colormap ());
+    MOCK_CONST_METHOD0(averageColor, const unsigned short * ());
     MOCK_METHOD1(setCurrentDesktop, void (unsigned int desktop));
     MOCK_CONST_METHOD0(activeWindow, Window ());
     MOCK_CONST_METHOD1(grabWindowIsNot, bool (Window w));
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2016-08-01 13:25:02 +0000
+++ src/screen.cpp	2017-11-16 22:42:49 +0000
@@ -1427,6 +1427,113 @@
 	screen->cursorChangeNotify (cursorTheme, cursorSize);
 }
 
+void
+PrivateScreen::updateAverageColor (Atom atom)
+{
+    Atom	  actual_type;
+    int		  result, format;
+    unsigned long n, left;
+    unsigned char *data;
+
+    auto previousAverageColor = averageColor;
+    averageColor.clear ();
+
+    result = XGetWindowProperty (dpy, root,
+				 atom, 0L, 65536, False,
+				 XA_STRING, &actual_type, &format,
+				 &n, &left, &data);
+
+    if (result != Success || !data || actual_type != XA_STRING)
+    {
+	if (previousAverageColor != averageColor)
+	    screen->averageColorChangeNotify (averageColor.data ());
+
+	XFree (data);
+	return;
+    }
+
+    CompString colors (reinterpret_cast<char *> (data));
+    bool found_valid;
+    double r, g, b, a;
+    found_valid = false;
+    r = g = b = 0.0;
+    a = 1.0;
+    const CompString rgba_regex = R"((rgba?))"
+				  R"(\s*\(\s*([0-9]{1,3})\s*,)"
+				  R"(\s*([0-9]{1,3})\s*,)"
+				  R"(\s*([0-9]{1,3})\s*)"
+				  R"((,\s*((0*(\.[0-9]+)|1(\.0*)?)?)\s*)?\))";
+
+    std::vector<CompString> matches = compGetRegexMatches (rgba_regex, colors);
+
+    if (matches.size () > 4)
+    {
+	try
+	{
+	    found_valid = true;
+	    r = std::stoi (matches[2]) / 255.0;
+	    g = std::stoi (matches[3]) / 255.0;
+	    b = std::stoi (matches[4]) / 255.0;
+
+	    if (matches[1] == "rgba")
+	    {
+		if (matches.size () > 6 && !matches[6].empty ())
+		    a = std::stod (matches[6][0] == '.' ? '0'+matches[6] : matches[6]);
+		else
+		    found_valid = false;
+	    }
+	} catch (std::exception const& except) {
+	    found_valid = false;
+	    compLogMessage ("core", CompLogLevelWarn, "%s: failed to parse '%s' color string",
+			    except.what (), colors.c_str ());
+	}
+    } else {
+	size_t color_len = (colors.length () - 1) / 3;
+
+	if (color_len > 0 && color_len <= 4)
+	{
+	    CompString hex_regex = "#([[:xdigit:]]{" + std::to_string(color_len) + "})" +
+				   "([[:xdigit:]]{" + std::to_string(color_len) + "})" +
+				   "([[:xdigit:]]{" + std::to_string(color_len) + "})" +
+				   "([[:xdigit:]]{" + std::to_string(color_len) + "})?$";
+	    std::vector<CompString> matches = compGetRegexMatches (hex_regex, colors);
+	    if (matches.size () == 5)
+	    {
+		try
+		{
+		    double max_value = static_cast<float> ((1 << (4 * color_len)) - 1);
+		    found_valid = true;
+		    r = std::stoi (matches[1], 0, 16) / max_value;
+		    g = std::stoi (matches[2], 0, 16) / max_value;
+		    b = std::stoi (matches[3], 0, 16) / max_value;
+
+		    if (!matches[4].empty ())
+			a = std::stoi (matches[4], 0, 16) / max_value;
+		} catch (std::exception const& except) {
+		    found_valid = false;
+		    compLogMessage ("core", CompLogLevelWarn, "%s: failed to parse '%s' color string",
+				    except.what (), colors.c_str ());
+		}
+	    }
+	}
+    }
+
+    if (found_valid)
+    {
+	const double MaxUShort = std::numeric_limits<unsigned short>::max ();
+	averageColor.resize (4);
+	averageColor[0] = MAX (0, MIN (r * MaxUShort, MaxUShort));
+	averageColor[1] = MAX (0, MIN (g * MaxUShort, MaxUShort));
+	averageColor[2] = MAX (0, MIN (b * MaxUShort, MaxUShort));
+	averageColor[3] = MAX (0, MIN (a * MaxUShort, MaxUShort));
+    }
+
+    XFree (data);
+
+    if (previousAverageColor != averageColor)
+	screen->averageColorChangeNotify (averageColor.data ());
+}
+
 bool
 CompScreen::fileToImage (CompString &name,
 			 CompSize   &size,
@@ -1732,7 +1839,7 @@
 
     result = XGetWindowProperty (dpy, id,
 				 Atoms::mwmHints,
-				 0L, 20L, false, Atoms::mwmHints,
+				 0L, 20L, false, AnyPropertyType,
 				 &actual, &format, &n, &left, &data);
 
     if (result == Success && data)
@@ -3153,7 +3260,7 @@
 	}
 
 	if ((type & cps::GrabType::KEYBOARD) &&
-            !eventManager.topGrab (cps::GrabType::KEYBOARD))
+	    !eventManager.topGrab (cps::GrabType::KEYBOARD))
 	{
 	    status = XGrabKeyboard (dpy,
 				    eventManager.getGrabWindow (), true,
@@ -3171,7 +3278,7 @@
 		    }
 		    else
 		    {
-		    	XUngrabPointer (dpy, CurrentTime);
+			XUngrabPointer (dpy, CurrentTime);
 		    }
 		}
 
@@ -3242,7 +3349,7 @@
 	    }
 	    else
 	    {
-	        XUngrabPointer (privateScreen.dpy, CurrentTime);
+		XUngrabPointer (privateScreen.dpy, CurrentTime);
 	    }
 	}
 
@@ -4226,10 +4333,10 @@
 PrivateScreen::updateCursors (const CompString& theme, int size)
 {
     if (size > 0)
-        XcursorSetDefaultSize (dpy, size);
+	XcursorSetDefaultSize (dpy, size);
 
     if (!theme.empty())
-        XcursorSetTheme (dpy, theme.c_str());
+	XcursorSetTheme (dpy, theme.c_str());
 
     for (auto it = begin (cursors); it != end (cursors); ++it)
     {
@@ -4250,6 +4357,18 @@
     privateScreen.updateCursors (theme, size);
 }
 
+void
+CompScreen::averageColorChangeNotify (const unsigned short* color)
+{
+    WRAPABLE_HND_FUNCTN (averageColorChangeNotify, color);
+    _averageColorChangeNotify (color);
+}
+
+void
+CompScreenImpl::_averageColorChangeNotify (const unsigned short* color)
+{
+}
+
 /* Returns default viewport for some window geometry. If the window spans
  * more than one viewport the most appropriate viewport is returned. How the
  * most appropriate viewport is computed can be made optional if necessary. It
@@ -4396,6 +4515,10 @@
 ScreenInterface::cursorChangeNotify (const CompString& theme, int size)
     WRAPABLE_DEF (cursorChangeNotify, theme, size)
 
+void
+ScreenInterface::averageColorChangeNotify (const unsigned short *color)
+    WRAPABLE_DEF (averageColorChangeNotify, color)
+
 Window
 CompScreenImpl::root ()
 {
@@ -4841,6 +4964,12 @@
     return privateScreen.colormap;
 }
 
+const unsigned short *
+CompScreenImpl::averageColor() const
+{
+    return privateScreen.averageColor.data ();
+}
+
 void
 CompScreenImpl::setCurrentDesktop (unsigned int desktop)
 {
@@ -5270,6 +5399,8 @@
     XIGetClientPointer (dpy, None, &clientPointerDeviceId);
     updateResources ();
 
+    updateAverageColor (Atoms::gnomeRepresentativeColors);
+
     /* Attempt to gain SubstructureRedirectMask */
     CompScreenImpl::checkForError (dpy);
 
 
=== modified file 'src/string/src/string.cpp'
--- src/string/src/string.cpp	2012-03-23 03:37:26 +0000
+++ src/string/src/string.cpp	2017-11-16 22:42:49 +0000
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2008 Dennis Kasprzyk
+ * Copyright © 2017 Canonical Ltd.
  *
  * Permission to use, copy, modify, distribute, and sell this software
  * and its documentation for any purpose is hereby granted without
@@ -21,12 +22,20 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Authors: Dennis Kasprzyk <[e-mail]>
+ *          Marco Trevisan <[e-mail]>
  */
 
 #include <cstring>
 #include <cstdarg>
 #include <cstdio>
 
+#if defined(__GNUC__) && ((__GNUC__ < 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ < 9)))
+#include <regex.h>
+#else
+#include <regex>
+#define HAVE_CPP_REGEX
+#endif
+
 #include <core/string.h>
 
 CompString compPrintf (const char *format, ...)
@@ -86,3 +95,55 @@
     delete [] str;
     return rv;
 }
+
+CompStringVector
+compGetRegexMatches(const CompString& regexStr,
+		    const CompString& string)
+{
+
+    CompStringVector matches;
+
+#ifdef HAVE_CPP_REGEX
+
+    std::smatch subMatches;
+    std::regex regex(regexStr);
+
+    if (std::regex_match(string, subMatches, regex))
+    {
+	for (const auto& subMatch : subMatches)
+	    matches.push_back (subMatch.str ());
+    }
+
+#else
+
+    regex_t regex;
+    int ret;
+    ret = regcomp (&regex, regexStr.c_str (), REG_EXTENDED);
+
+    if (ret != 0)
+	return matches;
+
+    std::vector<regmatch_t> subMatches (regex.re_nsub + 1);
+    ret = regexec (&regex, string.c_str (), subMatches.size (), subMatches.data (), 0);
+
+    if (ret == REG_NOMATCH)
+	return matches;
+
+    for (const auto& sub_match : subMatches)
+    {
+	if (sub_match.rm_so >= 0)
+	{
+	    size_t sub_len = sub_match.rm_eo - sub_match.rm_so;
+	    matches.push_back (string.substr (sub_match.rm_so, sub_len));
+	} else {
+	    /* We keep this empty so the clients might access to all the subs */
+	    matches.push_back (CompString ());
+	}
+    }
+
+    regfree (&regex);
+
+#endif
+
+    return matches;
+}
 
=== modified file 'src/window.cpp'
--- src/window.cpp	2016-05-17 02:52:25 +0000
+++ src/window.cpp	2017-11-16 22:42:49 +0000
@@ -6921,8 +6921,8 @@
     /* Gravity here is assumed to be SouthEast, clients can update
      * that if need be */
 
-    serverFrameGeometry.set (serverInput.left - border.left,
-			     serverInput.top - border.top,
+    serverFrameGeometry.set (wa.x + (serverInput.left - border.left),
+			     wa.y + (serverInput.top - border.top),
 			     wa.width + (serverInput.left +
 					 serverInput.right),
 			     wa.height + (serverInput.top +