[fusion-commits] Compiz mirror: Changes to 'master' (21f90697c537fcd1622bf692c14842cda3ef6149)

[compiz at server.opencompositing.org]

New commits:
commit 21f90697c537fcd1622bf692c14842cda3ef6149
Merge: 40f876cf856699f0325ce1596a1a0cd03b55b360 8b7d26177eea34cf1cdf4bdbb19e7b56a318d11c
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat May 10 12:34:48 2008 +0200

    Merge branch 'master' of git+ssh://maniac@git.freedesktop.org/git/xorg/app/compiz

commit 40f876cf856699f0325ce1596a1a0cd03b55b360
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat May 10 12:34:11 2008 +0200

    Treat edge button bindings like edge bindings.

commit f45c8cf8f0044de4528fddb369976eed8465d780
Author: Danny Baumann <dannybaumann at web.de>
Date:   Sat May 10 12:32:08 2008 +0200

    Make edge button bindings behave more meaningfully:
    If switching was initiated by an edge button, terminate switching on edge leave and proceed on each button press.


 plugins/scale.c    |    5 ++++-
 plugins/switcher.c |    6 ++----
 2 files changed, 6 insertions(+), 5 deletions(-)


Modified: compiz/plugins/scale.c
===================================================================
--- compiz/plugins/scale.c
+++ compiz/plugins/scale.c
@@ -1183,8 +1183,11 @@ scaleInitiateCommon (CompScreen      *s,
 	damageScreen (s);
     }
 
-    if (state & CompActionStateInitButton)
+    if ((state & (CompActionStateInitButton | EDGE_STATE)) ==
+	CompActionStateInitButton)
+    {
 	action->state |= CompActionStateTermButton;
+    }
 
     if (state & CompActionStateInitKey)
 	action->state |= CompActionStateTermKey;

Modified: compiz/plugins/switcher.c
===================================================================
--- compiz/plugins/switcher.c
+++ compiz/plugins/switcher.c
@@ -812,12 +812,10 @@ switchInitiateCommon (CompDisplay           *d,
 	    if (state & CompActionStateInitKey)
 		action->state |= CompActionStateTermKey;
 
-	    if (state & CompActionStateInitButton)
-		action->state |= CompActionStateTermButton;
-
 	    if (state & CompActionStateInitEdge)
 		action->state |= CompActionStateTermEdge;
-
+	    else if (state & CompActionStateInitButton)
+		action->state |= CompActionStateTermButton;
 	}
 
 	switchToWindow (s, nextWindow);