Merge lp:~smspillaz/compiz-core/compiz-core.work_923683 into lp:compiz-core

[Sam Spilsbury]

Resubmitted now that lp:~smspillaz/compiz-core/compiz-core.fix_969108.2 and lp:~smspillaz/compiz-core/compiz-core.fix_969101 are active

Note: you'll get funny behaviour around window edges unless you use lp:~smspillaz/compiz-snap-plugin/compiz-snap-plugin.work_923683 . The snap plugin was using the interfaces incorrectly.

Always use the asynchronous codepaths in core. This commit changes the following:

 * CompWindow::move is now just a wrapper around CompWindow::configureXWindow
 * CompWindow::configureXWindow will always call through to moveNotify
 * moveNotify is only ever called pre-request to the server in the case of
   managed windows (SubstructureRedirectMask guaruntees they will end up in
   the right place) and post ConfigureNotify for override redirect windows
 * resizeNotify is always called post ConfigureNotify regardless of whether
   or not the window is managed or not
 * composite and opengl now use the geometry last sent to the server in order
   to compute display matrices and window positions as well as damage regions
 * decor now also does the above
 * const correctness in include/core/window.h
 * removed priv->width and priv->height , which was just redundant data used for
   window shading and honestly, is a ticking time bomb for future maintainers.
 * CompWindow::syncPosition is now deprecated and a no-op
 * Removed the majority of PrivateWindow::updateFrameWindow - this function had a lot
   of redundant code which PrivateWindow::reconfigureXWindow had anyways - the big work
   there was to send synthetic ConfigureNotify events to ourselves to notify about windows
   moving within frame windows that don't move themselves. Its safer to use reconfigureXWindow
   in this case and probably more sane too. We should look into removing the other update* functions.

Caveats:

 0) There are no tests yet
 1) Window movement performance will regress with this branch. This is *probably* due to the fact that for every slight movement, we send a full ConfigureWindow request to the X Server and it has to post back to us a full ConfigureNotify, for pretty much every pixel the window moves. In the case that we're not doing compositing thats fine, but in every other case its *super* chatty and largely unnecessary. This can probably be optimized a lot, but that will require work to gather up requests that we want to send to the X server - combine them (eg, merging the stack of requests based on the change mask and using the latest values where appropriate). Thats a lot of work and probably not appropriate in this branch
 2) The diff is a little big
 3) No tests
 4) Window shading is more than likely going to break again, mostly because I haven't tested it yet, but also because shading does some strange things and manipulated geometry values in strange ways
 5) No tests

Testing plan?

I would imagine here that the PendingConfigureRequests object can probably be split out into something testable, as can the logic to strip flags from frame window geometry and client window geometry updates.

[Sam Spilsbury (smspillaz)]

The diff is big and scary, but its not too complicated. I'll explain each separate part

1 === modified file 'include/core/window.h'
2 --- include/core/window.h 2012-01-20 15:20:44 +0000
3 +++ include/core/window.h 2012-01-31 17:12:59 +0000
4 @@ -398,9 +398,9 @@
5
6 bool hasUnmapReference ();
7
8 - bool resize (XWindowAttributes);
9 + bool resize (const XWindowAttributes &);
10
11 - bool resize (Geometry);
12 + bool resize (const Geometry &);
13
14 bool resize (int x, int y, int width, int height,
15 int border = 0);

const correctness

31 int x1, x2, y1, y2;
32
33 - CompWindow::Geometry geom = priv->window->geometry ();
34 - CompWindowExtents output = priv->window->output ();
35 + const CompWindow::Geometry &geom = priv->window->serverGeometry ();
36 + const CompWindowExtents &output = priv->window->output ();

more const correctness

35 + const CompWindow::Geometry &geom = priv->window->serverGeometry ();
36 + const CompWindowExtents &output = priv->window->output ();

Lots of this - in paint code we want to use serverFoo because it was the last thing sent to the server. And this is always guarunteed to come back to us.

166 - unsigned int width = window->size ().width ();
167 - unsigned int height = window->size ().height ();
168 + unsigned int width = window->geometry ().width ();
169 + unsigned int height = window->geometry ().height ();

CompWindow::size was just returning CompSize (priv->width, priv->height) which was just redundant data which should be removed. Replaced it with geometry () for clarity

299 + void move (int dx, int dy, bool sync);
300 + bool resize (int dx, int dy, int dwidth, int dheight, int dborder);
301 + bool resize (const CompWindow::Geometry &g);
302 + bool resize (const XWindowAttributes &attrib);
303 +

Added PrivateWindow::move and PrivateWindow::resize - to be called whenever a new position / size comes back from the server. (cut'n'paste code from CompWindow::move and CompWindow::resize

335 -
336 - gettimeofday (&lastConfigureRequest, NULL);
337 - /* Flush any changes made to serverFrameGeometry or serverGeometry to the server
338 - * since there is a race condition where geometries will go out-of-sync with
339 - * window movement */
340 -
341 - window->syncPosition ();
342 -
343 - if (serverInput.left || serverInput.right || serverInput.top || serverInput.bottom)
344 - {
345 - int bw = serverGeometry.border () * 2;
346 -
347 - xwc.x = serverGeometry.x () - serverInput.left;
348 - xwc.y = serverGeometry.y () - serverInput.top;
349 - xwc.width = serverGeometry.width () + serverInput.left + serverInput.right + bw;
350 - if (shaded)
351 - xwc.height = serverInput.top + serverInput.bottom + bw;
352 - else
353 - xwc.height = serverGeometry.height () + serverInput.top + serverInput.bottom + bw;
354 -
355 - if (shaded)
356 - height = serverInput.top + serverInput.bottom;
357 -
358 - if (serverFrameGeometry.x () == xwc.x)
359 - valueMask &= ~(CWX);
360 - else
361 - serverFrameGeometry.setX (xwc.x);
362 -
*snip*
616 - XMoveResizeWindow (screen->dpy (), id, 0, 0,
617 - serverGeometry.width (), serverGeometry.height ());
618 - window->sendConfigureNotify ();
619 - window->windowNotify (CompWindowNotifyFrameUpdate...

[Sam Spilsbury (smspillaz)]

824 -
825 - if (!pendingConfigures.pending ())
826 - {
827 - /* Tell plugins its ok to start doing stupid things again but
828 - * obviously FIXME */
829 - CompOption::Vector options;
830 - CompOption::Value v;
831 -
832 - options.push_back (CompOption ("window", CompOption::TypeInt));
833 - v.set ((int) id);
834 - options.back ().set (v);
835 - options.push_back (CompOption ("active", CompOption::TypeInt));
836 - v.set ((int) 0);
837 - options.back ().set (v);
838 -
839 - /* Notify other plugins that it is unsafe to change geometry or serverGeometry
840 - * FIXME: That API should not be accessible to plugins, this is a hack to avoid
841 - * breaking ABI */
842 -
843 - screen->handleCompizEvent ("core", "lock_position", options);
844 - }

DIE

924 -bool
925 -PrivateWindow::checkClear ()
926 -{
927 - if (pendingConfigures.pending ())
928 - {
929 - /* FIXME: This is a hack to avoid performance regressions
930 - * and must be removed in 0.9.6 */
931 - compLogMessage ("core", CompLogLevelWarn, "failed to receive ConfigureNotify event on 0x%x\n",
932 - id);
933 - pendingConfigures.dump ();
934 - pendingConfigures.clear ();
935 - }
936 -
937 - return false;
938 -}
939 -
940 void
941 compiz::X11::PendingEventQueue::add (PendingEvent::Ptr p)
942 {
943 @@ -2454,21 +2148,6 @@
944 mValueMask (valueMask),
945 mXwc (*xwc)
946 {
947 - CompOption::Vector options;
948 - CompOption::Value v;
949 -
950 - options.push_back (CompOption ("window", CompOption::TypeInt));
951 - v.set ((int) w);
952 - options.back ().set (v);
953 - options.push_back (CompOption ("active", CompOption::TypeInt));
954 - v.set ((int) 1);
955 - options.back ().set (v);
956 -
957 - /* Notify other plugins that it is unsafe to change geometry or serverGeometry
958 - * FIXME: That API should not be accessible to plugins, this is a hack to avoid
959 - * breaking ABI */
960 -
961 - screen->handleCompizEvent ("core", "lock_position", options);
962 }

DIE

[Daniel van Vugt (vanvugt)]

GOOD IN THEORY:

* Most of the description sounds like steps in the right direction.

* Simplified: Replacing 559 lines of code with 247.

UNSURE ABOUT THE THEORY:

* "composite and opengl now use the geometry last sent to the server"
This should give maximum performance, sure, but what if (for some reason) the server rejects the configure request as being somehow invalid? Would you ever encounter that, like moving a window to an invalid location?
For stability and correctness (which should be the primary goal right now) don't we want "composite and opengl now use the geometry last received from the server"?

* Caveat #1 is not really a caveat. It's the right (intended) design. But if you want to see a (buggy) example of how to solve the chattiness look at the timer code here:
https://code.launchpad.net/~vanvugt/compiz-core/fix-764330-trunk/+merge/86497
This was slightly buggy though as it broke keyboatrd-initiated moves (incorrect pointer warp). Simple to fix, probably.

* Still no XFlush's to ensure XConfigureWindow happens immediately. Or are there adequate XSyncs already?

BAD IN THEORY:

* The diff is too big for a mere mortal (who hasn't worked on all the code before) to fully load into their mental interpreter and evaluate its theoretical correctness. Please read that sentence again; it's important.

GOOD IN PRACTICE:

* Window movement is smooth and predictable, but not really better than in oneiric.

BAD IN PRACTICE:

* The bug introduced is worse than the bug being fixed; Window contents offset from the frame/decorations whenever a window is created or maximized.

* All that code, but we still haven't reduced the lag below oneiric-levels. Still not as good as Gnome Shell.

CONCLUSION:

The theory is mostly good but there is at least one serious bug that needs fixing. We probably shouldn't risk 0.9.7.0 any more with large changes like this. We should aim to get this code into a later release when it's more stable, not 0.9.7.0.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> GOOD IN THEORY:
>
> * Most of the description sounds like steps in the right direction.
>
> * Simplified: Replacing 559 lines of code with 247.
>
>
> UNSURE ABOUT THE THEORY:
>
> * "composite and opengl now use the geometry last sent to the server"
> This should give maximum performance, sure, but what if (for some reason) the
> server rejects the configure request as being somehow invalid? Would you ever
> encounter that, like moving a window to an invalid location?
> For stability and correctness (which should be the primary goal right now)
> don't we want "composite and opengl now use the geometry last received from
> the server"?

See http://tronche.com/gui/x/xlib/window/XConfigureWindow.html

Since we have SubstructureRedirectMask, it is guarunteed that any ConfigureWindow request we make on a child of the root window is guarunteed to end up in that position (hence the event tracker).

The only error cases I can think of is where you ask for a window to be of a size < 0 or > MAXSHORT. Ideally we should check for that case.

>
> * Caveat #1 is not really a caveat. It's the right (intended) design. But if
> you want to see a (buggy) example of how to solve the chattiness look at the
> timer code here:
> https://code.launchpad.net/~vanvugt/compiz-core/fix-764330-trunk/+merge/86497
> This was slightly buggy though as it broke keyboatrd-initiated moves
> (incorrect pointer warp). Simple to fix, probably.
>

There are some optimizations that can be done here - for example, if a window is grabbed, you can withold sending positions to the server until it is ungrabbed, or there is some other reason why you would want to do that. When that happens you can send it all at once.

> * Still no XFlush's to ensure XConfigureWindow happens immediately. Or are
> there adequate XSyncs already?

The GLib mainloop work introduced an XFlush as soon as we have finished dispatching the X event source.

>
>
> BAD IN THEORY:
>
> * The diff is too big for a mere mortal (who hasn't worked on all the code
> before) to fully load into their mental interpreter and evaluate its
> theoretical correctness. Please read that sentence again; it's important.

Indeed. The good thing is that its mostly all deletion and consolidation.

>
>
> GOOD IN PRACTICE:
>
> * Window movement is smooth and predictable, but not really better than in
> oneiric.
>
>
> BAD IN PRACTICE:
>
> * The bug introduced is worse than the bug being fixed; Window contents offset
> from the frame/decorations whenever a window is created or maximized.

Alright. I haven't seen this yet, but I have an idea of what might cause it. Will have a look into it when I get some time.

>
> * All that code, but we still haven't reduced the lag below oneiric-levels.
> Still not as good as Gnome Shell.

This will be fixed once the chattyness goes away. (as above). Watch your X.org CPU usage as you move windows - it skyrockets because at the moment we flood it with requests.

>
>
> CONCLUSION:
>
> The theory is mostly good but there is at least one serious bug that needs
> fixing. We probably shouldn't risk 0.9.7.0 any more with large changes like
> this. We should aim to get this code into a later r...

[Alan Griffiths (alan-griffiths)]

OK, I'm still wading through the changes. But I feel like a rant...

1307 CompSize
1308 CompWindow::size () const
1309 {
1310 - return CompSize (priv->width + priv->geometry.border () * 2,
1311 - priv->height + priv->geometry.border () * 2);
1312 + return CompSize (priv->geometry.width () + priv->geometry.border () * 2,
1313 + priv->geometry.height () + priv->geometry.border () * 2);
1314 }

As a change this doesn't look too bad - but it ignores a horrid design!

1. Chained operations like "priv->geometry.width ()" imply too muck knowledge of the details of "priv".
   That is "priv->width ()" would reflect less coupling.

2. You're tracing the path "priv->geometry..." many times, which suggests that the logic belongs in "geometry".
   "return priv->geometry.size ()" or "return CompSize(priv->geometry)" would reflect better coherence.

So, assuming (because borders may be optional?) that there's an unambiguous mapping from CompWindow::Geometry:

a. Add a constructor to CompSize: "explicit CompSize(CompWindow::Geometry const& g) : mWidth(g.width () + g.border () * 2) ..."
b. Add an inline method "CompSize PrivateWindow::size () const { return CompSize(priv->geometry); }"
c. Rewrite the above as "CompSize CompWindow::size () const { "return priv->size ()"; }"

[Alan Griffiths (alan-griffiths)]

264 - /* been shaded */
265 + /* been shaded
266 if (w->priv->height == 0)
267 {
268 if (w->id () == priv->activeWindow)
269 w->moveInputFocusTo ();
270 - }
271 + }*/

Comments are not for storing old versions of the code - that's what we use bzr for. ;)

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

There's a lot of "<blah>.width () + <blah>.border () * 2" and "<blah>.height () + <blah>.border () * 2" around. Surely CompWindow::Geometry could have a "widthWithBorders" method - or maybe a free function?

I'm tempted by

template<Typename T>
inline int heightWithBorders(T const& blah) { return blah.height () + blah.border () * 2; }

[Sam Spilsbury (smspillaz)]

> OK, I'm still wading through the changes. But I feel like a rant...
>
> 1307 CompSize
> 1308 CompWindow::size () const
> 1309 {
> 1310 - return CompSize (priv->width + priv->geometry.border () * 2,
> 1311 - priv->height + priv->geometry.border () * 2);
> 1312 + return CompSize (priv->geometry.width () + priv->geometry.border ()
> * 2,
> 1313 + priv->geometry.height () + priv->geometry.border () * 2);
> 1314 }
>
> As a change this doesn't look too bad - but it ignores a horrid design!
>
> 1. Chained operations like "priv->geometry.width ()" imply too muck knowledge
> of the details of "priv".
> That is "priv->width ()" would reflect less coupling.

Probably, although priv is just a private member with implementation details, I don't really see this as a large design problem.

>
> 2. You're tracing the path "priv->geometry..." many times, which suggests that
> the logic belongs in "geometry".
> "return priv->geometry.size ()" or "return CompSize(priv->geometry)" would
> reflect better coherence.
>
> So, assuming (because borders may be optional?) that there's an unambiguous
> mapping from CompWindow::Geometry:
>
> a. Add a constructor to CompSize: "explicit CompSize(CompWindow::Geometry
> const& g) : mWidth(g.width () + g.border () * 2) ..."
> b. Add an inline method "CompSize PrivateWindow::size () const { return
> CompSize(priv->geometry); }"
> c. Rewrite the above as "CompSize CompWindow::size () const { "return
> priv->size ()"; }"

+1 for all three

[Sam Spilsbury (smspillaz)]

> 264 - /* been shaded */
> 265 + /* been shaded
> 266 if (w->priv->height == 0)
> 267 {
> 268 if (w->id () == priv->activeWindow)
> 269 w->moveInputFocusTo ();
> 270 - }
> 271 + }*/
>
> Comments are not for storing old versions of the code - that's what we use bzr
> for. ;)

Indeed, this is a small portion of the code and I'm not yet sure what to do with it. When I get around to revisiting this section (when I actually get time to look at this again, wanted to get it up for review early) I'll see what can be done.

[Sam Spilsbury (smspillaz)]

> There's a lot of "<blah>.width () + <blah>.border () * 2" and "<blah>.height
> () + <blah>.border () * 2" around. Surely CompWindow::Geometry could have a
> "widthWithBorders" method - or maybe a free function?
>
> I'm tempted by
>
> template<Typename T>
> inline int heightWithBorders(T const& blah) { return blah.height () +
> blah.border () * 2; }

I'm not really sure ?

The complexity here comes from a legacy part of the X Server coming into play - a window could have fixed dimentions, but also specify a "border" which would be exclusive of the fixed dimentions, so you'd have to take this into account for all positioning operations (Xterm comes to mind here).

I definitely agree that geom.width () + geom.border () * 2 feels fragile and indeed, that has tripped me up many times before. Maybe a default parameter with a bitflag makes sense here, eg IncludeBorder , IncludeBorderFirst , IncludeBorderSecond (as it is on both sides)

[Sam Spilsbury (smspillaz)]

I'll note that the above isn't *really* all that relevant to this merge though, but good things to keep in mind in any case. I'd rather not see the diff get any better except for adding tests.

[Daniel van Vugt (vanvugt)]

Please resubmit for target branch lp:compiz-core (0.9.7)

review: Needs Resubmitting

[Alan Griffiths (alan-griffiths)]

A lot of the above is about making the code better (which the proposal doesn't attempt). However, in a previous version I pointed out that:

> 264 - /* been shaded */
> 265 + /* been shaded
> 266 if (w->priv->height == 0)
> 267 {
> 268 if (w->id () == priv->activeWindow)
> 269 w->moveInputFocusTo ();
> 270 - }
> 271 + }*/
>
> Comments are not for storing old versions of the code - that's what we use bzr for. ;)

I still think that needs fixing.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Alright, I've updated this so that there's no distorted windows on decoration size change. Was (ironically) a race condition.

[Sam Spilsbury (smspillaz)]

For the sake of not making this diff any bigger, I'm not going to introduce unit tests here.

As for testing this I'd say the following is appropriate:

 * Add testcase for PendingConfigureEvent
 * Add testcase for rectsToRegion (serverGeometry should really be DI'd here)

Notes for the future:

 * As alan has said - the whole priv->geometry ().width () + priv->geometry ().border () * 2 is /really/ awkward and error prone, but we need it to support windows like xterm that still use this (stupid, legacy) attribute on their windows. I would say that the role of compiz::window::Geometry should thus be expanded somewhat
   - it should also encapsulate priv->region and really, geometry::x and friends should be made with reference to that. Ideally we'll store two regions, one with borders and one without. That sucks, since its a little memory hungry, but at least the cost is only really born whenever those regions need to be updated (::translate on a region with one rectangle is basically free, slightly more complicated on regions with multiple rects (eg, shaped window). The default should be to return the size /without/ borders, and have a default-parameter enum to get the size with borders.

[Daniel van Vugt (vanvugt)]

Unfortunately still fails basic testing. The same bug remains;

* The bug introduced is worse than the bug being fixed; Window contents offset from the frame/decorations whenever a window is created or maximized.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also... I would have thought/hoped that a simplified/stable solution would eliminate "serverGeometry" completely.

        /**
        * Geometry retrieved from the
         * last ConfigureNotify event received
         */
        Geometry & geometry () const;

        /**
         * Geometry last sent to the server
         */
        Geometry & serverGeometry () const;

I understand why we have, and why we might want, serverGeometry. However it is an optimization which only makes sense to attempt if the code is stable and bug-free to begin with.

While serious bugs remain, I think the first goal should be to simplify the logic down to just using "geometry" and remove or stub "serverGeometry".

[Sam Spilsbury (smspillaz)]

> Also... I would have thought/hoped that a simplified/stable solution would
> eliminate "serverGeometry" completely.
>
> /**
> * Geometry retrieved from the
> * last ConfigureNotify event received
> */
> Geometry & geometry () const;
>
> /**
> * Geometry last sent to the server
> */
> Geometry & serverGeometry () const;
>
> I understand why we have, and why we might want, serverGeometry. However it is
> an optimization which only makes sense to attempt if the code is stable and
> bug-free to begin with.
>
> While serious bugs remain, I think the first goal should be to simplify the
> logic down to just using "geometry" and remove or stub "serverGeometry".

There are some usescases for when we need to know what the last /received/ geometry from the server is. That's why the whole geometry/serverGeometry thing exists.

[Sam Spilsbury (smspillaz)]

Also, I'm not seeing this offset problem - could you give me some steps to reproduce it ?

[Sam Spilsbury (smspillaz)]

> > Also... I would have thought/hoped that a simplified/stable solution would
> > eliminate "serverGeometry" completely.
> >
> > /**
> > * Geometry retrieved from the
> > * last ConfigureNotify event received
> > */
> > Geometry & geometry () const;
> >
> > /**
> > * Geometry last sent to the server
> > */
> > Geometry & serverGeometry () const;
> >
> > I understand why we have, and why we might want, serverGeometry. However it
> is
> > an optimization which only makes sense to attempt if the code is stable and
> > bug-free to begin with.
> >
> > While serious bugs remain, I think the first goal should be to simplify the
> > logic down to just using "geometry" and remove or stub "serverGeometry".
>
>
> There are some usescases for when we need to know what the last /received/
> geometry from the server is. That's why the whole geometry/serverGeometry
> thing exists.

Hmm, we could make it so that serverGeometry is returned for managed windows and geometry is returned for override redirect windows on the public API. That of course means that we have to break the public API and update all the plugins.

[Daniel van Vugt (vanvugt)]

The practical problem:

Just start compiz --replace composite opengl move resize decor
and gtk-window-decorator --replace
Then every window will have its contents horizontally shifted around 15 pixels from the correct location relative to its decorations. The shift occurs whenever a window is created, maximized or restored. The shift goes away (corrects itself) when you start moving the window. On a positive note, the lag *appears* totally fixed and dragging windows is performing as well as Gnome Shell now.

The theoretical problem:

You can ignore my comments about geometry/serverGeometry for now. They are insignificant compared to the above bug. And besides, the use of both geometry and serverGeometry now appears to be yielding the desired reduction in lag.

[Daniel van Vugt (vanvugt)]

Screenshot of the bug introduced by this branch:
https://launchpadlibrarian.net/92172452/shift.png

[Sam Spilsbury (smspillaz)]

Alright, I'll have another look into it ? (Not seeing it here :( )

[Daniel van Vugt (vanvugt)]

And it gets worse:
* The usual lag has come back. I have no idea how or why it was fixed when I ran it the first time.
* When dragging windows around, the area of desktop recently exposed flashes white.

So there is no improvement in performance and 2 serious regressions introduced :(

[Sam Spilsbury (smspillaz)]

    //XSynchronize (dpy, TRUE);

:) Haven't merged your other branch

[Daniel van Vugt (vanvugt)]

Yikes. That would be another regression to be missing:
src/screen.cpp: XSynchronize (dpy, synchronousX ? True : False);

[Daniel van Vugt (vanvugt)]

Perhaps remember to pull from trunk more often.

[Daniel van Vugt (vanvugt)]

where trunk == lp:compiz-core

[Daniel van Vugt (vanvugt)]

Why doesn't the removal of XSynchronize show up in the below diff? It's obvious if I merge the branch myself. Maybe LaunchPad needs a kick to update the below diff?

[Daniel van Vugt (vanvugt)]

I think the horizontal shift bug is coming from upstream lp:compiz-core, and is exposed moreso by this branch. I can reproduce the same kind of horizontal shift jitter using just lp:compiz-core and resizing a window rapidly.

[Alan Griffiths (alan-griffiths)]

> The default should be to return the size /without/ borders,
> and have a default-parameter enum to get the size with borders.

There are very few designs where default parameters are better than multiple functions. This isn't one.

auto sizeWithoutBorders = geometry.size();
auto sizeWithBorders = geometry.sizeWithBorders(); // not geometry.size(::compiz::geometry::WithBorders);

[Daniel van Vugt (vanvugt)]

OK, the horizontal shifting bug does not seem to be caused by this branch. Just made worse by this branch.

Sam, please review that nasty issue first: bug 928173.

[Sam Spilsbury (smspillaz)]

This branch will incidentally help with a lot of the resizing issues, so I think it should be merged first.

[Daniel van Vugt (vanvugt)]

I would prefer not to approve this branch so long as the offset/shift bug is as bad as it is. If absolutely necessary, we could release without a fix for bug 928173 because it is hidden by the default Ubuntu config. But introducing this branch makes the bug unacceptably worse, as the screenshot showed.

[Daniel van Vugt (vanvugt)]

To clarify, "unacceptably worse" means that the bug will no longer be hidden in Ubuntu and will occur on every new window that opens. At least on my machine (and presumably others).

[Sam Spilsbury (smspillaz)]

.... I'm still not even seeing this issue.

I can look into resizing tonight if you really think that this is a blocker.

[Daniel van Vugt (vanvugt)]

I think I may have confused the situation by suggesting the regression introduced by this branch is bug 928173. The symptoms are actually slightly different. It's only a theory that it's the same bug, because the size of the horizontal offset looks similar.

The bug I see with this branch would be worthy of a new bug report (a critical regression) that I don't want to log. And we won't have to log that bug so long as it's fixed before this branch is merged.

[Sam Spilsbury (smspillaz)]

On Wed, 8 Feb 2012, Daniel van Vugt wrote:

> I think I may have confused the situation by suggesting the regression introduced by this branch is bug 928173. The symptoms are actually slightly different. It's only a theory that it's the same bug, because the size of the horizontal offset looks similar.
>
> The bug I see with this branch would be worthy of a new bug report (a critical regression) that I don't want to log. And we won't have to log that bug so long as it's fixed before this branch is merged.
> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/91654
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.work_923683.
>

Alright.

I am looking into the decor plugin for a way to resolve this.

[Daniel van Vugt (vanvugt)]

Despite the success of the fix for #928173: lp:~smspillaz/compiz-core/compiz-core.decor_928173
the offset bug introduced by this branch persists.

This confirms that the horizontal offset/shift problems introduced (or exposed) by this branch are certainly not the same as bug 928173.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

I still can't even observe this problem that you're referring to :(

Can you specify, exactly what windows this occurs on and /exact/ steps to reproduce it ?

[Daniel van Vugt (vanvugt)]

Steps to reproduce the issue:

1. Start with an exact clone of lp:compiz-core
2. Merge in lp:~smspillaz/compiz-core/compiz-core.work_923683
3. Build and install it.
4. Run compiz --replace composite opengl move resize decor
5. Run gtk-window-decorator --replace

Now every window will be corrupted. Not just the existing ones, but any new ones you open too. The corruption persists during window resizing, but vanishes as soon as you move a window.

Here is a new screenshot:
https://launchpadlibrarian.net/92390683/shifted2.png

[Sam Spilsbury (smspillaz)]

Is the window itself shifted (eg are the input regions correctly lined up) or is it just the image that is shifted ?

[Daniel van Vugt (vanvugt)]

The window itself is shifted. The input regions correctly line up with the image still.

However, it looks like the damage events are not shifted. This causes some redraw problems.

[Sam Spilsbury (smspillaz)]

Can you post the xwininfo -all of the window, xwininfo -all -id of the parent and xwininfo -all -parent of the parent of that ?

[Daniel van Vugt (vanvugt)]

Attachments sent via email. This is interesting though;

$ diff correct.xwininfo shifted.xwininfo
11c11
< 0x2c03ca7 (has no name): () 1x1+-1+-1 +45+69
---
> 0x2c03ca7 (has no name): () 1x1+-1+-1 +34+69
13c13
< Absolute upper-left X: 46
---
> Absolute upper-left X: 35
31,32c31,32
< Corners: +46+70 -1232+70 -1232-720 +46-720
< -geometry 80x24+35+41
---
> Corners: +35+70 -1243+70 -1243-720 +35-720
> -geometry 80x24+34+41

It looks like geometry/serverGeometry might be out of sync.

[Daniel van Vugt (vanvugt)]

And why do I have so many 1x1 pixel windows?! I swear occasionally I see them on screen too.

[Sam Spilsbury (smspillaz)]

On Sun, 12 Feb 2012, Daniel van Vugt wrote:

> And why do I have so many 1x1 pixel windows?!

Applications use them as a means of doing IPC. Gtk+ is a serial offender
here.

> I swear occasionally I see them on screen too.

Under what circumstances?

> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/91654
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.work_923683.
>

[Sam Spilsbury (smspillaz)]

On Sun, 12 Feb 2012, Daniel van Vugt wrote:

The frame window is in the wrong position. This means that serverGeometry
isn't the last thing sent to the server. serverGeometry is still writable
in this branch, so it could be $evilplugin doing the wrong thing here.

I don't want to spend any more time on this until wednesday. So I'll pick
it up then.

(compiz run with --debug will have some logs which can confirm this btw)

Incidentally, you don't see any of those "unmatched ConfigureNotify"
warnings do you? They're all gone here but they indicate the first sign of
trouble.

> Attachments sent via email. This is interesting though;
>
> $ diff correct.xwininfo shifted.xwininfo
> 11c11
> < 0x2c03ca7 (has no name): () 1x1+-1+-1 +45+69
> ---
>> 0x2c03ca7 (has no name): () 1x1+-1+-1 +34+69
> 13c13
> < Absolute upper-left X: 46
> ---
>> Absolute upper-left X: 35
> 31,32c31,32
> < Corners: +46+70 -1232+70 -1232-720 +46-720
> < -geometry 80x24+35+41
> ---
>> Corners: +35+70 -1243+70 -1243-720 +35-720
>> -geometry 80x24+34+41
>
> It looks like geometry/serverGeometry might be out of sync.
> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/91654
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.work_923683.
>

[Daniel van Vugt (vanvugt)]

It's random and very rare. But sometimes I see 1-pixel windows (with shadow). Can't ever seem to get xwininfo for them. Sometimes I also get very large white anonymous windows blocking my view. But it's all very hard to reproduce. And off-topic.

[Daniel van Vugt (vanvugt)]

Correct. I did stop getting "Warn: failed to receive ConfigureNotify event on ..." when using this branch.

[Sam Spilsbury (smspillaz)]

Well, you should stop getting "failed to receive" since I've removed the timeout which checks for unmatched events :) (A necessary hack coming up to the oneiric release).

I'm more interested in warnings that say "unmatched ConfigureNotify"

[Sam Spilsbury (smspillaz)]

Could you have a look again to see if the issue is still occurring for you ? I've just re-synced with trunk, so it may be fixed.

[Sam Spilsbury (smspillaz)]

OK, I found the issue. Its actually a bug that's been in the code for quite some time which would cause the client to not move within the frame when the frame was updated until the client position itself was updated.

[Sam Spilsbury (smspillaz)]

There's still one more issue here though to do with override redirect windows not getting their paint regions updated, so that needs to be looked into as well. And tests.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

^ Those fix the offset issue confirmed here (was finally able to reproduce it with qtcreator)

[Daniel van Vugt (vanvugt)]

1. Confirmed the shifted window regression is now fixed. Seems to work without any obvious bugs now.

2. I'm not entirely sure about replacing geometry with serverGeometry. I thought it would be a good idea to do the opposite. There would be a slight performance penalty, but using just "geometry" would guarantee that compiz always agrees with the actual server geometry, instead of guessing/assuming that serverGeometry is accepted by the server (which does not always seem to be true, hence bug 886192).

3. There are two instances of double semicolons ";;" in this proposal.

4. I suspect this proposal will conflict just slightly with the proposal for bug 940139. But it should be minor.

5. NEW REGRESSION:
375 - XSynchronize (dpy, synchronousX ? True : False);
376 +// priv->connection = XGetXCBConnection (priv->dpy);

6. Why always two spaces before "* 2" ?

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> 2. I'm not entirely sure about replacing geometry with serverGeometry. I
> thought it would be a good idea to do the opposite. There would be a slight
> performance penalty, but using just "geometry" would guarantee that compiz
> always agrees with the actual server geometry, instead of guessing/assuming
> that serverGeometry is accepted by the server (which does not always seem to
> be true, hence bug 886192).
>

serverGeometry will always be "accepted" by the server as long as the window is managed and the requested window geometry will not generate a BadValue error (eg, 0 < 1 < MAXINT) (eg, it is not override redirect and it is a child of a window for which we have a SubstructureRedirectMask.

Bug 886192 is not an example of this. In fact, the behaviour exhibited by bug 886192 is primarily /because/ we use the geometry last received from the server rather than geometry last sent, and the latency of which explains the reason why the window movement lags the cursor, because the server is "catching up".

The only case where you can't guaruntee that a similar update for geometry is going to be delivered by the server for serverGeometry as stored on XConfigureWindow is either in the case that A) Another client has SubstructureRedirectMask on the root window or a parent window owned by compiz and in that case compiz shouldn't even touch that window at all or B) override redirect windows, and as you can see in the code, we /always/ use geometry for override redirect windows in placement sensitive operations. Incidentally, override redirect windows are why getting window stacking right is such a nightmare, but thats a topic for another day.

> 3. There are two instances of double semicolons ";;" in this proposal.

Fix
>
> 4. I suspect this proposal will conflict just slightly with the proposal for
> bug 940139. But it should be minor.

Yes, fixable

>
> 5. NEW REGRESSION:
> 375 - XSynchronize (dpy, synchronousX ? True : False);
> 376 +// priv->connection = XGetXCBConnection (priv->dpy);

Please elaborate further on why this is a regression.

>
> 6. Why always two spaces before "* 2" ?

Most likely copy-and-paste errors

[Daniel van Vugt (vanvugt)]

#5 is a regression because it will make "--sync" be ignored. Line 375 is important and should not be deleted.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

On Mon, 27 Feb 2012, Daniel van Vugt wrote:

> Review: Needs Fixing
>
> #5 is a regression because it will make "--sync" be ignored. Line 375 is important and should not be deleted.

Thank you. Fixing.

> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/94683
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.work_923683.
>

[Mikkel Kamstrup Erlandsen (kamstrup)]

> > #5 is a regression because it will make "--sync" be ignored. Line 375 is
> important and should not be deleted.
>
> Thank you. Fixing.

Be sure to add a comment there explaining why that call needs to be there - this review demonstrates that it should have been there in the first place :-)

[Daniel van Vugt (vanvugt)]

Comments are good. Though the string "synchronousX" is unique so its use should be quite clear already without a comment.

[Daniel van Vugt (vanvugt)]

Looks like a mistake:

710 - if (x2 > priv->width)
711 - x2 = priv->width;
712 - if (y2 > priv->height)
713 - y2 = priv->height;
714 + if (x2 > priv->serverGeometry.width ())
715 + x2 = priv->serverGeometry.height (); <====== width?
716 + if (y2 > priv->serverGeometry.width ()) <====== height?
717 + y2 = priv->serverGeometry.height ();

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, there seems to be a HUGE performance regression when moving windows with this new branch. Try running under callgrind. With lp:compiz-core it's nice and fast. However with this branch it is painfully slow moving windows.

About 75% of the time is spent in:
  775,164,942 /home/dan/bzr/compiz-core/sam/plugins/move/src/move.cpp:moveHandleMotionEvent(CompScreen*, int, int) [/home/dan/sam/lib/compiz/libmove.so]
  772,734,309 /home/dan/bzr/compiz-core/sam/src/window.cpp:CompWindow::configureXWindow(unsigned int, XWindowChanges*) [/home/dan/sam/lib/libcompiz_core.so.0.9.7.0]
  771,062,144 /home/dan/bzr/compiz-core/sam/src/window.cpp:CompWindow::move(int, int, bool) [/home/dan/sam/lib/libcompiz_core.so.0.9.7.0]
  636,443,803 /home/dan/bzr/compiz-core/sam/src/window.cpp:CompWindow::moveNotify(int, int, bool) [/home/dan/sam/lib/libcompiz_core.so.0.9.7.0]
  636,266,731 /home/dan/bzr/compiz-core/sam/plugins/decor/src/decor.cpp:DecorWindow::moveNotify(int, int, bool) [/home/dan/sam/lib/compiz/libdecor.so]

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

The main paths causing this massive performance regression are:

70% of the time:
CompWindow::move
DecorWindow::moveNotify
DecorWindow::computeShadowRegion

18% of the time:
CompWindow::move
CompWindow::configureXWindow
PrivateWindow::reconfigureXWindow

[Sam Spilsbury (smspillaz)]

Hmm, I would imagine this is the throttling of motion events that we mentioned earlier. I think in lp:compiz-core we would have just spent all that time in CompWindow::move although I'll conceed that configureXWindow is a bit more of an ... involved function (although I haven't noticed any *noticable* performance problems).

[Daniel van Vugt (vanvugt)]

I also recommend "kcachegrind" to display callgrind output in a pretty graphical way.

[Daniel van Vugt (vanvugt)]

Try using valgrind/callgrind to simulate a slow machine. You will see a monumental difference in performance when dragging windows. Even my i7 (running callgrind) can't keep up with dragging windows using this branch. But it is almost perfectly fluid without this branch.

Maybe it is the fact that all motion events are getting though now. But regardless, people with slow-to-regular machines will be noticeably impacted. We need a fix before accepting this.

[Daniel van Vugt (vanvugt)]

From what I can tell, the problem is that moveNotify is called much more often with this branch. However moveNotify is far too expensive to call so often, mostly due to DecorWindow::moveNotify.

Does DecorWindow::moveNotify really need to computeShadowRegion on EVERY window whenever a single window moves?

[Sam Spilsbury (smspillaz)]

One small caveat is that I haven't merged lp:compiz-core into this one today, which includes the region fixes.

> Does DecorWindow::moveNotify really need to computeShadowRegion on EVERY window whenever a single window moves?

Yes it does. There are some optimizations we can do there to make it only compute regions on certain windows. I've done them before, so its not too hard. Not for this branch.

> From what I can tell, the problem is that moveNotify is called much more often with this branch. However moveNotify is far too expensive to call so often, mostly due to DecorWindow::moveNotify.

So I think there are three optimizations which can be applied here, all of which are quite involved, so I'll need to put them in separate branches.

Firstly, we need to throttle motion events, so they aren't dispatched spuriously. That's easy enough to do.

The second which is a bit more complicated is to also throttle dispatch of serverGeometry updates / moveNotify / XConfigureWindow as well. There are some plugins which need immediate move notify updates but probably not immediate move notify updates 1000 times a second.

Another optimization is to only call XConfigureWindow when we actually need to update the server side position and not necessarily all the time. This does mean that serverGeometry will be "ahead" of whats being sent to the server, but that's OK since we can just flush the changes on demand (and besides, its meant to be ahead, which is why its there).

Incidentally, I'm not able to get such high readings in callgrind for window movement, but I guess this is a case-by-case thing.

[Daniel van Vugt (vanvugt)]

Window movement accounts for all my CPU because that's all I am testing since I noticed the problem;
  Start compiz
  Move windows around lots
  Stop compiz

With this branch I see movement account for 60-80% of compiz' time and is incredibly slow and stuttering. Without this branch, it only uses maximum 20% of compiz' time and is visually much smoother.

[Daniel van Vugt (vanvugt)]

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

I merged lp:compiz-core from today. Could you give it another try and let me know how it goes ?

Also some thoughts on those optimizations would be nice :)

Currently I'm testing using the entire unity stack, but I can reduce it down to just compiz and a basic set of plugins.

[Daniel van Vugt (vanvugt)]

I was already testing this branch merged with the latest lp:compiz-core (including yesterday's optimizations) all along. Which makes the regression from this branch more worrying.

[Sam Spilsbury (smspillaz)]

tOn Tue, 28 Feb 2012, Daniel van Vugt wrote:

> I was already testing this branch merged with the latest lp:compiz-core (including yesterday's optimizations) all along. Which makes the regression from this branch more worrying.
> --
> https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.work_923683/+merge/94923
> You are the owner of lp:~smspillaz/compiz-core/compiz-core.work_923683.
>

OK, well, I know there are some code paths which can be slow, so lets look
at optimizing. Do you have any thoughts about the ideas I raised ?

[Daniel van Vugt (vanvugt)]

I don't have the encyclopaedic knowledge of CompWindow or the time to research your suggestions right now. So no comment.

But I'm happy to test/profile any further additions to this proposal... tomorrow.

(Daniel logs off)

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

I don't see anything obviously wrong, but would like to hear the results of Daniel's profiling.

review: Abstain

[Daniel van Vugt (vanvugt)]

Tested revision 2994. Moving windows is still so slow it's unusable (under valgrind). We should fix this because it's a good indication that the same would occur in the wild on a slow machine.

compiz is spending 70% of it's CPU in or below moveHandleMotionEvent. The two main CPU hogs are:

(73% of the 70%)
moveHandleMotionEvent
CompWindow::move
DecorWindow::moveNotify
DecorWindow::computeShadowRegion

(16% of the 70%)
moveHandleMotionEvent
CompWindow::move
CompWindow::configureXWindow
PrivateWindow::reconfigureXWindow

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

And no, combining this branch with lp:~smspillaz/compiz-core/compiz-core.optimization-inlining
does not solve or change the performance problem.

[Sam Spilsbury (smspillaz)]

Indeed, that's not meant to completely fix it, but it does fix some hotspots and other inefficiencies I observed :)

[Alan Griffiths (alan-griffiths)]

I'm concerned that the code still looks "fragile" (to use Sam's word). For example:

50 + y1 = geom.height () + geom.border ();
...
59 + y2 = geom.height () - geom.border ();

It isn't explicit why border is added in one case and subtracted in the other. I suspect that there's an abstraction missing (or at least suitably named functions that derive the appropriate result from geom). Something like "internalHeight = internalHeight(geom)" is much easier to follow.

I've not tested the latest version enough to be confident in it. Will aim to do so on Thursday.

[Sam Spilsbury (smspillaz)]

> I'm concerned that the code still looks "fragile" (to use Sam's word). For
> example:
>
> 50 + y1 = geom.height () + geom.border ();
> ...
> 59 + y2 = geom.height () - geom.border ();
>
> It isn't explicit why border is added in one case and subtracted in the other.
> I suspect that there's an abstraction missing (or at least suitably named
> functions that derive the appropriate result from geom). Something like
> "internalHeight = internalHeight(geom)" is much easier to follow.
>
> I've not tested the latest version enough to be confident in it. Will aim to
> do so on Thursday.

Ack, I'll add something like that to compiz::window::Geometry

[Sam Spilsbury (smspillaz)]

Alan: see https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.width-height-for-border/+merge/100728 for your comments

[Daniel van Vugt (vanvugt)]

Tested this branch by itself and merged with lp:~smspillaz/compiz-core/compiz-core.fix_969108.2

By itself, this branch still makes window movement unacceptably slow. With the other branch designed to make movement more efficient, windows now often don't move at all when dragged.

Unfortunately performance is getting worse, not better.

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Its probably a small typo during refactoring. Please don't panic

[Daniel van Vugt (vanvugt)]

I got this branch performing somewhat better by combining it with:
https://code.launchpad.net/~vanvugt/compiz-core/lastMotionTime/+merge/100742

However I would say still noticeably slower than lp:compiz-core. :(

[Daniel van Vugt (vanvugt)]

Confirmed the performance problems with this branch do seem to be fixed by:
https://code.launchpad.net/~smspillaz/compiz-core/compiz-core.fix_969101/+merge/100270

[Daniel van Vugt (vanvugt)]

Please resubmit with prerequisite:
lp:~smspillaz/compiz-core/compiz-core.fix_969101

review: Needs Resubmitting

[Daniel van Vugt (vanvugt)]

This branch does appear to fix bug 862430.

[Daniel van Vugt (vanvugt)]

I was so close to approving and merging this today. But in final testing I noticed it triggers window border/shadow artefacts when resizing. They are easiest to see in Normal resize mode, but still happen much less noticeably in Rectangle resize mode too.

Just put a Nautilus window in front of a large white window and resize the Nautilus window rapidly from its top-right corner. Ugly artefacts will be left on the window behind.

I actually suspect the resize plugin being to blame for this, because I have encountered similar bugs with it before. And read that the GLES branch seems to have too.

However right now, it's being triggered by this branch. So I can't approve it just yet.

[Daniel van Vugt (vanvugt)]

I can't reproduce the same resize artefacts with my experimental branch, only with this one.

Perhaps we didn't notice the artefacts before because they are the result of the latest compiz-core commit r3086 combining with this branch...

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

Resubmitted again.

LP #923520 is also fixed in this branch. I'm not sure if the artefacts are fixed "for good" but I can't reproduce them anymore since fixing that one.

(I cannot remove that fix from this branch, since its actually dependent on the fact that we can update window regions before sending geometry to the server, which wouldn't be possible in core at the moment)

[Sam Spilsbury (smspillaz)]

> (I cannot remove that fix from this branch, since its actually dependent on
> the fact that we can update window regions before sending geometry to the
> server, which wouldn't be possible in core at the moment)

Clarifying ambiguous words: I can't separate out that fix.

[Sam Spilsbury (smspillaz)]

Typo : bug 932520

[Alan Griffiths (alan-griffiths)]

The intent has always looked sensible. The latest code looks the tidiest. And I've been running it all morning without noticing anything untoward.

review: Approve

[Alan Griffiths (alan-griffiths)]

Probably a reason not to merge, but running with "wobbly windows", and dragging a window across others there are repaint issues on the "behind" windows that don't resolve until the moved window is released.

[Alan Griffiths (alan-griffiths)]

> Probably a reason not to merge, but running with "wobbly windows", and
> dragging a window across others there are repaint issues on the "behind"
> windows that don't resolve until the moved window is released.

That should be "Probably /not/ a reason not to merge"

[Sam Spilsbury (smspillaz)]

> Probably a reason not to merge, but running with "wobbly windows", and
> dragging a window across others there are repaint issues on the "behind"
> windows that don't resolve until the moved window is released.

I'll resolve this anyhow since it could impact other plugins.

[Daniel van Vugt (vanvugt)]

Please remove the ABI changes (include/core/window.h at least). I agree they're nice changes, but we can't change the ABI.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Also, when I maximize and restore a window, it moves left by about 1 pixel each time. So I don't think we can declare this branch as having fixed bug 892012.

[Daniel van Vugt (vanvugt)]

And confirmed the regression with wobbly windows this branch introduces. Although not officially enabled by default, enough people do use wobbly windows for us to want to avoid introducing such a regression.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Confirmed the flicker bug 862430 is fixed. So that's some good news.

[Sam Spilsbury (smspillaz)]

Both issues fixed, please re-review.

Will look into the 1px shift later.

[Alan Griffiths (alan-griffiths)]

Confirm wobbly windows fixed. They are rather cute!

[Daniel van Vugt (vanvugt)]

I'm still testing the various bugs, and want to continue testing for tomorrow at least.

So far I can't see any regressions. And the 1px movement issue is actually not related to this branch, so forget that for now.

Once I'm happy it runs OK and further fixes are not required, then I'll start reviewing the code again in detail.

[Daniel van Vugt (vanvugt)]

I sense a slight performance regression when moving windows compared to trunk. Trunk is slightly smoother. But it's only noticeable when running under callgrind and only slight.

I have confirmed 3 of the 4 bugs are fixed, and the other 1 I can't reproduce.

All good so far. But I won't review the rather large diff in detail tonight.

[Alan Griffiths (alan-griffiths)]

Only problem I've seen today is that when I replace the graphics stack all windows end up in 1st workspace. I don't think that is this branch - but haven't got to the bottom of it yet.

[Daniel van Vugt (vanvugt)]

* priv->frameRegion -= infiniteRegion
  should be:
  priv->frameRegion = emptyRegion;

* Gererally speaking, x1 + width != x2
  That's an off-by-one mistake. It should usually be: x1 + width - 1 == x2
  However I can't prove that's causing any problems right now and it's not new in this branch.

* Regression: The resize artefacts reported on 5 April are still present. I thought they were meant to be fixed?

I really really don't want to see any more revisions of this branch. But the regression is kind of a problem.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Thanks, the regression is now fixed (or at least worked around by damageScreen).

And after 10 weeks(!) of revisions on this branch, I'm sure I'm not the only one who is fed up looking at it.

As far as I can tell, it fixes all the bugs linked to it. And there are no visible regressions now. Let's land it, and move on.

review: Approve

[Daniel van Vugt (vanvugt)]

As above.

review: Approve

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

[Daniel van Vugt (vanvugt)]

REGRESSION:
When resizing a window's top or left edges, the opposite edge jitters about (in Normal resize move). I know I mentioned this bug yesterday but I only just realized it's a regression that's unique to this branch.

Sounds like that's the cause of the resize artefacts too. So if we fix the regression then we can remove the damageScreen workaround from the resize plugin.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

And please wait till Monday at least before proposing any new revisions. It would ruin my weekend to see this branch come up in weekend email :)

[Daniel van Vugt (vanvugt)]

Make that Tuesday. You're meant to have Monday off, I believe :)

[Sam Spilsbury (smspillaz)]

> And please wait till Monday at least before proposing any new revisions. It
> would ruin my weekend to see this branch come up in weekend email :)

Nobody is making you look at this ...........................................

[lp:~smspillaz/compiz-core/compiz-core.work_923683]

3009. By Sam Spilsbury on 2012-04-14

Merged trunk and fixed a number of problems with resize synchronization

3010. By Sam Spilsbury on 2012-04-14

Send resize notification immediately for windows that aren't override redirect

3011. By Sam Spilsbury on 2012-04-14

Fix jumping around on resize because we were rebinding way too much at the wrong time.

Only rebind on paints.

3012. By Sam Spilsbury on 2012-04-14

Don't not update decorations when we're grabbed for resizing

[Sam Spilsbury (smspillaz)]

Okay.

Normal resize mode was not something I was planning on supporting in precise. Nevertheless, I've merged in some work I did a few weeks ago to essentially fix it up so that there's no tearing and windows don't appear to jump around when you resize them.

There is still a race condition in the window decorators where pixmaps can be freed server side before they are bound by the decorator. Getting around that race condition requires some synchronization protocol which I've prototyped and works fine with gtk-window-decorator (no fail to bind errors \o/). However, I don't want to push up the size of the diff anymore. So I've put that work in another branch (lp:~smspillaz/compiz-core/compiz-core.decor_synchronization).

The damageScreen call in DecorWindow::resizeNotify is, while unfortunate, necessary for now at least. There are some race conditions to do with bindPixmapToTexture where the returned size can differ from the actual texture size in the middle of a resize op. As such, damageScreen for now.

I hope this is the last revision we need to do of this.

[lp:~smspillaz/compiz-core/compiz-core.work_923683]

3013. By Sam Spilsbury on 2012-04-14

Null check

3014. By Sam Spilsbury on 2012-04-15

resize: unconditionally finish the resize operation when releasing the button

3015. By Sam Spilsbury on 2012-04-16

Merge trunk

3016. By Sam Spilsbury on 2012-04-16

Don't send a moveNotify and resizeNotify if the window was moved and resized

3017. By Sam Spilsbury on 2012-04-16

Cleanup wobbly model update code

3018. By Sam Spilsbury on 2012-04-17

Ensure that override redirect windows get their regions set correctly.
Also they can't have input extents.

3019. By Sam Spilsbury on 2012-04-18

Force all override redirect windows to use geometry last received from
server. Force all managed windows to use geometry last sent.

The difference between geometry and server* is now moot and can be
removed in a future release

3020. By Sam Spilsbury on 2012-04-18

Clean some cruft

3021. By Sam Spilsbury on 2012-04-18

Update decoration matrix of shaded windows

3022. By Sam Spilsbury on 2012-04-18

Send a resizeNotify to indicate to plugins when map operations have completed

3023. By Sam Spilsbury on 2012-04-18

Merge lp:compiz-core

3024. By Sam Spilsbury on 2012-04-18

Don't notify plugins of unreparent in the right place

3025. By Sam Spilsbury on 2012-04-18

Merged lp:~vanvugt/compiz-core/compiz-core/fix-981703-properly

3026. By Sam Spilsbury on 2012-04-18

updateState is bitwise, so never clobber it

3027. By Sam Spilsbury on 2012-04-18

Base decision to send notifications to plugins on absolute position
changes

3028. By Sam Spilsbury on 2012-04-19

Don't set height = 0 if the window still has a pixmap

3029. By Sam Spilsbury on 2012-04-19

Remove some unnecessary cahgnes in the wobbly plugin

3030. By Sam Spilsbury on 2012-04-19

Merge lp:compiz-core

3031. By Sam Spilsbury on 2012-04-19

Now that geometry and serverGeometry both return the same thing, the changes
in client code don't make any sense to keep

3032. By Sam Spilsbury on 2012-04-20

Fix logic errors

3033. By Sam Spilsbury on 2012-04-20

!= 0 not necessary

3034. By Sam Spilsbury on 2012-04-23

Merge lp:compiz-core

Unmerged revisions

3034. By Sam Spilsbury on 2012-04-23

Merge lp:compiz-core

3033. By Sam Spilsbury on 2012-04-20

!= 0 not necessary

3032. By Sam Spilsbury on 2012-04-20

Fix logic errors

3031. By Sam Spilsbury on 2012-04-19

Now that geometry and serverGeometry both return the same thing, the changes
in client code don't make any sense to keep

3030. By Sam Spilsbury on 2012-04-19

Merge lp:compiz-core

3029. By Sam Spilsbury on 2012-04-19

Remove some unnecessary cahgnes in the wobbly plugin

3028. By Sam Spilsbury on 2012-04-19

Don't set height = 0 if the window still has a pixmap

3027. By Sam Spilsbury on 2012-04-18

Base decision to send notifications to plugins on absolute position
changes

3026. By Sam Spilsbury on 2012-04-18

updateState is bitwise, so never clobber it

3025. By Sam Spilsbury on 2012-04-18

Merged lp:~vanvugt/compiz-core/compiz-core/fix-981703-properly

=== modified file 'plugins/composite/src/window.cpp'
--- plugins/composite/src/window.cpp	2012-03-22 17:00:51 +0000
+++ plugins/composite/src/window.cpp	2012-04-15 17:04:19 +0000
@@ -128,6 +128,9 @@
 	/* We have to grab the server here to make sure that window
 	   is mapped when getting the window pixmap */
 	XGrabServer (screen->dpy ());
+
+	/* Flush changes to the server and wait for it to process them */
+	XSync (screen->dpy (), false);
 	XGetWindowAttributes (screen->dpy (),
 			      ROOTPARENT (priv->window), &attr);
 	if (attr.map_state != IsViewable)
@@ -250,7 +253,7 @@
 
     if (x2 > x1 && y2 > y1)
     {
-	CompWindow::Geometry geom = priv->window->geometry ();
+	const CompWindow::Geometry &geom = priv->window->serverGeometry ();
 
 	x1 += geom.x () + geom.border ();
 	y1 += geom.y () + geom.border ();
@@ -272,20 +275,20 @@
     {
 	int x1, x2, y1, y2;
 
-	CompWindow::Geometry geom = priv->window->geometry ();
-	CompWindowExtents output  = priv->window->output ();
+	const CompWindow::Geometry &geom = priv->window->serverGeometry ();
+	const CompWindowExtents &output  = priv->window->output ();
 
 	/* top */
 	x1 = -output.left - geom.border ();
 	y1 = -output.top - geom.border ();
-	x2 = priv->window->size ().width () + output.right - geom.border ();
+	x2 = geom.width () + geom.border () + output.right;
 	y2 = -geom.border ();
 
 	if (x1 < x2 && y1 < y2)
 	    addDamageRect (CompRect (x1, y1, x2 - x1, y2 - y1));
 
 	/* bottom */
-	y1 = priv->window->size ().height () - geom.border ();
+	y1 = geom.height () + geom.border ();
 	y2 = y1 + output.bottom - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
@@ -295,13 +298,13 @@
 	x1 = -output.left - geom.border ();
 	y1 = -geom.border ();
 	x2 = -geom.border ();
-	y2 = priv->window->size ().height () - geom.border ();
+	y2 = geom.height () - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
 	    addDamageRect (CompRect (x1, y1, x2 - x1, y2 - y1));
 
 	/* right */
-	x1 = priv->window->size ().width () - geom.border ();
+	x1 = geom.width () - geom.border ();
 	x2 = x1 + output.right - geom.border ();
 
 	if (x1 < x2 && y1 < y2)
@@ -322,7 +325,7 @@
 	x = rect.x ();
 	y = rect.y ();
 
-	CompWindow::Geometry geom = priv->window->geometry ();
+	const CompWindow::Geometry &geom = priv->window->serverGeometry ();
 	x += geom.x () + geom.border ();
 	y += geom.y () + geom.border ();
 
@@ -341,16 +344,16 @@
     if (priv->window->shaded () || force ||
 	(priv->window->isViewable ()))
     {
-	int    border = priv->window->geometry ().border ();
+	int    border = priv->window->serverGeometry ().border ();
 
 	int x1 = -MAX (priv->window->output ().left,
 		       priv->window->input ().left) - border;
 	int y1 = -MAX (priv->window->output ().top,
 		       priv->window->input ().top) - border;
-	int x2 = priv->window->size ().width () +
+	int x2 = priv->window->serverGeometry ().width () +
 		 MAX (priv->window->output ().right,
 		      priv->window->input ().right) ;
-	int y2 = priv->window->size ().height () +
+	int y2 = priv->window->serverGeometry ().height () +
 		 MAX (priv->window->output ().bottom,
 		      priv->window->input ().bottom) ;
 	CompRect r (x1, y1, x2 - x1, y2 - y1);
@@ -410,7 +413,7 @@
 
     if (!w->damageRect (initial, CompRect (x, y, width, height)))
     {
-	CompWindow::Geometry geom = w->priv->window->geometry ();
+	CompWindow::Geometry geom = w->priv->window->serverGeometry ();
 
 	x += geom.x () + geom.border ();
 	y += geom.y () + geom.border ();
@@ -557,10 +560,6 @@
 {
     window->resizeNotify (dx, dy, dwidth, dheight);
 
-    Pixmap pixmap = None;
-    CompSize size = CompSize ();
-
-
     if (window->shaded () || (window->isViewable ()))
     {
 	int x, y, x1, x2, y1, y2;
@@ -578,25 +577,6 @@
 	cScreen->damageRegion (CompRegion (CompRect (x1, y1, x2 - x1, y2 - y1)));
     }
 
-    if (window->mapNum () && redirected)
-    {
-	unsigned int actualWidth, actualHeight, ui;
-	Window	     root;
-	Status	     result;
-	int	     i;
-
-	pixmap = XCompositeNameWindowPixmap (screen->dpy (), ROOTPARENT (window));
-	result = XGetGeometry (screen->dpy (), pixmap, &root, &i, &i,
-			       &actualWidth, &actualHeight, &ui, &ui);
-	size = CompSize (actualWidth, actualHeight);
-	if (!result || actualWidth != (unsigned int) window->size ().width () ||
-	    actualHeight != (unsigned int) window->size ().height ())
-	{
-	    XFreePixmap (screen->dpy (), pixmap);
-	    return;
-	}
-    }
-
     if (((!window->mapNum () && window->isViewable ()) ||
 	   window->state () & CompWindowStateHiddenMask) && window->hasUnmapReference ())
     {
@@ -622,14 +602,14 @@
     {
 	int x, y, x1, x2, y1, y2;
 
-	x = window->geometry ().x ();
-	y = window->geometry ().y ();
+	x = window->serverGeometry ().x ();
+	y = window->serverGeometry ().y ();
 
 	x1 = x - window->output ().left - dx;
 	y1 = y - window->output ().top - dy;
-	x2 = x + window->size ().width () +
+	x2 = x + window->serverGeometry ().width () +
 	     window->output ().right - dx;
-	y2 = y + window->size ().height () +
+	y2 = y + window->serverGeometry ().height () +
 	     window->output ().bottom - dy;
 
 	cScreen->damageRegion (CompRegion (CompRect (x1, y1, x2 - x1, y2 - y1)));

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-08 10:09:51 +0000
+++ plugins/decor/src/decor.cpp	2012-04-15 17:04:19 +0000
@@ -214,26 +214,6 @@
 		         const CompRegion   &region,
 		         unsigned int       mask)
 {
-    const CompRegion *preg = NULL;
-
-    if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
-		 PAINT_WINDOW_WITH_OFFSET_MASK)))
-	preg = &region;
-    else if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
-	preg = &infiniteRegion;
-    else
-    {
-	tmpRegion = shadowRegion;
-	tmpRegion &= region;
-	preg = &tmpRegion;
-    }
-
-    /* In case some plugin needs to paint us with an offset region */
-    if (preg->isEmpty ())
-	preg = &region;
-
-    const CompRegion &reg (*preg);
-
     if (wd &&
 	wd->decor->type == WINDOW_DECORATION_TYPE_PIXMAP)
     {
@@ -241,8 +221,35 @@
 	GLTexture::MatrixList ml (1);
 	mask |= PAINT_WINDOW_BLEND_MASK;
 
+	const CompRegion *preg = NULL;
+
+	if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
+		     PAINT_WINDOW_WITH_OFFSET_MASK)))
+	    preg = &region;
+	else if (mask & PAINT_WINDOW_TRANSFORMED_MASK)
+	    preg = &infiniteRegion;
+	else
+	{
+	    tmpRegion = mOutputRegion;
+	    tmpRegion &= region;
+
+	    if (tmpRegion.isEmpty ())
+		preg = &region;
+	    else
+		preg = &shadowRegion;
+	}
+
+	/* In case some plugin needs to paint us with an offset region */
+	if (preg->isEmpty ())
+	    preg = &region;
+
+	const CompRegion &reg (*preg);
+
 	gWindow->geometry ().reset ();
 
+	if (updateReg)
+	    updateDecorationScale ();
+
 	for (int i = 0; i < wd->nQuad; i++)
 	{
 	    box.setGeometry (wd->quad[i].box.x1,
@@ -262,8 +269,7 @@
 	    gWindow->glDrawTexture (wd->decor->texture->textures[0],
 				    attrib, mask);
     }
-    else if (wd && !reg.isEmpty () &&
-	     wd->decor->type == WINDOW_DECORATION_TYPE_WINDOW)
+    else if (wd && wd->decor->type == WINDOW_DECORATION_TYPE_WINDOW)
     {
 	GLTexture::MatrixList ml (1);
 
@@ -272,11 +278,14 @@
 	if (gWindow->textures ().empty ())
 	    return;
 
+	if (updateReg)
+	    setDecorationMatrices ();
+
 	if (gWindow->textures ().size () == 1)
 	{
 	    ml[0] = gWindow->matrices ()[0];
 	    gWindow->geometry ().reset ();
-	    gWindow->glAddGeometry (ml, window->frameRegion (), reg);
+	    gWindow->glAddGeometry (ml, window->frameRegion (), region);
 
 	    if (gWindow->geometry ().vCount)
 		gWindow->glDrawTexture (gWindow->textures ()[0], attrib, mask);
@@ -289,7 +298,7 @@
 	    {
 		ml[0] = gWindow->matrices ()[i];
 		gWindow->geometry ().reset ();
-		gWindow->glAddGeometry (ml, regions[i], reg);
+		gWindow->glAddGeometry (ml, regions[i], region);
 
 		if (gWindow->geometry ().vCount)
 		    gWindow->glDrawTexture (gWindow->textures ()[i], attrib,
@@ -1040,8 +1049,8 @@
     for (i = 0; i < wd->nQuad; i++)
     {
 	int x, y;
-	unsigned int width = window->size ().width ();
-	unsigned int height = window->size ().height ();
+	unsigned int width = window->serverGeometry ().width ();
+	unsigned int height = window->serverGeometry ().height ();
 
 	if (window->shaded ())
 	    height = 0;
@@ -1050,8 +1059,8 @@
 			&x1, &y1, &x2, &y2, &sx, &sy);
 
 	/* Translate by x and y points of this window */
-	x = window->geometry ().x ();
-	y = window->geometry ().y ();
+	x = window->serverGeometry ().x ();
+	y = window->serverGeometry ().y ();
 
 	wd->quad[i].box.x1 = x1 + x;
 	wd->quad[i].box.y1 = y1 + y;
@@ -1079,8 +1088,8 @@
 bool
 DecorWindow::checkSize (const Decoration::Ptr &decoration)
 {
-    return (decoration->minWidth <= (int) window->size ().width () &&
-            decoration->minHeight <= (int) window->size ().height ());
+    return (decoration->minWidth <= (int) window->serverGeometry ().width () &&
+	    decoration->minHeight <= (int) window->serverGeometry ().height ());
 }
 
 /*
@@ -1499,7 +1508,7 @@
      */
     if (decoration)
     {
-	wd = WindowDecoration::create (decoration);
+	wd = WindowDecoration::create ( decoration);
 	if (!wd)
 	    return false;
 
@@ -1520,7 +1529,9 @@
 	if (decorate)
 	    updateFrame ();
 	window->updateWindowOutputExtents ();
-	mOutputRegion = CompRegion (window->outputRect ());
+
+	updateReg = true;
+	mOutputRegion = CompRegion (window->serverOutputRect ());
 	updateGroupShadows ();
 	if (dScreen->cmActive)
 	    cWindow->damageOutputExtents ();
@@ -1684,7 +1695,6 @@
     XRectangle           rects[4];
     int                  x, y, width, height;
     CompWindow::Geometry server = window->serverGeometry ();
-    int                  bw = server.border () * 2;
     CompWindowExtents	 input;
     CompWindowExtents    border;
     Window		 parent;
@@ -1711,8 +1721,8 @@
 
     x      = window->border ().left - border.left;
     y      = window->border ().top - border.top;
-    width  = server.width () + input.left + input.right + bw;
-    height = server.height ()+ input.top  + input.bottom + bw;
+    width  = server.widthIncBorders () + input.left + input.right;
+    height = server.heightIncBorders ()+ input.top  + input.bottom ;
 
     /* Non switcher windows are rooted relative to the frame window of the client
      * and switchers need to be offset by the window geometry of the client */
@@ -1851,7 +1861,6 @@
     XRectangle           rects[4];
     int                  x, y, width, height;
     CompWindow::Geometry server = window->serverGeometry ();
-    int                  bw = server.border () * 2;
     CompWindowExtents	 input;
 
     /* Determine frame extents */
@@ -1862,8 +1871,8 @@
 
     x      = window->input ().left - input.left;
     y      = window->input ().top - input.top;
-    width  = server.width () + input.left + input.right + bw;
-    height = server.height ()+ input.top  + input.bottom + bw;
+    width  = server.widthIncBorders () + input.left + input.right;
+    height = server.heightIncBorders ()+ input.top  + input.bottom;
 
     if (window->shaded ())
 	height = input.top + input.bottom;
@@ -2094,8 +2103,8 @@
 	{
 	    int x, y;
 
-	    x = window->geometry (). x ();
-	    y = window->geometry (). y ();
+	    x = window->serverGeometry (). x ();
+	    y = window->serverGeometry (). y ();
 
 	    region += frameRegion.translated (x - wd->decor->input.left,
 					      y - wd->decor->input.top);
@@ -2105,6 +2114,7 @@
 	    region += infiniteRegion;
 	}
     }
+
     updateReg = true;
 }
 
@@ -2116,7 +2126,7 @@
 void
 DecorWindow::updateWindowRegions ()
 {
-    const CompRect &input (window->inputRect ());
+    const CompRect &input (window->serverInputRect ());
 
     if (regions.size () != gWindow->textures ().size ())
 	regions.resize (gWindow->textures ().size ());
@@ -2127,6 +2137,7 @@
 	regions[i].translate (input.x (), input.y ());
 	regions[i] &= window->frameRegion ();
     }
+
     updateReg = false;
 }
 
@@ -2365,7 +2376,13 @@
 		if (w)
 		{
 		    DECOR_WINDOW (w);
-		    dw->updateDecoration ();
+
+		    if (dw->wd && dw->wd->decor)
+		    {
+			if ((dw->wd->decor->minWidth < w->serverGeometry ().width () ||
+			 dw->wd->decor->minHeight < w->serverGeometry ().height ()))
+			    dw->updateDecoration ();
+		    }
 
 		    dw->update (true);
 		}
@@ -2700,9 +2717,8 @@
 	    wd->quad[i].box.x2 += dx;
 	    wd->quad[i].box.y2 += dy;
 	}
-
-	setDecorationMatrices ();
     }
+
     updateReg = true;
 
     mInputRegion.translate (dx, dy);
@@ -2714,30 +2730,18 @@
     window->moveNotify (dx, dy, immediate);
 }
 
-/*
- * DecorWindow::resizeTimeout
- *
- * Called from the timeout on ::resizeNotify,
- * set the shading and unshading bits and also
- * updates the decoration. See the comment
- * in ::resizeNotify as to why the timeout
- * is necessary here
- *
- */
-bool
-DecorWindow::resizeTimeout ()
-{
-    if (shading || unshading)
-    {
-	shading = false;
-	unshading = false;
-
-	updateDecoration ();
-    }
-
-    if (!window->hasUnmapReference ())
-	update (true);
-    return false;
+void
+DecorWindow::grabNotify (int x, int y, unsigned int state, unsigned int mask)
+{
+    window->grabNotify (x, y, state, mask);
+}
+
+void
+DecorWindow::ungrabNotify ()
+{
+    update (true);
+
+    window->ungrabNotify ();
 }
 
 /*
@@ -2751,6 +2755,11 @@
 void
 DecorWindow::resizeNotify (int dx, int dy, int dwidth, int dheight)
 {
+    if (shading || unshading)
+    {
+	shading = false;
+	unshading = false;
+    }
     /* FIXME: we should not need a timer for calling decorWindowUpdate,
        and only call updateWindowDecorationScale if decorWindowUpdate
        returns false. Unfortunately, decorWindowUpdate may call
@@ -2758,16 +2767,20 @@
        we never should call a wrapped function that's currently
        processed, we need the timer for the moment. updateWindowOutputExtents
        should be fixed so that it does not emit a resize notification. */
-    resizeUpdate.start (boost::bind (&DecorWindow::resizeTimeout, this), 0);
     updateDecorationScale ();
     updateReg = true;
 
-    mInputRegion = CompRegion (window->inputRect ());
-    mOutputRegion = CompRegion (window->outputRect ());
+    mInputRegion = CompRegion (window->serverInputRect ());
+    mOutputRegion = CompRegion (window->serverOutputRect ());
     if (dScreen->cmActive && mClipGroup)
 	updateGroupShadows ();
 
+    updateReg = true;
+
     window->resizeNotify (dx, dy, dwidth, dheight);
+
+    /* FIXME: remove */
+    CompositeScreen::get (screen)->damageScreen ();
 }
 
 
@@ -3010,8 +3023,8 @@
     isSwitcher (false),
     frameExtentsRequested (false),
     mClipGroup (NULL),
-    mOutputRegion (window->outputRect ()),
-    mInputRegion (window->inputRect ())
+    mOutputRegion (window->serverOutputRect ()),
+    mInputRegion (window->serverInputRect ())
 {
     WindowInterface::setHandler (window);
 

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-03-30 14:29:18 +0000
+++ plugins/decor/src/decor.h	2012-04-15 17:04:19 +0000
@@ -159,7 +159,7 @@
 
 class WindowDecoration {
     public:
-	static WindowDecoration * create (const Decoration::Ptr &);
+	static WindowDecoration * create (const Decoration::Ptr &d);
 	static void destroy (WindowDecoration *);
 
     public:
@@ -245,13 +245,13 @@
 	void getOutputExtents (CompWindowExtents&);
 	void resizeNotify (int, int, int, int);
 	void moveNotify (int, int, bool);
+	void grabNotify (int x, int y, unsigned int state, unsigned int mask);
+	void ungrabNotify ();
 	void stateChangeNotify (unsigned int);
 	void updateFrameRegion (CompRegion &region);
 
 	bool damageRect (bool, const CompRect &);
 
-	void computeShadowRegion ();
-
 	bool glDraw (const GLMatrix &, GLFragment::Attrib &,
 		     const CompRegion &, unsigned int);
 	void glDecorate (const GLMatrix &, GLFragment::Attrib &,

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2012-02-16 05:31:28 +0000
+++ plugins/move/src/move.cpp	2012-04-15 17:04:19 +0000
@@ -138,8 +138,8 @@
 	    {
 		int xRoot, yRoot;
 
-		xRoot = w->geometry ().x () + (w->size ().width () / 2);
-		yRoot = w->geometry ().y () + (w->size ().height () / 2);
+		xRoot = w->serverGeometry ().x () + (w->size ().width () / 2);
+		yRoot = w->serverGeometry ().y () + (w->size ().height () / 2);
 
 		s->warpPointer (xRoot - pointerX, yRoot - pointerY);
 	    }
@@ -169,8 +169,8 @@
     if (ms->w)
     {
 	if (state & CompAction::StateCancel)
-	    ms->w->move (ms->savedX - ms->w->geometry ().x (),
-			 ms->savedY - ms->w->geometry ().y (), false);
+	    ms->w->move (ms->savedX - ms->w->serverGeometry ().x (),
+			 ms->savedY - ms->w->serverGeometry ().y (), false);
 
 	ms->w->syncPosition ();
 
@@ -314,12 +314,10 @@
 
 	w = ms->w;
 
-	wX      = w->geometry ().x ();
-	wY      = w->geometry ().y ();
-	wWidth  = w->geometry ().width () +
-		  w->geometry ().border () * 2;
-	wHeight = w->geometry ().height () +
-		  w->geometry ().border () * 2;
+	wX      = w->serverGeometry ().x ();
+	wY      = w->serverGeometry ().y ();
+	wWidth  = w->serverGeometry ().widthIncBorders ();
+	wHeight = w->serverGeometry ().heightIncBorders ();
 
 	ms->x += xRoot - lastPointerX;
 	ms->y += yRoot - lastPointerY;
@@ -484,8 +482,8 @@
 
 	if (dx || dy)
 	{
-	    w->move (wX + dx - w->geometry ().x (),
-		     wY + dy - w->geometry ().y (), false);
+	    w->move (wX + dx - w->serverGeometry ().x (),
+		     wY + dy - w->serverGeometry ().y (), false);
 
 	    if (!ms->optionGetLazyPositioning ())
 		w->syncPosition ();

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-03-19 09:19:04 +0000
+++ plugins/opengl/src/paint.cpp	2012-04-15 17:04:19 +0000
@@ -1194,7 +1194,7 @@
 	!priv->cWindow->damaged ())
 	return true;
 
-    if (priv->textures.empty () && !bind ())
+    if (textures ().empty () && !bind ())
 	return false;
 
     if (mask & PAINT_WINDOW_TRANSLUCENT_MASK)
@@ -1210,26 +1210,19 @@
     //
     priv->gScreen->setTexEnvMode (GL_REPLACE);
 
-    if (priv->textures.size () == 1)
+    if (priv->updateState & PrivateGLWindow::UpdateMatrix)
+	priv->setWindowMatrix ();
+
+    if (priv->updateState & PrivateGLWindow::UpdateRegion)
+	priv->updateWindowRegions ();
+
+    for (unsigned int i = 0; i < textures ().size (); i++)
     {
-	ml[0] = priv->matrices[0];
+	ml[0] = priv->matrices[i];
 	priv->geometry.reset ();
-	glAddGeometry (ml, priv->window->region (), reg);
+	glAddGeometry (ml, priv->regions[i], reg);
 	if (priv->geometry.vCount)
-	    glDrawTexture (priv->textures[0], fragment, mask);
-    }
-    else
-    {
-	if (priv->updateReg)
-	    priv->updateWindowRegions ();
-	for (unsigned int i = 0; i < priv->textures.size (); i++)
-	{
-	    ml[0] = priv->matrices[i];
-	    priv->geometry.reset ();
-	    glAddGeometry (ml, priv->regions[i], reg);
-	    if (priv->geometry.vCount)
-		glDrawTexture (priv->textures[i], fragment, mask);
-	}
+	    glDrawTexture (textures ()[i], fragment, mask);
     }
 
     return true;

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2012-02-08 10:54:35 +0000
+++ plugins/opengl/src/privates.h	2012-04-15 17:04:19 +0000
@@ -134,6 +134,11 @@
     public CompositeWindowInterface
 {
     public:
+
+	static const unsigned int UpdateRegion = 1 << 0;
+	static const unsigned int UpdateMatrix = 1 << 1;
+
+    public:
 	PrivateGLWindow (CompWindow *w, GLWindow *gw);
 	~PrivateGLWindow ();
 
@@ -153,7 +158,8 @@
 	GLTexture::List       textures;
 	GLTexture::MatrixList matrices;
 	CompRegion::Vector    regions;
-	bool                  updateReg;
+	unsigned int          updateState;
+	bool		      needsRebind;
 
 	CompRegion    clip;
 

=== modified file 'plugins/opengl/src/window.cpp'
--- plugins/opengl/src/window.cpp	2012-03-22 17:00:51 +0000
+++ plugins/opengl/src/window.cpp	2012-04-15 17:04:19 +0000
@@ -54,7 +54,8 @@
     gScreen (GLScreen::get (screen)),
     textures (),
     regions (),
-    updateReg (true),
+    updateState (UpdateRegion | UpdateMatrix),
+    needsRebind (true),
     clip (),
     bindFailed (false),
     geometry (),
@@ -76,7 +77,7 @@
 void
 PrivateGLWindow::setWindowMatrix ()
 {
-    CompRect input (window->inputRect ());
+    CompRect input (window->serverInputRect ());
 
     if (textures.size () != matrices.size ())
 	matrices.resize (textures.size ());
@@ -87,28 +88,41 @@
 	matrices[i].x0 -= (input.x () * matrices[i].xx);
 	matrices[i].y0 -= (input.y () * matrices[i].yy);
     }
+
+    updateState &= ~(UpdateMatrix);
 }
 
 bool
 GLWindow::bind ()
 {
     if ((!priv->cWindow->pixmap () && !priv->cWindow->bind ()))
-	return false;
+    {
+	if (!priv->textures.empty ())
+	{
+	    /* Getting a new pixmap failed, recycle the old texture */
+	    priv->needsRebind = false;
+	    return true;
+	}
+    }
 
-    priv->textures =
+    GLTexture::List textures =
 	GLTexture::bindPixmapToTexture (priv->cWindow->pixmap (),
 					priv->cWindow->size ().width (),
 					priv->cWindow->size ().height (),
 					priv->window->depth ());
-    if (priv->textures.empty ())
+    if (textures.empty ())
     {
 	compLogMessage ("opengl", CompLogLevelInfo,
 			"Couldn't bind redirected window 0x%x to "
 			"texture\n", (int) priv->window->id ());
     }
+    else
+    {
+	priv->textures = textures;
+	priv->needsRebind = false;
+    }
 
-    priv->setWindowMatrix ();
-    priv->updateReg = true;
+    priv->updateState = PrivateGLWindow::UpdateRegion | PrivateGLWindow::UpdateMatrix;
 
     return true;
 }
@@ -116,12 +130,12 @@
 void
 GLWindow::release ()
 {
-    priv->textures.clear ();
-
+    /* Release the pixmap but don't release
+     * the texture (yet) */
     if (priv->cWindow->pixmap ())
-    {
 	priv->cWindow->release ();
-    }
+
+    priv->needsRebind = true;
 }
 
 bool
@@ -180,8 +194,7 @@
 PrivateGLWindow::resizeNotify (int dx, int dy, int dwidth, int dheight)
 {
     window->resizeNotify (dx, dy, dwidth, dheight);
-    setWindowMatrix ();
-    updateReg = true;
+    updateState = PrivateGLWindow::UpdateMatrix | PrivateGLWindow::UpdateRegion;
     if (!window->hasUnmapReference ())
 	gWindow->release ();
 }
@@ -190,8 +203,10 @@
 PrivateGLWindow::moveNotify (int dx, int dy, bool now)
 {
     window->moveNotify (dx, dy, now);
-    updateReg = true;
-    setWindowMatrix ();
+    updateState = PrivateGLWindow::UpdateMatrix;
+
+    foreach (CompRegion &r, regions)
+	r.translate (dx, dy);
 }
 
 void
@@ -298,6 +313,13 @@
 const GLTexture::List &
 GLWindow::textures () const
 {
+    static const GLTexture::List emptyList;
+
+    /* No pixmap backs this window, let
+     * users know that the window needs rebinding */
+    if (priv->needsRebind)
+	return emptyList;
+
     return priv->textures;
 }
 
@@ -338,13 +360,13 @@
 PrivateGLWindow::updateFrameRegion (CompRegion &region)
 {
     window->updateFrameRegion (region);
-    updateReg = true;
+    updateState = PrivateGLWindow::UpdateRegion;
 }
 
 void
 PrivateGLWindow::updateWindowRegions ()
 {
-    CompRect input (window->inputRect ());
+    CompRect input (window->serverInputRect ());
 
     if (regions.size () != textures.size ())
 	regions.resize (textures.size ());
@@ -354,7 +376,7 @@
 	regions[i].translate (input.x (), input.y ());
 	regions[i] &= window->region ();
     }
-    updateReg = false;
+    updateState &= ~(UpdateRegion);
 }
 
 unsigned int

=== modified file 'plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp'
--- plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2012-01-20 06:13:07 +0000
+++ plugins/place/src/constrain-to-workarea/src/constrain-to-workarea.cpp	2012-04-15 17:04:19 +0000
@@ -61,13 +61,11 @@
     }
 
     left   = x - border.left;
-    right  = left + g.width () +  (border.left +
-				   border.right +
-				   2 * g.border ());
+    right  = left + g.widthIncBorders () +  (border.left +
+					     border.right);
     top    = y - border.top;
-    bottom = top + g.height () + (border.top +
-				  border.bottom +
-				  2 * g.border ());
+    bottom = top + g.heightIncBorders () + (border.top +
+					    border.bottom);
 
     if ((right - left) > workArea.width ())
     {

=== modified file 'plugins/place/src/place.cpp'
--- plugins/place/src/place.cpp	2012-02-02 17:01:15 +0000
+++ plugins/place/src/place.cpp	2012-04-15 17:04:19 +0000
@@ -343,37 +343,36 @@
     CompWindow::Geometry geom;
     int      output;
 
+    geom.set (xwc->x, xwc->y, xwc->width, xwc->height,
+	      window->serverGeometry ().border ());
+
     if (clampToViewport)
     {
 	/* left, right, top, bottom target coordinates, clamed to viewport
 	 * sizes as we don't need to validate movements to other viewports;
 	 * we are only interested in inner-viewport movements */
 
-	x = xwc->x % screen->width ();
-	if ((x + xwc->width) < 0)
+	x = geom.x () % screen->width ();
+	if ((geom.x2 ()) < 0)
 	    x += screen->width ();
 
-	y = xwc->y % screen->height ();
-	if ((y + xwc->height) < 0)
+	y = geom.y () % screen->height ();
+	if ((geom.y2 ()) < 0)
 	    y += screen->height ();
     }
     else
     {
-	x = xwc->x;
-	y = xwc->y;
+	x = geom.x ();
+	y = geom.y ();
     }
 
     left   = x - window->border ().left;
-    right  = left + xwc->width +  (window->border ().left +
-				   window->border ().right +
-				   2 * window->serverGeometry ().border ());
+    right  = left + geom.widthIncBorders () +  (window->border ().left +
+						window->border ().right);
     top    = y - window->border ().top;
-    bottom = top + xwc->height + (window->border ().top +
-				  window->border ().bottom +
-				  2 * window->serverGeometry ().border ());
+    bottom = top + geom.heightIncBorders () + (window->border ().top +
+					       window->border ().bottom);
 
-    geom.set (xwc->x, xwc->y, xwc->width, xwc->height,
-	      window->serverGeometry ().border ());
     output   = screen->outputDeviceForGeometry (geom);
     workArea = screen->getWorkareaForOutput (output);
 
@@ -746,10 +745,8 @@
 {
     if (PlaceScreen::get (screen)->getPointerPosition (pos))
     {
-	unsigned int dx = (window->serverGeometry ().width () / 2) -
-			   window->serverGeometry ().border ();
-	unsigned int dy = (window->serverGeometry ().height () / 2) -
-			   window->serverGeometry ().border ();
+	unsigned int dx = (window->serverGeometry ().widthIncBorders () / 2);
+	unsigned int dy = (window->serverGeometry ().heightIncBorders () / 2);
 	pos -= CompPoint (dx, dy);
     }
     else
@@ -1200,14 +1197,12 @@
 
     extents.left   = pos.x () - window->border ().left;
     extents.top    = pos.y () - window->border ().top;
-    extents.right  = extents.left + window->serverWidth () +
+    extents.right  = extents.left + window->serverGeometry ().heightIncBorders () +
 		     (window->border ().left +
-		      window->border ().right +
-		      2 * window->serverGeometry ().border ());
-    extents.bottom = extents.top + window->serverHeight () +
+		      window->border ().right);
+    extents.bottom = extents.top + window->serverGeometry ().widthIncBorders () +
 		     (window->border ().top +
-		      window->border ().bottom +
-		      2 * window->serverGeometry ().border ());
+		      window->border ().bottom);
 
     delta = workArea.right () - extents.right;
     if (delta < 0)

=== modified file 'plugins/resize/src/resize.cpp'
--- plugins/resize/src/resize.cpp	2012-02-16 05:31:28 +0000
+++ plugins/resize/src/resize.cpp	2012-04-15 17:04:19 +0000
@@ -56,7 +56,7 @@
 void
 ResizeWindow::getStretchScale (BoxPtr pBox, float *xScale, float *yScale)
 {
-    CompRect rect (window->borderRect ());
+    CompRect rect (window->serverBorderRect ());
 
     *xScale = (rect.width ())  ? (pBox->x2 - pBox->x1) /
 				 (float) rect.width () : 1.0f;
@@ -642,8 +642,7 @@
 	    w->configureXWindow (mask, &xwc);
 	}
 
-	if (!(mask & (CWWidth | CWHeight)))
-	    rs->finishResizing ();
+	rs->finishResizing ();
 
 	if (rs->grabIndex)
 	{
@@ -1467,10 +1466,10 @@
 		getPaintRectangle (&box);
 		damageRectangle (&box);
 
-		box.x1 = w->outputRect ().x ();
-		box.y1 = w->outputRect ().y ();
-		box.x2 = box.x1 + w->outputRect ().width ();
-		box.y2 = box.y1 + w->outputRect ().height ();
+		box.x1 = w->serverOutputRect ().x ();
+		box.y1 = w->serverOutputRect ().y ();
+		box.x2 = box.x1 + w->serverOutputRect ().width ();
+		box.y2 = box.y1 + w->serverOutputRect ().height ();
 
 		damageRectangle (&box);
 	    }
@@ -1510,15 +1509,6 @@
 }
 
 void
-ResizeWindow::resizeNotify (int dx, int dy, int dwidth, int dheight)
-{
-    window->resizeNotify (dx, dy, dwidth, dheight);
-
-    if (rScreen->w == window && !rScreen->grabIndex)
-	rScreen->finishResizing ();
-}
-
-void
 ResizeScreen::glPaintRectangle (const GLScreenPaintAttrib &sAttrib,
 				const GLMatrix            &transform,
 				CompOutput                *output,
@@ -1649,8 +1639,8 @@
 	rScreen->getPaintRectangle (&box);
 	getStretchScale (&box, &xScale, &yScale);
 
-	x = window->geometry (). x ();
-	y = window->geometry (). y ();
+	x = window->serverGeometry (). x ();
+	y = window->serverGeometry (). y ();
 
 	xOrigin = x - window->border ().left;
 	yOrigin = y - window->border ().top;

=== modified file 'plugins/resize/src/resize.h'
--- plugins/resize/src/resize.h	2012-02-09 07:48:57 +0000
+++ plugins/resize/src/resize.h	2012-04-15 17:04:19 +0000
@@ -162,8 +162,6 @@
 	ResizeWindow (CompWindow *w);
 	~ResizeWindow ();
 
-	void resizeNotify (int, int, int, int);
-
 	bool damageRect (bool, const CompRect &);
 
 	bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,

=== modified file 'plugins/wobbly/src/wobbly.cpp'
--- plugins/wobbly/src/wobbly.cpp	2011-03-14 16:12:45 +0000
+++ plugins/wobbly/src/wobbly.cpp	2012-04-15 17:04:19 +0000
@@ -1251,7 +1251,7 @@
     if (!model)
     {
 	unsigned int edgeMask = 0;
-	CompRect outRect (window->outputRect ());
+	CompRect outRect (window->serverOutputRect ());
 
 	if (window->type () & CompWindowTypeNormalMask)
 	    edgeMask = WestEdgeMask | EastEdgeMask | NorthEdgeMask |
@@ -1448,9 +1448,9 @@
 			else
 			    cw->addDamage ();
 
-			int wx = w->geometry ().x ();
-			int wy = w->geometry ().y ();
-			int borderWidth = w->geometry ().border ();
+			int wx = w->serverGeometry ().x ();
+			int wy = w->serverGeometry ().y ();
+			int borderWidth = w->serverGeometry ().border ();
 
 			// Damage a box that's 1-pixel larger on each side
 			// to prevent artifacts
@@ -1578,7 +1578,7 @@
 	}
     }
 
-    CompRect outRect (window->outputRect ());
+    CompRect outRect (window->serverOutputRect ());
     wx     = outRect.x ();
     wy     = outRect.y ();
     width  = outRect.width ();
@@ -1772,7 +1772,7 @@
 
 	if (ww->isWobblyWin () && ww->ensureModel ())
 	{
-	    CompRect outRect (w->outputRect ());
+	    CompRect outRect (w->serverOutputRect ());
 
 	    ww->model->setMiddleAnchor (outRect.x (), outRect.y (),
 					outRect.width (), outRect.height ());
@@ -1901,7 +1901,7 @@
 		switch (focusEffect) {
 		case WobblyOptions::FocusEffectShiver:
 		    {
-			CompRect outRect (w->outputRect ());
+			CompRect outRect (w->serverOutputRect ());
 
 			ww->model->adjustObjectsForShiver (outRect.x (),
 							   outRect.y (),
@@ -1977,7 +1977,7 @@
 	wScreen->optionGetMapWindowMatch ().evaluate (window) &&
 	ensureModel ())
     {
-	CompRect outRect (window->outputRect ());
+	CompRect outRect (window->serverOutputRect ());
 
 	model->initObjects (outRect.x (), outRect.y (),
 			    outRect.width (), outRect.height ());
@@ -2006,7 +2006,7 @@
 			    int dwidth,
 			    int dheight)
 {
-    CompRect outRect (window->outputRect ());
+    CompRect outRect (window->serverOutputRect ());
 
     if (wScreen->optionGetMaximizeEffect () &&
 	isWobblyWin () &&
@@ -2144,7 +2144,7 @@
 
 	    if (wScreen->optionGetMaximizeEffect ())
 	    {
-		CompRect outRect (window->outputRect ());
+		CompRect outRect (window->serverOutputRect ());
 
 		if (window->state () & MAXIMIZE_STATE)
 		{
@@ -2192,7 +2192,7 @@
 	    if (wScreen->yConstrained)
 	    {
 		int output =
-		    ::screen->outputDeviceForGeometry (window->geometry ());
+		    ::screen->outputDeviceForGeometry (window->serverGeometry ());
 		wScreen->constraintBox =
 		    &::screen->outputDevs ()[output].workArea ();
 	    }
@@ -2252,7 +2252,7 @@
 	    if (wScreen->optionGetMaximizeEffect () &&
 		(state & MAXIMIZE_STATE))
 	    {
-		CompRect outRect (window->outputRect ());
+		CompRect outRect (window->serverOutputRect ());
 
 		model->addEdgeAnchors (outRect.x (), outRect.y (),
 				       outRect.width (), outRect.height ());

=== modified file 'src/actions.cpp'
--- src/actions.cpp	2012-01-31 14:52:20 +0000
+++ src/actions.cpp	2012-04-15 17:04:19 +0000
@@ -201,9 +201,9 @@
 	time   = CompOption::getIntOptionNamed (options, "time", CurrentTime);
 	button = CompOption::getIntOptionNamed (options, "button", 0);
 	x      = CompOption::getIntOptionNamed (options, "x",
-						w->geometry ().x ());
+						w->serverGeometry ().x ());
 	y      = CompOption::getIntOptionNamed (options, "y",
-						w->geometry ().y ());
+						w->serverGeometry ().y ());
 
 	screen->toolkitAction (Atoms::toolkitActionWindowMenu,
 			       time, w->id (), button, x, y);

=== modified file 'src/event.cpp'
--- src/event.cpp	2012-04-04 03:11:55 +0000
+++ src/event.cpp	2012-04-15 17:04:19 +0000
@@ -1251,7 +1251,7 @@
 	    }
 
 	    /* been shaded */
-	    if (w->priv->height == 0)
+	    if (w->shaded ())
 	    {
 		if (w->id () == priv->activeWindow)
 		    w->moveInputFocusTo ();

=== modified file 'src/privatewindow.h'
--- src/privatewindow.h	2012-03-02 18:02:07 +0000
+++ src/privatewindow.h	2012-04-15 17:04:19 +0000
@@ -34,7 +34,6 @@
 #include <core/timer.h>
 #include "privatescreen.h"
 
-
 typedef CompWindowExtents CompFullscreenMonitorSet;
 
 class PrivateWindow {
@@ -167,6 +166,11 @@
 
 	bool handleSyncAlarm ();
 
+	void move (int dx, int dy, bool sync);
+	bool resize (int dx, int dy, int dwidth, int dheight, int dborder);
+	bool resize (const CompWindow::Geometry &g);
+	bool resize (const XWindowAttributes &attrib);
+
 	void configure (XConfigureEvent *ce);
 
 	void configureFrame (XConfigureEvent *ce);
@@ -241,13 +245,8 @@
 	XSizeHints	     sizeHints;
 	XWMHints             *hints;
 
-	struct timeval       lastGeometryUpdate;
-	struct timeval       lastConfigureRequest;
-
 	bool       inputHint;
 	bool       alpha;
-	int        width;
-	int        height;
 	CompRegion region;
 	CompRegion inputRegion;
 	CompRegion frameRegion;
@@ -290,8 +289,6 @@
 	typedef std::pair <XWindowChanges, unsigned int> XWCValueMask;
 
 	compiz::X11::PendingEventQueue pendingConfigures;
-	CompTimer                     mClearCheckTimeout;
-	bool pendingPositionUpdates;
 
 	char *startupId;
 	char *resName;
@@ -327,6 +324,8 @@
 
 	bool closeRequests;
 	Time lastCloseRequestTime;
+
+	bool nextMoveImmediate;
 };
 
 #endif

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-03-30 06:26:33 +0000
+++ src/screen.cpp	2012-04-15 17:04:19 +0000
@@ -4060,8 +4060,8 @@
     CompRect rect (gm);
     int      offset;
 
-    rect.setWidth  (rect.width () + (gm.border () * 2));
-    rect.setHeight (rect.height () + (gm.border () * 2));
+    rect.setWidth  (gm.widthIncBorders ());
+    rect.setHeight (gm.heightIncBorders ());
 
     offset = rect.centerX () < 0 ? -1 : 0;
     viewport.setX (priv->vp.x () + ((rect.centerX () / width ()) + offset) %
@@ -4657,6 +4657,8 @@
 	return false;
     }
 
+    /* Use synchronous behaviour when running with --sync, useful
+     * for getting stacktraces when X Errors occurr */
     XSynchronize (dpy, synchronousX ? True : False);
 
     snprintf (displayString, 255, "DISPLAY=%s",

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-04-12 13:21:45 +0000
+++ src/window.cpp	2012-04-15 17:04:19 +0000
@@ -77,8 +77,8 @@
 PrivateWindow::isInvisible() const
 {
     return attrib.map_state != IsViewable ||
-     attrib.x + width  + output.right  <= 0 ||
-     attrib.y + height + output.bottom <= 0 ||
+     attrib.x + geometry.width ()  + output.right  <= 0 ||
+     attrib.y + geometry.height () + output.bottom <= 0 ||
      attrib.x - output.left >= (int) screen->width () ||
      attrib.y - output.top >= (int) screen->height ();
 }
@@ -810,292 +810,14 @@
     if (!serverFrame)
 	return;
 
-
-    gettimeofday (&lastConfigureRequest, NULL);
-    /* Flush any changes made to serverFrameGeometry or serverGeometry to the server
-     * since there is a race condition where geometries will go out-of-sync with
-     * window movement */
-
-    window->syncPosition ();
-
-    if (serverInput.left || serverInput.right || serverInput.top || serverInput.bottom)
-    {
-	int	   bw = serverGeometry.border () * 2;
-
-	xwc.x      = serverGeometry.x () - serverInput.left;
-	xwc.y      = serverGeometry.y () - serverInput.top;
-	xwc.width  = serverGeometry.width () + serverInput.left + serverInput.right + bw;
-	if (shaded)
-	    xwc.height = serverInput.top  + serverInput.bottom + bw;
-	else
-	    xwc.height = serverGeometry.height () + serverInput.top  + serverInput.bottom + bw;
-
-	if (shaded)
-	    height = serverInput.top + serverInput.bottom;
-
-	if (serverFrameGeometry.x () == xwc.x)
-	    valueMask &= ~(CWX);
-	else
-	    serverFrameGeometry.setX (xwc.x);
-
-	if (serverFrameGeometry.y ()  == xwc.y)
-	    valueMask &= ~(CWY);
-	else
-	    serverFrameGeometry.setY (xwc.y);
-
-	if (serverFrameGeometry.width () == xwc.width)
-	    valueMask &= ~(CWWidth);
-	else
-	    serverFrameGeometry.setWidth (xwc.width);
-
-	if (serverFrameGeometry.height () == xwc.height)
-	    valueMask &= ~(CWHeight);
-	else
-	    serverFrameGeometry.setHeight (xwc.height);
-
-	/* Geometry is the same, so we're not going to get a ConfigureNotify
-	 * event when the window is configured, which means that other plugins
-	 * won't know that the client, frame and wrapper windows got shifted
-	 * around (and might result in display corruption, eg in OpenGL */
-	if (valueMask == 0)
-	{
-	    XConfigureEvent xev;
-	    XWindowAttributes attrib;
-	    unsigned int      nchildren = 0;
-	    Window            rootRet = 0, parentRet = 0;
-	    Window            *children = NULL;
-
-	    xev.type   = ConfigureNotify;
-	    xev.event  = screen->root ();
-	    xev.window = priv->serverFrame;
-
-	    XGrabServer (screen->dpy ());
-
-	    if (XGetWindowAttributes (screen->dpy (), priv->serverFrame, &attrib))
-	    {
-		xev.x	     = attrib.x;
-		xev.y	     = attrib.y;
-		xev.width	     = attrib.width;
-		xev.height	     = attrib.height;
-		xev.border_width = attrib.border_width;
-		xev.above = None;
-
-		/* We need to ensure that the stacking order is
-		 * based on the current server stacking order so
-		 * find the sibling to this window's frame in the
-		 * server side stack and stack above that */
-		XQueryTree (screen->dpy (), screen->root (), &rootRet, &parentRet, &children, &nchildren);
-
-		if (nchildren)
-		{
-		    for (unsigned int i = 0; i < nchildren; i++)
-		    {
-			if (i + 1 == nchildren ||
-				children[i + 1] == ROOTPARENT (window))
-			{
-			    xev.above = children[i];
-			    break;
-			}
-		    }
-		}
-
-		if (children)
-		    XFree (children);
-
-		if (!xev.above)
-		    xev.above = (window->serverPrev) ? ROOTPARENT (window->serverPrev) : None;
-
-		xev.override_redirect = priv->attrib.override_redirect;
-
-	    }
-
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), serverFrame, valueMask, &xwc)));
-
-	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-
-	    XSendEvent (screen->dpy (), screen->root (), false,
-			SubstructureNotifyMask, (XEvent *) &xev);
-
-	    XUngrabServer (screen->dpy ());
-	    XSync (screen->dpy (), false);
-	}
-	else
-	{
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), serverFrame, valueMask, &xwc)));
-
-	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-	    XConfigureWindow (screen->dpy (), serverFrame, valueMask, &xwc);
-	}
-
-	if (shaded)
-	{
-	    XUnmapWindow (screen->dpy (), wrapper);
-	}
-	else
-	{
-	    XMapWindow (screen->dpy (), wrapper);
-	    XMoveResizeWindow (screen->dpy (), wrapper, serverInput.left, serverInput.top,
-			       serverGeometry.width (), serverGeometry.height ());
-	}
-	XMoveResizeWindow (screen->dpy (), id, 0, 0,
-			   serverGeometry.width (), serverGeometry.height ());
-	window->sendConfigureNotify ();
-	window->windowNotify (CompWindowNotifyFrameUpdate);
-    }
-    else
-    {
-	int	   bw = serverGeometry.border () * 2;
-
-	xwc.x      = serverGeometry.x ();
-	xwc.y      = serverGeometry.y ();
-	xwc.width  = serverGeometry.width () + bw;
-
-	/* FIXME: It doesn't make much sense to allow undecorated windows to be
-	 * shaded */
-	if (shaded)
-	    xwc.height = bw;
-	else
-	    xwc.height = serverGeometry.height () + bw;
-
-	if (serverFrameGeometry.x () == xwc.x)
-	    valueMask &= ~(CWX);
-	else
-	    serverFrameGeometry.setX (xwc.x);
-
-	if (serverFrameGeometry.y ()  == xwc.y)
-	    valueMask &= ~(CWY);
-	else
-	    serverFrameGeometry.setY (xwc.y);
-
-	if (serverFrameGeometry.width () == xwc.width)
-	    valueMask &= ~(CWWidth);
-	else
-	    serverFrameGeometry.setWidth (xwc.width);
-
-	if (serverFrameGeometry.height () == xwc.height)
-	    valueMask &= ~(CWHeight);
-	else
-	    serverFrameGeometry.setHeight (xwc.height);
-
-	/* Geometry is the same, so we're not going to get a ConfigureNotify
-	 * event when the window is configured, which means that other plugins
-	 * won't know that the client, frame and wrapper windows got shifted
-	 * around (and might result in display corruption, eg in OpenGL */
-	if (valueMask == 0)
-	{
-	    XConfigureEvent xev;
-	    XWindowAttributes attrib;
-	    unsigned int      nchildren = 0;
-	    Window            rootRet = 0, parentRet = 0;
-	    Window            *children = NULL;
-
-	    xev.type   = ConfigureNotify;
-	    xev.event  = screen->root ();
-	    xev.window = priv->serverFrame;
-
-	    XGrabServer (screen->dpy ());
-
-	    if (XGetWindowAttributes (screen->dpy (), priv->serverFrame, &attrib))
-	    {
-		xev.x	     = attrib.x;
-		xev.y	     = attrib.y;
-		xev.width	     = attrib.width;
-		xev.height	     = attrib.height;
-		xev.border_width = attrib.border_width;
-		xev.above = None;
-
-		/* We need to ensure that the stacking order is
-		 * based on the current server stacking order so
-		 * find the sibling to this window's frame in the
-		 * server side stack and stack above that */
-		XQueryTree (screen->dpy (), screen->root (), &rootRet, &parentRet, &children, &nchildren);
-
-		if (nchildren)
-		{
-		    for (unsigned int i = 0; i < nchildren; i++)
-		    {
-			if (i + 1 == nchildren ||
-				children[i + 1] == ROOTPARENT (window))
-			{
-			    xev.above = children[i];
-			    break;
-			}
-		    }
-		}
-
-		if (children)
-		    XFree (children);
-
-		if (!xev.above)
-		    xev.above = (window->serverPrev) ? ROOTPARENT (window->serverPrev) : None;
-
-		xev.override_redirect = priv->attrib.override_redirect;
-
-	    }
-
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), serverFrame, valueMask, &xwc)));
-
-	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-
-	    XSendEvent (screen->dpy (), screen->root (), false,
-			SubstructureNotifyMask, (XEvent *) &xev);
-
-	    XUngrabServer (screen->dpy ());
-	    XSync (screen->dpy (), false);
-	}
-	else
-	{
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), serverFrame, valueMask, &xwc)));
-
-	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-
-	    XConfigureWindow (screen->dpy (), serverFrame, valueMask, &xwc);
-	}
-
-	if (shaded)
-	{
-	    XUnmapWindow (screen->dpy (), wrapper);
-	}
-	else
-	{
-	    XMapWindow (screen->dpy (), wrapper);
-	    XMoveResizeWindow (screen->dpy (), wrapper, 0, 0,
-			       serverGeometry.width (), serverGeometry.height ());
-	}
-
-	XMoveResizeWindow (screen->dpy (), id, 0, 0,
-			   serverGeometry.width (), serverGeometry.height ());
-	window->sendConfigureNotify ();
-	window->windowNotify (CompWindowNotifyFrameUpdate);
-    }
+    xwc.x = serverGeometry.x ();
+    xwc.y = serverGeometry.y ();
+    xwc.width = serverGeometry.width ();
+    xwc.height = serverGeometry.height ();
+    xwc.border_width = serverGeometry.border ();
+
+    window->configureXWindow (valueMask, &xwc);
+    window->windowNotify (CompWindowNotifyFrameUpdate);
     window->recalcActions ();
 }
 
@@ -1138,8 +860,8 @@
 
     for (unsigned int i = 0; i < n; i++)
     {
-	x1 = rects[i].x + priv->geometry.border ();
-	y1 = rects[i].y + priv->geometry.border ();
+	x1 = rects[i].x + priv->serverGeometry.border ();
+	y1 = rects[i].y + priv->serverGeometry.border ();
 	x2 = x1 + rects[i].width;
 	y2 = y1 + rects[i].height;
 
@@ -1147,17 +869,17 @@
 	    x1 = 0;
 	if (y1 < 0)
 	    y1 = 0;
-	if (x2 > priv->width)
-	    x2 = priv->width;
-	if (y2 > priv->height)
-	    y2 = priv->height;
+	if (x2 > priv->serverGeometry.width ())
+	    x2 = priv->serverGeometry.width ();
+	if (y2 > priv->serverGeometry.height ())
+	    y2 = priv->serverGeometry.height ();
 
 	if (y1 < y2 && x1 < x2)
 	{
-	    x1 += priv->geometry.x ();
-	    y1 += priv->geometry.y ();
-	    x2 += priv->geometry.x ();
-	    y2 += priv->geometry.y ();
+	    x1 += priv->serverGeometry.x ();
+	    y1 += priv->serverGeometry.y ();
+	    x2 += priv->serverGeometry.x ();
+	    y2 += priv->serverGeometry.y ();
 
 	    ret += CompRect (x1, y1, x2 - x1, y2 - y1);
 	}
@@ -1178,24 +900,26 @@
     XRectangle *inputShapeRects = NULL;
     int	       nBounding = 0, nInput = 0;
 
-    priv->region = CompRegion ();
-    priv->inputRegion = CompRegion ();
+    priv->region -= infiniteRegion;
+    priv->inputRegion -= infiniteRegion;
 
     if (screen->XShape ())
     {
 	int order;
 
+	/* We should update the server here */
+	XSync (screen->dpy (), false);
+
 	boundingShapeRects = XShapeGetRectangles (screen->dpy (), priv->id,
 					 	  ShapeBounding, &nBounding, &order);
 	inputShapeRects = XShapeGetRectangles (screen->dpy (), priv->id,
 					       ShapeInput, &nInput, &order);
-
     }
 
-    r.x      = -priv->geometry.border ();
-    r.y      = -priv->geometry.border ();
-    r.width  = priv->width + priv->geometry.border ();
-    r.height = priv->height + priv->geometry.border ();
+    r.x      = -priv->serverGeometry.border ();
+    r.y      = -priv->serverGeometry.border ();
+    r.width  = priv->serverGeometry.widthIncBorders ();
+    r.height = priv->serverGeometry.heightIncBorders ();
 
     if (nBounding < 1)
     {
@@ -1729,7 +1453,7 @@
     priv->attrib.map_state = IsUnmapped;
     priv->invisible = true;
 
-    if (priv->shaded && priv->height)
+    if (priv->shaded)
     {
 	priv->updateFrameWindow ();
     }
@@ -1814,7 +1538,7 @@
 }
 
 bool
-CompWindow::resize (CompWindow::Geometry gm)
+PrivateWindow::resize (const CompWindow::Geometry &gm)
 {
     /* Input extents are now the last thing sent
      * from the server. This might not work in some
@@ -1831,12 +1555,8 @@
 	priv->geometry.height ()  != gm.height () ||
 	priv->geometry.border ()  != gm.border ())
     {
-	int pw, ph;
 	int dx, dy, dwidth, dheight;
 
-	pw = gm.width () + gm.border () * 2;
-	ph = gm.height () + gm.border () * 2;
-
 	dx      = gm.x () - priv->geometry.x ();
 	dy      = gm.y () - priv->geometry.y ();
 	dwidth  = gm.width () - priv->geometry.width ();
@@ -1846,37 +1566,57 @@
 			    gm.width (), gm.height (),
 			    gm.border ());
 
-	priv->width = pw;
-	priv->height = ph;
-
-	if (priv->mapNum)
-	    priv->updateRegion ();
-
-	resizeNotify (dx, dy, dwidth, dheight);
-
 	priv->invisible = priv->isInvisible ();
+
+	if (priv->attrib.override_redirect)
+	{
+	    if (priv->mapNum)
+		priv->updateRegion ();
+
+	    priv->serverGeometry = priv->geometry;
+	    priv->serverFrameGeometry = priv->frameGeometry;
+	    window->resizeNotify (dx, dy, dwidth, dheight);
+	}
     }
     else if (priv->geometry.x () != gm.x () || priv->geometry.y () != gm.y ())
     {
-	int dx, dy;
-
-	dx = gm.x () - priv->geometry.x ();
-	dy = gm.y () - priv->geometry.y ();
-
-	priv->geometry.setX (gm.x ());
-	priv->geometry.setY (gm.y ());
-
-	priv->region.translate (dx, dy);
-	priv->inputRegion.translate (dx, dy);
-	if (!priv->frameRegion.isEmpty ())
-	    priv->frameRegion.translate (dx, dy);
-
-	priv->invisible = priv->isInvisible ();
-
-	moveNotify (dx, dy, true);
+	move (gm.x () - priv->geometry.x (),
+	      gm.y () - priv->geometry.y (), true);
     }
 
-    updateFrameRegion ();
+    return true;
+}
+
+bool
+PrivateWindow::resize (const XWindowAttributes &attr)
+{
+    return resize (CompWindow::Geometry (attr.x, attr.y, attr.width, attr.height,
+					 attr.border_width));
+}
+
+bool
+PrivateWindow::resize (int          x,
+		       int          y,
+		       int          width,
+		       int          height,
+		       int          border)
+{
+    return resize (CompWindow::Geometry (x, y, width, height, border));
+}
+
+bool
+CompWindow::resize (CompWindow::Geometry gm)
+{
+    XWindowChanges xwc = XWINDOWCHANGES_INIT;
+    unsigned int   valueMask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
+
+    xwc.x = gm.x ();
+    xwc.y = gm.y ();
+    xwc.width = gm.width ();
+    xwc.height = gm.height ();
+    xwc.border_width = gm.border ();
+
+    configureXWindow (valueMask, &xwc);
 
     return true;
 }
@@ -2044,13 +1784,7 @@
 				ce->border_width);
     else
     {
-	if (ce->override_redirect)
-	{
-	    priv->serverGeometry.set (ce->x, ce->y, ce->width, ce->height,
-				      ce->border_width);
-	}
-
-	window->resize (ce->x, ce->y, ce->width, ce->height, ce->border_width);
+	resize (ce->x, ce->y, ce->width, ce->height, ce->border_width);
     }
 
     if (ce->event == screen->root ())
@@ -2120,9 +1854,9 @@
      * windows since we didn't resize them
      * on configureXWindow */
     if (priv->shaded)
-	height = priv->serverGeometry.height () - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+	height = priv->serverGeometry.heightIncBorders () - priv->serverInput.top - priv->serverInput.bottom;
     else
-	height = ce->height - priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
+	height = ce->height + priv->serverGeometry.border () * 2 - priv->serverInput.top - priv->serverInput.bottom;
 
     /* set the frame geometry */
     priv->frameGeometry.set (ce->x, ce->y, ce->width, ce->height, ce->border_width);
@@ -2131,7 +1865,7 @@
     if (priv->syncWait)
 	priv->syncGeometry.set (x, y, width, height, ce->border_width);
     else
-	window->resize (x, y, width, height, ce->border_width);
+	resize (x, y, width, height, ce->border_width);
 
     if (priv->restack (ce->above))
 	priv->updatePassiveButtonGrabs ();
@@ -2140,27 +1874,6 @@
 
     if (above)
 	above->priv->updatePassiveButtonGrabs ();
-
-    if (!pendingConfigures.pending ())
-    {
-	/* Tell plugins its ok to start doing stupid things again but
-	 * obviously FIXME */
-	CompOption::Vector options;
-	CompOption::Value  v;
-
-	options.push_back (CompOption ("window", CompOption::TypeInt));
-	v.set ((int) id);
-	options.back ().set (v);
-	options.push_back (CompOption ("active", CompOption::TypeInt));
-	v.set ((int) 0);
-	options.back ().set (v);
-
-	/* Notify other plugins that it is unsafe to change geometry or serverGeometry
-	 * FIXME: That API should not be accessible to plugins, this is a hack to avoid
-	 * breaking ABI */
-
-	screen->handleCompizEvent ("core", "lock_position", options);
-    }
 }
 
 void
@@ -2183,23 +1896,34 @@
 {
     if (dx || dy)
     {
-	gettimeofday (&priv->lastGeometryUpdate, NULL);
-
-	/* Don't allow window movement to overwrite working geometries
-	 * last received from the server if we know there are pending
-	 * ConfigureNotify events on this window. That's a clunky workaround
-	 * and a FIXME in any case, however, until we can break the API
-	 * and remove CompWindow::move, this will need to be the case */
-
-	if (!priv->pendingConfigures.pending ())
+	XWindowChanges xwc = XWINDOWCHANGES_INIT;
+	unsigned int   valueMask = CWX | CWY;
+
+	xwc.x = priv->serverGeometry.x () + dx;
+	xwc.y = priv->serverGeometry.y () + dy;
+
+	priv->nextMoveImmediate = immediate;
+
+	configureXWindow (valueMask, &xwc);
+    }
+}
+
+void
+PrivateWindow::move (int dx,
+		     int dy,
+		     bool immediate)
+{
+    if (dx || dy)
+    {
+	priv->geometry.setX (priv->geometry.x () + dx);
+	priv->geometry.setY (priv->geometry.y () + dy);
+	priv->frameGeometry.setX (priv->frameGeometry.x () + dx);
+	priv->frameGeometry.setY (priv->frameGeometry.y () + dy);
+
+	if (priv->attrib.override_redirect)
 	{
-	    priv->geometry.setX (priv->geometry.x () + dx);
-	    priv->geometry.setY (priv->geometry.y () + dy);
-	    priv->frameGeometry.setX (priv->frameGeometry.x () + dx);
-	    priv->frameGeometry.setY (priv->frameGeometry.y () + dy);
-
-	    priv->pendingPositionUpdates = true;
-
+	    priv->serverGeometry = priv->geometry;
+	    priv->serverFrameGeometry = priv->frameGeometry;
 	    priv->region.translate (dx, dy);
 	    priv->inputRegion.translate (dx, dy);
 	    if (!priv->frameRegion.isEmpty ())
@@ -2207,19 +1931,7 @@
 
 	    priv->invisible = priv->isInvisible ();
 
-	    moveNotify (dx, dy, immediate);
-	}
-	else
-	{
-	    XWindowChanges xwc = XWINDOWCHANGES_INIT;
-	    unsigned int   valueMask = CWX | CWY;
-	    compLogMessage ("core", CompLogLevelDebug, "pending configure notifies on 0x%x, "\
-			    "moving window asyncrhonously!", (unsigned int) priv->serverId);
-
-	    xwc.x = priv->serverGeometry.x () + dx;
-	    xwc.y = priv->serverGeometry.y () + dy;
-
-	    configureXWindow (valueMask, &xwc);
+	    window->moveNotify (dx, dy, true);
 	}
     }
 }
@@ -2230,22 +1942,6 @@
     return !mEvents.empty ();
 }
 
-bool
-PrivateWindow::checkClear ()
-{
-    if (pendingConfigures.pending ())
-    {
-	/* FIXME: This is a hack to avoid performance regressions
-	 * and must be removed in 0.9.6 */
-	compLogMessage ("core", CompLogLevelWarn, "failed to receive ConfigureNotify event on 0x%x\n",
-			id);
-	pendingConfigures.dump ();
-	pendingConfigures.clear ();
-    }
-
-    return false;
-}
-
 void
 compiz::X11::PendingEventQueue::add (PendingEvent::Ptr p)
 {
@@ -2280,9 +1976,9 @@
 {
     compiz::X11::PendingEvent::dump ();
 
-    compLogMessage ("core", CompLogLevelDebug,  "- x: %i y: %i width: %i height: %i "\
+    compLogMessage ("core", CompLogLevelDebug,  "- x: %i y: %i width: %i height: %i x2: %i y2 %i"\
 						 "border: %i, sibling: 0x%x",
-						 mXwc.x, mXwc.y, mXwc.width, mXwc.height, mXwc.border_width, mXwc.sibling);
+						 mXwc.x, mXwc.y, mXwc.width, mXwc.height, mXwc.x + mXwc.width, mXwc.y + mXwc.height, mXwc.border_width, mXwc.sibling);
 }
 
 bool
@@ -2467,21 +2163,6 @@
     mValueMask (valueMask),
     mXwc (*xwc)
 {
-    CompOption::Vector options;
-    CompOption::Value  v;
-
-    options.push_back (CompOption ("window", CompOption::TypeInt));
-    v.set ((int) w);
-    options.back ().set (v);
-    options.push_back (CompOption ("active", CompOption::TypeInt));
-    v.set ((int) 1);
-    options.back ().set (v);
-
-    /* Notify other plugins that it is unsafe to change geometry or serverGeometry
-     * FIXME: That API should not be accessible to plugins, this is a hack to avoid
-     * breaking ABI */
-
-    screen->handleCompizEvent ("core", "lock_position", options);
 }
 
 compiz::X11::PendingConfigureEvent::~PendingConfigureEvent ()
@@ -2491,57 +2172,6 @@
 void
 CompWindow::syncPosition ()
 {
-    gettimeofday (&priv->lastConfigureRequest, NULL);
-
-    unsigned int   valueMask = CWX | CWY;
-    XWindowChanges xwc = XWINDOWCHANGES_INIT;
-
-    if (priv->pendingPositionUpdates && !priv->pendingConfigures.pending ())
-    {
-	if (priv->serverFrameGeometry.x () == priv->frameGeometry.x ())
-	    valueMask &= ~(CWX);
-	if (priv->serverFrameGeometry.y () == priv->frameGeometry.y ())
-	    valueMask &= ~(CWY);
-
-	/* Because CompWindow::move can update the geometry last
-	 * received from the server, we must indicate that no values
-	 * changed, because when the ConfigureNotify comes around
-	 * the values are going to be the same. That's obviously
-	 * broken behaviour and worthy of a FIXME, but requires
-	 * larger changes to the window movement system. */
-	if (valueMask)
-	{
-	    priv->serverGeometry.setX (priv->geometry.x ());
-	    priv->serverGeometry.setY (priv->geometry.y ());
-	    priv->serverFrameGeometry.setX (priv->frameGeometry.x ());
-	    priv->serverFrameGeometry.setY (priv->frameGeometry.y ());
-
-	    xwc.x = priv->serverFrameGeometry.x ();
-	    xwc.y = priv->serverFrameGeometry.y ();
-
-	    compiz::X11::PendingEvent::Ptr pc =
-		    boost::shared_static_cast<compiz::X11::PendingEvent> (compiz::X11::PendingConfigureEvent::Ptr (
-									      new compiz::X11::PendingConfigureEvent (
-										  screen->dpy (), priv->serverFrame, 0, &xwc)));
-
-	    priv->pendingConfigures.add (pc);
-
-	    /* Got 3 seconds to get its stuff together */
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
-	    XConfigureWindow (screen->dpy (), ROOTPARENT (this), valueMask, &xwc);
-
-	    if (priv->serverFrame)
-	    {
-		XMoveWindow (screen->dpy (), priv->wrapper,
-			     priv->serverInput.left, priv->serverInput.top);
-		sendConfigureNotify ();
-	    }
-	}
-	priv->pendingPositionUpdates = false;
-    }
 }
 
 bool
@@ -3342,14 +2972,41 @@
 {
     unsigned int frameValueMask = 0;
 
-    /* Immediately sync window position
-     * if plugins were updating w->geometry () directly
-     * in order to avoid a race condition */
-
-    window->syncPosition ();
+    if (id == screen->root ())
+    {
+	compLogMessage ("core", CompLogLevelWarn, "attempted to reconfigure root window");
+	return;
+    }
 
     /* Remove redundant bits */
 
+    xwc->x = valueMask & CWX ? xwc->x : serverGeometry.x ();
+    xwc->y = valueMask & CWY ? xwc->y : serverGeometry.y ();
+    xwc->width = valueMask & CWWidth ? xwc->width : serverGeometry.width ();
+    xwc->height = valueMask & CWHeight ? xwc->height : serverGeometry.height ();
+    xwc->border_width = valueMask & CWBorderWidth ? xwc->border_width : serverGeometry.border ();
+
+    /* Don't allow anything that might generate a BadValue */
+    if (valueMask & CWWidth && !xwc->width)
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Attempted to set < 1 width on a window");
+	xwc->width = 1;
+    }
+
+    if (valueMask & CWHeight && !xwc->height)
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Attempted to set < 1 height on a window");
+	xwc->height = 1;
+    }
+
+    int dx = valueMask & CWX ? xwc->x - serverGeometry.x () : 0;
+    int dy = valueMask & CWY ? xwc->y - serverGeometry.y () : 0;
+    int dwidth = valueMask & CWWidth ? xwc->width - serverGeometry.width () : 0;
+    int dheight = valueMask & CWHeight ? xwc->height - serverGeometry.height () : 0;
+
+    /* FIXME: This is a total fallacy for the reparenting case
+     * at least since the client doesn't actually move here, it only
+     * moves within the frame */
     if (valueMask & CWX && serverGeometry.x () == xwc->x)
 	valueMask &= ~(CWX);
 
@@ -3416,18 +3073,15 @@
 	    compLogMessage ("core", CompLogLevelWarn, "restack_mode not Above");
     }
 
-    frameValueMask = valueMask;
+    frameValueMask = CWX | CWY | CWWidth | CWHeight | (valueMask & (CWStackMode | CWSibling));
 
-    if (frameValueMask & CWX &&
-	serverFrameGeometry.x () == xwc->x - serverGeometry.border () - serverInput.left)
+    if (serverFrameGeometry.x () == xwc->x - serverGeometry.border () - serverInput.left)
 	frameValueMask &= ~(CWX);
 
-    if (frameValueMask & CWY &&
-	serverFrameGeometry.y () == xwc->y - serverGeometry.border () - serverInput.top)
+    if (serverFrameGeometry.y () == xwc->y - serverGeometry.border () - serverInput.top)
 	frameValueMask &= ~(CWY);
 
-   if (frameValueMask & CWWidth &&
-	serverFrameGeometry.width () == xwc->width + serverGeometry.border () * 2
+   if (serverFrameGeometry.width () == xwc->width + serverGeometry.border () * 2
 				      + serverInput.left + serverInput.right)
 	frameValueMask &= ~(CWWidth);
 
@@ -3437,19 +3091,64 @@
 
     if (shaded)
     {
-	if (frameValueMask & CWHeight &&
-	    serverFrameGeometry.height () == serverGeometry.border () * 2
+	if (serverFrameGeometry.height () == serverGeometry.border () * 2
 	    + serverInput.top + serverInput.bottom)
 	    frameValueMask &= ~(CWHeight);
     }
     else
     {
-	if (frameValueMask & CWHeight &&
-	    serverFrameGeometry.height () == xwc->height + serverGeometry.border () * 2
+	if (serverFrameGeometry.height () == xwc->height + serverGeometry.border () * 2
 	    + serverInput.top + serverInput.bottom)
 	    frameValueMask &= ~(CWHeight);
     }
 
+
+    if (valueMask & CWStackMode &&
+        ((xwc->stack_mode != TopIf) && (xwc->stack_mode != BottomIf) && (xwc->stack_mode != Opposite) &&
+	 (xwc->stack_mode != Above) && (xwc->stack_mode != Below)))
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Invalid stack mode %i", xwc->stack_mode);
+	valueMask &= ~(CWStackMode | CWSibling);
+    }
+
+    /* Don't allow anything that might cause a BadMatch error */
+
+    if (valueMask & CWSibling && !(valueMask & CWStackMode))
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Didn't specify a CWStackMode for CWSibling");
+	valueMask &= ~CWSibling;
+    }
+
+    if (valueMask & CWSibling && xwc->sibling == (serverFrame ? serverFrame : id))
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Can't restack a window relative to itself");
+	valueMask &= ~CWSibling;
+    }
+
+    if (valueMask & CWBorderWidth && attrib.c_class == InputOnly)
+    {
+	compLogMessage ("core", CompLogLevelWarn, "Cannot set border_width of an input_only window");
+	valueMask &= ~CWBorderWidth;
+    }
+
+    if (valueMask & CWSibling)
+    {
+	CompWindow *sibling = screen->findTopLevelWindow (xwc->sibling);
+
+	if (!sibling)
+	{
+	    compLogMessage ("core", CompLogLevelWarn, "Attempted to restack relative to 0x%x which is "\
+			    "not a child of the root window or a window compiz owns", static_cast <unsigned int> (xwc->sibling));
+	    valueMask &= ~(CWSibling | CWStackMode);
+	}
+	else if (sibling->frame () && xwc->sibling != sibling->frame ())
+	{
+	    compLogMessage ("core", CompLogLevelWarn, "Attempted to restack relative to 0x%x which is "\
+			    "not a child of the root window", static_cast <unsigned int> (xwc->sibling));
+	    valueMask &= ~(CWSibling | CWStackMode);
+	}
+    }
+
     /* Can't set the border width of frame windows */
     frameValueMask &= ~(CWBorderWidth);
 
@@ -3476,11 +3175,8 @@
 					   + serverInput.top + serverInput.bottom);
     }
 
-
     if (serverFrame)
     {
-	gettimeofday (&lastConfigureRequest, NULL);
-
 	if (frameValueMask)
 	{
 	    XWindowChanges wc = *xwc;
@@ -3496,13 +3192,10 @@
 										  screen->dpy (), priv->serverFrame, frameValueMask, &wc)));
 
 	    pendingConfigures.add (pc);
-	    if (priv->mClearCheckTimeout.active ())
-		priv->mClearCheckTimeout.stop ();
-	    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-					    2000, 2500);
 
 	    XConfigureWindow (screen->dpy (), serverFrame, frameValueMask, &wc);
 	}
+
 	valueMask &= ~(CWSibling | CWStackMode);
 
 	/* If the frame has changed position (eg, serverInput.top
@@ -3528,6 +3221,28 @@
 
     if (valueMask)
 	XConfigureWindow (screen->dpy (), id, valueMask, xwc);
+
+    if (!attrib.override_redirect)
+    {
+	if (valueMask & (CWWidth | CWHeight))
+	{
+	    updateRegion ();
+	    window->resizeNotify (dx, dy, dwidth, dheight);
+	}
+	else if (valueMask & (CWX | CWY))
+	{
+	    region.translate (dx, dy);
+	    inputRegion.translate (dx, dy);
+	    if (!frameRegion.isEmpty ())
+		frameRegion.translate (dx, dy);
+	}
+
+	if (dx || dy)
+	{
+	    window->moveNotify (dx, dy, priv->nextMoveImmediate);
+	    priv->nextMoveImmediate = true;
+	}
+    }
 }
 
 bool
@@ -4305,10 +4020,6 @@
 											  screen->dpy (), serverFrame, valueMask, &lxwc)));
 
 		    pendingConfigures.add (pc);
-		    if (priv->mClearCheckTimeout.active ())
-			priv->mClearCheckTimeout.stop ();
-		    priv->mClearCheckTimeout.start (boost::bind (&PrivateWindow::checkClear, priv),
-						    2000, 2500);
 		}
 
 		/* Below with no sibling puts the window at the bottom
@@ -4612,8 +4323,8 @@
 PrivateWindow::ensureWindowVisibility ()
 {
     int x1, y1, x2, y2;
-    int	width = serverGeometry.width () + serverGeometry.border () * 2;
-    int	height = serverGeometry.height () + serverGeometry.border () * 2;
+    int	width = serverGeometry.widthIncBorders ();
+    int	height = serverGeometry.heightIncBorders ();
     int dx = 0;
     int dy = 0;
 
@@ -5473,10 +5184,10 @@
     }
     else
     {
-	m = priv->geometry.x () + offX;
-	if (m - priv->input.left < (int) s->width () - vWidth)
+	m = priv->serverGeometry.x () + offX;
+	if (m - priv->serverInput.left < (int) s->width () - vWidth)
 	    rv.setX (offX + vWidth);
-	else if (m + priv->width + priv->input.right > vWidth)
+	else if (m + priv->serverGeometry.width () + priv->serverInput.right > vWidth)
 	    rv.setX (offX - vWidth);
 	else
 	    rv.setX (offX);
@@ -5488,10 +5199,10 @@
     }
     else
     {
-	m = priv->geometry.y () + offY;
-	if (m - priv->input.top < (int) s->height () - vHeight)
+	m = priv->serverGeometry.y () + offY;
+	if (m - priv->serverInput.top < (int) s->height () - vHeight)
 	    rv.setY (offY + vHeight);
-	else if (m + priv->height + priv->input.bottom > vHeight)
+	else if (m + priv->serverGeometry.height () + priv->serverInput.bottom > vHeight)
 	    rv.setY (offY - vHeight);
 	else
 	    rv.setY (offY);
@@ -6014,8 +5725,8 @@
 	y -= screen->vp ().y () * screen->height ();
     }
 
-    tx = x - priv->geometry.x ();
-    ty = y - priv->geometry.y ();
+    tx = x - priv->serverGeometry.x ();
+    ty = y - priv->serverGeometry.y ();
 
     if (tx || ty)
     {
@@ -6037,21 +5748,21 @@
 
 	if (screen->vpSize ().width ()!= 1)
 	{
-	    m = priv->geometry.x () + tx;
+	    m = priv->serverGeometry.x () + tx;
 
 	    if (m - priv->output.left < (int) screen->width () - vWidth)
 		wx = tx + vWidth;
-	    else if (m + priv->width + priv->output.right > vWidth)
+	    else if (m + priv->serverGeometry.width () + priv->output.right > vWidth)
 		wx = tx - vWidth;
 	}
 
 	if (screen->vpSize ().height () != 1)
 	{
-	    m = priv->geometry.y () + ty;
+	    m = priv->serverGeometry.y () + ty;
 
 	    if (m - priv->output.top < (int) screen->height () - vHeight)
 		wy = ty + vHeight;
-	    else if (m + priv->height + priv->output.bottom > vHeight)
+	    else if (m + priv->serverGeometry.height () + priv->output.bottom > vHeight)
 		wy = ty - vHeight;
 	}
 
@@ -6206,8 +5917,8 @@
 	svp  = screen->vp ();
 	size = *screen;
 
-	x = window->geometry ().x () + (svp.x () - vp.x ()) * size.width ();
-	y = window->geometry ().y () + (svp.y () - vp.y ()) * size.height ();
+	x = window->serverGeometry ().x () + (svp.x () - vp.x ()) * size.width ();
+	y = window->serverGeometry ().y () + (svp.y () - vp.y ()) * size.height ();
 	window->moveToViewportPosition (x, y, true);
 
 	if (allowWindowFocus (0, timestamp))
@@ -6276,9 +5987,6 @@
     priv->serverFrameGeometry = priv->frameGeometry = priv->syncGeometry
 	    = priv->geometry = priv->serverGeometry;
 
-    priv->width  = priv->attrib.width  + priv->attrib.border_width * 2;
-    priv->height = priv->attrib.height + priv->attrib.border_width * 2;
-
     priv->sizeHints.flags = 0;
 
     priv->recalcNormalHints ();
@@ -6300,8 +6008,7 @@
 
     if (priv->attrib.c_class != InputOnly)
     {
-	priv->region = CompRegion (priv->attrib.x, priv->attrib.y,
-				   priv->width, priv->height);
+	priv->region = CompRegion (priv->serverGeometry);
 	priv->inputRegion = priv->region;
 
 	/* need to check for DisplayModal state on all windows */
@@ -6531,8 +6238,6 @@
     hints (NULL),
     inputHint (true),
     alpha (false),
-    width (0),
-    height (0),
     region (),
     wmType (0),
     type (CompWindowTypeUnknownMask),
@@ -6567,7 +6272,6 @@
     pendingUnmaps (0),
     pendingMaps (0),
     pendingConfigures (screen->dpy ()),
-    pendingPositionUpdates (false),
 
     startupId (0),
     resName (0),
@@ -6745,14 +6449,12 @@
 void
 CompWindow::updateFrameRegion ()
 {
-    if (priv->serverFrame &&
-	priv->serverGeometry.width () == priv->geometry.width () &&
-	priv->serverGeometry.height () == priv->geometry.height ())
+    if (priv->serverFrame)
     {
 	CompRect   r;
 	int        x, y;
 
-	priv->frameRegion = CompRegion ();
+	priv->frameRegion = emptyRegion;
 
 	updateFrameRegion (priv->frameRegion);
 
@@ -6761,16 +6463,16 @@
 	    r = priv->region.boundingRect ();
 	    priv->frameRegion -= r;
 
-	    r.setGeometry (r.x1 () - priv->input.left,
-			r.y1 () - priv->input.top,
-			r.width  () + priv->input.right + priv->input.left,
-			r.height () + priv->input.bottom + priv->input.top);
+	    r.setGeometry (r.x1 () - priv->serverInput.left,
+			r.y1 () - priv->serverInput.top,
+			r.width  () + priv->serverInput.right + priv->serverInput.left,
+			r.height () + priv->serverInput.bottom + priv->serverInput.top);
 
 	    priv->frameRegion &= CompRegion (r);
 	}
 
-	x = priv->geometry.x () - priv->input.left;
-	y = priv->geometry.y () - priv->input.top;
+	x = priv->serverGeometry.x () - priv->serverInput.left;
+	y = priv->serverGeometry.y () - priv->serverInput.top;
 
 	XShapeCombineRegion (screen->dpy (), priv->serverFrame,
 			     ShapeBounding, -x, -y,
@@ -6811,6 +6513,11 @@
 
 	priv->updateSize ();
 	priv->updateFrameWindow ();
+
+	/* Always send a moveNotify
+	 * whenever the frame extents update
+	 * so that plugins can re-position appropriately */
+	moveNotify (0, 0, true);
     }
 
     /* Use b for _NET_WM_FRAME_EXTENTS here because
@@ -7094,10 +6801,10 @@
 	/* Wait for the reparent to finish */
 	XSync (dpy, false);
 
-	xwc.x = serverGeometry.x () - serverGeometry.border ();
-	xwc.y = serverGeometry.y () - serverGeometry.border ();
-	xwc.width = serverGeometry.width () + serverGeometry.border () * 2;
-	xwc.height = serverGeometry.height () + serverGeometry.border () * 2;
+	xwc.x = serverGeometry.xMinusBorder ();
+	xwc.y = serverGeometry.yMinusBorder ();
+	xwc.width = serverGeometry.widthIncBorders ();
+	xwc.height = serverGeometry.heightIncBorders ();
 
 	XConfigureWindow (dpy, serverFrame, CWX | CWY | CWWidth | CWHeight, &xwc);
 
@@ -7181,7 +6888,12 @@
     frame = None;
     wrapper = None;
     serverFrame = None;
+<<<<<<< TREE
 
     // Finally, (i.e. after updating state) notify the change
     window->windowNotify (CompWindowNotifyUnreparent);
+=======
+
+    window->windowNotify (CompWindowNotifyUnreparent);
+>>>>>>> MERGE-SOURCE
 }

=== modified file 'src/window/geometry/include/core/windowgeometry.h'
--- src/window/geometry/include/core/windowgeometry.h	2012-01-19 20:08:32 +0000
+++ src/window/geometry/include/core/windowgeometry.h	2012-04-15 17:04:19 +0000
@@ -64,6 +64,12 @@
     compiz::window::Geometry  change (const compiz::window::Geometry &g, unsigned int mask) const;
     void		      applyChange (const compiz::window::Geometry &g, unsigned int mask);
 
+    int xMinusBorder () const { return x () - mBorder; }
+    int yMinusBorder () const { return y () - mBorder; }
+
+    unsigned int widthIncBorders () const { return width () + mBorder * 2; }
+    unsigned int heightIncBorders () const { return height () + mBorder * 2; }
+
 private:
     int mBorder;
 };

=== modified file 'src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp'
--- src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-03-30 16:30:13 +0000
+++ src/window/geometry/tests/window-geometry/src/test-window-geometry.cpp	2012-04-15 17:04:19 +0000
@@ -87,3 +87,13 @@
     EXPECT_EQ (rg, compiz::window::Geometry (49, 99, 199, 299, 5));
     EXPECT_EQ (mask, CHANGE_X | CHANGE_Y | CHANGE_WIDTH | CHANGE_HEIGHT);
 }
+
+TEST_F(CompWindowGeometryTestGeometry, TestBorders)
+{
+    compiz::window::Geometry g (1, 1, 1, 1, 1);
+
+    EXPECT_EQ (g.xMinusBorder (), 0);
+    EXPECT_EQ (g.yMinusBorder (), 0);
+    EXPECT_EQ (g.widthIncBorders (), 3);
+    EXPECT_EQ (g.heightIncBorders (), 3);
+}

=== modified file 'src/windowgeometry.cpp'
--- src/windowgeometry.cpp	2012-01-23 05:44:19 +0000
+++ src/windowgeometry.cpp	2012-04-15 17:04:19 +0000
@@ -61,22 +61,19 @@
 int
 CompWindow::width () const
 {
-    return priv->width +
-	    priv->geometry.border ()  * 2;
+    return priv->geometry.widthIncBorders ();
 }
 
 int
 CompWindow::height () const
 {
-    return priv->height +
-	    priv->geometry.border ()  * 2;;
+    return priv->geometry.heightIncBorders ();
 }
 
 CompSize
 CompWindow::size () const
 {
-    return CompSize (priv->width + priv->geometry.border ()  * 2,
-		     priv->height + priv->geometry.border ()  * 2);
+    return CompSize (width (), height ());
 }
 
 int
@@ -102,88 +99,84 @@
 int
 CompWindow::serverWidth () const
 {
-    return priv->serverGeometry.width () +
-	   2 * priv->serverGeometry.border ();
+    return priv->serverGeometry.widthIncBorders ();
 }
 
 int
 CompWindow::serverHeight () const
 {
-    return priv->serverGeometry.height () +
-	   2 * priv->serverGeometry.border ();
+    return priv->serverGeometry.heightIncBorders ();
 }
 
 const CompSize
 CompWindow::serverSize () const
 {
-    return CompSize (priv->serverGeometry.width () +
-		     2 * priv->serverGeometry.border (),
-		     priv->serverGeometry.height () +
-		     2 * priv->serverGeometry.border ());
+    return CompSize (priv->serverGeometry.widthIncBorders (),
+		     priv->serverGeometry.heightIncBorders ());
 }
 
 CompRect
 CompWindow::borderRect () const
 {
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->border.top,
-		     priv->geometry.width () + priv->geometry.border () * 2 +
+    return CompRect (priv->geometry.xMinusBorder () - priv->border.left,
+		     priv->geometry.yMinusBorder () - priv->border.top,
+		     priv->geometry.widthIncBorders () +
 		     priv->border.left + priv->border.right,
-		     priv->geometry.height () + priv->geometry.border () * 2 +
+		     priv->geometry.heightIncBorders () +
 		     priv->border.top + priv->border.bottom);
 }
 
 CompRect
 CompWindow::serverBorderRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->geometry.border () - priv->border.left,
-		     priv->serverGeometry.y () - priv->geometry.border () - priv->border.top,
-		     priv->serverGeometry.width () + priv->geometry.border () * 2 +
+    return CompRect (priv->serverGeometry.xMinusBorder () - priv->border.left,
+		     priv->serverGeometry.yMinusBorder () - priv->border.top,
+		     priv->serverGeometry.widthIncBorders () +
 		     priv->border.left + priv->border.right,
-		     priv->serverGeometry.height () + priv->geometry.border () * 2 +
+		     priv->serverGeometry.heightIncBorders() +
 		     priv->border.top + priv->border.bottom);
 }
 
 CompRect
 CompWindow::inputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->geometry.border () - priv->serverInput.left,
-		     priv->geometry.y () - priv->geometry.border () - priv->serverInput.top,
-		     priv->geometry.width () + priv->geometry.border () * 2 +
+    return CompRect (priv->geometry.xMinusBorder () - priv->serverInput.left,
+		     priv->geometry.yMinusBorder () - priv->serverInput.top,
+		     priv->geometry.widthIncBorders () +
 		     priv->serverInput.left + priv->serverInput.right,
-		     priv->geometry.height () +priv->geometry.border () * 2 +
+		     priv->geometry.heightIncBorders () +
 		     priv->serverInput.top + priv->serverInput.bottom);
 }
 
 CompRect
 CompWindow::serverInputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () - priv->serverInput.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->serverInput.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->serverGeometry.xMinusBorder () - priv->serverInput.left,
+		     priv->serverGeometry.yMinusBorder () - priv->serverInput.top,
+		     priv->serverGeometry.widthIncBorders () +
 		     priv->serverInput.left + priv->serverInput.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->serverGeometry.heightIncBorders () +
 		     priv->serverInput.top + priv->serverInput.bottom);
 }
 
 CompRect
 CompWindow::outputRect () const
 {
-    return CompRect (priv->geometry.x () - priv->serverGeometry.border ()- priv->output.left,
-		     priv->geometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->geometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->geometry.xMinusBorder ()- priv->output.left,
+		     priv->geometry.yMinusBorder () - priv->output.top,
+		     priv->geometry.widthIncBorders () +
 		     priv->output.left + priv->output.right,
-		     priv->geometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->geometry.heightIncBorders () +
 		     priv->output.top + priv->output.bottom);
 }
 
 CompRect
 CompWindow::serverOutputRect () const
 {
-    return CompRect (priv->serverGeometry.x () - priv->serverGeometry.border () -  priv->output.left,
-		     priv->serverGeometry.y () - priv->serverGeometry.border () - priv->output.top,
-		     priv->serverGeometry.width () + priv->serverGeometry.border () * 2 +
+    return CompRect (priv->serverGeometry.xMinusBorder () -  priv->output.left,
+		     priv->serverGeometry.yMinusBorder () - priv->output.top,
+		     priv->serverGeometry.widthIncBorders () +
 		     priv->output.left + priv->output.right,
-		     priv->serverGeometry.height () + priv->serverGeometry.border () * 2 +
+		     priv->serverGeometry.heightIncBorders () +
 		     priv->output.top + priv->output.bottom);
 }