Merge lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic into lp:~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken

[Sam Spilsbury]

wall: Remove mouse polling edge flip detection code, instead turn edges on
      in the following situations:

    1. Edge flip pointer is on (always on)
    2. Edge flip move is on, and the screen is grabbed (someone is moving
       a window)
    3. Edge flip dnd is on, and a dnd type window is mapped (someone is
       doing a dnd)

Fix a misconstructed boolean condition in removeAction that could cause
actions to be removed twice and as such cause the edge reference count to
go negative.

Note that dnd window detection is a bit imprecise, but I didn't want to resort
to using some exotic workarounds for the dnd edge cases (such as non-EWMH
compliant dnd windows which are still compliant with ICCCM).

wall: Remove mouse polling edge flip detection code, instead turn edges on
      in the following situations:

    1. Edge flip pointer is on (always on)
    2. Edge flip move is on, and the screen is grabbed (someone is moving
       a window)
    3. Edge flip dnd is on, and a dnd type window is mapped (someone is
       doing a dnd)

Fix a misconstructed boolean condition in removeAction that could cause
actions to be removed twice and as such cause the edge reference count to
go negative.

Note that dnd window detection is a bit imprecise, but I didn't want to resort
to using some exotic workarounds for the dnd edge cases (such as non-EWMH
compliant dnd windows which are still compliant with ICCCM)

[MC Return (mc-return)]

You did it :)

From a first look:

Typos:

332 + or colum

316 + or colum

I do not understand this step:

292 + and set up screen edges as appropriate

307 + and set up screen edges as appropriate

323 + and set up screen edges as appropriate

I think this ^^ could be removed.

Please add newlines after:

66 + break;

70 + break;

The rest LGTM. I will test this ASAP.

[MC Return (mc-return)]

Did you test this ?

It does not seem to work here, none of the edge-flipping modes... :(

[MC Return (mc-return)]

Or am I missing something ?

Ah -> probably I am missing this part:

260 - if (!(privateScreen.initialized || action->active ()))
261 + if (!privateScreen.initialized ||
262 + !action->active ())

hmm, but this change seems to be unrelated and does not change the logic ?!

(I just exchanged the plugin)

*clueless* at the moment

review: Needs Information

[MC Return (mc-return)]

Or is it this:

292 + and set up screen edges as appropriate

What exactly should I setup here and where ?

[MC Return (mc-return)]

But I have some good news as well:

I did not have to change anything regarding the cmake config to compile this MP, just cmake .. && make -j5 :)
This means for the first time ever here all the tests compiled :), which means recent trunk fixes seem to work :)

[Sam Spilsbury (smspillaz)]

Yes I did, it works fine here.

Its possible that when I took the patch off my main branch I may have
missed something. I can look into that.
On 27/04/2013 4:42 PM, "MC Return" <email address hidden> wrote:

> Did you test this ?
>
> It does not seem to work here, none of the edge-flipping modes... :(
> --
>
> https://code.launchpad.net/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic/+merge/161279
> You are the owner of
> lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic.
>

[MC Return (mc-return)]

> Yes I did, it works fine here.
>
> Its possible that when I took the patch off my main branch I may have
> missed something. I can look into that.

Thanks :)
I am pretty sure I made no mistake -> and I double-checked, so most probably
something's missing...

[MC Return (mc-return)]

Note: I just took the compiled libwall.so to test, so if this needs changes to core...

But this thing below seems unrelated and does not change anything, or does it ?

253 === modified file 'src/screen.cpp'
254 --- src/screen.cpp 2013-02-03 17:58:29 +0000
255 +++ src/screen.cpp 2013-04-27 06:17:25 +0000
256 @@ -3486,7 +3486,8 @@
257 void
258 CompScreenImpl::removeAction (CompAction *action)
259 {
260 - if (!(privateScreen.initialized || action->active ()))
261 + if (!privateScreen.initialized ||
262 + !action->active ())
263 return;
264
265 grabManager.setCurrentState(action->state());
266 @@ -3902,6 +3903,11 @@
267 SubstructureRedirectMask | SubstructureNotifyMask, &xev);
268 }
269
270 +/* These functions do not guard against negative decrements
271 + * as they are unable to determine the source of the reference
272 + * and as such they should only be called by functions that
273 + * actually determine the source of what was referencing the
274 + * edge and can guard against multiple-references-per-owner */
275 void
276 PrivateScreen::enableEdge (int edge)
277 {
278

[Sam Spilsbury (smspillaz)]

In testing I remember coming across something that would effectively
cause actions to be removed from the active actions list multiple
times, which would in term cause the screen edge reference count to go
below zero. The if condition was the problem. It read:

if NOT
   (privateScreen.initialized OR
    action->active ())
    return false;

The sub-condition is true if either privateScreen.initialized or
action->active () is true. This means that in order for it to be
false, both of them must be false. Eg,

!(A || B) -> !A && !B

That's incorrect, because privateScreen.initialized is usually always
true, so you'd run into situations like this:

A && !B

But that still satisfies A || B because A is still true.

The adjusted condition is correct:

if (!A || !B) -> !(A && B)

What we want is for the function to always return false if
action->active () is false, regardless of what the value of
privateScreen.initialized is.

On Sat, Apr 27, 2013 at 5:43 PM, MC Return <email address hidden> wrote:
> Note: I just took the compiled libwall.so to test, so if this needs changes to core...
>
> But this thing below seems unrelated and does not change anything, or does it ?
>
> 253 === modified file 'src/screen.cpp'
> 254 --- src/screen.cpp 2013-02-03 17:58:29 +0000
> 255 +++ src/screen.cpp 2013-04-27 06:17:25 +0000
> 256 @@ -3486,7 +3486,8 @@
> 257 void
> 258 CompScreenImpl::removeAction (CompAction *action)
> 259 {
> 260 - if (!(privateScreen.initialized || action->active ()))
> 261 + if (!privateScreen.initialized ||
> 262 + !action->active ())
> 263 return;
> 264
> 265 grabManager.setCurrentState(action->state());
> 266 @@ -3902,6 +3903,11 @@
> 267 SubstructureRedirectMask | SubstructureNotifyMask, &xev);
> 268 }
> 269
> 270 +/* These functions do not guard against negative decrements
> 271 + * as they are unable to determine the source of the reference
> 272 + * and as such they should only be called by functions that
> 273 + * actually determine the source of what was referencing the
> 274 + * edge and can guard against multiple-references-per-owner */
> 275 void
> 276 PrivateScreen::enableEdge (int edge)
> 277 {
> 278
>
> --
> https://code.launchpad.net/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic/+merge/161279
> You are the owner of lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic.

--
Sam Spilsbury

[MC Return (mc-return)]

> In testing I remember coming across something that would effectively
> cause actions to be removed from the active actions list multiple
> times, which would in term cause the screen edge reference count to go
> below zero. The if condition was the problem. It read:
>
> if NOT
> (privateScreen.initialized OR
> action->active ())
> return false;
>
> The sub-condition is true if either privateScreen.initialized or
> action->active () is true. This means that in order for it to be
> false, both of them must be false. Eg,
>
> !(A || B) -> !A && !B
>
> That's incorrect, because privateScreen.initialized is usually always
> true, so you'd run into situations like this:
>
> A && !B
>
> But that still satisfies A || B because A is still true.
>
> The adjusted condition is correct:
>
> if (!A || !B) -> !(A && B)
>
> What we want is for the function to always return false if
> action->active () is false, regardless of what the value of
> privateScreen.initialized is.
>
>
Aha -> I thought this might be the problem, but was too lazy to really rethink
the boolean logic (I am still missing my shower & coffee today ;))...

I will approve this blindly this time, because I hope and am sure you will
immediately take care of regressions should those occur...

review: Approve

[Sam Spilsbury (smspillaz)]

Can you verify it please?

On Sat, Apr 27, 2013 at 6:06 PM, MC Return <email address hidden> wrote:
> Review: Approve
>
>> In testing I remember coming across something that would effectively
>> cause actions to be removed from the active actions list multiple
>> times, which would in term cause the screen edge reference count to go
>> below zero. The if condition was the problem. It read:
>>
>> if NOT
>> (privateScreen.initialized OR
>> action->active ())
>> return false;
>>
>> The sub-condition is true if either privateScreen.initialized or
>> action->active () is true. This means that in order for it to be
>> false, both of them must be false. Eg,
>>
>> !(A || B) -> !A && !B
>>
>> That's incorrect, because privateScreen.initialized is usually always
>> true, so you'd run into situations like this:
>>
>> A && !B
>>
>> But that still satisfies A || B because A is still true.
>>
>> The adjusted condition is correct:
>>
>> if (!A || !B) -> !(A && B)
>>
>> What we want is for the function to always return false if
>> action->active () is false, regardless of what the value of
>> privateScreen.initialized is.
>>
>>
> Aha -> I thought this might be the problem, but was too lazy to really rethink
> the boolean logic (I am still missing my shower & coffee today ;))...
>
> I will approve this blindly this time, because I hope and am sure you will
> immediately take care of regressions should those occur...
>
>
> --
> https://code.launchpad.net/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic/+merge/161279
> You are the owner of lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic.

--
Sam Spilsbury

[MC Return (mc-return)]

> Can you verify it please?
>
If you ask me to, how can I say no ?
;)

But it'll take a few hours until I can get to it...

[MC Return (mc-return)]

I get this error, when trying to install this branch locally (probably not related to changes in this branch):

...
copying build/locale/or/ccsm.mo -> /home/mcr2010/staging/share/locale/or/LC_MESSAGES
copying build/locale/pl/ccsm.mo -> /home/mcr2010/staging/share/locale/pl/LC_MESSAGES
running install_egg_info
Removing /home/mcr2010/staging/lib/python2.7/site-packages/ccsm-0.9.10.0-py2.7.egg-info
Writing /home/mcr2010/staging/lib/python2.7/site-packages/ccsm-0.9.10.0-py2.7.egg-info
gtk-update-icon-cache: Cache file created successfully.
Updating Gtk icon cache.
CMake Error at compizconfig/gconf/cmake_install.cmake:50 (FILE):
  file cannot create directory: /compizconfig/backends. Maybe need
  administrative privileges.
Call Stack (most recent call first):
  compizconfig/cmake_install.cmake:41 (INCLUDE)
  cmake_install.cmake:85 (INCLUDE)

make: *** [install] Error 1

I do not know why I cannot install locally, but I do not want to try to sudo it through...

Installing this way worked not long ago, recently I was not forced to do it, because I was just replacing the compiled plugin binaries manually to test them...

review: Abstain

[MC Return (mc-return)]

Sam, I got this report (quote by bryonak, who is helping with testing):
"
@MC Return:
Sadly, this one doesn't work well. Window move and pointer flipping work flawlessly, but d&d has some issues. Moreover, after trying to d&d, the other two stop working. Here's a video of it: http://caleo.dyx.ch/stuff/.compiz/flipping.mp4
"

[Sam Spilsbury (smspillaz)]

Did the other tester also install the core patch or just the wall plugin.

The core patch is necessary to prevent he bug which the tester has referred
to.
On 28/04/2013 11:07 PM, "MC Return" <email address hidden> wrote:

> Sam, I got this report (quote by bryonak, who is helping with testing):
> "
> @MC Return:
> Sadly, this one doesn't work well. Window move and pointer flipping work
> flawlessly, but d&d has some issues. Moreover, after trying to d&d, the
> other two stop working. Here's a video of it:
> http://caleo.dyx.ch/stuff/.compiz/flipping.mp4
> "
> --
>
> https://code.launchpad.net/~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic/+merge/161279
> You are the owner of
> lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic.
>

[MC Return (mc-return)]

Sam, could you merge trunk into this branch ? -> then I could test it myself as IIRC the bug I had above is already fixed in trunk...

[MC Return (mc-return)]

Forget it -> (I could do it locally myself)

[Sam Spilsbury (smspillaz)]

Ping.

[MC Return (mc-return)]

> Ping.

Sorry for the delay -> it is due to the core-changing nature of this MP.
I still had no chance to test this properly... :(
My suggestion would be this, to not hold up this any longer:

First we merge lp:~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken into lp:compiz, then this branch here afterwards.

Currently I have this PPA running here locally: gebner/compiz-cms
It correctly updates and has the latest Compiz core from trunk in it.
I could then run the latest version of trunk here and would spot regressions or non-functionality of wall then. In the worst case we could revert this branch, which probably won't be necessary anyway...

How about this plan ?

review: Needs Information

[Sam Spilsbury (smspillaz)]

On Sat, May 11, 2013 at 5:07 PM, MC Return <email address hidden> wrote:
> Review: Needs Information
>
>> Ping.
>
> Sorry for the delay -> it is due to the core-changing nature of this MP.
> I still had no chance to test this properly... :(
> My suggestion would be this, to not hold up this any longer:
> ...
> Currently I have this PPA running here locally: gebner/compiz-cms
> It correctly updates and has the latest Compiz core from trunk in it.
> I could then run the latest version of trunk here and would spot regressions or non-functionality of wall then. In the worst case we could revert this branch, which probably won't be necessary anyway...

Huh?

What's stopping you from compiling compiz and unity locally?

The reason why I proposed this one is because
lp:~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken
breaks edge-flip-dnd.

--
Sam Spilsbury

[MC Return (mc-return)]

>
> Huh?
>
> What's stopping you from compiling compiz and unity locally?
>
My additionally installed lenses/scopes, Compiz plugins and special CCSM settings.

> The reason why I proposed this one is because
> lp:~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken
> breaks edge-flip-dnd.
>
For maximally 3 hours until your branch lands and just in trunk, while fixing all
those other things ;)
Come on, now you must be joking...

[Sam Spilsbury (smspillaz)]

> >
> > Huh?
> >
> > What's stopping you from compiling compiz and unity locally?
> >
> My additionally installed lenses/scopes, Compiz plugins and special CCSM
> settings.
>
> > The reason why I proposed this one is because
> > lp:~mc-return/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-
> broken
> > breaks edge-flip-dnd.
> >
> For maximally 3 hours until your branch lands and just in trunk, while fixing
> all
> those other things ;)
> Come on, now you must be joking...

No, I'm not.

1. I know its broken. It would be unconscionable for me to land something that I know is broken.
2. Landing this doesn't change the fact that you can't yet test the branch that fixes it because it requires a core change.

[Sam Spilsbury (smspillaz)]

Hmm, merge conflicts I see.

review: Needs Fixing

[MC Return (mc-return)]

> Hmm, merge conflicts I see.

It is just the ABI logic change...
I merged latest lp:compiz to the other branch already.

Please fix the conflict, I will test this ASAP to get it off the table finally...

[Sam Spilsbury (smspillaz)]

Back to needs-review again so this gets noticed.

Can you merge your branch with lp:compiz again? Just merged mine but yours is behind again.

[Sam Spilsbury (smspillaz)]

review: Needs Fixing

[MC Return (mc-return)]

> Back to needs-review again so this gets noticed.
>
I did not forget it, there's just so much to do...

> Can you merge your branch with lp:compiz again? Just merged mine but yours is
> behind again.
Just noticed, sorry...
I will do it right now.

[MC Return (mc-return)]

> Can you merge your branch with lp:compiz again? Just merged mine but yours is
> behind again.

Done and pushed...

[lp:~smspillaz/compiz/compiz.merge-fix771448-desktop-wall-edge-flipping-broken.wall_edge_flip_logic]

3680. By Sam Spilsbury on 2013-05-15

Merge from upstream

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-27 11:48:55 +0000
+++ CMakeLists.txt	2013-05-13 13:29:47 +0000
@@ -104,7 +104,7 @@
     x11-xcb
     xrandr
     xinerama
-    xext
+    xi
     ice
     sm
     libxml-2.0

=== modified file 'debian/patches/100_workaround_virtualbox_hang.patch'
--- debian/patches/100_workaround_virtualbox_hang.patch	2013-02-17 07:28:12 +0000
+++ debian/patches/100_workaround_virtualbox_hang.patch	2013-05-13 13:29:47 +0000
@@ -1,8 +1,6 @@
-Index: compiz/plugins/opengl/include/opengl/opengl.h
-===================================================================
---- compiz.orig/plugins/opengl/include/opengl/opengl.h	2013-02-17 10:22:08.012876000 +0800
-+++ compiz/plugins/opengl/include/opengl/opengl.h	2013-02-17 10:23:36.643958000 +0800
-@@ -578,6 +578,17 @@
+--- a/plugins/opengl/include/opengl/opengl.h
++++ b/plugins/opengl/include/opengl/opengl.h
+@@ -582,6 +582,17 @@
  
  extern GLScreenPaintAttrib defaultScreenPaintAttrib;
  
@@ -20,7 +18,7 @@
  class GLScreen;
  class GLFramebufferObject;
  class GLScreenInterface;
-@@ -770,6 +781,13 @@
+@@ -774,6 +785,13 @@
  
  	bool glInitContext (XVisualInfo *);
  
@@ -34,11 +32,9 @@
  	WRAPABLE_HND (0, GLScreenInterface, bool, glPaintOutput,
  		      const GLScreenPaintAttrib &, const GLMatrix &,
  		      const CompRegion &, CompOutput *, unsigned int);
-Index: compiz/plugins/opengl/src/privates.h
-===================================================================
---- compiz.orig/plugins/opengl/src/privates.h	2013-02-17 10:22:08.012876000 +0800
-+++ compiz/plugins/opengl/src/privates.h	2013-02-17 10:23:36.643958000 +0800
-@@ -46,6 +46,24 @@
+--- a/plugins/opengl/src/privates.h
++++ b/plugins/opengl/src/privates.h
+@@ -47,6 +47,24 @@
  
  extern CompOutput *targetOutput;
  
@@ -63,7 +59,7 @@
  class GLDoubleBuffer :
      public compiz::opengl::DoubleBuffer
  {
-@@ -122,6 +140,7 @@
+@@ -123,6 +141,7 @@
  class PrivateGLScreen :
      public ScreenInterface,
      public compiz::composite::PaintHandler,
@@ -71,7 +67,7 @@
      public OpenglOptions
  {
      public:
-@@ -206,6 +225,7 @@
+@@ -207,6 +226,7 @@
  	std::vector<GLTexture::BindPixmapProc> bindPixmap;
  	bool hasCompositing;
  	bool commonFrontbuffer;
@@ -79,7 +75,7 @@
  	bool incorrectRefreshRate; // hack for NVIDIA specifying an incorrect
  				   // refresh rate, causing us to miss vblanks
  
-@@ -225,6 +245,10 @@
+@@ -226,6 +246,10 @@
  
  	mutable CompString prevRegex;
  	mutable bool       prevBlacklisted;
@@ -90,10 +86,8 @@
  };
  
  class PrivateGLWindow :
-Index: compiz/plugins/opengl/src/screen.cpp
-===================================================================
---- compiz.orig/plugins/opengl/src/screen.cpp	2013-02-17 10:22:08.012876000 +0800
-+++ compiz/plugins/opengl/src/screen.cpp	2013-02-17 10:23:36.643958000 +0800
+--- a/plugins/opengl/src/screen.cpp
++++ b/plugins/opengl/src/screen.cpp
 @@ -67,6 +67,7 @@
  
  
@@ -148,10 +142,8 @@
      if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))
  	GL::textureNonPowerOfTwo = true;
      GL::textureNonPowerOfTwoMipmap = GL::textureNonPowerOfTwo;
-Index: compiz/plugins/opengl/src/texture.cpp
-===================================================================
---- compiz.orig/plugins/opengl/src/texture.cpp	2013-02-17 10:22:08.012876000 +0800
-+++ compiz/plugins/opengl/src/texture.cpp	2013-02-17 10:23:36.643958000 +0800
+--- a/plugins/opengl/src/texture.cpp
++++ b/plugins/opengl/src/texture.cpp
 @@ -41,6 +41,7 @@
  #include "glx-tfp-bind.h"
  

=== modified file 'debian/patches/ubuntu-config.patch'
--- debian/patches/ubuntu-config.patch	2013-02-14 05:47:11 +0000
+++ debian/patches/ubuntu-config.patch	2013-05-13 13:29:47 +0000
@@ -204,7 +204,6 @@
  	    <min>0</min>
  	    <max>1</max>
  	    <precision>0.01</precision>
-
 --- a/plugins/decor/decor.xml.in
 +++ b/plugins/decor/decor.xml.in
 @@ -31,7 +31,7 @@
@@ -243,7 +242,6 @@
  	    </option>
  	    <option name="mipmap" type="bool">
  		<_short>Mipmap</_short>
-
 --- a/plugins/expo/expo.xml.in
 +++ b/plugins/expo/expo.xml.in
 @@ -17,6 +17,7 @@
@@ -321,15 +319,6 @@
  			<min>0.0</min>
  			<max>100.0</max>
  			<precision>0.1</precision>
-@@ -211,7 +209,7 @@
- 		    <option name="vp_saturation" type="float">
- 			<_short>Saturation</_short>
- 			<_long>Inactive viewport saturation.</_long>
--			<default>100.0</default>
-+			<default>40.0</default>
- 			<min>0.0</min>
- 			<max>100.0</max>
- 			<precision>0.1</precision>
 @@ -223,7 +221,7 @@
  			    <red>0xfbfb</red>
  			    <green>0x8b8b</green>
@@ -348,16 +337,6 @@
  		    </option>
  		    <option name="ground_color1" type="color">
  			<_short>Ground color(near)</_short>
-@@ -265,7 +263,7 @@
- 		    <option name="scale_factor" type="float">
- 			<_short>Reflection Scale</_short>
- 			<_long>Scale factor of the expo wall reflection</_long>
--			<default>0.75</default>
-+			<default>1.0</default>
- 			<min>0.0</min>
- 			<max>2.0</max>
- 			<precision>0.01</precision>
-
 --- a/plugins/ezoom/ezoom.xml.in
 +++ b/plugins/ezoom/ezoom.xml.in
 @@ -29,7 +29,6 @@
@@ -393,7 +372,6 @@
  		    </option>
  		</subgroup>
  	    </group>
-
 --- a/plugins/fade/fade.xml.in
 +++ b/plugins/fade/fade.xml.in
 @@ -10,6 +10,7 @@
@@ -413,7 +391,6 @@
  	    </option>
  	    <option name="visual_bell" type="bell">
  		<_short>Visual Bell</_short>
-
 --- a/plugins/gnomecompat/gnomecompat.xml.in
 +++ b/plugins/gnomecompat/gnomecompat.xml.in
 @@ -53,6 +53,7 @@
@@ -424,38 +401,6 @@
  		</option>
  	    </group>
  	</options>
-
---- a/plugins/grid/grid.xml.in
-+++ b/plugins/grid/grid.xml.in
-@@ -23,17 +23,16 @@
- 		<option name="put_center_key" type="key">
- 		    <_short>Put Center</_short>
- 		    <_long>Move window to the center</_long>
--		    <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
- 		</option>
- 		<option name="put_left_key" type="key">
- 		    <_short>Put Left</_short>
- 		    <_long>Move window to the left edge</_long>
--		    <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
-+		    <default>&lt;Control&gt;&lt;Super&gt;Left</default>
- 		</option>
- 		<option name="put_right_key" type="key">
- 		    <_short>Put Right</_short>
- 		    <_long>Move window to the right edge</_long>
--		    <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
-+		    <default>&lt;Control&gt;&lt;Super&gt;Right</default>
- 		</option>
- 		<option name="put_top_key" type="key">
- 		    <_short>Put Top</_short>
-@@ -68,7 +67,6 @@
- 		<option name="put_maximize_key" type="key">
- 		    <_short>Maximize</_short>
- 		    <_long>Maximize window</_long>
--		    <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
- 		</option>
- 		<option name="put_restore_key" type="key">
- 		    <_short>Restore</_short>
-
 --- a/plugins/place/place.xml.in
 +++ b/plugins/place/place.xml.in
 @@ -20,8 +20,8 @@
@@ -469,7 +414,6 @@
  		<max>5</max>
  		<desc>
  		    <value>0</value>
-
 --- a/plugins/resize/resize.xml.in
 +++ b/plugins/resize/resize.xml.in
 @@ -28,7 +28,7 @@
@@ -516,7 +460,6 @@
  		</default>
  	    </option>
  	    <subgroup>
-
 --- a/plugins/scale/scale.xml.in
 +++ b/plugins/scale/scale.xml.in
 @@ -19,14 +19,14 @@
@@ -607,7 +550,6 @@
  			</option>
  	    </group>
  	</options>
-
 --- a/plugins/staticswitcher/staticswitcher.xml.in
 +++ b/plugins/staticswitcher/staticswitcher.xml.in
 @@ -11,7 +11,6 @@
@@ -686,7 +628,6 @@
  			<desc>
  			    <value>0</value>
  			    <_name>None</_name>
-
 --- a/plugins/vpswitch/vpswitch.xml.in
 +++ b/plugins/vpswitch/vpswitch.xml.in
 @@ -95,13 +95,11 @@
@@ -703,7 +644,6 @@
  					<internal/>
  				</option>
  				<option name="initiate_button" type="button">
-
 --- a/plugins/wall/wall.xml.in
 +++ b/plugins/wall/wall.xml.in
 @@ -31,12 +31,12 @@
@@ -853,7 +793,6 @@
  				</option>
  				<option name="edgeflip_dnd" type="bool">
  					<_short>Edge Flip DnD</_short>
-
 --- a/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
 +++ b/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp
 @@ -46,7 +46,7 @@
@@ -865,3 +804,34 @@
  unsigned int DEFAULT_VIEWPORT_HEIGHT = 1;
  
  bool Advance (Display *d, bool r)
+--- a/plugins/grid/grid.xml.in
++++ b/plugins/grid/grid.xml.in
+@@ -23,17 +23,16 @@
+ 		<option name="put_center_key" type="key">
+ 		    <_short>Put Center Key</_short>
+ 		    <_long>Move window to the center.</_long>
+-		    <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
+ 		</option>
+ 		<option name="put_left_key" type="key">
+ 		    <_short>Put Left Key</_short>
+ 		    <_long>Move window to the left edge.</_long>
+-		    <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
++		    <default>&lt;Control&gt;&lt;Super&gt;Left</default>
+ 		</option>
+ 		<option name="put_right_key" type="key">
+ 		    <_short>Put Right Key</_short>
+ 		    <_long>Move window to the right edge.</_long>
+-		    <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
++		    <default>&lt;Control&gt;&lt;Super&gt;Right</default>
+ 		</option>
+ 		<option name="put_top_key" type="key">
+ 		    <_short>Put Top Key</_short>
+@@ -73,7 +72,7 @@
+ 		<option name="put_restore_key" type="key">
+ 		    <_short>Restore</_short>
+ 		    <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
+-		    <default>&lt;Alt&gt;F5</default>
++		    <default>&lt;Control&gt;&lt;Super&gt;Down</default>
+ 		</option>
+ 	    </group>
+ 	    <group>

=== modified file 'plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h'
--- plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2012-09-07 22:37:20 +0000
+++ plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h	2013-05-13 13:29:47 +0000
@@ -162,6 +162,6 @@
 };
 
 extern const unsigned short ICON_SIZE;
-extern const unsigned int MAX_ICON_SIZE;
+extern const unsigned short MAX_ICON_SIZE;
 
 #endif

=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
--- plugins/compiztoolbox/src/compiztoolbox.cpp	2013-05-09 13:43:07 +0000
+++ plugins/compiztoolbox/src/compiztoolbox.cpp	2013-05-13 13:29:47 +0000
@@ -29,8 +29,8 @@
 #include <core/abiversion.h>
 #include <core/propertywriter.h>
 
-const unsigned short ICON_SIZE = 48;
-const unsigned int MAX_ICON_SIZE = 256;
+const unsigned short ICON_SIZE     = 512;
+const unsigned short MAX_ICON_SIZE = 512;
 
 bool openGLAvailable;
 

=== modified file 'plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ plugins/decor/src/pixmap-requests/tests/integration/xorg-gtest/CMakeLists.txt	2013-05-13 13:29:47 +0000
@@ -18,7 +18,7 @@
 
     set (COMPIZ_DECOR_PIXMAP_PROTOCOL_XORG_INTEGRATION_TEST_LIBRARIES
          xorg_gtest_all
-         xorg_gtest_main
+         compiz_xorg_gtest_main
          compiz_xorg_gtest_system_test
          compiz_decor_pixmap_requests
          compiz_decor_pixmap_requests_mock

=== modified file 'plugins/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2013-04-25 10:11:04 +0000
+++ plugins/grid/grid.xml.in	2013-05-13 13:29:47 +0000
@@ -21,492 +21,486 @@
 	    <group>
 		<_short>Bindings</_short>
 		<option name="put_center_key" type="key">
-		    <_short>Put Center</_short>
-		    <_long>Move window to the center</_long>
+		    <_short>Put Center Key</_short>
+		    <_long>Move window to the center.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_5</default>
 		</option>
 		<option name="put_left_key" type="key">
-		    <_short>Put Left</_short>
-		    <_long>Move window to the left edge</_long>
+		    <_short>Put Left Key</_short>
+		    <_long>Move window to the left edge.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_4</default>
 		</option>
 		<option name="put_right_key" type="key">
-		    <_short>Put Right</_short>
-		    <_long>Move window to the right edge</_long>
+		    <_short>Put Right Key</_short>
+		    <_long>Move window to the right edge.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_6</default>
 		</option>
 		<option name="put_top_key" type="key">
-		    <_short>Put Top</_short>
-		    <_long>Move window to the top edge</_long>
+		    <_short>Put Top Key</_short>
+		    <_long>Move window to the top edge.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_8</default>
 		</option>
 		<option name="put_bottom_key" type="key">
-		    <_short>Put Bottom</_short>
-		    <_long>Move window to the bottom edge</_long>
+		    <_short>Put Bottom Key</_short>
+		    <_long>Move window to the bottom edge.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_2</default>
 		</option>
 		<option name="put_topleft_key" type="key">
-		    <_short>Put Top Left</_short>
-		    <_long>Move window to the top left corner</_long>
+		    <_short>Put Top Left Key</_short>
+		    <_long>Move window to the top left corner.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_7</default>
 		</option>
 		<option name="put_topright_key" type="key">
-		    <_short>Put Top Right</_short>
-		    <_long>Move window to the top right corner</_long>
+		    <_short>Put Top Right Key</_short>
+		    <_long>Move window to the top right corner.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_9</default>
 		</option>
 		<option name="put_bottomleft_key" type="key">
-		    <_short>Put Bottom Left</_short>
-		    <_long>Move window to the bottom left corner</_long>
+		    <_short>Put Bottom Left Key</_short>
+		    <_long>Move window to the bottom left corner.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_1</default>
 		</option>
 		<option name="put_bottomright_key" type="key">
-		    <_short>Put Bottom Right</_short>
-		    <_long>Move window to the bottom right corner</_long>
+		    <_short>Put Bottom Right Key</_short>
+		    <_long>Move window to the bottom right corner.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_3</default>
 		</option>
 		<option name="put_maximize_key" type="key">
-		    <_short>Maximize</_short>
-		    <_long>Maximize window</_long>
+		    <_short>Maximize Key</_short>
+		    <_long>Maximize window.</_long>
 		    <default>&lt;Control&gt;&lt;Alt&gt;KP_0</default>
 		</option>
 		<option name="put_restore_key" type="key">
 		    <_short>Restore</_short>
-		    <_long>Restores grid-resized, semi-maximized and maximized windows to their original size and position.</_long>
-		    <default>&lt;Control&gt;&lt;Alt&gt;r</default>
-		</option>
-	    </group>
-	    <group>
-		<_short>Edges</_short>
-		<subgroup>
-			<_short>Resize Actions</_short>
-			<_long>Window resize action</_long>
-			<option name="top_left_corner_action" type="int">
-			    <_short>Upper Left Corner</_short>
-			    <_long>Action to be performed when window is dropped on the top left corner.</_long>
-			    <default>4</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="top_edge_action" type="int">
-			    <_short>Top Edge</_short>
-			    <_long>Action to be performed when window is dropped on the top edge.</_long>
-			    <default>10</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="top_right_corner_action" type="int">
-			    <_short>Upper Right Corner</_short>
-			    <_long>Action to be performed when window is dropped on the top right corner.</_long>
-			    <default>6</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="left_edge_action" type="int">
-			    <_short>Left Edge</_short>
-			    <_long>Action to be performed when window is dropped on the left edge.</_long>
-			    <default>4</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="right_edge_action" type="int">
-			    <_short>Right Edge</_short>
-			    <_long>Action to be performed when window is dropped on the right edge.</_long>
-			    <default>6</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="bottom_left_corner_action" type="int">
-			    <_short>Bottom Left Corner</_short>
-			    <_long>Action to be performed when window is dropped on the bottom left corner.</_long>
-			    <default>4</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="bottom_edge_action" type="int">
-			    <_short>Bottom Edge</_short>
-			    <_long>Action to be performed when window is dropped on the bottom edge.</_long>
-			    <default>0</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="bottom_right_corner_action" type="int">
-			    <_short>Bottom Right Corner</_short>
-			    <_long>Action to be performed when window is dropped on the bottom right corner.</_long>
-			    <default>6</default>
-			    <min>0</min>
-			    <max>10</max>
-			    <desc>
-				<value>0</value>
-				<_name>None</_name>
-			    </desc>
-			    <desc>
-				<value>1</value>
-				<_name>Bottom Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>2</value>
-				<_name>Bottom Half</_name>
-			    </desc>
-			    <desc>
-				<value>3</value>
-				<_name>Bottom Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>4</value>
-				<_name>Left Half</_name>
-			    </desc>
-			    <desc>
-				<value>5</value>
-				<_name>Fill Screen</_name>
-			    </desc>
-			    <desc>
-				<value>6</value>
-				<_name>Right Half</_name>
-			    </desc>
-			    <desc>
-				<value>7</value>
-				<_name>Top Left Corner</_name>
-			    </desc>
-			    <desc>
-				<value>8</value>
-				<_name>Top Half</_name>
-			    </desc>
-			    <desc>
-				<value>9</value>
-				<_name>Top Right Corner</_name>
-			    </desc>
-			    <desc>
-				<value>10</value>
-				<_name>Maximize</_name>
-			    </desc>
-			</option>
-			<option name="snapoff_maximized" type="bool">
-				<_short>Snapoff Maximized/Semi-maximized Windows</_short>
-				<_long>Snapoff maximized and vertically maximized windows by dragging them up or down and horizontally maximized ones by dragging them left or right.</_long>
-				<default>false</default>
-			</option>
-			<option name="snapback_windows" type="bool">
-				<_short>Snap Windows Back To Original Size</_short>
-				<_long>Snaps windows back to their original size if dragged away from their gridded position.</_long>
-				<default>true</default>
-			</option>
-			<option name="cycle_sizes" type="bool">
-				<_short>Cycle Through Multiple Sizes</_short>
-				<_long>Cycle through multiple different sizes by using the same keyboard shortcut multiple times in a row.</_long>
-				<default>false</default>
-			</option>
-		</subgroup>
-		<subgroup>
-			<_short>Thresholds</_short>
+		    <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long>
+		    <default>&lt;Alt&gt;F5</default>
+		</option>
+	    </group>
+	    <group>
+		<_short>Corners / Edges</_short>
+		<option name="top_left_corner_action" type="int">
+		    <_short>Upper Left Corner</_short>
+		    <_long>Action to be performed when window is dropped on the top left corner.</_long>
+		    <default>4</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="top_edge_action" type="int">
+		    <_short>Top Edge</_short>
+		    <_long>Action to be performed when window is dropped on the top edge.</_long>
+		    <default>10</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="top_right_corner_action" type="int">
+		    <_short>Upper Right Corner</_short>
+		    <_long>Action to be performed when window is dropped on the top right corner.</_long>
+		    <default>6</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="left_edge_action" type="int">
+		    <_short>Left Edge</_short>
+		    <_long>Action to be performed when window is dropped on the left edge.</_long>
+		    <default>4</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="right_edge_action" type="int">
+		    <_short>Right Edge</_short>
+		    <_long>Action to be performed when window is dropped on the right edge.</_long>
+		    <default>6</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="bottom_left_corner_action" type="int">
+		    <_short>Bottom Left Corner</_short>
+		    <_long>Action to be performed when window is dropped on the bottom left corner.</_long>
+		    <default>4</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="bottom_edge_action" type="int">
+		    <_short>Bottom Edge</_short>
+		    <_long>Action to be performed when window is dropped on the bottom edge.</_long>
+		    <default>0</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+		<option name="bottom_right_corner_action" type="int">
+		    <_short>Bottom Right Corner</_short>
+		    <_long>Action to be performed when window is dropped on the bottom right corner.</_long>
+		    <default>6</default>
+		    <min>0</min>
+		    <max>10</max>
+		    <desc>
+			<value>0</value>
+			<_name>None</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Bottom Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>2</value>
+			<_name>Bottom Half</_name>
+		    </desc>
+		    <desc>
+			<value>3</value>
+			<_name>Bottom Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>4</value>
+			<_name>Left Half</_name>
+		    </desc>
+		    <desc>
+			<value>5</value>
+			<_name>Fill Screen</_name>
+		    </desc>
+		    <desc>
+			<value>6</value>
+			<_name>Right Half</_name>
+		    </desc>
+		    <desc>
+			<value>7</value>
+			<_name>Top Left Corner</_name>
+		    </desc>
+		    <desc>
+			<value>8</value>
+			<_name>Top Half</_name>
+		    </desc>
+		    <desc>
+			<value>9</value>
+			<_name>Top Right Corner</_name>
+		    </desc>
+		    <desc>
+			<value>10</value>
+			<_name>Maximize</_name>
+		    </desc>
+		</option>
+	    </group>
+	    <group>
+		<_short>Resize Actions</_short>
+		<option name="snapback_windows" type="bool">
+			<_short>Snap Windows Back To Original Size</_short>
+			<_long>Snaps windows back to their original size if dragged away from their gridded position.</_long>
+			<default>true</default>
+		</option>
+		<option name="cycle_sizes" type="bool">
+			<_short>Cycle Through Multiple Sizes</_short>
+			<_long>Cycle through multiple different sizes by using the same keyboard shortcut multiple times in a row.</_long>
+			<default>false</default>
+		</option>
+		<subgroup>
+			<_short>Grid Snapback Thresholds</_short>
 			<option name="left_edge_threshold" type="int">
 				<_short>Left Edge</_short>
 				<_long>Maximum number of pixels from the left edge a window can be dropped.</_long>
@@ -536,6 +530,16 @@
 				<max>500</max>
 			</option>
 		</subgroup>
+		<subgroup>
+			<_short>Grid Snapoff Threshold</_short>
+			<option name="snapoff_threshold" type="int">
+				<_short>General Size</_short>
+				<_long>The pixels to drag until a grid-resized window snaps off.</_long>
+				<default>50</default>
+				<min>0</min>
+				<max>500</max>
+			</option>
+		</subgroup>
 	    </group>
 	    <group>
 		<_short>Appearance</_short>

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2013-05-09 13:43:07 +0000
+++ plugins/grid/src/grid.cpp	2013-05-13 13:29:47 +0000
@@ -36,8 +36,8 @@
 static int const CURVE_ANIMATION = 35;
 
 void
-GridScreen::handleCompizEvent(const char*    plugin,
-			      const char*    event,
+GridScreen::handleCompizEvent(const char           *plugin,
+			      const char           *event,
 			      CompOption::Vector&  o)
 {
     if (strcmp(event, "start_viewport_switch") == 0)
@@ -118,12 +118,12 @@
 }
 
 bool
-GridScreen::initiateCommon (CompAction		*action,
-			    CompAction::State	state,
-			    CompOption::Vector	&option,
-			    unsigned int	where,
-			    bool		resize,
-			    bool		key)
+GridScreen::initiateCommon (CompAction          *action,
+			    CompAction::State   state,
+			    CompOption::Vector  &option,
+			    unsigned int        where,
+			    bool                resize,
+			    bool                key)
 {
     CompWindow *cw = 0;
 
@@ -142,7 +142,7 @@
 					 vertMaximizedGridPosition ||
 					 where & GridMaximize;
 
-	if (!(cw->actions () & CompWindowActionResizeMask) ||
+	if (!(cw->actions () & CompWindowActionResizeMask)			||
 	    (maximizeH && !(cw->actions () & CompWindowActionMaximizeHorzMask)) ||
 	    (maximizeV && !(cw->actions () & CompWindowActionMaximizeVertMask)) ||
 	    where & GridUnknown)
@@ -168,29 +168,20 @@
 	    if (props.numCellsX == 1)
 		centerCheck = true;
 
-	    /* Do not overwrite the original size if we already have been gridded */
-	    if (!gw->isGridResized && !gw->isGridHorzMaximized && !gw->isGridVertMaximized)
+	    /* Do not overwrite the original size if we already have been gridded or
+	     * have been grid-maximized */
+	    if (!gw->isGridResized && !gw->isGridHorzMaximized && !gw->isGridVertMaximized &&
+		!(cw->state () & MAXIMIZE_STATE))
 		/* Store size not including borders when using a keybinding */
 		gw->originalSize = slotToRect(cw, cw->serverBorderRect ());
 	}
 
-	if ((cw->state () & MAXIMIZE_STATE) &&
-	    (resize || optionGetSnapoffMaximized ()))
-	    /* maximized state interferes with us, clear it */
+	if ((cw->state () & MAXIMIZE_STATE) && resize)
+	    // maximized state interferes with us, clear it
 	    cw->maximize (0);
 
 	if ((where & GridMaximize) && resize)
 	{
-	    /* move the window to the correct output */
-	    if (cw == mGrabWindow)
-	    {
-		/* TODO: Remove these magic numbers */
-		xwc.x = workarea.x () + 50;
-		xwc.y = workarea.y () + 50;
-		xwc.width = workarea.width ();
-		xwc.height = workarea.height ();
-		cw->configureXWindow (CWX | CWY, &xwc);
-	    }
 	    cw->maximize (MAXIMIZE_STATE);
 	    /* Core can handle fully maximized windows so we don't
 	     * have to worry about them. Don't mark the window as a
@@ -202,6 +193,7 @@
 
 	    for (unsigned int i = 0; i < animations.size (); ++i)
 		animations.at (i).fadingOut = true;
+
 	    return true;
 	}
 
@@ -246,12 +238,12 @@
 	 * unless the user explicitely specified that in CCSM
 	 */
 	if (gw->lastTarget == where &&
-	    gw->isGridResized &&
+	    gw->isGridResized	    &&
 	    !optionGetCycleSizes ())
 	    return false;
 
-	/* !(Grid Left/Right/Top/Bottom) are only valid here, if
-	 * cycling through sizes is disabled also
+	/* !(Grid Left/Right/Top/Bottom) are only valid here,
+	 * if cycling through sizes is disabled also
 	 */
 	if ((where & ~(GridMaximize) ||
 	     ((!horzMaximizedGridPosition || !vertMaximizedGridPosition) &&
@@ -398,7 +390,7 @@
 
 		    rwc.x = gw->originalSize.x ();
 		    rwc.y = gw->originalSize.y ();
-		    rwc.width = gw->originalSize.width ();
+		    rwc.width  = gw->originalSize.width ();
 		    rwc.height = gw->originalSize.height ();
 
 		    cw->configureXWindow (CWX | CWY | CWWidth | CWHeight, &rwc);
@@ -469,10 +461,8 @@
 	 */
 	if (centerCheck)
 	{
-	    if ((cw->serverBorderRect ().width () >
-		 desiredSlot.width ()) ||
-		cw->serverBorderRect ().width () <
-		desiredSlot.width ())
+	    if (cw->serverBorderRect ().width () > desiredSlot.width () ||
+		cw->serverBorderRect ().width () < desiredSlot.width ())
 	    {
 		wc.x = (workarea.width () >> 1) -
 		       ((cw->serverBorderRect ().width () >> 1) -
@@ -492,13 +482,13 @@
 			      const GLMatrix            &transform,
 			      CompOutput                *output)
 {
-    CompRect rect;
-    GLMatrix sTransform (transform);
+    CompRect        rect;
+    GLMatrix        sTransform (transform);
     std::vector<Animation>::iterator iter;
-    GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+    GLVertexBuffer  *streamingBuffer = GLVertexBuffer::streamingBuffer ();
     GLfloat         vertexData[12];
     GLushort        colorData[4];
-    GLushort       *color;
+    GLushort        *color;
     GLboolean       isBlendingEnabled;
 
     const float MaxUShortFloat = std::numeric_limits <unsigned short>::max ();
@@ -702,10 +692,10 @@
     type.push_back (GridTypeMask (GridWindowType::GridTopRight, 9));
     type.push_back (GridTypeMask (GridWindowType::GridMaximize, 10));
 
-
     for (unsigned int i = 0; i < type.size (); ++i)
     {
 	GridTypeMask &tm = type[i];
+
 	if (tm.type == t)
 	    return tm.mask;
     }
@@ -721,35 +711,35 @@
     switch (edge)
     {
 	case Left:
-	    ret = (int) optionGetLeftEdgeAction ();
+	    ret = optionGetLeftEdgeAction ();
 	    break;
 
 	case Right:
-	    ret = (int) optionGetRightEdgeAction ();
+	    ret = optionGetRightEdgeAction ();
 	    break;
 
 	case Top:
-	    ret = (int) optionGetTopEdgeAction ();
+	    ret = optionGetTopEdgeAction ();
 	    break;
 
 	case Bottom:
-	    ret = (int) optionGetBottomEdgeAction ();
+	    ret = optionGetBottomEdgeAction ();
 	    break;
 
 	case TopLeft:
-	    ret = (int) optionGetTopLeftCornerAction ();
+	    ret = optionGetTopLeftCornerAction ();
 	    break;
 
 	case TopRight:
-	    ret = (int) optionGetTopRightCornerAction ();
+	    ret = optionGetTopRightCornerAction ();
 	    break;
 
 	case BottomLeft:
-	    ret = (int) optionGetBottomLeftCornerAction ();
+	    ret = optionGetBottomLeftCornerAction ();
 	    break;
 
 	case BottomRight:
-	    ret = (int) optionGetBottomRightCornerAction ();
+	    ret = optionGetBottomRightCornerAction ();
 	    break;
 
 	case NoEdge:
@@ -862,6 +852,7 @@
 	    if (edge != NoEdge && check)
 	    {
 		CompWindow *cw = screen->findWindow (screen->activeWindow ());
+
 		if (cw)
 		{
 		    animations.push_back (Animation ());
@@ -894,12 +885,14 @@
     {
 	GRID_WINDOW (w);
 
-	if ((gw->pointerBufDx > SNAPOFF_THRESHOLD ||
-	     gw->pointerBufDy > SNAPOFF_THRESHOLD ||
-	     gw->pointerBufDx < -SNAPOFF_THRESHOLD ||
-	     gw->pointerBufDy < -SNAPOFF_THRESHOLD) &&
-	     gw->isGridResized &&
-	     optionGetSnapbackWindows ())
+	int snapoffThreshold = optionGetSnapoffThreshold ();
+
+	/* we just care about snapping of grid-resized windows */
+	if ((gw->pointerBufDx > snapoffThreshold   ||
+	     gw->pointerBufDy > snapoffThreshold   ||
+	     gw->pointerBufDx < -snapoffThreshold  ||
+	     gw->pointerBufDy < -snapoffThreshold) &&
+	     gw->isGridResized)
 	    restoreWindow (0, 0, o);
     }
 }
@@ -938,13 +931,11 @@
 	pointerBufDx = pointerBufDy = 0;
 	grabMask = mask;
 
-	if (!isGridResized &&
-	    !isGridHorzMaximized &&
-	    !isGridVertMaximized &&
-	    gScreen->optionGetSnapbackWindows ())
+	if (!isGridResized	    &&
+	    !isGridHorzMaximized    &&
+	    !isGridVertMaximized)
 	    /* Store size not including borders when grabbing with cursor */
-	    originalSize = gScreen->slotToRect(window,
-					       window->serverBorderRect ());
+	    originalSize = gScreen->slotToRect (window, window->serverBorderRect ());
     }
     else if (gwHandler.resetResize ())
     {
@@ -982,9 +973,9 @@
 {
     window->moveNotify (dx, dy, immediate);
 
-    if (isGridResized &&
-	!isGridHorzMaximized &&
-	!isGridVertMaximized &&
+    if (isGridResized		&&
+	!isGridHorzMaximized	&&
+	!isGridVertMaximized	&&
 	!GridScreen::get (screen)->mSwitchingVp)
     {
 	if (window->grabbed () && screen->grabExist ("expo"))
@@ -996,6 +987,7 @@
 	    gScreen->restoreWindow (0, 0, gScreen->o);
 	    return;
 	}
+
 	if (window->grabbed () && (grabMask & CompWindowGrabMoveMask))
 	{
 	    pointerBufDx += dx;
@@ -1036,8 +1028,7 @@
 	    lastTarget = GridMaximize;
 
 	if (window->grabbed ())
-	    originalSize = gScreen->slotToRect (window,
-						window->serverBorderRect ());
+	    originalSize = gScreen->slotToRect (window, window->serverBorderRect ());
     }
 
     window->stateChangeNotify (lastState);
@@ -1049,8 +1040,8 @@
 			   CompOption::Vector &option)
 {
     XWindowChanges xwc;
-    int xwcm = 0;
-    CompWindow *cw = screen->findWindow (screen->activeWindow ());
+    int            xwcm = 0;
+    CompWindow     *cw = screen->findWindow (screen->activeWindow ());
 
     if (!cw)
 	return false;
@@ -1058,13 +1049,13 @@
     GRID_WINDOW (cw);
 
     /* We have nothing to do here */
-    if (!gw->isGridResized &&
-	!gw->isGridVertMaximized &&
+    if (!gw->isGridResized		&&
+	!gw->isGridVertMaximized	&&
 	!gw->isGridHorzMaximized)
 	return false;
 
-    else if (!gw->isGridResized &&
-	     gw->isGridHorzMaximized &&
+    else if (!gw->isGridResized		&&
+	     gw->isGridHorzMaximized	&&
 	     !gw->isGridVertMaximized)
     {
 	/* Window has been horizontally maximized by grid. We only need
@@ -1073,8 +1064,8 @@
 	    gw->window->sizeHints ().flags |= gw->sizeHintsFlags;
 	xwcm |=  CWY | CWHeight;
     }
-    else if (!gw->isGridResized &&
-	     !gw->isGridHorzMaximized &&
+    else if (!gw->isGridResized		&&
+	     !gw->isGridHorzMaximized	&&
 	     gw->isGridVertMaximized)
     {
 	/* Window has been vertically maximized by grid. We only need
@@ -1083,8 +1074,8 @@
 	    gw->window->sizeHints ().flags |= gw->sizeHintsFlags;
 	xwcm |= CWX | CWWidth;
     }
-    else if (gw->isGridResized &&
-	     !gw->isGridHorzMaximized &&
+    else if (gw->isGridResized		&&
+	     !gw->isGridHorzMaximized	&&
 	     !gw->isGridVertMaximized)
 	/* Window is just gridded (center, corners).
 	 * We need to handle everything. */
@@ -1093,15 +1084,25 @@
     {
 	/* This should never happen. But if it does, just bail out
 	 * gracefully. */
-	assert (gw->isGridResized &&
+	assert (gw->isGridResized	&&
 		(gw->isGridHorzMaximized || gw->isGridVertMaximized));
 	return false;
     }
 
     if (cw == mGrabWindow)
     {
-	xwc.x = pointerX - (gw->originalSize.width () / 2);
-	xwc.y = pointerY + (cw->border ().top / 2);
+	/* The windows x-center is different in this case. */
+	if (optionGetSnapbackWindows ())
+	{
+	    xwc.x = pointerX - (gw->originalSize.width () / 2);
+	    xwc.y = pointerY + (cw->border ().top / 2);
+	}
+	else /* the user does not want the original size back */
+	{
+	    /* this one is quite tricky to get right */
+	    xwc.x = pointerX - gw->pointerBufDx - gw->currentSize.width () / 2;
+	    xwc.y = pointerY - gw->pointerBufDy + cw->border ().top / 2;
+	}
     }
     else if (cw->grabbed () && screen->grabExist ("expo"))
     {
@@ -1119,19 +1120,32 @@
 	xwc.y = gw->originalSize.y ();
     }
 
-    xwc.width  = gw->originalSize.width ();
-    xwc.height = gw->originalSize.height ();
+    /* We just need the original size, if
+     * this option is enabled or we are not grabbed */
+    if (optionGetSnapbackWindows () ||
+	!(cw == mGrabWindow))
+    {
+	xwc.width  = gw->originalSize.width ();
+	xwc.height = gw->originalSize.height ();
+    }
+    else
+    {
+	/* the current size is also our new size */
+	xwc.width  = gw->currentSize.width ();
+	xwc.height = gw->currentSize.height ();
+    }
 
     if (cw->mapNum() && xwcm)
 	cw->sendSyncRequest();
 
     cw->configureXWindow (xwcm, &xwc);
-    gw->currentSize = CompRect ();
-    gw->pointerBufDx = 0;
-    gw->pointerBufDy = 0;
+
+    gw->currentSize         = CompRect ();
+    gw->pointerBufDx        = 0;
+    gw->pointerBufDy        = 0;
     gw->isGridHorzMaximized = false;
     gw->isGridVertMaximized = false;
-    gw->isGridResized = false;
+    gw->isGridResized       = false;
 
     if (cw->state () & MAXIMIZE_STATE)
 	cw->maximize(0);
@@ -1143,18 +1157,6 @@
 }
 
 void
-GridScreen::snapbackOptionChanged (CompOption *option,
-				   Options    num)
-{
-    GRID_WINDOW (screen->findWindow
-		 (CompOption::getIntOptionNamed (o, "window")));
-    gw->isGridResized = false;
-    gw->isGridHorzMaximized = false;
-    gw->isGridVertMaximized = false;
-    gw->resizeCount = 0;
-}
-
-void
 GridScreen::preparePaint (int msSinceLastPaint)
 {
     std::vector<Animation>::iterator iter;
@@ -1270,6 +1272,7 @@
     edge = lastEdge = lastResizeEdge = NoEdge;
     currentWorkarea = lastWorkarea = screen->getWorkareaForOutput
 				     (screen->outputDeviceForPoint (pointerX, pointerY));
+
     gridProps[GridUnknown] = GridProps (0,1, 1,1);
     gridProps[GridBottomLeft]  = GridProps (0,1, 2,2);
     gridProps[GridBottom]  = GridProps (0,1, 1,2);
@@ -1301,9 +1304,6 @@
 
 #undef GRIDSET
 
-    optionSetSnapbackWindowsNotify (boost::bind (&GridScreen::
-						 snapbackOptionChanged, this, _1, _2));
-
     optionSetPutRestoreKeyInitiate (boost::bind (&GridScreen::
 						 restoreWindow, this, _1, _2, _3));
 }
@@ -1380,7 +1380,6 @@
 	    wTransform.translate (translateX / scaleX - window->x (),
 				  translateY / scaleY - window->y (), 0.0f);
 
-
 	    gWindow->glPaint (wAttrib, wTransform, region, wMask);
 	}
     }
@@ -1394,8 +1393,15 @@
 bool
 GridPluginVTable::init ()
 {
+<<<<<<< TREE
     if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
 	return true;
+=======
+    if (CompPlugin::checkPluginABI ("composite", CORE_ABIVERSION)   &&
+	CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)	    &&
+	CompPlugin::checkPluginABI ("opengl", CORE_ABIVERSION))
+	return true;
+>>>>>>> MERGE-SOURCE
 
     return false;
 }

=== modified file 'plugins/grid/src/grid.h'
--- plugins/grid/src/grid.h	2013-04-02 18:22:48 +0000
+++ plugins/grid/src/grid.h	2013-05-13 13:29:47 +0000
@@ -30,21 +30,19 @@
 
 #include "grid_options.h"
 
-static const unsigned short SNAPOFF_THRESHOLD = 50;
-
 namespace GridWindowType
 {
-    static const unsigned int GridUnknown = (1 << 0);
+    static const unsigned int GridUnknown     = (1 << 0);
     static const unsigned int GridBottomLeft  = (1 << 1);
-    static const unsigned int GridBottom  = (1 << 2);
+    static const unsigned int GridBottom      = (1 << 2);
     static const unsigned int GridBottomRight = (1 << 3);
-    static const unsigned int GridLeft  = (1 << 4);
-    static const unsigned int GridCenter  = (1 << 5);
-    static const unsigned int GridRight  = (1 << 6);
-    static const unsigned int GridTopLeft  = (1 << 7);
-    static const unsigned int GridTop  = (1 << 8);
-    static const unsigned int GridTopRight  = (1 << 9);
-    static const unsigned int GridMaximize  = (1 << 10);
+    static const unsigned int GridLeft        = (1 << 4);
+    static const unsigned int GridCenter      = (1 << 5);
+    static const unsigned int GridRight       = (1 << 6);
+    static const unsigned int GridTopLeft     = (1 << 7);
+    static const unsigned int GridTop         = (1 << 8);
+    static const unsigned int GridTopRight    = (1 << 9);
+    static const unsigned int GridMaximize    = (1 << 10);
 };
 
 typedef unsigned int GridType;
@@ -93,16 +91,16 @@
 
 	Animation ();
 
-	GLfloat progress;
+	GLfloat  progress;
 	CompRect fromRect;
 	CompRect targetRect;
 	CompRect currentRect;
-	GLfloat opacity;
-	GLfloat timer;
-	Window window;
-	int duration;
-	bool complete;
-	bool fadingOut;
+	GLfloat  opacity;
+	GLfloat  timer;
+	Window   window;
+	int      duration;
+	bool     complete;
+	bool     fadingOut;
 };
 
 class GridScreen :
@@ -115,56 +113,80 @@
     public:
 
 	GridScreen (CompScreen *);
-	CompositeScreen *cScreen;
-	GLScreen        *glScreen;
-
-	CompRect workarea, currentRect, desiredSlot, lastSlot,
-		 desiredRect, lastWorkarea, currentWorkarea;
-	GridProps props;
-	Edges edge, lastEdge, lastResizeEdge;
+
+	CompositeScreen    *cScreen;
+	GLScreen           *glScreen;
+
+	CompRect           workarea;
+	CompRect           currentRect;
+	CompRect           desiredSlot;
+	CompRect           lastSlot;
+	CompRect           desiredRect;
+	CompRect           lastWorkarea;
+	CompRect           currentWorkarea;
+
+	GridProps          props;
+
+	Edges              edge;
+	Edges              lastEdge;
+	Edges              lastResizeEdge;
+
 	CompOption::Vector o;
-	bool centerCheck;
-	CompWindow *mGrabWindow;
-	bool animating;
-	bool mSwitchingVp;
+	bool               centerCheck;
+	CompWindow         *mGrabWindow;
+	bool               animating;
+	bool               mSwitchingVp;
 
 	void getPaintRectangle (CompRect&);
 	void setCurrentRect (Animation&);
 
-	bool initiateCommon (CompAction*, CompAction::State,
-			     CompOption::Vector&, unsigned int, bool, bool);
+	bool initiateCommon (CompAction         *,
+			     CompAction::State   ,
+			     CompOption::Vector &,
+			     unsigned int        ,
+			     bool                ,
+			     bool                 );
 
-	void glPaintRectangle (const GLScreenPaintAttrib&,
-			       const GLMatrix&, CompOutput *);
+	void glPaintRectangle (const GLScreenPaintAttrib &,
+			       const GLMatrix            &,
+			       CompOutput                *);
 
 	bool glPaintOutput (const GLScreenPaintAttrib &,
-			    const GLMatrix &, const CompRegion &,
-			    CompOutput *, unsigned int);
+			    const GLMatrix            &,
+			    const CompRegion          &,
+			    CompOutput                *,
+			    unsigned int                );
 
 	void preparePaint (int msSinceLastPaint);
+
 	void donePaint ();
 
 	std::vector <Animation> animations;
 
 	int edgeToGridType ();
+
 	unsigned int typeToMask (int);
 
 	void handleEvent (XEvent *event);
-	void handleCompizEvent (const char *plugin, const char *event, CompOption::Vector &options);
-
-	bool restoreWindow (CompAction*,
-			    CompAction::State,
-			    CompOption::Vector&);
+
+	void handleCompizEvent (const char         *plugin,
+				const char         *event,
+				CompOption::Vector &options);
+
+	bool restoreWindow (CompAction         *,
+			    CompAction::State   ,
+			    CompOption::Vector &);
 
 	void
 	snapbackOptionChanged (CompOption *option,
-				Options    num);
+			       Options    num);
 
 	CompRect
 	slotToRect (CompWindow      *w,
 		    const CompRect& slot);
+
 	CompRect
-	constrainSize (CompWindow *w,
+	constrainSize (CompWindow      *w,
 		       const CompRect& slot);
 };
 
@@ -177,24 +199,30 @@
 
 	GridWindow (CompWindow *);
 	~GridWindow ();
-	CompWindow *window;
-    	GLWindow *gWindow;
-	GridScreen *gScreen;
-
-	bool isGridResized;
-	bool isGridHorzMaximized;
-	bool isGridVertMaximized;
+
+	CompWindow   *window;
+	GLWindow     *gWindow;
+	GridScreen   *gScreen;
+
+	bool         isGridResized;
+	bool         isGridHorzMaximized;
+	bool         isGridVertMaximized;
+
 	unsigned int grabMask;
-	int pointerBufDx;
-	int pointerBufDy;
-	int resizeCount;
-	CompRect currentSize;
-	CompRect originalSize;
-	GridType lastTarget;
+
+	int          pointerBufDx;
+	int          pointerBufDy;
+
+	int          resizeCount;
+	CompRect     currentSize;
+	CompRect     originalSize;
+	GridType     lastTarget;
 	unsigned int sizeHintsFlags;
 
-	bool glPaint (const GLWindowPaintAttrib&, const GLMatrix&,
-		      const CompRegion&, unsigned int);
+	bool glPaint (const GLWindowPaintAttrib &,
+		      const GLMatrix            &,
+		      const CompRegion          &,
+		      unsigned int                );
 
 	void grabNotify (int, int, unsigned int, unsigned int);
 
@@ -203,9 +231,10 @@
 	void moveNotify (int, int, bool);
 
 	void stateChangeNotify (unsigned int);
-	void validateResizeRequest (unsigned int &valueMask,
+
+	void validateResizeRequest (unsigned int   &valueMask,
 				    XWindowChanges *xwc,
-				    unsigned int source);
+				    unsigned int   source);
 };
 
 #define GRID_WINDOW(w) \
@@ -220,4 +249,3 @@
 };
 
 COMPIZ_PLUGIN_20090315 (grid, GridPluginVTable);
-

=== modified file 'plugins/kdecompat/src/kdecompat.cpp'
--- plugins/kdecompat/src/kdecompat.cpp	2013-05-09 13:43:07 +0000
+++ plugins/kdecompat/src/kdecompat.cpp	2013-05-13 13:29:47 +0000
@@ -288,7 +288,7 @@
 	}
 	else
 	{
-	    icon = gWindow->getIcon (256, 256);
+	    icon = gWindow->getIcon (512, 512);
 	    if (!icon)
 		icon = ks->gScreen->defaultIcon ();
 

=== modified file 'plugins/put/put.xml.in'
--- plugins/put/put.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/put/put.xml.in	2013-05-13 13:29:47 +0000
@@ -283,6 +283,14 @@
 		    <_short>Put To Next Output</_short>
 		    <_long>Move window to the next output device</_long>
 		</option>
+		<option name="put_previous_output_key" type="key">
+		    <_short>Put To Previous Output</_short>
+		    <_long>Move window to the previous output device</_long>
+		</option>
+		<option name="put_previous_output_button" type="button">
+		    <_short>Put To Previous Output</_short>
+		    <_long>Move window to the previous output device</_long>
+		</option>
 		<option name="put_put" type="action">
 		    <_short>Put</_short>
 		    <_long>Move window arbitrarily by passing x, y and type.</_long>

=== modified file 'plugins/put/src/put.cpp'
--- plugins/put/src/put.cpp	2013-05-09 13:43:07 +0000
+++ plugins/put/src/put.cpp	2013-05-13 13:29:47 +0000
@@ -637,6 +637,7 @@
 	dx = 0;
 	dy = (s->vp ().y () < s->vpSize ().height ()-1) ? s->height () : 0;
 	break;
+    case PutPreviousOutput:
     case PutNextOutput:
 	{
 	    int        outputNum, currentNum;
@@ -647,7 +648,11 @@
 		return result;
 
 	    currentNum = getOutputForWindow (w);
-	    outputNum  = (currentNum + 1) % nOutputDev;
+
+            outputNum = (currentNum + (type == PutNextOutput ? 1 : -1)) % nOutputDev;
+            if (outputNum < 0) 
+                outputNum += nOutputDev;
+
 	    outputNum  = CompOption::getIntOptionNamed (option,"output",
 							outputNum);
 
@@ -1030,7 +1035,7 @@
 	    return false;
 
 	/* only allow movement of fullscreen windows to next output */
-	if (type != PutNextOutput &&
+	if ((type != PutNextOutput && type != PutPreviousOutput) &&
 	    (w->type () & CompWindowTypeFullscreenMask))
 	{
 	    return false;
@@ -1111,6 +1116,8 @@
 	return PutViewportUp;
     else if (type == "viewportdown")
 	return PutViewportDown;
+    else if (type == "previousoutput")
+	return PutPreviousOutput;
     else if (type == "nextoutput")
 	return PutNextOutput;
     else if (type == "restore")
@@ -1227,6 +1234,7 @@
     setAction (PutRestore, PutRestore);
     setAction (PutPointer, PutPointer);
     setAction (PutNextOutput, PutNextOutput);
+    setAction (PutPreviousOutput, PutPreviousOutput);
     setAction (PutCenter, PutCenter);
     setAction (PutEmptyCenter, PutEmptyCenter);
     setAction (PutLeft, PutLeft);

=== modified file 'plugins/put/src/put.h'
--- plugins/put/src/put.h	2010-06-11 00:05:35 +0000
+++ plugins/put/src/put.h	2013-05-13 13:29:47 +0000
@@ -46,14 +46,15 @@
     PutViewportDown = 17,
     PutRelative = 18,
     PutNextOutput = 19,
-    PutEmptyBottomLeft = 20,
-    PutEmptyBottom = 21,
-    PutEmptyBottomRight = 22,
-    PutEmptyLeft = 23,
-    PutEmptyCenter = 24,
-    PutEmptyRight = 25,
-    PutEmptyTopLeft = 26,
-    PutEmptyTop = 27,
+    PutPreviousOutput = 20,
+    PutEmptyBottomLeft = 21,
+    PutEmptyBottom = 22,
+    PutEmptyBottomRight = 23,
+    PutEmptyLeft = 24,
+    PutEmptyCenter = 25,
+    PutEmptyRight = 26,
+    PutEmptyTopLeft = 27,
+    PutEmptyTop = 28,
     PutEmptyTopRight,
 };
 

=== modified file 'plugins/resize/src/logic/src/resize-logic.cpp'
--- plugins/resize/src/logic/src/resize-logic.cpp	2013-02-03 18:29:25 +0000
+++ plugins/resize/src/logic/src/resize-logic.cpp	2013-05-13 13:29:47 +0000
@@ -99,11 +99,13 @@
 void
 ResizeLogic::handleEvent (XEvent *event)
 {
-    switch (event->type) {
+    switch (event->type)
+    {
 	case KeyPress:
 	    if (event->xkey.root == mScreen->root ())
 		handleKeyEvent (event->xkey.keycode);
 	    break;
+
 	case ButtonRelease:
 	    if (event->xbutton.root == mScreen->root ())
 	    {
@@ -120,15 +122,18 @@
 		}
 	    }
 	    break;
+
 	case MotionNotify:
 	    if (event->xmotion.root == mScreen->root ())
 		handleMotionEvent (pointerX, pointerY);
 	    break;
+
 	case EnterNotify:
 	case LeaveNotify:
 	    if (event->xcrossing.root == mScreen->root ())
 		handleMotionEvent (pointerX, pointerY);
 	    break;
+
 	case ClientMessage:
 	    if (event->xclient.message_type == Atoms::wmMoveResize)
 	    {
@@ -165,7 +170,8 @@
 			    /* TODO: not only button 1 */
 			    if (pointerMods & Button1Mask)
 			    {
-				static unsigned int mask[] = {
+				static unsigned int mask[] =
+				{
 				    ResizeUpMask | ResizeLeftMask,
 				    ResizeUpMask,
 				    ResizeUpMask | ResizeRightMask,
@@ -218,6 +224,7 @@
 		}
 	    }
 	    break;
+
 	case DestroyNotify:
 	    if (w && w->id () == event->xdestroywindow.window)
 	    {
@@ -225,12 +232,15 @@
 		terminateResize (&options->optionGetInitiateKey (), 0, noOptions ());
 	    }
 	    break;
+
 	case UnmapNotify:
 	    if (w && w->id () == event->xunmap.window)
 	    {
 		terminateResize (&options->optionGetInitiateButton (), 0, noOptions ());
 		terminateResize (&options->optionGetInitiateKey (), 0, noOptions ());
 	    }
+	    break;
+
 	default:
 	    break;
     }
@@ -342,9 +352,7 @@
 		    centered = true;
 	    }
 	    else
-	    {
 		centered = false;
-	    }
 	}
     }
 
@@ -369,10 +377,8 @@
 {
     if (grabIndex && w)
     {
-	int	   widthInc, heightInc;
-
-	widthInc  = w->sizeHints ().width_inc;
-	heightInc = w->sizeHints ().height_inc;
+	int widthInc  = w->sizeHints ().width_inc;
+	int heightInc = w->sizeHints ().height_inc;
 
 	if (widthInc < MIN_KEY_WIDTH_INC)
 	    widthInc = MIN_KEY_WIDTH_INC;
@@ -386,24 +392,20 @@
 		continue;
 
 	    if (mask & rKeys[i].warpMask)
-	    {
 		XWarpPointer (mScreen->dpy (), None, None, 0, 0, 0, 0,
 			      rKeys[i].dx * widthInc, rKeys[i].dy * heightInc);
-	    }
 	    else
 	    {
-		int x, y, left, top, width, height;
-
 		CompWindow::Geometry server = w->serverGeometry ();
 		const CompWindowExtents    &border  = w->border ();
 
-		left   = server.x () - border.left;
-		top    = server.y () - border.top;
-		width  = border.left + server.width () + border.right;
-		height = border.top  + server.height () + border.bottom;
+		int left   = server.x () - border.left;
+		int top    = server.y () - border.top;
+		int width  = border.left + server.width () + border.right;
+		int height = border.top  + server.height () + border.bottom;
 
-		x = left + width  * (rKeys[i].dx + 1) / 2;
-		y = top  + height * (rKeys[i].dy + 1) / 2;
+		int x = left + width  * (rKeys[i].dx + 1) / 2;
+		int y = top  + height * (rKeys[i].dy + 1) / 2;
 
 		mScreen->warpPointer (x - pointerX, y - pointerY);
 

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2013-05-09 13:43:07 +0000
+++ plugins/resize/src/resize.cpp	2013-05-13 13:29:47 +0000
@@ -209,15 +209,11 @@
 			     CompOutput                *output,
 			     unsigned int              mask)
 {
-    bool status;
-
-    if (logic.w)
-    {
-	if (logic.mode == ResizeOptions::ModeStretch)
-	    mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK;
-    }
-
-    status = gScreen->glPaintOutput (sAttrib, transform, region, output, mask);
+    if (logic.w &&
+	logic.mode == ResizeOptions::ModeStretch)
+	mask |= PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK;
+
+    bool status = gScreen->glPaintOutput (sAttrib, transform, region, output, mask);
 
     if (status && logic.w)
     {
@@ -226,12 +222,16 @@
 	border = optionGetBorderColor ();
 	fill   = optionGetFillColor ();
 
-	switch (logic.mode) {
+	switch (logic.mode)
+	{
 	    case ResizeOptions::ModeOutline:
 		glPaintRectangle (sAttrib, transform, output, border, NULL);
 		break;
+
 	    case ResizeOptions::ModeRectangle:
 		glPaintRectangle (sAttrib, transform, output, border, fill);
+		break;
+
 	    default:
 		break;
 	}
@@ -253,9 +253,7 @@
     {
 	GLMatrix       wTransform (transform);
 	BoxRec	       box;
-	float	       xOrigin, yOrigin;
 	float	       xScale, yScale;
-	int            x, y;
 
 	if (mask & PAINT_WINDOW_OCCLUSION_DETECTION_MASK)
 	    return false;
@@ -271,11 +269,11 @@
 	rScreen->logic.getPaintRectangle (&box);
 	getStretchScale (&box, &xScale, &yScale);
 
-	x = window->geometry (). x ();
-	y = window->geometry (). y ();
+	int x = window->geometry (). x ();
+	int y = window->geometry (). y ();
 
-	xOrigin = x - window->border ().left;
-	yOrigin = y - window->border ().top;
+	float xOrigin = x - window->border ().left;
+	float yOrigin = y - window->border ().top;
 
 	wTransform.translate (xOrigin, yOrigin, 0.0f);
 	wTransform.scale (xScale, yScale, 1.0f);
@@ -287,9 +285,7 @@
 			 mask | PAINT_WINDOW_TRANSFORMED_MASK);
     }
     else
-    {
 	status = gWindow->glPaint (attrib, transform, region, mask);
-    }
 
     return status;
 }
@@ -350,18 +346,22 @@
 	    mask = &logic.outlineMask;
 	    valueMask = optionGetOutlineModifierMask ();
 	    break;
+
 	case ResizeOptions::RectangleModifier:
 	    mask = &logic.rectangleMask;
 	    valueMask = optionGetRectangleModifierMask ();
 	    break;
+
 	case ResizeOptions::StretchModifier:
 	    mask = &logic.stretchMask;
 	    valueMask = optionGetStretchModifierMask ();
 	    break;
-        case ResizeOptions::CenteredModifier:
+
+	case ResizeOptions::CenteredModifier:
 	    mask = &logic.centeredMask;
 	    valueMask = optionGetCenteredModifierMask ();
 	    break;
+
 	default:
 	    break;
     }

=== modified file 'plugins/ring/src/ring.cpp'
--- plugins/ring/src/ring.cpp	2013-05-09 13:43:07 +0000
+++ plugins/ring/src/ring.cpp	2013-05-13 13:29:47 +0000
@@ -33,7 +33,7 @@
 
 const double PI = 3.14159265359f;
 
-const unsigned short ICON_SIZE = 64;
+const unsigned short ICON_SIZE = 512;
 
 bool textAvailable;
 
@@ -296,7 +296,7 @@
 	{
 	    GLTexture *icon;
 
-	    icon = gWindow->getIcon (256, 256);
+	    icon = gWindow->getIcon (512, 512);
 	    if (!icon)
 		icon = rs->gScreen->defaultIcon ();
 

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2013-05-09 13:43:07 +0000
+++ plugins/scale/src/scale.cpp	2013-05-13 13:29:47 +0000
@@ -137,7 +137,7 @@
 	GLWindowPaintAttrib sAttrib (attrib);
 	GLTexture           *icon;
 
-	icon = priv->gWindow->getIcon (96, 96);
+	icon = priv->gWindow->getIcon (512, 512);
 	if (!icon)
 	    icon = priv->spScreen->gScreen->defaultIcon ();
 

=== modified file 'plugins/shift/src/shift.cpp'
--- plugins/shift/src/shift.cpp	2013-05-09 13:43:07 +0000
+++ plugins/shift/src/shift.cpp	2013-05-13 13:29:47 +0000
@@ -322,7 +322,11 @@
 	{
 	    GLTexture *icon;
 
+<<<<<<< TREE
 	    icon = gWindow->getIcon (256, 256);
+=======
+	    icon = gWindow->getIcon (512, 512);
+>>>>>>> MERGE-SOURCE
 
 	    if (!icon)
 		icon = ss->gScreen->defaultIcon ();

=== modified file 'plugins/stackswitch/src/stackswitch.cpp'
--- plugins/stackswitch/src/stackswitch.cpp	2013-05-09 13:43:07 +0000
+++ plugins/stackswitch/src/stackswitch.cpp	2013-05-13 13:29:47 +0000
@@ -212,8 +212,13 @@
     glPushMatrix ();
     glLoadMatrixf (wTransform.getMatrix ());
 
+<<<<<<< TREE
     icon = sw->gWindow->getIcon (96, 96);
 
+=======
+    icon = sw->gWindow->getIcon (512, 512);
+
+>>>>>>> MERGE-SOURCE
     if (!icon)
 	icon = gScreen->defaultIcon ();
 
@@ -352,8 +357,13 @@
 
 	if (scaled && !gWindow->textures ().size ())
 	{
+<<<<<<< TREE
 	    GLTexture *icon = gWindow->getIcon (96, 96);
 
+=======
+	    GLTexture *icon = gWindow->getIcon (512, 512);
+
+>>>>>>> MERGE-SOURCE
 	    if (!icon)
 		icon = ss->gScreen->defaultIcon ();
 

=== modified file 'plugins/staticswitcher/src/staticswitcher.cpp'
--- plugins/staticswitcher/src/staticswitcher.cpp	2013-05-09 13:43:07 +0000
+++ plugins/staticswitcher/src/staticswitcher.cpp	2013-05-13 13:29:47 +0000
@@ -27,6 +27,8 @@
 
 COMPIZ_PLUGIN_20090315 (staticswitcher, StaticSwitchPluginVTable)
 
+const unsigned short MAX_ICON_SIZE = 512;
+
 const unsigned short PREVIEWSIZE = 150;
 const unsigned short BORDER = 10;
 

=== modified file 'plugins/staticswitcher/src/staticswitcher.h'
--- plugins/staticswitcher/src/staticswitcher.h	2012-09-07 23:56:21 +0000
+++ plugins/staticswitcher/src/staticswitcher.h	2013-05-13 13:29:47 +0000
@@ -157,7 +157,7 @@
 	StaticSwitchScreen    *sScreen;
 };
 
-#define MAX_ICON_SIZE 256
+extern const unsigned short MAX_ICON_SIZE;
 
 extern const unsigned short PREVIEWSIZE;
 extern const unsigned short BORDER;

=== modified file 'plugins/wall/src/wall.cpp'
--- plugins/wall/src/wall.cpp	2013-05-11 09:13:17 +0000
+++ plugins/wall/src/wall.cpp	2013-05-13 13:29:47 +0000
@@ -495,23 +495,19 @@
 
 	    moveViewport (-dx, -dy, None);
 	}
-	if (event->xclient.message_type == Atoms::xdndEnter)
-	{
-	    toggleEdges (true);
-	    edgeDrag = true;
-	}
-	else if (event->xclient.message_type == Atoms::xdndLeave)
-	    edgeDrag = false;
 
 	break;
 
 	case FocusIn:
 	case FocusOut:
-	    if (event->xfocus.mode == NotifyGrab)
-		poller.start ();
-	    else if (event->xfocus.mode == NotifyUngrab)
-		poller.stop ();
-	break;
+	    /* Edges on when grabbed */
+	    if (!optionGetEdgeflipPointer ())
+	    {
+		if (event->xfocus.mode == NotifyGrab)
+		    toggleEdges (true);
+		else if (event->xfocus.mode == NotifyUngrab)
+		    toggleEdges (false);
+	    }
 
 	case ConfigureNotify:
 	break;
@@ -523,6 +519,7 @@
     screen->handleEvent (event);
 }
 
+<<<<<<< TREE
 void
 WallScreen::positionUpdate (const CompPoint &pos)
 {
@@ -538,6 +535,36 @@
 	toggleEdges (true);
     }
 }
+=======
+/*
+ * When a dnd type window is mapped toggle edge flip dnd windows back on
+ * _NET_WM_WINDOW_TYPE_DND windows. This will not detect all dnd windows
+ * but it will detect the EWMH-compliant ones without resorting to
+ * hacks involving selection stealing.
+ */
+void
+WallWindow::windowNotify (CompWindowNotify n)
+{
+    WallScreen *ws = WallScreen::get (screen);
+    bool toggleOnDnd = ws->optionGetEdgeflipDnd ();
+
+    switch (n)
+    {
+	case CompWindowNotifyMap:
+	    if (window->type () & CompWindowTypeDndMask && toggleOnDnd)
+		ws->toggleEdges (true);
+	    break;
+	case CompWindowNotifyUnmap:
+	    if (window->type () & CompWindowTypeDndMask && toggleOnDnd)
+		ws->toggleEdges (false);
+	    break;
+	default:
+	    break;
+    }
+
+    window->windowNotify (n);
+ }
+>>>>>>> MERGE-SOURCE
 
 void
 WallWindow::activate ()
@@ -599,19 +626,19 @@
 void
 WallWindow::grabNotify (int          x,
 			int          y,
-			unsigned int width,
-			unsigned int height)
+			unsigned int state,
+			unsigned int mask)
 {
-    WallScreen::get (screen)->toggleEdges (true);
-    WallScreen::get (screen)->edgeDrag = true;
+    if (mask & (CompWindowGrabMoveMask | CompWindowGrabButtonMask))
+	WallScreen::get (screen)->windowIsDragMoved = true;
 
-    window->grabNotify (x, y, width, height);
+    window->grabNotify (x, y, state, mask);
 }
 
 void
 WallWindow::ungrabNotify ()
 {
-    WallScreen::get (screen)->edgeDrag = false;
+    WallScreen::get (screen)->windowIsDragMoved = false;
 
     window->ungrabNotify ();
 }
@@ -760,6 +787,7 @@
     int dx, dy;
     int amountX, amountY;
 
+<<<<<<< TREE
     if (screen->otherGrabExist ("wall", "move", "group-drag", NULL))
 	return false;
 
@@ -787,6 +815,21 @@
 
     switch (direction)
     {
+=======
+    const bool allowFlipDnd = (state & CompAction::StateInitEdgeDnd) &&
+			      optionGetEdgeflipDnd ();
+    const bool allowFlipMove = (windowIsDragMoved &&
+				optionGetEdgeflipMove ());
+    const bool allowFlipPointer = optionGetEdgeflipPointer ();
+
+    if (!allowFlipDnd &&
+	!allowFlipMove &&
+	!allowFlipPointer)
+	return false;
+
+    switch (direction)
+    {
+>>>>>>> MERGE-SOURCE
     case Left:
 	dx = -1;
 	dy = 0;
@@ -1573,6 +1616,9 @@
 	    ww->isSliding = !optionGetNoSlideMatch ().evaluate (w);
 	}
 	break;
+    case WallOptions::EdgeflipPointer:
+	toggleEdges (optionGetEdgeflipPointer ());
+	break;
 
     default:
 	break;
@@ -1633,7 +1679,7 @@
     moveWindow (None),
     focusDefault (true),
     transform (NoTransformation),
-    edgeDrag (false)
+    windowIsDragMoved (false)
 {
     ScreenInterface::setHandler (screen);
     CompositeScreenInterface::setHandler (cScreen);
@@ -1700,9 +1746,12 @@
     setNotify (ArrowShadowColor);
     setNotify (NoSlideMatch);
     setNotify (EdgeflipPointer);
+<<<<<<< TREE
 
     poller.setCallback (boost::bind (&WallScreen::positionUpdate, this,
 				     _1));
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 WallScreen::~WallScreen ()
@@ -1729,11 +1778,18 @@
 bool
 WallPluginVTable::init ()
 {
+<<<<<<< TREE
     if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)		&&
 	CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)	&&
 	CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI)	&&
 	CompPlugin::checkPluginABI ("mousepoll", COMPIZ_MOUSEPOLL_ABI))
 	return true;
+=======
+    if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)		&&
+	CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI)	&&
+	CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
+	return true;
+>>>>>>> MERGE-SOURCE
 
     return false;
 }

=== modified file 'plugins/wall/src/wall.h'
--- plugins/wall/src/wall.h	2013-04-26 13:15:57 +0000
+++ plugins/wall/src/wall.h	2013-05-13 13:29:47 +0000
@@ -167,10 +167,7 @@
 	WallCairoContext highlightContext;
 	WallCairoContext arrowContext;
 
-	MousePoller	 poller;
-	bool		 edgeDrag;
-	CompRegion	 edgeRegion;
-	CompRegion	 noEdgeRegion;
+	bool             windowIsDragMoved;
 };
 
 class WallWindow :
@@ -184,6 +181,7 @@
 	virtual void activate ();
 	void grabNotify (int, int, unsigned int, unsigned int);
 	void ungrabNotify ();
+	void windowNotify (CompWindowNotify);
 	bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, unsigned int);
 

=== modified file 'plugins/wall/wall.xml.in'
--- plugins/wall/wall.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/wall/wall.xml.in	2013-05-13 13:29:47 +0000
@@ -17,7 +17,6 @@
 			</relation>
 			<requirement>
 				<plugin>opengl</plugin>
-				<plugin>mousepoll</plugin>
 			</requirement>
 		</deps>
 		<options>
@@ -290,6 +289,7 @@
 							<edge name="Left"/>
 						</default>
 						<allowed edgednd="true"/>
+                                                <passive_grab>false</passive_grab>
 					</option>
 					<option name="flip_right_edge" type="edge">
 						<_short>Flip Right</_short>
@@ -299,6 +299,7 @@
 							<edge name="Right"/>
 						</default>
 						<allowed edgednd="true"/>
+                                                <passive_grab>false</passive_grab>
 					</option>
 					<option name="flip_up_edge" type="edge">
 						<_short>Flip Up</_short>
@@ -308,6 +309,7 @@
 							<edge name="Top"/>
 						</default>
 						<allowed edgednd="true"/>
+                                                <passive_grab>false</passive_grab>
 					</option>
 					<option name="flip_down_edge" type="edge">
 						<_short>Flip Down</_short>
@@ -317,6 +319,7 @@
 							<edge name="Bottom"/>
 						</default>
 						<allowed edgednd="true"/>
+                                                <passive_grab>false</passive_grab>
 					</option>
 				</subgroup>
 			</group>

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2013-05-09 13:43:07 +0000
+++ plugins/wobbly/src/wobbly.cpp	2013-05-13 13:29:47 +0000
@@ -49,6 +49,7 @@
     int output = ::screen->outputDeviceForPoint (x, object->position.y);
     const CompRect &workArea =
 	::screen->outputDevs ()[(unsigned) output].workArea ();
+
     int workAreaEdge = workArea.x1 ();
 
     if (x >= workAreaEdge)
@@ -75,9 +76,7 @@
 		    window->output ().bottom;
 	    }
 	    else
-	    {
 		continue;
-	    }
 
 	    if (s > object->position.y)
 	    {
@@ -108,18 +107,13 @@
 		    if (v > v1)
 			v1 = v;
 		}
-		else
-		{
-		    if (v < v2)
-			v2 = v;
-		}
+		else if (v < v2)
+		    v2 = v;
 	    }
 	}
     }
     else
-    {
 	v2 = workAreaEdge;
-    }
 
     v1 = v1 - window->output ().left + window->border ().left;
     v2 = v2 - window->output ().left + window->border ().left;
@@ -150,7 +144,7 @@
 
     int output = ::screen->outputDeviceForPoint (x, object->position.y);
     const CompRect &workArea =
-	::screen->outputDevs ()[(unsigned) output].workArea ();
+	    ::screen->outputDevs ()[(unsigned) output].workArea ();
     int workAreaEdge = workArea.x2 ();
 
     if (x <= workAreaEdge)
@@ -177,9 +171,7 @@
 		    window->output ().bottom;
 	    }
 	    else
-	    {
 		continue;
-	    }
 
 	    if (s > object->position.y)
 	    {
@@ -209,18 +201,13 @@
 		    if (v < v1)
 			v1 = v;
 		}
-		else
-		{
-		    if (v > v2)
-			v2 = v;
-		}
+		else if (v > v2)
+		    v2 = v;
 	    }
 	}
     }
     else
-    {
 	v2 = workAreaEdge;
-    }
 
     v1 = v1 + window->output ().right - window->border ().right;
     v2 = v2 + window->output ().right - window->border ().right;
@@ -278,9 +265,7 @@
 		    window->output ().right;
 	    }
 	    else
-	    {
 		continue;
-	    }
 
 	    if (s > object->position.x)
 	    {
@@ -310,18 +295,13 @@
 		    if (v > v1)
 			v1 = v;
 		}
-		else
-		{
-		    if (v < v2)
-			v2 = v;
-		}
+		else if (v < v2)
+		    v2 = v;
 	    }
 	}
     }
     else
-    {
 	v2 = workAreaEdge;
-    }
 
     v1 = v1 - window->output ().top + window->border ().top;
     v2 = v2 - window->output ().top + window->border ().top;
@@ -379,9 +359,7 @@
 		    window->output ().right;
 	    }
 	    else
-	    {
 		continue;
-	    }
 
 	    if (s > object->position.x)
 	    {
@@ -411,18 +389,13 @@
 		    if (v < v1)
 			v1 = v;
 		}
-		else
-		{
-		    if (v > v2)
-			v2 = v;
-		}
+		else if (v > v2)
+		    v2 = v;
 	    }
 	}
     }
     else
-    {
 	v2 = workAreaEdge;
-    }
 
     v1 = v1 + window->output ().bottom - window->border ().bottom;
     v2 = v2 + window->output ().bottom - window->border ().bottom;
@@ -488,7 +461,8 @@
     bottomRight.y = MINSHORT;
 
     Object *object = objects;
-    for (int i = 0; i < numObjects; i++, object++)
+
+    for (int i = 0; i < numObjects; ++i, ++object)
     {
 	if (topLeft.x > object->position.x)
 	    topLeft.x = object->position.x;
@@ -511,7 +485,7 @@
     Spring *spring;
 
     spring = &springs[numSprings];
-    numSprings++;
+    ++numSprings;
 
     spring->init (a, b, offsetX, offsetY);
 }
@@ -522,10 +496,8 @@
 			int   width,
 			int   height)
 {
-    float gx, gy;
-
-    gx = ((GRID_WIDTH  - 1) / 2 * width)  / (float) (GRID_WIDTH  - 1);
-    gy = ((GRID_HEIGHT - 1) / 2 * height) / (float) (GRID_HEIGHT - 1);
+    float gx = ((GRID_WIDTH  - 1) / 2 * width)  / (float) (GRID_WIDTH  - 1);
+    float gy = ((GRID_HEIGHT - 1) / 2 * height) / (float) (GRID_HEIGHT - 1);
 
     if (anchorObject)
 	anchorObject->immobile = false;
@@ -543,9 +515,7 @@
 		     int y,
 		     int width)
 {
-    float gx;
-
-    gx = ((GRID_WIDTH - 1) / 2 * width)  / (float) (GRID_WIDTH - 1);
+    float gx = ((GRID_WIDTH - 1) / 2 * width)  / (float) (GRID_WIDTH - 1);
 
     if (anchorObject)
 	anchorObject->immobile = false;
@@ -600,24 +570,28 @@
     o = &objects[0];
     o->position.x = x;
     o->position.y = y;
+
     if (o != anchorObject)
 	o->immobile = false;
 
     o = &objects[GRID_WIDTH - 1];
     o->position.x = x + width;
     o->position.y = y;
+
     if (o != anchorObject)
 	o->immobile = false;
 
     o = &objects[GRID_WIDTH * (GRID_HEIGHT - 1)];
     o->position.x = x;
     o->position.y = y + height;
+
     if (o != anchorObject)
 	o->immobile = false;
 
     o = &objects[numObjects - 1];
     o->position.x = x + width;
     o->position.y = y + height;
+
     if (o != anchorObject)
 	o->immobile = false;
 }
@@ -630,13 +604,14 @@
 			     int    height)
 {
     Object *o;
-    int	   gridX, gridY, i = 0;
+    int	   i = 0;
 
-    for (gridY = 0; gridY < GRID_HEIGHT; gridY++)
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (gridX = 0; gridX < GRID_WIDTH; gridX++, i++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++i)
 	{
 	    o = &objects[i];
+
 	    if (o == object)
 	    {
 		o->position.x = x + (gridX * width) / (GRID_WIDTH - 1);
@@ -654,15 +629,14 @@
 		    int	width,
 		    int	height)
 {
-    float gw, gh;
-
-    gw = GRID_WIDTH  - 1;
-    gh = GRID_HEIGHT - 1;
+    float gw = GRID_WIDTH  - 1;
+    float gh = GRID_HEIGHT - 1;
 
     Object *object = objects;
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, object++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++object)
 	{
 	    object->init (x + (gridX * width) / gw,
 			  y + (gridY * height) / gh,
@@ -676,9 +650,9 @@
 void
 WobblyWindow::updateModelSnapping ()
 {
-    unsigned int edgeMask, gridMask, mask;
+    unsigned int gridMask, mask;
 
-    edgeMask = model->edgeMask;
+    unsigned int edgeMask = model->edgeMask;
 
     if (model->snapCnt[North])
 	edgeMask &= ~SouthEdgeMask;
@@ -691,7 +665,8 @@
 	edgeMask &= ~WestEdgeMask;
 
     Object *object = model->objects;
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
 	if (gridY == 0)
 	    gridMask = edgeMask & NorthEdgeMask;
@@ -700,7 +675,7 @@
 	else
 	    gridMask = 0;
 
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, object++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++object)
 	{
 	    mask = gridMask;
 
@@ -747,9 +722,10 @@
 Model::reduceEdgeEscapeVelocity ()
 {
     Object *object = objects;
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, object++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++object)
 	{
 	    if (object->vertEdge.snapped)
 		object->vertEdge.velocity *= drand48 () * 0.25f;
@@ -766,9 +742,10 @@
     bool snapped = false;
 
     Object *object = objects;
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, object++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++object)
 	{
 	    if (object->vertEdge.snapped ||
 		object->horzEdge.snapped)
@@ -793,16 +770,16 @@
 			       int   height)
 {
     float vX, vY;
-    float w, h;
     float scale;
 
-    w = width;
-    h = height;
+    float w = width;
+    float h = height;
 
     Object *object = objects;
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, object++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++object)
 	{
 	    if (!object->immobile)
 	    {
@@ -828,16 +805,15 @@
 		    int   height)
 {
     int   i = 0;
-    float hpad, vpad;
 
     numSprings = 0;
 
-    hpad = ((float) width) / (GRID_WIDTH  - 1);
-    vpad = ((float) height) / (GRID_HEIGHT - 1);
+    float hpad = ((float) width) / (GRID_WIDTH  - 1);
+    float vpad = ((float) height) / (GRID_HEIGHT - 1);
 
-    for (int gridY = 0; gridY < GRID_HEIGHT; gridY++)
+    for (int gridY = 0; gridY < GRID_HEIGHT; ++gridY)
     {
-	for (int gridX = 0; gridX < GRID_WIDTH; gridX++, i++)
+	for (int gridX = 0; gridX < GRID_WIDTH; ++gridX, ++i)
 	{
 	    if (gridX > 0)
 		addSpring (&objects[i - 1],
@@ -857,7 +833,7 @@
 	     float ty)
 {
     Object *object = objects;
-    for (int i = 0; i < numObjects; i++, object++)
+    for (int i = 0; i < numObjects; ++i, ++object)
     {
 	object->position.x += tx;
 	object->position.y += ty;
@@ -918,7 +894,7 @@
     {
 	object->position.x += object->velocity.x * 2.0f;
 
-	model->snapCnt[dir]--;
+	--model->snapCnt[dir];
 
 	object->vertEdge.snapped = false;
 	object->edgeMask = 0;
@@ -941,7 +917,7 @@
     {
 	object->position.y += object->velocity.y * 2.0f;
 
-	model->snapCnt[dir]--;
+	--model->snapCnt[dir];
 
 	object->horzEdge.snapped = false;
 	object->edgeMask = 0;
@@ -1005,7 +981,7 @@
 			    object->position.x = object->vertEdge.next;
 			    object->velocity.x = 0.0f;
 
-			    model->snapCnt[West]++;
+			    ++model->snapCnt[West];
 
 			    updateModelSnapping ();
 			}
@@ -1040,7 +1016,7 @@
 			    object->position.x = object->vertEdge.next;
 			    object->velocity.x = 0.0f;
 
-			    model->snapCnt[East]++;
+			    ++model->snapCnt[East];
 
 			    updateModelSnapping ();
 			}
@@ -1078,7 +1054,7 @@
 			    object->position.y = object->horzEdge.next;
 			    object->velocity.y = 0.0f;
 
-			    model->snapCnt[North]++;
+			    ++model->snapCnt[North];
 
 			    updateModelSnapping ();
 			}
@@ -1113,7 +1089,7 @@
 			    object->position.y = object->horzEdge.next;
 			    object->velocity.y = 0.0f;
 
-			    model->snapCnt[South]++;
+			    ++model->snapCnt[South];
 
 			    updateModelSnapping ();
 			}
@@ -1152,23 +1128,22 @@
 			 float time)
 {
     unsigned int wobbly = 0;
-    int          steps;
     float        velocitySum = 0.0f;
     float        force, forceSum = 0.0f;
 
     model->steps += time / 15.0f;
-    steps = floor (model->steps);
+    int steps = floor (model->steps);
     model->steps -= steps;
 
     if (!steps)
 	return WobblyInitialMask;
 
-    for (int j = 0; j < steps; j++)
+    for (int j = 0; j < steps; ++j)
     {
-	for (int i = 0; i < model->numSprings; i++)
+	for (int i = 0; i < model->numSprings; ++i)
 	    model->springs[i].exertForces (k);
 
-	for (int i = 0; i < model->numObjects; i++)
+	for (int i = 0; i < model->numObjects; ++i)
 	{
 	    velocitySum += modelStepObject (&model->objects[i],
 					    friction,
@@ -1195,7 +1170,6 @@
 			    float *patchY)
 {
     float coeffsU[4], coeffsV[4];
-    float x, y;
 
     coeffsU[0] = (1 - u) * (1 - u) * (1 - u);
     coeffsU[1] = 3 * u * (1 - u) * (1 - u);
@@ -1207,11 +1181,12 @@
     coeffsV[2] = 3 * v * v * (1 - v);
     coeffsV[3] = v * v * v;
 
-    x = y = 0.0f;
+    float x = 0.0f;
+    float y = 0.0f;
 
-    for (int i = 0; i < 4; i++)
+    for (int i = 0; i < 4; ++i)
     {
-	for (int j = 0; j < 4; j++)
+	for (int j = 0; j < 4; ++j)
 	{
 	    x += coeffsU[i] * coeffsV[j] *
 		objects[j * GRID_WIDTH + i].position.x;
@@ -1266,7 +1241,7 @@
     Object *object = &objects[0];
     float  distance, minDistance = 0.0;
 
-    for (int i = 0; i < numObjects; i++)
+    for (int i = 0; i < numObjects; ++i)
     {
 	distance = objects[i].distanceToPoint (x, y);
 	if (i == 0 || distance < minDistance)
@@ -1351,10 +1326,8 @@
 			{
 			    float topmostYPos    = MAXSHORT;
 			    float bottommostYPos = MINSHORT;
-			    int   decorTop;
-			    int   decorTitleBottom;
 
-			    for (int i = 0; i < GRID_WIDTH; i++)
+			    for (int i = 0; i < GRID_WIDTH; ++i)
 			    {
 				int modelY = model->objects[i].position.y;
 
@@ -1365,9 +1338,9 @@
 				topmostYPos = MIN (modelY, topmostYPos);
 			    }
 
-			    decorTop = bottommostYPos +
-				       w->output ().top - w->border ().top;
-			    decorTitleBottom = topmostYPos + w->output ().top;
+			    int decorTop = bottommostYPos +
+					   w->output ().top - w->border ().top;
+			    int decorTitleBottom = topmostYPos + w->output ().top;
 
 			    if (constraintBox->y () > decorTop)
 			    {
@@ -1448,10 +1421,8 @@
 		    }
 		}
 		if (!ww->wobblingMask)
-		{
 		    // Wobbling just finished for this window
 		    ww->enableWobbling (false);
-		}
 
 		wobblingWindowsMask |= ww->wobblingMask;
 	    }
@@ -1487,19 +1458,20 @@
 			     unsigned int                maxGridWidth,
 			     unsigned int                maxGridHeight)
 {
-    int wx, wy, width, height, gridW, gridH;
-
     CompRect outRect (window->outputRect ());
-    wx     = outRect.x ();
-    wy     = outRect.y ();
-    width  = outRect.width ();
-    height = outRect.height ();
-
-    gridW = width / wScreen->optionGetGridResolution ();
+
+    int wx     = outRect.x ();
+    int wy     = outRect.y ();
+    int width  = outRect.width ();
+    int height = outRect.height ();
+
+    int gridW = width / wScreen->optionGetGridResolution ();
+
     if (gridW < wScreen->optionGetMinGridSize ())
 	gridW = wScreen->optionGetMinGridSize ();
 
-    gridH = height / wScreen->optionGetGridResolution ();
+    int gridH = height / wScreen->optionGetGridResolution ();
+
     if (gridH < wScreen->optionGetMinGridSize ())
 	gridH = wScreen->optionGetMinGridSize ();
 
@@ -1525,7 +1497,7 @@
 	GLfloat normalizedX = (v[0] - wx) / width;
 	GLfloat normalizedY = (v[1] - wy) / height;
 	model->bezierPatchEvaluate (normalizedX, normalizedY,
-	                            &deformedX, &deformedY);
+				    &deformedX, &deformedY);
 	v[0] = deformedX;
 	v[1] = deformedY;
     }
@@ -1569,13 +1541,9 @@
     {
 	WobblyWindow *ww = WobblyWindow::get (w);
 
-	if (ww->grabbed && ww->model)
-	{
-	    if (ww->model->disableSnapping ())
-	    {
-		startWobbling (ww);
-	    }
-	}
+	if (ww->grabbed && ww->model &&
+	    ww->model->disableSnapping ())
+	    startWobbling (ww);
     }
 
     snapping = false;
@@ -1618,6 +1586,7 @@
 	    if (model && isWobblyWin ())
 		initiateMapEffect ();
 	    break;
+
 	default:
 	    break;
     }
@@ -1639,11 +1608,10 @@
 	{
 	    XkbStateNotifyEvent *stateEvent = (XkbStateNotifyEvent *) event;
 	    CompAction	        *action;
-	    bool		inverted;
 	    unsigned int	mods = 0xffffffff;
 
-	    action   = &optionGetSnapKey ();
-	    inverted = optionGetSnapInverted ();
+	    action	  = &optionGetSnapKey ();
+	    bool inverted = optionGetSnapInverted ();
 
 	    if (action->type () & CompAction::BindingTypeKey)
 		mods = action->key ().modifiers ();
@@ -1700,6 +1668,8 @@
 		}
 	    }
 	}
+	break;
+
     default:
 	break;
     }
@@ -1714,16 +1684,15 @@
 
 	if (ww->isWobblyWin ())
 	{
-	    int focusEffect;
-
-	    focusEffect = optionGetFocusEffect ();
+	    int focusEffect = optionGetFocusEffect ();
 
 	    if ((focusEffect != WobblyOptions::FocusEffectNone) &&
 		optionGetFocusWindowMatch ().evaluate (w) &&
 		ww->ensureModel ())
 	    {
-		switch (focusEffect) {
-		case WobblyOptions::FocusEffectShiver:
+		switch (focusEffect)
+		{
+		    case WobblyOptions::FocusEffectShiver:
 		    {
 			CompRect outRect (w->serverOutputRect ());
 
@@ -1732,8 +1701,10 @@
 							   outRect.width (),
 							   outRect.height ());
 		    }
-		default:
-		    break;
+			break;
+
+		    default:
+			break;
 		}
 
 		startWobbling (ww);
@@ -1762,6 +1733,7 @@
 	cScreen->donePaintSetEnabled (this, true);
 	gScreen->glPaintOutputSetEnabled (this, true);
     }
+
     ww->wobblingMask |= WobblyInitialMask;
     wobblingWindowsMask |= ww->wobblingMask;
 
@@ -1773,7 +1745,6 @@
 			  const CompRect &rect)
 {
     if (!initial)
-    {
 	if (wobblingMask == WobblyForceMask)
 	{
 	    int x1 = model->topLeft.x;
@@ -1786,7 +1757,6 @@
 
 	    return true;
 	}
-    }
 
     return cWindow->damageRect (initial, rect);
 }
@@ -1815,6 +1785,7 @@
 					   outRect.width (),
 					   outRect.height ());
 	    break;
+
 	default:
 	    break;
 	}
@@ -1871,17 +1842,13 @@
     }
     else if (model)
     {
-	if (wobblingMask)
-	{
-	    if (!(state & MAXIMIZE_STATE))
-		model->setTopAnchor (outRect.x (), outRect.y (),
-				     outRect.width ());
-	}
+	if (wobblingMask &&
+	    !(state & MAXIMIZE_STATE))
+	    model->setTopAnchor (outRect.x (), outRect.y (),
+				 outRect.width ());
 	else
-	{
 	    model->initObjects (outRect.x (), outRect.y (),
 				outRect.width (), outRect.height ());
-	}
 
 	model->initSprings (outRect.x (), outRect.y (),
 			    outRect.width (), outRect.height ());
@@ -1917,7 +1884,8 @@
 	    if (state & MAXIMIZE_STATE)
 	    {
 		Object *object = model->objects;
-		for (int i = 0; i < model->numObjects; i++, object++)
+
+		for (int i = 0; i < model->numObjects; ++i, ++object)
 		{
 		    if (object->immobile)
 		    {
@@ -1952,11 +1920,12 @@
 	wScreen->grabMask   = mask;
 	wScreen->grabWindow = window;
     }
+
     wScreen->moveWindow = false;
 
-    if (mask & (CompWindowGrabButtonMask) &&
-	mask & (CompWindowGrabMoveMask) &&
-	wScreen->optionGetMoveWindowMatch ().evaluate (window) &&
+    if (mask & (CompWindowGrabButtonMask)			&&
+	mask & (CompWindowGrabMoveMask)				&&
+	wScreen->optionGetMoveWindowMatch ().evaluate (window)	&&
 	isWobblyWin ())
     {
 	wScreen->moveWindow = true;
@@ -1970,10 +1939,8 @@
 		CompRect outRect (window->outputRect ());
 
 		if (window->state () & MAXIMIZE_STATE)
-		{
 		    model->addEdgeAnchors (outRect.x (), outRect.y (),
 					   outRect.width (), outRect.height ());
-		}
 		else
 		{
 		    model->removeEdgeAnchors (outRect.x (), outRect.y (),
@@ -1983,11 +1950,8 @@
 			model->anchorObject->immobile = false;
 		}
 	    }
-	    else
-	    {
-		if (model->anchorObject)
-		    model->anchorObject->immobile = false;
-	    }
+	    else if (model->anchorObject)
+		model->anchorObject->immobile = false;
 
 	    model->anchorObject = model->findNearestObject (x, y);
 	    model->anchorObject->immobile = true;
@@ -2029,7 +1993,7 @@
 
 	    if (wScreen->optionGetGrabWindowMatch ().evaluate (window))
 	    {
-		for (int i = 0; i < model->numSprings; i++)
+		for (int i = 0; i < model->numSprings; ++i)
 		{
 		    s = &model->springs[i];
 
@@ -2161,12 +2125,10 @@
     grabbed (false),
     state (w->state ())
 {
-    if ((w->mapNum () && wScreen->optionGetMaximizeEffect ()) ||
-	wScreen->optionGetMapEffect () != WobblyOptions::MapEffectNone)
-    {
-	if (isWobblyWin ())
-	    ensureModel ();
-    }
+    if (((w->mapNum () && wScreen->optionGetMaximizeEffect ()) ||
+	wScreen->optionGetMapEffect () != WobblyOptions::MapEffectNone) &&
+	isWobblyWin ())
+	ensureModel ();
 
     WindowInterface::setHandler (window);
     CompositeWindowInterface::setHandler (cWindow, false);

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2013-02-27 03:24:45 +0000
+++ src/privatescreen.h	2013-05-13 13:29:47 +0000
@@ -744,6 +744,7 @@
 
     Window wmSnSelectionWindow;
 
+    int    clientPointerDeviceId;
     Cursor normalCursor;
     Cursor busyCursor;
     Cursor invisibleCursor;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2013-02-03 17:58:29 +0000
+++ src/screen.cpp	2013-05-13 13:29:47 +0000
@@ -52,6 +52,7 @@
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
+#include <X11/extensions/XInput2.h>
 
 #include <core/global.h>
 #include <core/screen.h>
@@ -2082,9 +2083,9 @@
     if (priv->initialized)
     {
 	if (!emptySequence())
-	    XDefineCursor (priv->dpy, priv->rootWindow(), priv->busyCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->busyCursor);
 	else
-	    XDefineCursor (priv->dpy, priv->rootWindow(), priv->normalCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->normalCursor);
     }
 }
 
@@ -3486,7 +3487,8 @@
 void
 CompScreenImpl::removeAction (CompAction *action)
 {
-    if (!(privateScreen.initialized || action->active ()))
+    if (!privateScreen.initialized ||
+        !action->active ())
 	return;
 
     grabManager.setCurrentState(action->state());
@@ -3902,6 +3904,11 @@
 		SubstructureRedirectMask | SubstructureNotifyMask, &xev);
 }
 
+/* These functions do not guard against negative decrements
+ * as they are unable to determine the source of the reference
+ * and as such they should only be called by functions that
+ * actually determine the source of what was referencing the
+ * edge and can guard against multiple-references-per-owner */
 void
 PrivateScreen::enableEdge (int edge)
 {
@@ -5002,10 +5009,12 @@
     eventManager.setSupportingWmCheck (dpy, rootWindow());
     screen->updateSupportedWmHints ();
 
+    XIGetClientPointer (dpy, None, &clientPointerDeviceId);
+
     normalCursor = XCreateFontCursor (dpy, XC_left_ptr);
     busyCursor   = XCreateFontCursor (dpy, XC_watch);
 
-    XDefineCursor (dpy, rootWindow(), normalCursor);
+    XIDefineCursor (dpy, clientPointerDeviceId, rootWindow(), normalCursor);
 
     /* Attempt to gain SubstructureRedirectMask */
     CompScreenImpl::checkForError (dpy);
@@ -5180,6 +5189,7 @@
     nDesktop (1),
     currentDesktop (0),
     wmSnSelectionWindow (None),
+    clientPointerDeviceId (None),
     normalCursor (None),
     busyCursor (None),
     invisibleCursor (None),

=== modified file 'tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt'
--- tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt	2013-05-13 13:29:47 +0000
@@ -7,7 +7,7 @@
 set (COMPIZ_XORG_ACCEPTANCE_TEST_LIBRARIES
      compiz_xorg_gtest_system_test
      xorg_gtest_all
-     xorg_gtest_main
+     compiz_xorg_gtest_main
      ${GTEST_BOTH_LIBRARIES}
      ${XORG_SERVER_LIBRARIES}
      ${X11_XI_LIBRARIES})

=== added directory 'tests/manual/plugins'
=== added file 'tests/manual/plugins/wall.txt'
--- tests/manual/plugins/wall.txt	1970-01-01 00:00:00 +0000
+++ tests/manual/plugins/wall.txt	2013-05-13 13:29:47 +0000
@@ -0,0 +1,49 @@
+COMPIZ WALL PLUGIN MANUAL TESTS
+===============================
+Sam Spilsbury <[e-mail]>
+
+Edge Flip Pointer
+-----------------
+Setup:
+#. Enable "Edge Flip Pointer" in the wall plugin
+   and set up screen edges as appropriate
+
+Actions:
+#. Move cursor to relevant screen edge
+#. Viewport will change to the next one
+   over
+#. Viewport will not change if that
+   viewport is the last one in the row
+   or column
+
+Edge Flip Move
+--------------
+Setup:
+#. Disable "Edge Flip Pointer" in the wall plugin,
+   enable "Edge Flip Move" in the wall plugin,
+   and set up screen edges as appropriate
+
+Actions:
+#. Grab window by titlebar
+#. Move cursor to relevant screen edge
+#. Viewport will change to the next one
+   over while window is grabbed
+#. Viewport will not change if that
+   viewport is the last one in the row
+   or colum
+
+Edge Flip Dnd
+-------------
+Setup:
+#. Disable "Edge Flip Pointer" in the wall plugin,
+   enable "Edge Flip Dnd" in the wall plugin,
+   and set up screen edges as appropriate
+
+Actions:
+#. Grab a desktop icon
+#. Move cursor to relevant screen edge
+#. Viewport will change to the next one
+   over while icon is grabbed
+#. Viewport will not change if that
+   viewport is the last one in the row
+   or colum

=== modified file 'tests/system/xorg-gtest/tests/CMakeLists.txt'
--- tests/system/xorg-gtest/tests/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ tests/system/xorg-gtest/tests/CMakeLists.txt	2013-05-13 13:29:47 +0000
@@ -31,7 +31,7 @@
     set (COMPIZ_XORG_GTEST_LIBRARIES
 	 compiz_xorg_gtest_system_test
 	 xorg_gtest_all
-	 xorg_gtest_main
+	 compiz_xorg_gtest_main
          ${GTEST_BOTH_LIBRARIES}
 	 ${XORG_SERVER_LIBRARIES}
 	 ${X11_XI_LIBRARIES})

=== modified file 'tests/xorg-gtest/CMakeLists.txt'
--- tests/xorg-gtest/CMakeLists.txt	2013-04-22 14:30:55 +0000
+++ tests/xorg-gtest/CMakeLists.txt	2013-05-13 13:29:47 +0000
@@ -24,14 +24,11 @@
 set (_xorg_gtest_all_srcs
      ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest-all.cpp)
 
-set (_xorg_gtest_main_srcs
-     ${XORG_SERVER_GTEST_SRC}/src/xorg-gtest_main.cpp)
-
 add_library (xorg_gtest_all STATIC
 	     ${_xorg_gtest_all_srcs})
 
-add_library (xorg_gtest_main STATIC
-	     ${_xorg_gtest_main_srcs})
+add_library (compiz_xorg_gtest_main STATIC
+             ${CMAKE_CURRENT_SOURCE_DIR}/src/compiz_xorg_gtest_main.cpp)
 
 add_library (compiz_xorg_gtest_system_test STATIC
 	     ${CMAKE_CURRENT_SOURCE_DIR}/src/compiz-xorg-gtest.cpp)
@@ -43,13 +40,13 @@
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${XORG_SERVER_GTEST_LIBRARIES})
 
-target_link_libraries (xorg_gtest_main
+target_link_libraries (compiz_xorg_gtest_main
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${XORG_SERVER_GTEST_LIBRARIES})
 
 target_link_libraries (compiz_xorg_gtest_system_test
 		       xorg_gtest_all
-		       xorg_gtest_main
+		       compiz_xorg_gtest_main
 		       ${GTEST_BOTH_LIBRARIES}
 		       ${XORG_SERVER_LIBRARIES}
 		       ${COMPIZ_XORG_GTEST_COMMUNICATOR_LIBRARY}

=== added file 'tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp'
--- tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp	1970-01-01 00:00:00 +0000
+++ tests/xorg-gtest/src/compiz_xorg_gtest_main.cpp	2013-05-13 13:29:47 +0000
@@ -0,0 +1,154 @@
+/*
+ * Compiz XOrg GTest Decoration Pixmap Protocol Integration Tests
+ *
+ * Copyright (C) 2013 Sam Spilsbury.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authored By:
+ * Sam Spilsbury <[e-mail]>
+ */
+
+#include <csignal>
+
+#include <sstream>
+#include <stdexcept>
+
+#include <gtest/gtest.h>
+#include "xorg/gtest/xorg-gtest-environment.h"
+
+#include <X11/Xlib.h>
+
+namespace compiz
+{
+namespace testing
+{
+class XorgEnvironment :
+    public xorg::testing::Environment
+{
+    public:
+
+	virtual void SetUp ()
+	{
+	    /* Another hack - if the server fails
+	     * to start then just set another display
+	     * number until it does */
+	    const int MaxConnections = 255;
+	    int displayNumber = 0;
+	    bool serverRunningOnDisplay = true;
+
+	    while (serverRunningOnDisplay &&
+		   displayNumber < MaxConnections)
+	    {
+		std::stringstream ss;
+		ss << ":" << displayNumber;
+		Display *check = XOpenDisplay (ss.str ().c_str ());
+
+		if (!check)
+		    serverRunningOnDisplay = false;
+		else
+		{
+		    XCloseDisplay (check);
+		    ++displayNumber;
+		}
+	    }
+
+	    if (displayNumber == MaxConnections)
+		throw std::runtime_error ("couldn't find a socket "
+					  "to launch on");
+
+	    std::stringstream logFile;
+	    logFile << "/tmp/Compiz.Xorg.GTest." << displayNumber << ".log";
+
+	    SetDisplayNumber (displayNumber);
+	    SetLogFile (logFile.str ());
+	    xorg::testing::Environment::SetUp ();
+	}
+};
+}
+}
+
+/* X testing environment - Google Test environment feat. dummy x server
+ * Copyright (C) 2011, 2012 Canonical Ltd.
+ */
+compiz::testing::XorgEnvironment *environment = NULL;
+
+namespace
+{
+
+void SignalHandler (int signum)
+{
+    if (environment)
+	environment->Kill ();
+
+    /* This will call the default handler because we used SA_RESETHAND */
+    raise (signum);
+}
+
+void SetupSignalHandlers ()
+{
+    static const int signals[] =
+    {
+	SIGHUP,
+	SIGTERM,
+	SIGQUIT,
+	SIGILL,
+	SIGABRT,
+	SIGFPE,
+	SIGSEGV,
+	SIGPIPE,
+	SIGALRM,
+	SIGTERM,
+	SIGUSR1,
+	SIGUSR2,
+	SIGBUS,
+	SIGPOLL,
+	SIGPROF,
+	SIGSYS,
+	SIGTRAP,
+	SIGVTALRM,
+	SIGXCPU,
+	SIGXFSZ,
+	SIGIOT,
+	SIGSTKFLT,
+	SIGIO,
+	SIGPWR,
+	SIGUNUSED,
+    };
+
+    struct sigaction action;
+    action.sa_handler = SignalHandler;
+    sigemptyset(&action.sa_mask);
+    action.sa_flags = SA_RESETHAND;
+
+    for (unsigned i = 0; i < sizeof(signals) / sizeof(signals[0]); ++i)
+	if (sigaction(signals[i], &action, NULL))
+	    std::cerr << "Warning: Failed to set signal handler for signal "
+		      << signals[i] << "\n";
+}
+}
+
+int main (int argc, char **argv)
+{
+    ::testing::InitGoogleTest (&argc, argv);
+
+    SetupSignalHandlers ();
+
+    environment = new compiz::testing::XorgEnvironment ();
+    ::testing::AddGlobalTestEnvironment (environment);
+
+    return RUN_ALL_TESTS ();
+}
+