[fusion-commits] Compiz mirror: Changes to 'master' (8ee26a557b0daef557825ab980b87678f9f029ac)

[compiz at server.opencompositing.org]

New commits:
commit 8ee26a557b0daef557825ab980b87678f9f029ac
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri May 2 08:35:35 2008 +0200

    Only initiate window menu if we don't have an active grab.
    Otherwise, doing so might deadlock.

commit 39b7e70d7dacf5c6817c14013c1732e088146b7d
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri May 2 08:34:21 2008 +0200

    Added missing action check.

commit d03bdf44715ffec9d3062cb5d6a5143aff1f784d
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri May 2 08:31:27 2008 +0200

    Allow minimizeWindow to minimize windows that don't have the minimize action set as this is desired e.g. for minimizing transients.
    Instead, check for the minimize action when minimization is triggered externally.


 src/display.c |    6 +++---
 src/event.c   |    5 ++++-
 src/window.c  |    3 ---
 3 files changed, 7 insertions(+), 7 deletions(-)


Modified: compiz/src/display.c
===================================================================
--- compiz/src/display.c
+++ compiz/src/display.c
@@ -173,7 +173,7 @@ closeWin (CompDisplay     *d,
     time = getIntOptionNamed (option, nOption, "time", CurrentTime);
 
     w = findTopLevelWindowAtDisplay (d, xid);
-    if (w)
+    if (w && (w->actions & CompWindowActionCloseMask))
 	closeWindow (w, time);
 
     return TRUE;
@@ -255,7 +255,7 @@ minimize (CompDisplay     *d,
     xid = getIntOptionNamed (option, nOption, "window", 0);
 
     w = findTopLevelWindowAtDisplay (d, xid);
-    if (w)
+    if (w && (w->actions & CompWindowActionMinimizeMask))
 	minimizeWindow (w);
 
     return TRUE;
@@ -577,7 +577,7 @@ windowMenu (CompDisplay     *d,
     xid = getIntOptionNamed (option, nOption, "window", 0);
 
     w = findTopLevelWindowAtDisplay (d, xid);
-    if (w)
+    if (w && !w->screen->maxGrab)
     {
 	int  x, y, button;
 	Time time;

Modified: compiz/src/event.c
===================================================================
--- compiz/src/event.c
+++ compiz/src/event.c
@@ -1876,7 +1876,10 @@ handleEvent (CompDisplay *d,
 	    if (w)
 	    {
 		if (event->xclient.data.l[0] == IconicState)
-		    minimizeWindow (w);
+		{
+		    if (w->actions & CompWindowActionMinimizeMask)
+			minimizeWindow (w);
+		}
 		else if (event->xclient.data.l[0] == NormalState)
 		    unminimizeWindow (w);
 	    }

Modified: compiz/src/window.c
===================================================================
--- compiz/src/window.c
+++ compiz/src/window.c
@@ -4611,9 +4611,6 @@ minimizeTransients (CompWindow *w,
 void
 minimizeWindow (CompWindow *w)
 {
-    if (!(w->actions & CompWindowActionMinimizeMask))
-	return;
-
     if (!w->managed)
 	return;