Merge lp:~compiz-team/compiz-expo-plugin/compiz-expo-plugin.initiate_scale into lp:compiz-expo-plugin

[Sam Spilsbury]

Adds an option to use scale with expo. SCALE WITH EXPO

Unmerged revisions

141. By Sam Spilsbury on 2011-09-17

Added a mode to trigger the expo plugin

140. By Sam Spilsbury on 2011-08-19

Bump VERSION

139. By Sam Spilsbury on 2011-08-19

Update NEWS for 0.9.5.92

=== modified file 'expo.xml.in'
--- expo.xml.in	2010-09-28 22:30:37 +0000
+++ expo.xml.in	2011-09-17 06:04:17 +0000
@@ -17,6 +17,7 @@
 		<plugin>wobbly</plugin>
 		<plugin>animation</plugin>
 		<plugin>wallpaper</plugin>
+		<plugin>scale</plugin>
 	    </relation>
 	</deps>
 	<options>
@@ -77,6 +78,21 @@
 	    </group>
 	    <group>
 		<_short>Behaviour</_short>
+		<option name="dnd_behaviour" type="int">
+		    <_short>Expo Dnd Behaviour</_short>
+		    <_long>Behaviour to use for mouse input</_long>
+		    <min>0</min>
+		    <max>1</max>
+		    <desc>
+			<value>0</value>
+			<_name>Drag and Drop</_name>
+		    </desc>
+		    <desc>
+			<value>1</value>
+			<_name>Initiate Scale</_name>
+		    </desc>
+		    <default>0</default>
+		</option>
 		<option name="zoom_time" type="float">
 		    <_short>Zoom time</_short>
 		    <_long>Duration of the zoomout animation</_long>

=== modified file 'src/expo.cpp'
--- src/expo.cpp	2011-03-30 13:17:53 +0000
+++ src/expo.cpp	2011-09-17 06:04:17 +0000
@@ -67,11 +67,36 @@
 
     if (dndState == DnDDuring || dndState == DnDStart)
     {
-	if (dndWindow)
+	CompPlugin *scalePlugin = CompPlugin::find ("scale");
+
+	dndState  = DnDNone;
+
+	if ((optionGetDndBehaviour () != ExpoOptions::DndBehaviourInitiateScale ||
+	     !scalePlugin) && dndWindow)
 	    finishWindowMovement ();
-
-	dndState  = DnDNone;
-	dndWindow = NULL;
+	else if (scalePlugin)
+	{
+	    CompOption::Vector &plugin_options = scalePlugin->vTable->getOptions ();
+
+	    foreach (CompOption &o, plugin_options)
+	    {
+		if (o.name () == "initiate_key")
+		{
+		    CompAction *a = &o.value ().action ();
+		    CompOption::Vector argument = options;
+
+		    argument.push_back(CompOption ("select_x", CompOption::TypeInt));
+		    argument.back ().value ().set (newCursor.x () % screen->width ());
+
+		    argument.push_back(CompOption ("select_y", CompOption::TypeInt));
+		    argument.back ().value ().set (newCursor.y () % screen->height ());
+
+		    if (a)
+			if (a->terminate () (a, 0, argument))
+			    termExpo (NULL, state, options);
+		}
+	    }
+	}
 
 	action->setState (action->state () & CompAction::StateInitButton);
 	cScreen->damageScreen ();
@@ -117,6 +142,33 @@
 	screen->addAction (&optionGetNextVpButton ());
 	screen->addAction (&optionGetPrevVpButton ());
 
+	if (optionGetDndBehaviour () == ExpoOptions::DndBehaviourInitiateScale)
+	{
+	    CompPlugin *scalePlugin = CompPlugin::find ("scale");
+
+	    if (scalePlugin)
+	    {
+		CompOption::Vector &plugin_options = scalePlugin->vTable->getOptions ();
+
+		foreach (CompOption &o, plugin_options)
+		{
+		    if (o.name () == "initiate_key")
+		    {
+			CompAction *a = &o.value ().action ();
+
+			if (a)
+			{
+			    CompOption::Vector argument = options;
+
+			    argument.push_back(CompOption ("no_auto_grab", CompOption::TypeInt));
+			    argument.back ().value ().set (1);
+			    a->initiate () (a, state, argument);
+			}
+		    }
+		}
+	    }
+	}
+
 	cScreen->damageScreen ();
     }
     else
@@ -157,6 +209,27 @@
     screen->removeAction (&optionGetNextVpButton ());
     screen->removeAction (&optionGetPrevVpButton ());
 
+    if (optionGetDndBehaviour () == ExpoOptions::DndBehaviourInitiateScale)
+    {
+	CompPlugin *scalePlugin = CompPlugin::find ("scale");
+
+	if (scalePlugin)
+	{
+	    CompOption::Vector &plugin_options = scalePlugin->vTable->getOptions ();
+
+	    foreach (CompOption &o, plugin_options)
+	    {
+		if (o.name () == "initiate_key")
+		{
+		    CompAction *a = &o.value ().action ();
+
+		    if (a)
+			a->terminate () (a, CompAction::StateCancel, options);
+		}
+	    }
+	}
+    }
+
     cScreen->damageScreen ();
     screen->focusDefaultWindow ();
 
@@ -310,6 +383,8 @@
 	s->currentOutputDev = lastOutput;
     }
 #endif
+
+    dndWindow = NULL;
 }
 
 void
@@ -450,6 +525,7 @@
 	ew->gWindow->glDrawSetEnabled (ew, enable);
 	ew->gWindow->glAddGeometrySetEnabled (ew, enable);
 	ew->gWindow->glDrawTextureSetEnabled (ew, enable);
+	ew->window->focusSetEnabled (ew, enable);
     }
 }
 
@@ -527,8 +603,15 @@
 
     cScreen->donePaint ();
 
-    switch (dndState) {
-    case DnDDuring:
+    if (optionGetDndBehaviour () == ExpoOptions::DndBehaviourInitiateScale)
+    {
+	if (dndState == DnDStart)
+	    dndState = DnDDuring;
+    }
+    else
+    {
+	switch (dndState) {
+	case DnDDuring:
 	{
 	    if (dndWindow)
 		dndWindow->move (newCursor.x () - prevCursor.x (),
@@ -540,7 +623,7 @@
 	}
 	break;
 
-    case DnDStart:
+	case DnDStart:
 	{
 	    int                              xOffset, yOffset;
 	    CompWindowList::reverse_iterator iter;
@@ -572,18 +655,18 @@
 		else
 		{
 		    nx = newCursor.x () -
-			 (screen->vp ().x () * screen->width ());
+			    (screen->vp ().x () * screen->width ());
 		    ny = newCursor.y () -
-			 (screen->vp ().y () * screen->height ());
+			    (screen->vp ().y () * screen->height ());
 		}
 
 		inWindow = (nx >= input.left () && nx <= input.right ()) ||
-			   (nx >= (input.left () + xOffset) &&
-			    nx <= (input.right () + xOffset));
+			(nx >= (input.left () + xOffset) &&
+			 nx <= (input.right () + xOffset));
 
 		inWindow &= (ny >= input.top () && ny <= input.bottom ()) ||
-			    (ny >= (input.top () + yOffset) &&
-			     ny <= (input.bottom () + yOffset));
+			(ny >= (input.top () + yOffset) &&
+			 ny <= (input.bottom () + yOffset));
 
 		if (!inWindow)
 		    continue;
@@ -612,8 +695,9 @@
 	    prevCursor = newCursor;
 	}
 	break;
-    default:
-	break;
+	default:
+	    break;
+	}
     }
 }
 
@@ -1250,6 +1334,24 @@
 }
 
 bool
+ExpoWindow::focus ()
+{
+    if (window->overrideRedirect ())
+	return false;
+
+    if (!window->managed ())
+	return false;
+
+    if (!window->onCurrentDesktop ())
+	return false;
+
+    if (!window->shaded () && (window->state () & CompWindowStateHiddenMask))
+	return false;
+
+    return true;
+}
+
+bool
 ExpoWindow::glPaint (const GLWindowPaintAttrib& attrib,
 		     const GLMatrix&            transform,
 		     const CompRegion&          region,
@@ -1360,6 +1462,10 @@
 {
     CompositeWindowInterface::setHandler (cWindow, false);
     GLWindowInterface::setHandler (gWindow, false);
+    WindowInterface::setHandler (window, false);
+
+    window->focusSetEnabled (this, false);
+
 }
 
 bool

=== modified file 'src/expo.h'
--- src/expo.h	2009-11-17 17:12:05 +0000
+++ src/expo.h	2011-09-17 06:04:17 +0000
@@ -130,11 +130,14 @@
 class ExpoWindow :
     public CompositeWindowInterface,
     public GLWindowInterface,
+    public WindowInterface,
     public PluginClassHandler<ExpoWindow, CompWindow>
 {
     public:
 	ExpoWindow (CompWindow *);
 
+	bool focus ();
+
 	bool damageRect (bool, const CompRect&);
 
 	bool glDraw (const GLMatrix&, GLFragment::Attrib&,