lp://qastaging/~3v1n0/compiz/msaa-configs-ignore

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/compiz/0.9.10 at revision 3698

PS Jenkins bot (community): Approve (continuous-integration) on 2013-05-13

Sam Spilsbury: Approve on 2013-05-13

MC Return: Approve on 2013-05-13

Diff: 53 lines (+23/-7)

1 file modified

plugins/opengl/src/screen.cpp (+23/-7)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1174495: Window Managers instability with r600 radeon and high monitor resolutions

Critical

Fix Released

Link a bug report

Related blueprints

3699. By Marco Trevisan (Treviño) on 2013-05-13

GLScreen: use compiz names convention

3698. By Marco Trevisan (Treviño) on 2013-05-13

OpenGL Screen: Ignore the MSAA configs during initialization

This fixes a crash with new MESA drivers and high monitor resolutions
caused by the fact that we're accidentally using some MSAA configs with
some drivers in Mesa 9.0.
Taking in account the values of GLX_SAMPLES and GLX_SAMPLE_BUFFERS
fixes the issue.

See mesa bug https://bugs.freedesktop.org/show_bug.cgi?id=61182

3697. By MC Return on 2013-05-13

Removed redundant Expo configuration changes from ubuntu-config.patch:

The reflection scale change, because reflection is disabled by default anyway.

The inactive viewport saturation change from 100.0% to 40.0%, because this
option does not work (and never did AFAICR), but if it finally gets fixed
Expo's look would dramatically change.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3696. By Hu Kang <email address hidden> on 2013-05-13

Use XIDefineCursor rather than XDefineCursor.

compiz should show a busy cursor during the application startup stage.
the corresponding code is in scr/screen.cpp:
cps::StartupSequenceImpl::updateStateFeedback ()
the patch changes all XDefineCursor to XIDefineCursor (see XInput2 extension)

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

Approved by PS Jenkins bot, Sam Spilsbury.

3695. By MC Return on 2013-05-12

Ring, Shift and Stack Window Switcher:

Increased the non-power-of-2 icon texture resolution from 96x96 to 512x512 pixels,
in the case of the ring switcher from 64 to 512.

Static Switcher:

Replaced #define of MAX_ICON_SIZE with type-safe extern const unsigned short and
set the icon resolution to 512 as well.

Compiztoolbox:

Increased the non-power-of-2 icon texture resolution const unsigned short ICON_SIZE
from 48 to 512 and const unsigned int MAX_ICON_SIZE from 256 to 512 as well.
Changed the type of MAX_ICON_SIZE from const unsigned int to const unsigned short.

Scale:

Increased the non-power-of-2 icon texture resolution from 96x96 to 512x512 pixels.

KDE Compatibility:

Increased the icon texture resolution from 256x256 to 512x512 pixels.

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

Approved by PS Jenkins bot, Sam Spilsbury.

3694. By Sam Spilsbury on 2013-05-12

Try to launch tests on another server if there's tests running in parallel.

Provide our own compiz_xorg_gtest_main and subclass xorg::testing::Environment
to try and launch tests on another display if there's tests running on
one already.

This isn't by any means perfect - there are still race conditions
surrounding XOpenDisplay and parallel test runs but it makes a more smaller
time gap for conditions such as:
 1. Client has a server grab on the display we're checking
    and won't let go.
 2. Two servers get launched on one port and one set of tests
    interfere with the other.

It also means that we're now unable to configure the display port,
log file and config file on the command line. But we weren't using that
anyways.

Finally, the logs now point to /tmp/Compiz.Xorg.GTest.displaynum.log

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

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

3693. By MC Return on 2013-05-12

Wobbly Windows, code cleanup:

Declaration and assignment of local variables in one line.
Merged if statements.
Removed redundant brackets.
Added missing break.
Removed and added newlines for better readability.
Fixed indentation.

Approved by PS Jenkins bot, Sam Spilsbury.

3692. By MC Return on 2013-05-12

Resize, minor code cleanup:

Declaration and assignment of local variables in one line.
Added and removed newlines, if appropriate.
Removed redundant brackets.
Indentation fixes.

Approved by PS Jenkins bot, Sam Spilsbury.

3691. By Mehrdad Afshari on 2013-05-11

Added "move window to previous monitor" feature to compiz Put plugin. Fixes: https://bugs.launchpad.net/bugs/1178581.

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

3690. By MC Return on 2013-05-11

*Grid, code changes and fixes:

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

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

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

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

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

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

Added missing ABI checks of OpenGL and Composite.

*Grid, xml changes and fixes:

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

*Grid, minor code cleanup:

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

(LP: #745159, LP: #1020857, LP: #1172641). Fixes: https://bugs.launchpad.net/bugs/745159, https://bugs.launchpad.net/bugs/1020857, https://bugs.launchpad.net/bugs/1172641.

Approved by PS Jenkins bot, Sam Spilsbury.