| 3754
|
|
|
Sam Spilsbury |
10 years ago
|
 |
|
| 3753
|
|
|
MC Return |
10 years ago
|
|
|
| 3752
|
|
|
MC Return |
10 years ago
|
|
|
| 3751
|
|
Unrevert 3728, fix failing tests.
Change the behaviour of undecorating windows.
Previously when a window was undecorated, we would shift it back to an appropriate position according to its gravity member. That behaviour was problematic because in the StaticGravity case the window has to just stay in the same place. But then if you had a window with StaticGravity which then did get a decoration and later removed it, it would be placed as though it was decorated and appear to be in the wrong place.
The correct behaviour is to place all windows as though they have decorations, and then when decorations are removed, to move the window back to the corner as indicated in its gravity and then expand its size to cover the obscured regions no longer hidden because the decorations went away.
(LP: #1165343).
1. Completely remove decorOffsetMove and other related code from
decor.cpp. Put the logic to handle the window->input () - window->border ()
placement offset inside of setWindowFrameExtents instead. Now the window
will always be offset from its original non-decorated position to the new
decorated position, rather than having to guess between decoration sizes.
2. Make saveGeometry and restoreGeometry work relative to window->border ()
as opposed to including it in the saved geometry. It is possible that the
border size might change during maximization, as such, we don't want to
save the position with the border before maximizing. Instead save the position
as if it were never decorated so that when the window is restored it can be
restored to its original position and then adjusted for its new border size.
3. Fix a few typoes in the tests.
4. Moved some commonly used matchers into compiz::testing
5. Make COMPIZ_PLUGIN_DIR accept multiple directories and look in each one
of them for the plugin
6. Set COMPIZ_PLUGIN_DIR appropriately for each plugin that we wish to load
on startup so that we load locally built plugins as opposed to installed
ones.
7. Uncomment compiz_discover_tests for the acceptance tests. Now they are
run by default.
(LP: #1195522). Fixes: https://bugs.launchpad.net/bugs/1195522.
Approved by PS Jenkins bot, MC Return, Brandon Schaefer.
|
Sam Spilsbury |
10 years ago
|
|
|
| 3750
|
|
|
MC Return |
10 years ago
|
|
|
| 3749
|
|
|
MC Return |
10 years ago
|
|
|
| 3748
|
|
|
MC Return |
10 years ago
|
|
|
| 3747
|
|
|
MC Return |
10 years ago
|
|
|
| 3746
|
|
|
MC Return |
10 years ago
|
|
|
| 3745
|
|
|
Iven Hsu |
10 years ago
|
|
|
| 3744
|
|
Add more acceptance tests for the decor plugin.
PixmapDecoratedWindowAcceptance.
UndecoratedWindowExpandToOrigSize
Test that upon undecoration, the window has exactly the same geometry
as it did before decoration.
DISABLED_UndecorateStaticGravityWindow
Tests that for windows with a static gravity, the window has exactly
the same geometry as it did before decoration.
Disabled, as core is currently not moving the window with the static
gravity back to where it started.
AdjustmentExtents/PixmapDecorationAdjustment.
AdjustRestoredWindowBorderMovesClient/P
Test that changing the border extents causes the client window's
absolute geometry to change.
DISABLED_AdjustRestoredWindowBorderShrinkClient/P
Tests that changing the border extents causes the client window's
absolute geometry to shrink by the amount of border.
Disabled, as the current behavior is to expand the frame window
as opposed to shrinking the client (but this will be changed).
DISABLED_ClientExpandsAsBorderShrinks/P
Tests that as the border shrinks away, the client expands back to
its original size.
Disabled, as the current behavior is to expand the frame window
as opposed to shrinking the client (but this will be changed).
DISABLED_ClientExpandsAsBorderShrinksWhilstMaximized/P
Tests that even if the client is maximized, if the restored border
shrinks away it demaximizes back to the same position while also
accounting for any change in the restored window border size.
Disabled, as the current behavior is to expand the frame window
as opposed to shrinking the client (but this will be changed).
DISABLED_ClientExpandsAsBorderShrinksWhilstUndecorated/P
Tests that even when the client is not permitted to be decorated
because the decoration hint was removed, when it is redecorated
it will be moved to the correct position taking into account any
changes in its border size.
Disabled, as the current behavior is to expand the frame window
as opposed to shrinking the client (but this will be changed).
DISABLED_AdjustRestoredWindowInputNoMoveClient/P
Tests that adjusting the input extents (as independent from the
border extents) of the client does not cause the client to move.
Disabled, as this behavior appears to be broken in core.
Move the "GetImmediateParent" function into the compiz::testing namespace
so that it can be used by other tests. Fixes: https://bugs.launchpad.net/bugs/1188900.
Approved by PS Jenkins bot, Andrea Azzarone.
|
Sam Spilsbury |
10 years ago
|
|
|
| 3743
|
|
|
Sam Spilsbury |
10 years ago
|
|
|
| 3742
|
|
Provide a basic decor plugin acceptance test suite.
This change provides a simple acceptance test suite for the decor plugin. It
creates a fake window decorator (cdt::FakeDecorator) and allows users to
create fake decorations (eg cdt::FakePixmapDecoration) which can be serialized
as decoration properties and set on windows under xorg-gtest. It also launches
compiz with the opengl, composite and decor plugins loaded and runs some
basic tests. Among them:
BaseDecorAcceptance.
Startup:
Basic canary "can we start compiz with these plugins" test
FakeDecoratorSessionOwnerNameSetOnSelectionOwner:
Create a fake decorator, ensure that libdecoration sets our
session name "fake" on the selection owner
FakeDecoratorReceiveClientMessage:
Create fake decorator, ensure that libdecoration posts a client
message to the root window announcing that the new decorator exists.
DecorationSupportsWindowType:
Create a fake decorator, announce support for the WINDOW type decorations
and ensure that the correct atom is set on the session owner window.
DecorationSupportsPixmapType:
Create a fake decorator, announce support for the PIXMAP type decorations
and ensure that the correct atom is set on the session owner window.
DecorFakeDecoratorAcceptance.
WindowDefaultFallbackNoExtents:
By default, newly created windows should recieve a fallback decoration
but they should not have any frame extents.
DecorWithPixmapDefaultsAcceptance.
These tests create a default pixmap decoration to use in the hypothetical
situation that the window decorator hasn't yet generated a decoration
for this window.
FallbackRecieveInputFrameNotify:
Verify that we get a _COMPIZ_WINDOW_DECOR_INPUT_FRAME property set on
the client when it is created and mapped (eg, an input frame window
was annonuced to be created)
FallbackHasInputFrameInParent:
Verify that a second window exists in the frame window after this
message was recieved.
FallbackNormalWindowExtentOnDecoration:
Verify that _NET_FRAME_EXTENTS is set to the default window extents
for the default decoration when the window was mapped.
FallbackNormalWindowInputOnFrame:
Verify that the input window matches the extents set.
PixmapDecoratedWindowAcceptance.
These tests create a new window and an associated unique decoration for
that window.
MaximizeBorderExtentsOnMaximize:
Maximize the window and ensure that the correct border extents are used.
MaximizeBorderExtentsOnVertMaximize:
Vertically maximize the window and ensure that the correct border extents
are used.
MaximizeBorderExtentsOnHorzMaximize:
Horizontally maximize the window and ensure that the correct border
extents are used.
MaximizeFrameWindowSizeEqOutputSize:
Maximie the window and ensure that the frame window exactly equals
the output size.
VertMaximizeFrameWindowSizeEqOutputYHeight:
Maximize the window and ensure that the frame window's Y and Height
values are consistent with the output size.
HorzMaximizeFrameWindowSizeEqOutputXWidth:
Ditto horizontal maximization.
DISABLED_VertMaximizeFrameWindowSizeSameXWidth:
Maximize the window vertically and ensure that the frame window's
border-relative X position and width does not change.
This test is disabled, as the behavior in compiz is currently broken,
(but it means that we can fix it later and enable the test).
DISABLED_HorzMaximizeFrameWindowSizeSameYHeight
Maximize the window horizontally and ensure that the frame window's
border-relative Y position and height does not change.
This test is disabled, as the behavior in compiz is currently broken,
(but it means that we can fix it later and enable the test).
(LP: #1188900). Fixes: https://bugs.launchpad.net/bugs/1188900.
Approved by PS Jenkins bot, Andrea Azzarone, MC Return.
|
Sam Spilsbury |
10 years ago
|
|
|
| 3741
|
|
|
Andrea Azzarone |
10 years ago
|
|
|
| 3740
|
|
Expo, code cleanup:
Declaration of local variables outside of loops.
Use prefix instead of postfix increments.
Declaration and assignment of local variables in one line, if possible.
Reduced the scope of some variables.
Removed redundant brackets.
Used static_cast <> (type) instead of (type) cast.
Added and removed newlines if appropriate.
Fixed indentation.
Added TODOs.
Expo, speed improvements:
Do not calculate screen->vpSize ().width () and screen->vpSize ().height ()
multiple times, instead save them in the unsigned ints vpCountHorz and
vpCountVert and use those variables instead.
Speed up the curve calculations by using additional variables to save results
to not have to re-calculate those all the time. The new variables introduced
are degToRad, screenWidth, screenWidthSquared, curveDistSquaredPlusQuarter,
pOne2MinusCurveDist, v0Squared and v2Squared.
Also introduced const float halfGapX = gapX / 2.0 and used this variable in the
calculations of curveDistance and curveRadius.
Simplified calculations of this type:
(M_PI / 180.0f) * curveAngle / 2.0, which is equal to: (M_PI / 360.0f) * curveAngle
Do not call optionGetGroundSize (); twice, instead save the value in the float
groundSize and use that variable in the following calculations.
Removed the creation of the redundant bool hide, which is just used once in an
if-condition check. It does not help to have this bool.
Try to avoid redundant GL_BLEND state changes, they are expensive - only enable
GL_BLEND if it is disabled and just disable it, if it was disabled before, otherwise
do nothing.
Try to avoid redundant GL filter changes - just query the filter state if the mipmap
option in CCSM is enabled. Also just set back the filter to the previous state if
we actually changed it, otherwise do nothing.
-5.5f * 2 = -11.0f.
No need to calculate M_PI / 180.0f 720 times:
Calculate this value once instead and save it in the const float mpi, use mpi
in the following looped calculations.
Use const int scw in the same loop instead of calling screen->width () 360 times.
glow.cpp:
Massively increased calculation speed of the glow texture:
No need for any macros here -> removed them and replaced them with local variables.
Precalculate values, store them in local variables and use those in the following
calculations (new variables are the ints winRealX, winRealY, winRealWidth, winRealHeight,
halfWinRealWidth, halfWinRealHeight, xPlusHalfWidth, yPlusHalfHeight, xPlusGlowOff,
yPlusGlowOff, xMinusGlowOff, yMinusGlowOff and the float glowPart).
Used w->geometry ().widthIncBorders () and w->geometry ().heightIncBorders ()
to determine winRealWidth and winRealHeight.
Expo, fixes:
Do not force "One wall per output" on the user, if his displays use different
resolutions.
"One big wall" makes a lot of sense for many multi-screen configs, where not
all of the screens have exactly the same resolution, so if the user explicitely
chooses this mode, Compiz should respect the user's choice.
(LP: #1009592). Fixes: https://bugs.launchpad.net/bugs/1009592.
Approved by PS Jenkins bot, Sam Spilsbury, Sami Jaktholm.
|
MC Return |
10 years ago
|
|
|
| 3739
|
|
|
MC Return |
11 years ago
|
|
|
| 3738
|
|
|
Sam Spilsbury |
11 years ago
|
|
|
| 3737
|
|
|
Iven Hsu |
11 years ago
|
|
|
| 3736
|
|
|
Sam Spilsbury |
11 years ago
|
|
|
| 3735
|
|
|
Andrea Azzarone |
11 years ago
|
|
|
collapse all