Merge lp:~mc-return/compiz/compiz.merge-grid-small-cleanup into lp:compiz/0.9.10

[MC Return]

*Grid, code changes and fixes:

Fixed segfault in Compiz when unchecking
"Snap windows back to original size".
This option now fully works and will snap
back windows to current size, if they are
dragged off via mouse.

Fixed segfault in Compiz when unchecking
"Snapoff Maximized/Semi-maximized Windows" -
this option is now removed as this setting is
configurable via "Move" plugin already.

The snapoff threshold global setting is now
configurable instead of hardcoded.

Fixed broken cursor y-coordinate calculation.
Fixed window placement cursor calculation
for non-original-size-restored windows.

Make sure grid-maximizing will never overwrite
the windows' original size.

Removed useless code until someone can
convince me that we need it (LP: #1020857).
This fixes the weird positioning (50, 50) when
restoring mouse-grid-maximized windows via
keyboard.

Added missing ABI checks of OpenGL and Composite.

*Grid, xml changes and fixes:

Put Corners/Edges setting into own tab.
New tab named "Resize Actions".
Removed hardcoded SNAPOFF_THRESHOLD and made it
configurable.
Improved tooltips.
Re-applied the quilt patch to the changed grid.xml.in.
Changed the put_restore_key to "Ctrl+Super+Down" to fix
restoring of grid-maximized windows for Ubuntu as well.
(LP: #1172641)

*Grid, minor code cleanup:

Removed redundant (int) casts.
Improved readability for the if condition checks.
Added and removed newlines, if appropriate.
Added comments.
Indentation fixes.

(LP: #745159, LP: #1020857, LP: #1172641)

See video of Grid reloaded here:
https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/745159/+attachment/3660185/+files/GridAllFunctionalityFullyFixed.mp4

[Sam Spilsbury (smspillaz)]

the xml cleanup is fine.

957 - ${GMOCK_LIBRARY}
958 - ${GMOCK_MAIN_LIBRARY})
959 + ${GMOCK_LIBRARY})

GMOCK_MAIN_LIBRARY is necessary here.

1019 +/*
1020 if (cw == mGrabWindow)
1021 {
1022 - /* TODO: Remove these magic numbers */
1023 - xwc.x = workarea.x () + 50;
1024 - xwc.y = workarea.y () + 50;
1025 + int snapoffThreshold = optionGetSnapoffThreshold ();
1026 +
1027 + xwc.x = workarea.x () + snapoffThreshold;
1028 + xwc.y = workarea.y () + snapoffThreshold;
1029 xwc.width = workarea.width ();
1030 xwc.height = workarea.height ();
1031 cw->configureXWindow (CWX | CWY, &xwc);
1032 }
1033 +*/

I think this ensures the window is moved back on-screen. Not sure though.

Gotta run, will do the rest of the review later.

[Sam Spilsbury (smspillaz)]

So I think the intention of that code was to ensure that the window maximizes on the same monitor that the pointer is on. In order to do that correctly, the best way is really to just move it to 0,0 on that output, eg:

if (cw == mGrabWindow)
{
    xwc.x = workarea.x ();
    xwc.y = workarea.y ();
    cw->configureXWindow (CWX | CWY, &xwc);
}

Though, this behavior feels a bit strange - If you want to change it so that keybinding triggers always maximize the window on its current monitor then this should be done in a separate branch. Nevertheless, commenting out the code is incorrect in its current state.

1009 - if ((cw->state () & MAXIMIZE_STATE) &&
1010 - (resize || optionGetSnapoffMaximized ()))
1011 - /* maximized state interferes with us, clear it */
1012 + if ((cw->state () & MAXIMIZE_STATE) && resize)

...

1298 - xwc.x = pointerX - (gw->originalSize.width () / 2);
1299 - xwc.y = pointerY + (cw->border ().top / 2);
1300 + /* The windows x-center is different in this case. */
1301 + if (optionGetSnapbackWindows ())
1302 + {
1303 + xwc.x = pointerX - (gw->originalSize.width () / 2);
1304 + xwc.y = pointerY + (cw->border ().top / 2);
1305 + }
1306 + else /* the user does not want the original size back */
1307 + {
1308 + /* this one is quite tricky to get right */
1309 + xwc.x = pointerX - gw->pointerBufDx - gw->currentSize.width () / 2;
1310 + xwc.y = pointerY - gw->pointerBufDy + cw->border ().top / 2;
1311 + }

No need to change it here, but please do substantive changes separately to cleanups.

1259 + else if (!gw->isGridResized &&
1260 + gw->isGridHorzMaximized &&

These are not aligned.

403 - if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1404 - return false;
1405 + if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1406 + return true;
1407
1408 - return true;
1409 + return false;

This is not consistent with the rest of the style of ABI checks and is wrong anyways.

The ABI checks always go like this:

/* Something bad happened */
if (!checkPluginABI ("foo", FOO_ABI) ||
    !checkPluginABI ("bar", BAR_ABI))
    return false;

return true;

For consistency's sake it should also be the same with just the single check.

That being said, this plugins also links in composite and opengl and should check the ABI of those too.

This is going to cranky, but please do not mix any further substantive and formal changes. They make reviewing more time-consuming than it needs to be and unnecessarily causes proposals to be blocked on unrelated items.

review: Needs Fixing

[MC Return (mc-return)]

> So I think the intention of that code was to ensure that the window maximizes
> on the same monitor that the pointer is on. In order to do that correctly, the
> best way is really to just move it to 0,0 on that output, eg:
>
> if (cw == mGrabWindow)
> {
> xwc.x = workarea.x ();
> xwc.y = workarea.y ();
> cw->configureXWindow (CWX | CWY, &xwc);
> }
>
> Though, this behavior feels a bit strange - If you want to change it so that
> keybinding triggers always maximize the window on its current monitor then
> this should be done in a separate branch. Nevertheless, commenting out the
> code is incorrect in its current state.
>
The problem here is IMHO bug #776435.
It should be changed to maximize windows on the monitor the mousepointer is on.

Restoring Grid windows without the commented code is fine and feels correct, maybe we should restore windows below the unity-panel, which currently is not happening, but the x-coordinate of the window is much better now.
Moving to 50, 50 feels completely off.

> 1009 - if ((cw->state () & MAXIMIZE_STATE) &&
> 1010 - (resize || optionGetSnapoffMaximized ()))
> 1011 - /* maximized state interferes with us, clear it */
> 1012 + if ((cw->state () & MAXIMIZE_STATE) && resize)
>
> ...
>
> 1298 - xwc.x = pointerX - (gw->originalSize.width () / 2);
> 1299 - xwc.y = pointerY + (cw->border ().top / 2);
> 1300 + /* The windows x-center is different in this case. */
> 1301 + if (optionGetSnapbackWindows ())
> 1302 + {
> 1303 + xwc.x = pointerX - (gw->originalSize.width () / 2);
> 1304 + xwc.y = pointerY + (cw->border ().top / 2);
> 1305 + }
> 1306 + else /* the user does not want the original size back */
> 1307 + {
> 1308 + /* this one is quite tricky to get right */
> 1309 + xwc.x = pointerX - gw->pointerBufDx -
> gw->currentSize.width () / 2;
> 1310 + xwc.y = pointerY - gw->pointerBufDy + cw->border ().top /
> 2;
> 1311 + }
>
> No need to change it here, but please do substantive changes separately to
> cleanups.
>
The problem is that I do not have space for 20 compiled Compiz branches on my SSD, so I have one work branch I backport from...

> 1259 + else if (!gw->isGridResized &&
> 1260 + gw->isGridHorzMaximized &&
>
> These are not aligned.
>
I'll look into that.

> 403 - if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> 1404 - return false;
> 1405 + if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> 1406 + return true;
> 1407
> 1408 - return true;
> 1409 + return false;
>
> This is not consistent with the rest of the style of ABI checks and is wrong
> anyways.
>
> The ABI checks always go like this:
>
> /* Something bad happened */
> if (!checkPluginABI ("foo", FOO_ABI) ||
> !checkPluginABI ("bar", BAR_ABI))
> return false;
>
> return true;
>
> For consistency's sake it should also be the same with just the single check.
>
> That being said, this plugins also links in composite and opengl and ...

[Sam Spilsbury (smspillaz)]

> > So I think the intention of that code was to ensure that the window
> maximizes
> > on the same monitor that the pointer is on. In order to do that correctly,
> the
> > best way is really to just move it to 0,0 on that output, eg:
> >
> > if (cw == mGrabWindow)
> > {
> > xwc.x = workarea.x ();
> > xwc.y = workarea.y ();
> > cw->configureXWindow (CWX | CWY, &xwc);
> > }
> >
> > Though, this behavior feels a bit strange - If you want to change it so that
> > keybinding triggers always maximize the window on its current monitor then
> > this should be done in a separate branch. Nevertheless, commenting out the
> > code is incorrect in its current state.
> >
> The problem here is IMHO bug #776435.
> It should be changed to maximize windows on the monitor the mousepointer is
> on.
>
> Restoring Grid windows without the commented code is fine and feels correct,
> maybe we should restore windows below the unity-panel, which currently is not
> happening, but the x-coordinate of the window is much better now.
> Moving to 50, 50 feels completely off.
>
> > 1009 - if ((cw->state () & MAXIMIZE_STATE) &&
> > 1010 - (resize || optionGetSnapoffMaximized ()))
> > 1011 - /* maximized state interferes with us, clear it */
> > 1012 + if ((cw->state () & MAXIMIZE_STATE) && resize)
> >
> > ...
> >
> > 1298 - xwc.x = pointerX - (gw->originalSize.width () / 2);
> > 1299 - xwc.y = pointerY + (cw->border ().top / 2);
> > 1300 + /* The windows x-center is different in this case. */
> > 1301 + if (optionGetSnapbackWindows ())
> > 1302 + {
> > 1303 + xwc.x = pointerX - (gw->originalSize.width () / 2);
> > 1304 + xwc.y = pointerY + (cw->border ().top / 2);
> > 1305 + }
> > 1306 + else /* the user does not want the original size back */
> > 1307 + {
> > 1308 + /* this one is quite tricky to get right */
> > 1309 + xwc.x = pointerX - gw->pointerBufDx -
> > gw->currentSize.width () / 2;
> > 1310 + xwc.y = pointerY - gw->pointerBufDy + cw->border ().top
> /
> > 2;
> > 1311 + }
> >
> > No need to change it here, but please do substantive changes separately to
> > cleanups.
> >
> The problem is that I do not have space for 20 compiled Compiz branches on my
> SSD, so I have one work branch I backport from...
>
> > 1259 + else if (!gw->isGridResized &&
> > 1260 + gw->isGridHorzMaximized &&
> >
> > These are not aligned.
> >
> I'll look into that.
>
> > 403 - if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> > 1404 - return false;
> > 1405 + if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> > 1406 + return true;
> > 1407
> > 1408 - return true;
> > 1409 + return false;
> >
> > This is not consistent with the rest of the style of ABI checks and is wrong
> > anyways.
> >
> > The ABI checks always go like this:
> >
> > /* Something bad happened */
> > if (!checkPluginABI ("foo", FOO_ABI) ||
> > !checkPluginABI ("bar", BAR_ABI))
> > return false;
> >
> > return true;
> ...

[Sam Spilsbury (smspillaz)]

> > So I think the intention of that code was to ensure that the window
> maximizes
> > on the same monitor that the pointer is on. In order to do that correctly,
> the
> > best way is really to just move it to 0,0 on that output, eg:
> >
> > if (cw == mGrabWindow)
> > {
> > xwc.x = workarea.x ();
> > xwc.y = workarea.y ();
> > cw->configureXWindow (CWX | CWY, &xwc);
> > }
> >
> > Though, this behavior feels a bit strange - If you want to change it so that
> > keybinding triggers always maximize the window on its current monitor then
> > this should be done in a separate branch. Nevertheless, commenting out the
> > code is incorrect in its current state.
> >
> The problem here is IMHO bug #776435.
> It should be changed to maximize windows on the monitor the mousepointer is
> on.
>
> Restoring Grid windows without the commented code is fine and feels correct,
> maybe we should restore windows below the unity-panel, which currently is not
> happening, but the x-coordinate of the window is much better now.
> Moving to 50, 50 feels completely off.
>

I meant to reply to this bit :)

If you think it makes sense to remove the commented code, then just remove it rather than leaving it commented out.

[MC Return (mc-return)]

>
> Test program:
>
> int main ()
> {
> bool a = true;
> bool b = true;
> bool c = true;
>
> if (!a || !b || !c)
> return 1;
>
> return 0;
> }
>
> g++ -O0 assembly:
>
> 4004fc: 0f b6 45 fd movzbl -0x3(%rbp),%eax
> 400500: 83 f0 01 xor $0x1,%eax
> 400503: 84 c0 test %al,%al
> 400505: 75 16 jne 40051d <main+0x31>
> 400507: 0f b6 45 fe movzbl -0x2(%rbp),%eax
> 40050b: 83 f0 01 xor $0x1,%eax
> 40050e: 84 c0 test %al,%al
> 400510: 75 0b jne 40051d <main+0x31>
> 400512: 0f b6 45 ff movzbl -0x1(%rbp),%eax
> 400516: 83 f0 01 xor $0x1,%eax
> 400519: 84 c0 test %al,%al
> 40051b: 74 07 je 400524 <main+0x38>
>
> int main ()
> {
> bool a = false;
> bool b = false;
> bool c = false;
>
> if (a && b && c)
> return 1;
>
> return 0;
> }
>
> Assembly:
>
> 4004fc: 80 7d fd 00 cmpb $0x0,-0x3(%rbp)
> 400500: 74 13 je 400515 <main+0x29>
> 400502: 80 7d fe 00 cmpb $0x0,-0x2(%rbp)
> 400506: 74 0d je 400515 <main+0x29>
> 400508: 80 7d ff 00 cmpb $0x0,-0x1(%rbp)
> 40050c: 74 07 je 400515 <main+0x29>
>
> The latter version is technically faster, because you can directly compare the
> booleans without negating them.
>
Do not forget that we expect almost always true, in fact it will be true in 100% of cases if
the plugin is okay, which it normally should be.

> However, this is a micro-optimization really. It saves 6 instructions and for
> 50 plugins would save 300 instructions total, which would make for a
> theoretical 4 one-hundred-millionths of a second optimization on a Pentium 4
> system (at 6500 MIPS).
>
If I do one such optimization per week, in a year it is 15000 instructions less to
execute, times say 5 million computers running Compiz will save a lot of energy ;)

> It probably makes more sense to keep it consistent with the other code. Though
> that's not to say that I wouldn't accept a best-case 4 one-hundred-millionth
> of a second optimization.

Yes, I agree 100%. It should be consistent in all cases. We also should report
to the console in the case something goes wrong, which just a few of the plugins
currently do.
Also water will currently not correctly execute without FBOs being enabled, but
there is not even a log message about it...

> I just don't think its worth the one hour of effort
> spent to write it.
It took about 30 minutes to fix it for all of the plugins here locally.
The improved error reporting will take another while of course and also to check that all ABI dependencies,
that each plugin has, get checked...

[MC Return (mc-return)]

>
> If you think it makes sense to remove the commented code, then just remove it
> rather than leaving it commented out.

I did not remove it yet, because the problem is not 100% fixed - it should remind me that there is a TODO there...
The y-restore postion could be better, namely below the unity/gnome/whatever-panel...

[Sam Spilsbury (smspillaz)]

>
> >
> > If you think it makes sense to remove the commented code, then just remove
> it
> > rather than leaving it commented out.
>
> I did not remove it yet, because the problem is not 100% fixed - it should
> remind me that there is a TODO there...
> The y-restore postion could be better, namely below the unity/gnome/whatever-
> panel...

In that case, it should either be fixed here or replaced with a TODO note in the source code.

If you want to place a window below the panel, the correct way to do it is to place it at the x position of the current output work-area plus the left and right window borders, for example:

CompOutput *currentOutput = &screen->outputDevs ()[screen->outputForGeometry (w->geometry ())];
const CompRect &workArea (currentOutput->workArea ());

int x = workArea.x () + w->border.left
int y = workArea.y () + w->border.top

[MC Return (mc-return)]

> the xml cleanup is fine.
>
> 957 - ${GMOCK_LIBRARY}
> 958 - ${GMOCK_MAIN_LIBRARY})
> 959 + ${GMOCK_LIBRARY})
>
> GMOCK_MAIN_LIBRARY is necessary here.
>

Good catch. Committed accidentially, because my work branch has yet to be rebased on trunk. Fixed in r3693.

[MC Return (mc-return)]

Ok, all fixed now.
Also made sure grid-maximizing will never overwrite the windows' original size.

The good news:
Recent testing shows the window restores below the panel anyway in all cases, except when a window was first grid-maximized, then grid-resized via keyboard and then restored, because the original size was stored when the window was maximized in this special case.
I have fixed this also now, so a maximized window will never overwrite the original size...

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

The other changes are good. Can you please revert this one?

1394 - if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1395 - return false;
1396 + if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1397 + return true;
1398
1399 - return true;
1400 + return false;

As mentioned before, I'd far prefer that the ABI check logic be kept consistent with the other plugins. If you think it would be worthwhile to change it, then it should be changed all at once in all the plugins in a separate MP.

[MC Return (mc-return)]

> The other changes are good. Can you please revert this one?
>
TBH, I would rather like to invest my time in adding composite and opengl here, which you correctly identified as missing...

> 1394 - if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> 1395 - return false;
> 1396 + if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> 1397 + return true;
> 1398
> 1399 - return true;
> 1400 + return false;
>
> As mentioned before, I'd far prefer that the ABI check logic be kept
> consistent with the other plugins.

I am for consistency also.

> If you think it would be worthwhile to
> change it, then it should be changed all at once in all the plugins in a
> separate MP.

Hmm, would mean 30 minutes of additional work - most probably this costs less time than the discussions necessary to get those changes in on a per-plugin basis...

[MC Return (mc-return)]

review: Needs Resubmitting

[Sam Spilsbury (smspillaz)]

Looks great now, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/compiz-autolanding/36/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-amd64-autolanding/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-armhf-autolanding/36/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-raring-i386-autolanding/36/console

review: Needs Fixing (continuous-integration)

[MC Return (mc-return)]

Ah - nice, another quilt patch I forgot:

Hunk #1 FAILED at 23.
Hunk #2 FAILED at 68.
2 out of 2 hunks FAILED -- rejects in file plugins/grid/grid.xml.in

:(

[MC Return (mc-return)]

I will quilt-fix this one, because here it is inevitable...
- but I want to note that I hate it -> the steps needed would be many:

1. First I have to install quilt, then setup the quilt environment variables in .quiltrc or .bashrc.
2. Then I have to throw away this branch and check out a new lp:compiz branch, because I have to know in advance of hacking if the quilt patching will fail - there is no way I can go from here...
3. Next I have to "quilt push -a" in my fresh lp:compiz branch to apply the patches, while doing that I read things like "Hunk #1 succeeded at 557 with fuzz 1 (offset 95 lines).", which help a lot to increase my confidence in quilt.
4. Now I would have to revert the grid change, refresh the patch and "quilt pop -a".
5. Then is the time to copy the new version over.
6. Later I can "quilt push -a" again.
7. Afterwards I have to search the stuff the quilt patch changed in the first place to mimic this behaviour manually, which means I have to add/remove the stuff quilt should remove, just that I have to do that manually... I am happy I know what exactly has been changed by quilt, because "patching file plugins/ezoom/ezoom.xml.in" is all the info quilt dared to gave me before. Thanks, such log messages make me a lot wiser.
8. To make sure what has been changed by quilt, ubuntu-config.patch (the old version) has to be checked in a editor.
9. I am now sure what has been changed and can edit plugins/grid/grid.xml.in.
10. After I have done all that I can now try to "quilt refresh", which I can do "as often as I like" \o/ HURRA !!!
11. As last step I can now do a "qilt pop -a" to update my patch and hopefully finish this nightmarish patching experience...

Less than 12 steps -> Easy, isn't it ?

I guess I will hack ubuntu-config.patch manually instead, should be much easier...
Or is there some quilt magic I do not know about ?

[Sam Spilsbury (smspillaz)]

The problems you've mentioned are pretty easy to deal with:

0. export QUILT_PATCHES=debian/patches
1. You don't need to check out a new branch. If a patch fails to apply
it will create .rej and .orig files, but those aren't checked in
2. I'm not sure what you mean by "revert the grid change". The correct
approach to deal with a failing quilt patch is to look at the .rej
file and apply the changes there by-hand. Once that's done you run
quilt refresh

Also - I'd place a bit more confidence in quilt. Its like any other
merge tool - it just looks for a block of text surrounded by a certain
amount of context in a file and then applies a change to that block.
It either works or it doesn't - if it can't find the exact bit that
you want it to change, it will create patch reject files and you just
need to apply the change by hand.

On Fri, May 10, 2013 at 10:15 PM, MC Return <email address hidden> wrote:
> I will quilt-fix this one, because here it is inevitable...
> - but I want to note that I hate it -> the steps needed would be many:
>
> 1. First I have to install quilt, then setup the quilt environment variables in .quiltrc or .bashrc.
> 2. Then I have to throw away this branch and check out a new lp:compiz branch, because I have to know in advance of hacking if the quilt patching will fail - there is no way I can go from here...
> 3. Next I have to "quilt push -a" in my fresh lp:compiz branch to apply the patches, while doing that I read things like "Hunk #1 succeeded at 557 with fuzz 1 (offset 95 lines).", which help a lot to increase my confidence in quilt.
> 4. Now I would have to revert the grid change, refresh the patch and "quilt pop -a".
> 5. Then is the time to copy the new version over.
> 6. Later I can "quilt push -a" again.
> 7. Afterwards I have to search the stuff the quilt patch changed in the first place to mimic this behaviour manually, which means I have to add/remove the stuff quilt should remove, just that I have to do that manually... I am happy I know what exactly has been changed by quilt, because "patching file plugins/ezoom/ezoom.xml.in" is all the info quilt dared to gave me before. Thanks, such log messages make me a lot wiser.
> 8. To make sure what has been changed by quilt, ubuntu-config.patch (the old version) has to be checked in a editor.
> 9. I am now sure what has been changed and can edit plugins/grid/grid.xml.in.
> 10. After I have done all that I can now try to "quilt refresh", which I can do "as often as I like" \o/ HURRA !!!
> 11. As last step I can now do a "qilt pop -a" to update my patch and hopefully finish this nightmarish patching experience...
>
> Less than 12 steps -> Easy, isn't it ?
>
> I guess I will hack ubuntu-config.patch manually instead, should be much easier...
> Or is there some quilt magic I do not know about ?
> --
> https://code.launchpad.net/~mc-return/compiz/compiz.merge-grid-small-cleanup/+merge/161330
> You are reviewing the proposed merge of lp:~mc-return/compiz/compiz.merge-grid-small-cleanup into lp:compiz.

--
Sam Spilsbury

[MC Return (mc-return)]

> The problems you've mentioned are pretty easy to deal with:
>
> 0. export QUILT_PATCHES=debian/patches
> 1. You don't need to check out a new branch. If a patch fails to apply
> it will create .rej and .orig files, but those aren't checked in

Okay, so by "quilt push -a -f" I can enforce the patching and get the file
plugins/grid/grid.xml.in, with this content then:

--- plugins/grid/grid.xml.in
+++ 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>

> 2. I'm not sure what you mean by "revert the grid change". The correct
> approach to deal with a failing quilt patch is to look at the .rej
> file and apply the changes there by-hand. Once that's done you run
> quilt refresh
>
How can I easily change this "by hand" or how do I have to change it in
this case ?
All this steps are not necessary -> I could manipulate the ubuntu-config.patch
itself from the beginning if I have to do it manually anyway...

> Also - I'd place a bit more confidence in quilt. Its like any other
> merge tool - it just looks for a block of text surrounded by a certain
> amount of context in a file and then applies a change to that block.
> It either works or it doesn't - if it can't find the exact bit that
> you want it to change, it will create patch reject files and you just
> need to apply the change by hand.
>
Well, most of the quilt patches just change some shortcuts for the Ubuntu
Compiz version - it is not exactly the best and easiest way to do that.
I could think of several better solutions to change default shortcuts
for Ubuntu, like a separated config file with separated defaults that get
imported for Ubuntu for example...

[MC Return (mc-return)]

*the file is of course called plugins/grid/grid.xml.in.rej

[MC Return (mc-return)]

review: Needs Information

[Sam Spilsbury (smspillaz)]

On Fri, May 10, 2013 at 11:06 PM, MC Return <email address hidden> wrote:
>> The problems you've mentioned are pretty easy to deal with:
>>
>> 0. export QUILT_PATCHES=debian/patches
>> 1. You don't need to check out a new branch. If a patch fails to apply
>> it will create .rej and .orig files, but those aren't checked in
>
> Okay, so by "quilt push -a -f" I can enforce the patching and get the file
> plugins/grid/grid.xml.in, with this content then:
>
> --- plugins/grid/grid.xml.in
> +++ 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>
>
>> 2. I'm not sure what you mean by "revert the grid change". The correct
>> approach to deal with a failing quilt patch is to look at the .rej
>> file and apply the changes there by-hand. Once that's done you run
>> quilt refresh
>>
> How can I easily change this "by hand" or how do I have to change it in
> this case ?
> All this steps are not necessary -> I could manipulate the ubuntu-config.patch
> itself from the beginning if I have to do it manually anyway...

So, the idea is that you apply the patch, and then edit the files to
which the patch applies should a part of the patch fail. For example:

x.patch patches foo.c and bar.c. A hunk on foo.c fails. This generates
foo.c.orig, a partially patched foo.c and foo.c.rej . Quilt is
"tracking" changes to foo.c at this point, so you examine foo.c.rej
and apply the remaining changes to foo.c manually. Once quilt refresh
is run, this will regenerate x.patch based on the correct data.

>>
> Well, most of the quilt patches just change some shortcuts for the Ubuntu
> Compiz version - it is not exactly the best and easiest way to do that.
> I could think of several better solutions to change default shortcuts
> for Ubuntu, like a sep...

[MC Return (mc-return)]

>
> So, the idea is that you apply the patch, and then edit the files to
> which the patch applies should a part of the patch fail. For example:
>
> x.patch patches foo.c and bar.c. A hunk on foo.c fails. This generates
> foo.c.orig, a partially patched foo.c and foo.c.rej . Quilt is
> "tracking" changes to foo.c at this point, so you examine foo.c.rej
> and apply the remaining changes to foo.c manually. Once quilt refresh
> is run, this will regenerate x.patch based on the correct data.
>
Okay, I get the idea ;) - but the correct version to do it would nevertheless
need the 11-step plan...
I will do a partially hacked version now - I think it will be the easiest way:

1. I will first remove grid from ubuntu-config.patch completely so the hunk won't fail.
2. Then I'll "quilt push -a" to apply the rest of the patch to the source
3. Now I'll do the changes to grid.xml.in.
4. Refresh
5. "qilt pop -a"

This should save me the complicated step of manual patch adjustment...

[MC Return (mc-return)]

Just a note to myself:

quilt push -a
quilt add -P debian/patches/ubuntu-config.patch plugins/grid/grid.xml.in
make changes...
quilt refresh debian/patches/ubuntu-config.patch

[MC Return (mc-return)]

Take care, cause this branch could explode your computer ;)

Just joking - all done. I'll closed my eyes and put my trust in quilt ;)

review: Needs Resubmitting

[MC Return (mc-return)]

quilt and me are very good friends now :)

[MC Return (mc-return)]

Note: I also fixed bug #1172641, which needed quilt involvement on the way...

[Sam Spilsbury (smspillaz)]

Thanks for refreshing the patches.

1653 +<<<<<<< TREE
1654 if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
1655 return true;
1656 +=======
1657 + if (!CompPlugin::checkPluginABI ("composite", CORE_ABIVERSION) ||
1658 + !CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
1659 + !CompPlugin::checkPluginABI ("opengl", CORE_ABIVERSION))
1660 + return false;
1661 +>>>>>>> MERGE-SOURCE

Merge conflict.

   <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>

On lines 492-503 of grid.xml.in, if the subgroup tag has been removed then the options also need to be unindented

[MC Return (mc-return)]

> Thanks for refreshing the patches.
>
> 1653 +<<<<<<< TREE
> 1654 if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
> 1655 return true;
> 1656 +=======
> 1657 + if (!CompPlugin::checkPluginABI ("composite", CORE_ABIVERSION)
> ||
> 1658 + !CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
> 1659 + !CompPlugin::checkPluginABI ("opengl", CORE_ABIVERSION))
> 1660 + return false;
> 1661 +>>>>>>> MERGE-SOURCE
>
> Merge conflict.
>
Noooooooooooooooooooooooooooo
Didn't I look at the diff ???
Looking now how to best fix that mess...

> <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>
>
> On lines 492-503 of grid.xml.in, if the subgroup tag has been removed then the
> options also need to be unindented

I have to investigate what happened here...

[MC Return (mc-return)]

/offtopic on

Regarding correct indentation of the .xml files -> they are all pretty messed up -> could vera++ help us here also ?

/offtopic off

[MC Return (mc-return)]

I did not see the merge conflict, because I had to merge lp:compiz for it to appear...

review: Needs Resubmitting

[MC Return (mc-return)]

Note:
Please let us fix the .xml indentation issue in some follow-up... it is really time for this to land now.

[lp:~mc-return/compiz/compiz.merge-grid-small-cleanup]

3701. By MC Return on 2013-05-11

Fixed indentation in grid.xml.in (lines 492-503)

[MC Return (mc-return)]

> >
> > On lines 492-503 of grid.xml.in, if the subgroup tag has been removed then
> the
> > options also need to be unindented

F*ck it. Fixed

[MC Return (mc-return)]

review: Needs Resubmitting

[MC Return (mc-return)]

Note:
The known Grid bugs left (after this MP has landed):

Bug #1115341 - Grid resize: Placing maximized windows on the top edge using shortcuts does not take the panel into account

Bug #1172923 - Grid: Window movement animations missing, when grid-keyboard-resizing from a non-semi-maximized state

Sam, if you have any ideas on how to fix those 2 bugs, please give me a hint ;)
Especially getting the missing animations one would be a "nice to have" ;)

[MC Return (mc-return)]

Additional note:
Bug #776435 - Window maximizes and semi-maximizes on the wrong workspace

can also be triggered by Grid and needs to be finally fixed in 0.9.10.
Unfortunately this involves manipulating the core, which makes testing the fix properly a bit harder without fully installing the self-compiled Compiz...
Nevertheless the fix itself should not be hard to implement -> the logic just needs to be changed to always semi-maximize/maximize on the output device containing the pointer, not the output device, on which the biggest part of the window resides when it is semi-maximized/maximized.
For plugins using this function this change could be problematic, maybe the best solution would be to create a new function with the old behaviour and make all plugins call that instead, so the behaviour for them won't change, while maximizing and semimaximizing would use the new function...

[Sam Spilsbury (smspillaz)]

> Additional note:
> Bug #776435 - Window maximizes and semi-maximizes on the wrong workspace
>
> can also be triggered by Grid and needs to be finally fixed in 0.9.10.
> Unfortunately this involves manipulating the core, which makes testing the fix
> properly a bit harder without fully installing the self-compiled Compiz...

If you are still having trouble with this I'd suggest poking me on IRC about it, I should be able to help you out.

> Nevertheless the fix itself should not be hard to implement -> the logic just
> needs to be changed to always semi-maximize/maximize on the output device
> containing the pointer, not the output device, on which the biggest part of
> the window resides when it is semi-maximized/maximized.

This can be easily worked around from within the grid plugin - just move the window so that it is on the monitor completely before it is maximized. I'd rather not have that behavioural change in core, because it creates a strong disconnect between the window location and the monitor that the window is maximized on - especially for windows may request to maximize themselves or triggering a maximize by keybinding.

In any case this branch is good for now.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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-11 08:07:29 +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-11 08:07:29 +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 @@
@@ -357,7 +355,6 @@
  			<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 +390,6 @@
  		    </option>
  		</subgroup>
  	    </group>
-
 --- a/plugins/fade/fade.xml.in
 +++ b/plugins/fade/fade.xml.in
 @@ -10,6 +10,7 @@
@@ -413,7 +409,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 +419,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 +432,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 +478,6 @@
  		</default>
  	    </option>
  	    <subgroup>
-
 --- a/plugins/scale/scale.xml.in
 +++ b/plugins/scale/scale.xml.in
 @@ -19,14 +19,14 @@
@@ -607,7 +568,6 @@
  			</option>
  	    </group>
  	</options>
-
 --- a/plugins/staticswitcher/staticswitcher.xml.in
 +++ b/plugins/staticswitcher/staticswitcher.xml.in
 @@ -11,7 +11,6 @@
@@ -686,7 +646,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 +662,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 +811,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 +822,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/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2013-04-25 10:11:04 +0000
+++ plugins/grid/grid.xml.in	2013-05-11 08:07:29 +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-11 08:07:29 +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,7 +1393,9 @@
 bool
 GridPluginVTable::init ()
 {
-    if (CompPlugin::checkPluginABI ("core", CORE_ABIVERSION))
+    if (CompPlugin::checkPluginABI ("composite", CORE_ABIVERSION)   &&
+	CompPlugin::checkPluginABI ("core", CORE_ABIVERSION)	    &&
+	CompPlugin::checkPluginABI ("opengl", CORE_ABIVERSION))
 	return true;
 
     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-11 08:07:29 +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);
-