Merge lp:~om26er/ubuntu/natty/compiz/compiz-fix-772612 into lp:ubuntu/natty-proposed/compiz

[Omer Akram]

Backport fix for a showstopper (bug 772612).

these two commits were backported:
http://gitweb.compiz.org/?p=compiz/core;a=commit;h=32affe04818a82b884ef617bf319b0c9f2189cd9
http://gitweb.compiz.org/?p=compiz/core;a=commit;h=20eadb9be94e1624022b5e4a99ca1e5adb3f88a7

People in the bug report confirm that these two commits fix the issue that's described in the bug report. There is still a similar issue in Oneiric which is totally random as I have not been able to find any steps. The original bug is far destructive as it happens 100% of the time so it will be really wise to fix it in Natty.

[Omer Akram (om26er)]

this branch causes a regression

[Didier Roche-Tolomelli (didrocks)]

Thanks omer for spotting it :)

Set as "need fixing" then

review: Needs Fixing

Unmerged revisions

232. By Omer Akram on 2011-08-10

forgot to add the patch

231. By Omer Akram on 2011-08-10

* debian/patches/090_send_fake_configure_notify.patch:
  - Maximised window is displaced. (LP: #772612)

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-24 10:52:47 +0000
+++ debian/changelog	2011-08-10 11:51:08 +0000
@@ -1,3 +1,10 @@
+compiz (1:0.9.4+bzr20110606-0ubuntu1~natty2.1) natty-proposed; urgency=low
+
+  * debian/patches/090_send_fake_configure_notify.patch:
+    - Maximised window is displaced. (LP: #772612) 
+
+ -- Omer Akram <[e-mail]>  Wed, 10 Aug 2011 16:36:11 +0500
+
 compiz (1:0.9.4+bzr20110606-0ubuntu1~natty2) natty-proposed; urgency=low
 
   * debian/patches/00_bzr_fix_727143.patch:

=== added file 'debian/patches/090_send_fake_configure_notify.patch'
--- debian/patches/090_send_fake_configure_notify.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/090_send_fake_configure_notify.patch	2011-08-10 11:51:08 +0000
@@ -0,0 +1,120 @@
+From: Scott Talbert <[e-mail]>
+Author: Sam Spilsbury <[e-mail]>
+Subject: Send a fake configure notify event when the window size doesn't change.
+Origin: http://gitweb.compiz.org/?p=compiz/core;a=commitdiff;h=32affe04818a82b884ef617bf319b0c9f2189cd9
+Origin:	http://gitweb.compiz.org/?p=compiz/core;a=commitdiff;h=20eadb9be94e1624022b5e4a99ca1e5adb3f88a7
+Bug-Ubuntu: https://launchpad.net/bugs/772612
+
+--- compiz-0.9.4+bzr20110606.orig/src/window.cpp	2011-06-01 11:49:33.000000000 -0400
++++ compiz-0.9.4+bzr20110606/src/window.cpp	2011-08-09 14:03:25.000000000 -0400
+@@ -770,7 +770,8 @@
+ 
+     if (input.left || input.right || input.top || input.bottom)
+     {
+-	int	   x, y, width, height;
++	int	   x, y;
++	unsigned int width, height;
+ 	int	   bw = serverGeometry.border () * 2;
+ 
+ 	x      = serverGeometry.x () - input.left;
+@@ -781,7 +782,36 @@
+ 	if (shaded)
+ 	    height = input.top + input.bottom;
+ 
+-	XMoveResizeWindow (screen->dpy (), frame, x, y, width, 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 (geometry.x () - input.left == x &&
++	    geometry.y () - input.top  == y &&
++	    geometry.width () + input.left + input.right + bw == width &&
++	    geometry.height () + input.top + input.bottom + bw == height)
++	{
++	    XConfigureEvent xev;
++
++	    xev.type   = ConfigureNotify;
++	    xev.event  = screen->root ();
++	    xev.window = priv->frame;
++
++	    xev.x		  = x;
++	    xev.y		  = y;
++	    xev.width	 	  = width;
++	    xev.height	 	  = height;
++	    xev.border_width 	  = window->priv->attrib.border_width;
++
++	    xev.above	      	  = (window->prev) ? ROOTPARENT (window->prev) : None;
++	    xev.override_redirect = window->priv->attrib.override_redirect;
++
++	    XSendEvent (screen->dpy (), screen->root (), false,
++			SubstructureNotifyMask, (XEvent *) &xev);
++	}
++	else
++	    XMoveResizeWindow (screen->dpy (), frame, x, y, width, height);
++
+ 	if (shaded)
+ 	{
+ 	    XUnmapWindow (screen->dpy (), wrapper);
+@@ -823,13 +853,13 @@
+ 	    XMoveResizeWindow (screen->dpy (), wrapper, 0, 0,
+ 			       serverGeometry.width (), serverGeometry.height ());
+ 	}
++
+         XMoveResizeWindow (screen->dpy (), id, 0, 0,
+ 			   serverGeometry.width (), serverGeometry.height ());
+         window->sendConfigureNotify ();
+ 	frameRegion = CompRegion ();
+ 	window->windowNotify (CompWindowNotifyFrameUpdate);
+     }
+-
+     window->recalcActions ();
+ }
+ 
+@@ -1425,8 +1455,8 @@
+ bool
+ CompWindow::resize (CompWindow::Geometry gm)
+ {
+-    if (priv->geometry.x ()       != gm.width ()  ||
+-	priv->geometry.y ()       != gm.height () ||
++    if (priv->geometry.width ()   != gm.width ()  ||
++	priv->geometry.height ()  != gm.height () ||
+ 	priv->geometry.border ()  != gm.border ())
+     {
+ 	int pw, ph;
+@@ -3093,9 +3123,9 @@
+ 	{
+ 	    if (!sibling)
+ 	    {
+-		XLowerWindow (screen->dpy (), id);
+ 		if (frame)
+ 		    XLowerWindow (screen->dpy (), frame);
++		XLowerWindow (screen->dpy (), id);
+ 
+ 		/* Restacking of compiz's window list happens
+ 		 * immediately and since this path doesn't call
+@@ -5695,7 +5725,7 @@
+ 
+     if (!i)
+ 	i = b;
+-  
++
+     if (priv->input.left   != i->left ||
+ 	priv->input.right  != i->right ||
+ 	priv->input.top    != i->top ||
+@@ -5722,6 +5752,7 @@
+ 			 Atoms::frameExtents,
+ 			 XA_CARDINAL, 32, PropModeReplace,
+ 			 (unsigned char *) data, 4);
++
+ 	priv->updateSize ();
+ 	priv->updateFrameWindow ();
+     }
+@@ -5859,7 +5890,7 @@
+     if (attrib.map_state == IsViewable || shaded)
+ 	XMapWindow (dpy, frame);
+ 
+-    attr.event_mask = SubstructureRedirectMask | StructureNotifyMask |
++    attr.event_mask = SubstructureRedirectMask |
+ 		      SubstructureNotifyMask | EnterWindowMask |
+ 		      LeaveWindowMask;
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-06-24 10:52:47 +0000
+++ debian/patches/series	2011-08-10 11:51:08 +0000
@@ -6,3 +6,4 @@
 060_move_checks_to_compiz.patch
 065_add_bailer_and_detection_plugins.patch
 086_new_grid_defaults.patch
+090_send_fake_configure_notify.patch