lp:~sjakthol/compiz/fix-986051

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:compiz/0.9.10 at revision 3775

PS Jenkins bot (community): Approve (continuous-integration) on 2013-07-22

Sam Spilsbury: Approve on 2013-07-22

MC Return: Needs Information on 2013-07-21

Diff: 214 lines (+32/-54)

2 files modified

plugins/decor/src/decor.cpp (+3/-3)
plugins/decor/tests/acceptance/xorg-gtest/compiz_decor_acceptance_tests.cpp (+29/-51)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #898870: Grid placed window overlaps the adjacent viewport	Low	Fix Released
Bug #986051: Window management - Semi-maximized windows have 1px borders drawn on adjacent workspaces	Medium	Fix Released

Link a bug report

Related blueprints

3768. By Sami Jaktholm on 2013-07-19

More text fixes.

3767. By Sami Jaktholm on 2013-07-19

Test fixes

3766. By Sami Jaktholm on 2013-07-19

Merge trunk

3765. By Sami Jaktholm on 2013-07-19

Decor: Use maximized border extents only if window is fully maximized.

The decorator draws a normal border around semi-maximized windows. When
maximized border extents were used for semi-maximized windows, compiz didn't
reserve any space for the border in its geometry calculations.

At least following problems are a result of this behavior:
- Semi-maximized windows have 1px borders drawn on adjacent workspaces
  (LP: #986051).
- Grid placed window overlaps the adjacent viewport (LP: #898870).

3764. By Sam Spilsbury on 2013-07-18

Remove redundant src/logmessage/include/core/logmessage.h

(LP: #1067246). Fixes: https://bugs.launchpad.net/bugs/1067246.

Approved by PS Jenkins bot, Sam Spilsbury.

3763. By Sam Spilsbury on 2013-07-18

Don't add the frame to the toplevel stack if it hasn't been created yet.

In the event that a window is unreparented or destroyed, we usually need
to add its frame window to the toplevel window stack until the time at
which we recieve a DestroyNotify for it, as there may be incoming
ConfigureNotify events puporting to stack other windows relative to
that frame.

However, this does not apply in the case where we have not yet received
a CreateNotify for the frame window. In that case, it is not possible
for any stacking requests to be made relative to this window, so it
does not need to be added immediately. Instead, we can add it at the
time that we recieve a CreateNotify for it as a regular override
redirect window until the time that it is later destroyed.

(LP: #1171314). Fixes: https://bugs.launchpad.net/bugs/1171314.

Approved by PS Jenkins bot, MC Return.

3762. By Brandon Schaefer on 2013-07-18

If we receive a stateNotifyChange, we check if we are in a max state. If so, overwrite the xwc with either X | W, or Y | H depending on the semi max state with the orig position before we went into a semi max state. This way when we leave any sort of max state the orig position is restored.

If the window is being grabbed we do not overwrite the position, which it gets its own value at that point (instead of the orig pos). Fixes: https://bugs.launchpad.net/bugs/892012.

Approved by PS Jenkins bot, Sam Spilsbury, MC Return, Sami Jaktholm.

3761. By Andrea Azzarone on 2013-07-18

Update window geo only on new decoration size only if mapped.

(LP: #1198000). Fixes: https://bugs.launchpad.net/bugs/1198000.

Approved by PS Jenkins bot, Sam Spilsbury, MC Return.

3760. By Sam Spilsbury on 2013-07-18

Port to new gmock. Disable some faling tests because of weird leaks. Fixes: https://bugs.launchpad.net/bugs/1185265.

Approved by PS Jenkins bot, Brandon Schaefer.

3759. By MC Return on 2013-07-09

Thumbnail, cleanup:

Merged if condition checks.
Declaration of variables when they are needed (C++ style).
Removed redundant brackets.
Removed useless "/* Could someone please explain how this works */"
comment.
Removed extern const unsigned short TEXT_DISTANCE, because this
variable does not exist anymore (value is configurable already).
Changed if (something > 0.0) to if (something), 10 times.
Changed pointedWin = 0; to pointedWin = NULL;.
Used centerX () and centerY () abstractions from
compiz::window::Geometry to determine the icon center coordinates.
Added and removed newlines, if appropriate.
Fixed indentation.

Thumbnail, code speedup:

Return ASAP, do not calculate stuff you might not need.
No need for WIN_W (w) and WIN_H (w) macros, removed those and
replaced them with the local variables int winWidth, int winHeight,
int dockWidth and int dockHeight.
No need for WIN_X (w) and WIN_Y (w) macros, replaced those with
int dockX and int dockY.
Introduced int tHeight = thumb.height;, int tWidth = thumb.width;,
int halfTWidth = tWidth / 2; and int halfTHeight =
tHeight / 2; and used those variables in the following calculations.
Use igMidPoint[0] and igMidPoint[1] as arguments in the
screen->outputDeviceForPoint (arg1, arg2) function, instead of re-
calculating the arguments again.

Thumbnail, GL speedup:

Introduced
GLfloat wxPlusWidth = wx + width;,
GLfloat wyPlusHeight = wy + height;,
GLfloat wxPlusWPlusOff = wxPlusWidth + off;,
GLfloat wyPlusHPlusOff = wyPlusHeight + off;,
GLfloat wxMinusOff = wx - off; and
GLfloat wyMinusOff = wy - off;
and used those coordinates in the vertexData arrays. No need to re-
calculate those values multiple times.
Just query optionGetShowDelay () once and use int showDelay later.
We just enable blending if it is currently disabled and disable
blending only, if it was disabled before.

Approved by PS Jenkins bot, MC Return, Sami Jaktholm, Sam Spilsbury.