Merge lp:~brandontschaefer/compiz/window-max-semimax-animation into lp:compiz/0.9.9

[Brandon Schaefer]

[lp:~brandontschaefer/compiz/window-max-semimax-animation]

3535. By Brandon Schaefer on 2013-01-11

* No need to draw if you're transparent

3536. By Brandon Schaefer on 2013-01-11

* Merged trunk

[ Jussi Pakkanen ]
* Build warning "multiple rules generate gtk/gnome/compiz.desktop.
  build will not be correct; continuing anyway" (LP: #1086789)
* Build uses pyrexc without checking that it exists (LP: #1086704)
[ Iven Hsu ]
* KWD: Appmenu always pops up at top-left corner of the screen (LP:
  #1089863)
[ Matija Skala ]
* findcompiz_install doesn't work (LP: #1051595)
[ Michail Bitzes ]
* [regression-r3320] firepaint doesn't paint any fire any more (LP:
  #1048505)
[ Timo Jyrinki ]
* Default blacklist string shouldn't contain double escape (LP:
  #1091103)
[ Scott Moreau <email address hidden>, MC Return <email address hidden>, Sam Spilsbury ]
* [needs-packaging] Wishlist: Missing plug-In: Wizard (LP: #1012330)
[ Brandon Schaefer ]
* Window management - When a monitor is disconnected, the windows do
  not move to the remaining monitor and the Launcher pips do not
  update (LP: #1002246)
[ MC Return ]
* [regression] thumbnail plugin does not build any more (LP: #1020825)
* [regression-r3320][GLES]: showmouse plugin does not work anymore at
  all (LP: #1048267)
[ Robert M <email address hidden>, Sam Spilsbury ]
* CCSM segfaults if no settings found (LP: #1092651)
[ Daniel van Vugt ]
* [regression] Window resize granularity is lost when restored after
  using Grid (LP: #925867)
* compiz_test_resize_logic: Multiple errors: Conditional jump or move
  depends on uninitialised value(s) (LP: #1097179)
* Add support for blacklisting some drivers from using unredirected
  fullscreen windows (LP: #1089246)
* [regression] compiz spends 31% of its CPU time in regexec() (LP:
  #1095001)
* GLShaderCache::priv [PrivateShaderCache] is leaked (LP: #1097664)
* [regression] r3523: Restored windows' contents are offset from (not
  aligned with) their frames (LP: #1089279)
* On ARM lp:compiz defaults to GL instead of GLES and FTBFS unless you
  -DBUILD_GLES=ON (LP: #1088414)
* [regression][GLES] wallpaper plugin does not build any more (LP:
  #1020830)
* [regression-r3320] firepaint doesn't paint any fire any more (LP:
  #1048505)
* findcompiz_install doesn't work (LP: #1051595)
* [Regression] Minimizing a window creates an input-insensitive area
  if you have unityshell loaded (LP: #1089811)
* [clang] lp:compiz r3523 FTBFS: unused function
  'ListValueToSettingValueList' [-Werror,-Wunused-function] (LP:
  #1089250)
* compiz fails to configure on arm with -DCOMPIZ_BUILD_TESTING=ON
  [package 'gl' not found] (LP: #1088419)
* PrivateGLScreen::projection is leaked (LP: #1097657)
* [clang] Multiple segfaults in test: SetSemantics (LP: #1089251)
* Plugin names are not sorted (they're shown in directory order) when
  cmake is run (LP: #1096780)
* Windows don't respond to input (mouse clicks) if XShape is disabled
  or unavailable (LP: #1087193)
* cmake suggests (kind of) expo is disabled but it still builds
  correctly. (LP: #1083027)
* EGL/GLES compiz builds do a eglWaitGL (synchronous wait) on every
  frame, likely to slow things down (LP: #1086779)
* Incorrect detection of shader support on fglrx (LP: #1026920)
* 1:0.9.8+bzr3319-0ubuntu1 regression: keeps setting gsettings keys to
  wrong values (LP: #1063617)
* resize leaks memory in multiple locations calling
  resize::CompScreenImpl::findWindow() -> operator new() (LP:
  #1097126)
[ Andrea Azzarone ]
* Modal dialogs don't appear on the same workspace/monitor as their
  parent window (LP: #754508)
* Multimonitor: New windows open on the wrong monitor, Place Plugin
  settings silently ignored (LP: #874146)
[ Sam Spilsbury ]
* [regression][GLES] cubeaddon plugin does not build any more (LP:
  #1020823)
* [regression-r3320] Animations and modules/plugins missing in Ubuntu
  12.10 and 13.04 (LP: #1069112)
* [nvidia] Moving or resizing windows freezes and stutters on nvidia
  (especially if some other window is redrawing). (LP: #1027211)
* Clicking on semi-maximized windows in a different workspace fails to
  switch to the correct workspace (LP: #1037164)
* CCSM segfaults if no settings found (LP: #1092651)
* Building compiz with clang++ on raring fails to build libgtest (LP:
  #1095906)
* Using grid-resize prevents windows from maximizing correctly (LP:
  #1093757)
* 1:0.9.8+bzr3319-0ubuntu1 regression: keeps setting gsettings keys to
  wrong values (LP: #1063617)
* ccp can fail to compile, as CompizPlugin is not included (LP:
  #1090845)
* opengl plugin FTBFS with clang (LP: #1095915)
[ Łukasz 'sil2100' Zemczak ]
* FTBFS after python2.7 upgrade - missing pyconfig.h (LP: #1088996)
[ Automatic PS uploader ]
* Automatic snapshot from revision 3554

3537. By Brandon Schaefer on 2013-01-12

* If the preview fades away, then keep the window under the orange glow.

[Brandon Schaefer (brandontschaefer)]

criss-cross merge...opps...removing and new branch can be found here...
https://code.launchpad.net/~brandontschaefer/compiz/window-max-semi-animation/+merge/143163

Unmerged revisions

3537. By Brandon Schaefer on 2013-01-12

* If the preview fades away, then keep the window under the orange glow.

3536. By Brandon Schaefer on 2013-01-11

* Merged trunk

[ Jussi Pakkanen ]
* Build warning "multiple rules generate gtk/gnome/compiz.desktop.
  build will not be correct; continuing anyway" (LP: #1086789)
* Build uses pyrexc without checking that it exists (LP: #1086704)
[ Iven Hsu ]
* KWD: Appmenu always pops up at top-left corner of the screen (LP:
  #1089863)
[ Matija Skala ]
* findcompiz_install doesn't work (LP: #1051595)
[ Michail Bitzes ]
* [regression-r3320] firepaint doesn't paint any fire any more (LP:
  #1048505)
[ Timo Jyrinki ]
* Default blacklist string shouldn't contain double escape (LP:
  #1091103)
[ Scott Moreau <email address hidden>, MC Return <email address hidden>, Sam Spilsbury ]
* [needs-packaging] Wishlist: Missing plug-In: Wizard (LP: #1012330)
[ Brandon Schaefer ]
* Window management - When a monitor is disconnected, the windows do
  not move to the remaining monitor and the Launcher pips do not
  update (LP: #1002246)
[ MC Return ]
* [regression] thumbnail plugin does not build any more (LP: #1020825)
* [regression-r3320][GLES]: showmouse plugin does not work anymore at
  all (LP: #1048267)
[ Robert M <email address hidden>, Sam Spilsbury ]
* CCSM segfaults if no settings found (LP: #1092651)
[ Daniel van Vugt ]
* [regression] Window resize granularity is lost when restored after
  using Grid (LP: #925867)
* compiz_test_resize_logic: Multiple errors: Conditional jump or move
  depends on uninitialised value(s) (LP: #1097179)
* Add support for blacklisting some drivers from using unredirected
  fullscreen windows (LP: #1089246)
* [regression] compiz spends 31% of its CPU time in regexec() (LP:
  #1095001)
* GLShaderCache::priv [PrivateShaderCache] is leaked (LP: #1097664)
* [regression] r3523: Restored windows' contents are offset from (not
  aligned with) their frames (LP: #1089279)
* On ARM lp:compiz defaults to GL instead of GLES and FTBFS unless you
  -DBUILD_GLES=ON (LP: #1088414)
* [regression][GLES] wallpaper plugin does not build any more (LP:
  #1020830)
* [regression-r3320] firepaint doesn't paint any fire any more (LP:
  #1048505)
* findcompiz_install doesn't work (LP: #1051595)
* [Regression] Minimizing a window creates an input-insensitive area
  if you have unityshell loaded (LP: #1089811)
* [clang] lp:compiz r3523 FTBFS: unused function
  'ListValueToSettingValueList' [-Werror,-Wunused-function] (LP:
  #1089250)
* compiz fails to configure on arm with -DCOMPIZ_BUILD_TESTING=ON
  [package 'gl' not found] (LP: #1088419)
* PrivateGLScreen::projection is leaked (LP: #1097657)
* [clang] Multiple segfaults in test: SetSemantics (LP: #1089251)
* Plugin names are not sorted (they're shown in directory order) when
  cmake is run (LP: #1096780)
* Windows don't respond to input (mouse clicks) if XShape is disabled
  or unavailable (LP: #1087193)
* cmake suggests (kind of) expo is disabled but it still builds
  correctly. (LP: #1083027)
* EGL/GLES compiz builds do a eglWaitGL (synchronous wait) on every
  frame, likely to slow things down (LP: #1086779)
* Incorrect detection of shader support on fglrx (LP: #1026920)
* 1:0.9.8+bzr3319-0ubuntu1 regression: keeps setting gsettings keys to
  wrong values (LP: #1063617)
* resize leaks memory in multiple locations calling
  resize::CompScreenImpl::findWindow() -> operator new() (LP:
  #1097126)
[ Andrea Azzarone ]
* Modal dialogs don't appear on the same workspace/monitor as their
  parent window (LP: #754508)
* Multimonitor: New windows open on the wrong monitor, Place Plugin
  settings silently ignored (LP: #874146)
[ Sam Spilsbury ]
* [regression][GLES] cubeaddon plugin does not build any more (LP:
  #1020823)
* [regression-r3320] Animations and modules/plugins missing in Ubuntu
  12.10 and 13.04 (LP: #1069112)
* [nvidia] Moving or resizing windows freezes and stutters on nvidia
  (especially if some other window is redrawing). (LP: #1027211)
* Clicking on semi-maximized windows in a different workspace fails to
  switch to the correct workspace (LP: #1037164)
* CCSM segfaults if no settings found (LP: #1092651)
* Building compiz with clang++ on raring fails to build libgtest (LP:
  #1095906)
* Using grid-resize prevents windows from maximizing correctly (LP:
  #1093757)
* 1:0.9.8+bzr3319-0ubuntu1 regression: keeps setting gsettings keys to
  wrong values (LP: #1063617)
* ccp can fail to compile, as CompizPlugin is not included (LP:
  #1090845)
* opengl plugin FTBFS with clang (LP: #1095915)
[ Łukasz 'sil2100' Zemczak ]
* FTBFS after python2.7 upgrade - missing pyconfig.h (LP: #1088996)
[ Automatic PS uploader ]
* Automatic snapshot from revision 3554

3535. By Brandon Schaefer on 2013-01-11

* No need to draw if you're transparent

3534. By Brandon Schaefer on 2013-01-11

* Adds window preview (ish) animation.
* Adds 2 options to ccsm, one is draw duration and enabling window preview

=== modified file 'plugins/grid/grid.xml.in'
--- plugins/grid/grid.xml.in	2012-10-15 10:31:51 +0000
+++ plugins/grid/grid.xml.in	2013-01-12 01:36:20 +0000
@@ -539,6 +539,18 @@
 			<_long>Draw Window Resize Indicator</_long>
 			<default>true</default>
 		</option>
+		<option name="draw_preview" type="bool">
+			<_short>Draw Window Preview</_short>
+			<_long>Draw window preview where the window will be resized</_long>
+			<default>true</default>
+		</option>
+		<option name="draw_duration" type="int">
+			<_short>Draw Duration</_short>
+			<_long>Draw Resize Duration</_long>
+			<default>350</default>
+			<min>250</min>
+			<max>1000</max>
+		</option>
 		<option name="outline_color" type="color">
 			<_short>Outline Color</_short>
 			<_long>Color of the resize indicator outline</_long>

=== modified file 'plugins/grid/src/grid.cpp'
--- plugins/grid/src/grid.cpp	2013-01-03 15:43:56 +0000
+++ plugins/grid/src/grid.cpp	2013-01-12 01:36:20 +0000
@@ -25,6 +25,7 @@
 #include <boost/bind.hpp>
 #include "grid.h"
 #include "grabhandler.h"
+#include "math.h"
 
 using namespace GridWindowType;
 namespace cgw = compiz::grid::window;
@@ -289,7 +290,7 @@
 		    currentRect.x () == desiredRect.x ()) ||
 		    (gw->resizeCount < 1) || (gw->resizeCount > 5))
 		    gw->resizeCount = 1;
-	    
+
 		switch (gw->resizeCount)
 		{
 		    case 1:
@@ -384,11 +385,11 @@
 	        gw->isGridMaximized = false;
 	    }
 
-	    int dw = (lastBorder.left + lastBorder.right) - 
+	    int dw = (lastBorder.left + lastBorder.right) -
 		      (gw->window->border ().left +
 		       gw->window->border ().right);
-			
-	    int dh = (lastBorder.top + lastBorder.bottom) - 
+
+	    int dh = (lastBorder.top + lastBorder.bottom) -
 			(gw->window->border ().top +
 			 gw->window->border ().bottom);
 
@@ -584,6 +585,61 @@
     glDisable (GL_BLEND);
 }
 
+void
+GridScreen::glPaintWindowPreview (const GLMatrix& transform, CompOutput *output)
+{
+    std::vector<Animation>::iterator iter;
+    GLMatrix wTransform (transform);
+    GLWindowPaintAttrib wAttrib;
+    unsigned int mask;
+
+    CompWindow *cw = screen->findWindow (CompOption::getIntOptionNamed (o, "window"));
+
+    if (!cw)
+        return;
+
+    GLWindow *glWindow = GLWindow::get(cw);
+
+    if (!glWindow || glWindow->textures().empty())
+        return;
+
+    wAttrib.opacity = OPAQUE;
+    wAttrib.brightness = BRIGHT;
+    wAttrib.saturation = COLOR;
+
+    wTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
+
+    for (iter = animations.begin (); iter != animations.end () && animating; ++iter)
+    {
+        Animation& anim = *iter;
+
+        if (!anim.fadingOut && anim.timer > 0.0f)
+        {
+            mask = glWindow->lastMask ();
+            mask |= PAINT_WINDOW_TRANSFORMED_MASK;
+            mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
+            mask |= PAINT_WINDOW_BLEND_MASK;
+
+            int width = cw->width() + cw->border().left + cw->border().right;
+            int height = cw->height() + cw->border().top + cw->border().bottom;
+            float scaleX = (float)(anim.currentRect.x2() - anim.currentRect.x1()) / width;
+            float scaleY = (float)(anim.currentRect.y2() - anim.currentRect.y1()) / height;
+
+            float translateX = (anim.currentRect.x1() - cw->x()) + cw->border().left * scaleX;
+            float translateY = (anim.currentRect.y1() - cw->y()) + cw->border().top * scaleY;
+
+            wTransform.translate (cw->x(), cw->y(), 0.0f);
+            wTransform.scale(scaleX, scaleY, 1.0f);
+            wTransform.translate (translateX / scaleX - cw->x(), translateY / scaleY - cw->y(), 0.0f);
+
+            float curve = powf(25, -anim.progress);
+            wAttrib.opacity = OPAQUE * curve;
+
+            glWindow->glDraw(wTransform, wAttrib, infiniteRegion, mask);
+        }
+    }
+}
+
 bool
 GridScreen::glPaintOutput (const GLScreenPaintAttrib &attrib,
 			   const GLMatrix            &matrix,
@@ -597,6 +653,9 @@
 
     glPaintRectangle (attrib, matrix, output);
 
+    if (optionGetDrawPreview ())
+    	glPaintWindowPreview(matrix, output);
+
     return status;
 }
 
@@ -757,7 +816,7 @@
 		lastSlot = desiredSlot;
 
 		if (edge == NoEdge || target == GridUnknown)
-			desiredSlot.setGeometry (0, 0, 0, 0);			
+			desiredSlot.setGeometry (0, 0, 0, 0);
 
 		if (cScreen)
 			cScreen->damageRegion (desiredSlot);
@@ -1063,7 +1122,7 @@
 	currentRect = CompRect (0, 0, 0, 0);
 	opacity = 0.0f;
 	timer = 0.0f;
-	duration = 250;
+	duration = optionGetDrawDuration();
 	complete = false;
 	fadingOut = false;
 }
@@ -1137,8 +1196,9 @@
     grabMask (0),
     pointerBufDx (0),
     pointerBufDy (0),
-    resizeCount (0),	
-    lastTarget (GridUnknown)
+    resizeCount (0),
+    lastTarget (GridUnknown),
+    sizeHintsFlags(0)
 {
     WindowInterface::setHandler (window);
 }

=== modified file 'plugins/grid/src/grid.h'
--- plugins/grid/src/grid.h	2012-11-05 00:54:07 +0000
+++ plugins/grid/src/grid.h	2013-01-12 01:36:20 +0000
@@ -87,7 +87,8 @@
     TopRight
 };
 
-class Animation
+class Animation :
+    public GridOptions
 {
 	public:
 
@@ -136,6 +137,8 @@
 	void glPaintRectangle (const GLScreenPaintAttrib&,
 			       const GLMatrix&, CompOutput *);
 
+    	void glPaintWindowPreview (const GLMatrix&, CompOutput *);
+
 	bool glPaintOutput (const GLScreenPaintAttrib &,
 			    const GLMatrix &, const CompRegion &,
 			    CompOutput *, unsigned int);