Merge lp:~ricotz/docky/desktopswitcher into lp:docky

[Rico Tzschichholz]

add WorkspaceSwitcher docklet

[Robert Dyer (psybers)]

Great idea and all, but you can technically have both workspaces and viewports within workspaces and your docklet does not allow that case.

review: Needs Fixing

[Robert Dyer (psybers)]

1) your docklet should not rotate

2) in OnClicked, the x/y are sent in as percents and you are assuming they are sent as relative co-ords

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

1) i hope you can explain how to establish this without rotating later

2) you should closer to "Cairo.Rectangle area = DeskAreaOnIcon (1, 1, row, col)" and understand what it does. A Cairo.Rectangle are 4 double values and DeskAreaOnIcon return an Cairo.Rectangle inside the bound of 1x1

[Rico Tzschichholz (ricotz)]

I think this is ready for merge.

review: Approve

[Ralf Czaska (longfried)]

Typo in desk.cs line 47?

[lp:~ricotz/docky/desktopswitcher]

1469. By Rico Tzschichholz on 2010-07-18

fix typo

1470. By Rico Tzschichholz on 2010-07-18

merge trunk 1575

[Rico Tzschichholz (ricotz)]

> Typo in desk.cs line 47?

Fixed, didn't noticed this since this property isn't used.

[Robert Dyer (psybers)]

1) It doesnt 'wrap' when I scroll over it. I realize for some cases this is hard to figure out, and honestly I dont know the answer (for square layouts). But for purely horizontal/vertical layouts it makes perfect sense and needs to be there.

2) what is this 'folder' (??) icon on the active desktop?

3) Should the hover text update itself based on what portion is hovered? IE, hover desk 1 and the hover shows 'desk 1' etc, instead of always showing the current desk - that way, you get a hover for what you are about to click on which makes it easier.... i am not even sure our API allows this, but lets first figure out if it makes sense and go from there :)

review: Needs Fixing

[Rico Tzschichholz (ricotz)]

> 1) It doesnt 'wrap' when I scroll over it. I realize for some cases this is hard to figure out, and honestly I dont know the answer (for square layouts). But for purely horizontal/vertical layouts it makes perfect sense and needs to be there.

I will implement it this way. If there is a one row/col layout it will
wrap around. On multi row and column layouts scrolling will walk through
line by line and jump from [1,1] to [n,n]

> 2) what is this 'folder' (??) icon on the active desktop?

Just the theme icon for "desktop" to mark it in a proper/colored way to
match the current icon theme.

> 3) Should the hover text update itself based on what portion is hovered? IE, hover desk 1 and the hover shows 'desk 1' etc, instead of always showing the current desk - that way, you get a hover for what you are about to click on which makes it easier.... i am not even sure our API allows this, but lets first figure out if it makes sense and go from there :)

Will need some core changes to do this, so shelve this idea for now.

[lp:~ricotz/docky/desktopswitcher]

1471. By Rico Tzschichholz on 2010-07-21

add WrappedScrolling

1472. By Rico Tzschichholz on 2010-07-21

wrapped scrolling through workspaces row/col by row/col

1473. By Rico Tzschichholz on 2010-07-21

optimizations and fixes

1474. By Rico Tzschichholz on 2010-07-21

last cleanups

=== modified file 'Docky-2.sln'
--- Docky-2.sln	2010-06-08 08:20:21 +0000
+++ Docky-2.sln	2010-07-21 11:16:11 +0000
@@ -41,6 +41,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Timer", "StandardPlugins\Timer\Timer.csproj", "{AAD062AA-454A-4263-97E7-B6ED3020D84C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkspaceSwitcher", "StandardPlugins\WorkspaceSwitcher\WorkspaceSwitcher.csproj", "{66939AAB-0832-4D2D-8282-3E29AA772B69}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.Widgets", "Docky.Widgets\Docky.Widgets.csproj", "{9CF2F475-7848-4333-9A35-93E8224653B3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Docky.DBus", "Docky.DBus\Docky.DBus.csproj", "{487D3B93-FAAF-4734-B337-85810A60ACCF}"
@@ -75,6 +77,10 @@
 		{58A2F667-86BF-4128-B442-77C6D14C89A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{58A2F667-86BF-4128-B442-77C6D14C89A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{58A2F667-86BF-4128-B442-77C6D14C89A4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66939AAB-0832-4D2D-8282-3E29AA772B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66939AAB-0832-4D2D-8282-3E29AA772B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66939AAB-0832-4D2D-8282-3E29AA772B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66939AAB-0832-4D2D-8282-3E29AA772B69}.Release|Any CPU.Build.0 = Release|Any CPU
 		{704C5716-B36A-42CC-8BE0-CB8A6CB6B97A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{704C5716-B36A-42CC-8BE0-CB8A6CB6B97A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{704C5716-B36A-42CC-8BE0-CB8A6CB6B97A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -151,6 +157,7 @@
 		{A96B9440-A980-4E61-8B9A-BA64A2A696E6} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{731A3B89-99C8-44A8-9ADB-9A3AF3A58C9E} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 		{AAD062AA-454A-4263-97E7-B6ED3020D84C} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
+		{66939AAB-0832-4D2D-8282-3E29AA772B69} = {8D4EE2FA-9CF2-4890-B14A-1BA8752404FE}
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
 		version = 2.0

=== modified file 'Docky.Items/Docky.Items/AbstractDockItem.cs'
--- Docky.Items/Docky.Items/AbstractDockItem.cs	2010-07-21 08:50:49 +0000
+++ Docky.Items/Docky.Items/AbstractDockItem.cs	2010-07-21 11:16:11 +0000
@@ -595,7 +595,9 @@
 				if (icon_buffers[j] == null || redraw[j])
 					continue;
 				
-				if (icon_buffers[j].Height == size)
+				if (icon_buffers[j].Height == size 
+				    || (Owner != null && Owner.IsOnVerticalDock && icon_buffers[j].Width == size))
+					
 					return icon_buffers[j];
 			}
 			

=== modified file 'Docky.Items/Docky.Items/AbstractDockItemProvider.cs'
--- Docky.Items/Docky.Items/AbstractDockItemProvider.cs	2010-06-17 06:43:24 +0000
+++ Docky.Items/Docky.Items/AbstractDockItemProvider.cs	2010-07-21 11:16:11 +0000
@@ -42,6 +42,8 @@
 			get { return !disposing && true; }
 		}
 		
+		public bool IsOnVerticalDock { get; set; }
+
 		IEnumerable<AbstractDockItem> items;
 		public IEnumerable<AbstractDockItem> Items {
 			get { return items; }
@@ -66,10 +68,11 @@
 				OnItemsChanged (added, removed);
 			}
 		}
-		
+
 		protected AbstractDockItemProvider ()
 		{
 			items = Enumerable.Empty<AbstractDockItem> ();
+			IsOnVerticalDock = false;
 		}
 		
 		public bool CanAcceptDrop (string uri)

=== modified file 'Docky/Docky/Interface/DockPreferences.cs'
--- Docky/Docky/Interface/DockPreferences.cs	2010-06-17 09:52:23 +0000
+++ Docky/Docky/Interface/DockPreferences.cs	2010-07-21 11:16:11 +0000
@@ -467,6 +467,7 @@
 		public void AddProvider (AbstractDockItemProvider provider)
 		{
 			item_providers.Add (provider);
+			provider.IsOnVerticalDock = IsVertical;
 			
 			OnItemProvidersChanged (provider.AsSingle (), null);
 		}
@@ -714,6 +715,8 @@
 		
 		void OnPositionChanged ()
 		{
+			item_providers.ForEach (provider => provider.IsOnVerticalDock = IsVertical);
+			
 			if (PositionChanged != null)
 				PositionChanged (this, EventArgs.Empty);
 		}

=== modified file 'StandardPlugins/Makefile.am'
--- StandardPlugins/Makefile.am	2010-05-22 04:50:36 +0000
+++ StandardPlugins/Makefile.am	2010-07-21 11:16:11 +0000
@@ -12,7 +12,8 @@
 	SessionManager \
 	Timer \
 	Trash \
-	Weather
+	Weather \
+	WorkspaceSwitcher
 
 DIST_SUBDIRS = \
 	BatteryMonitor \
@@ -28,4 +29,6 @@
 	SessionManager \
 	Timer \
 	Trash \
-	Weather
+	Weather \
+	WorkspaceSwitcher
+

=== added directory 'StandardPlugins/WorkspaceSwitcher'
=== added file 'StandardPlugins/WorkspaceSwitcher/Makefile.am'
--- StandardPlugins/WorkspaceSwitcher/Makefile.am	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/Makefile.am	2010-07-21 11:16:11 +0000
@@ -0,0 +1,30 @@
+# Simple component buildsystem
+include $(top_srcdir)/build.rules.docklets.mk
+
+ASSEMBLY = WorkspaceSwitcher
+
+FILES = \
+	src/Desk.cs \
+	src/WorkspaceSwitcherDockItem.cs \
+	src/WorkspaceSwitcherItemProvider.cs
+	
+RESOURCES = \
+	Resources/WorkspaceSwitcher.addin.xml
+
+PROJECT_REFERENCES= \
+	Docky.CairoHelper \
+	Docky.Items \
+	Docky.Windowing \
+	Docky.Services
+
+REFERENCES =  \
+	System \
+	System.Core \
+	Mono.Posix \
+	$(MONO_CAIRO_LIBS) \
+	$(GCONF_SHARP_20_LIBS) \
+	$(GTK_SHARP_20_LIBS) \
+	$(GLIB_SHARP_20_LIBS) \
+	$(GIO_SHARP_LIBS) \
+	$(LIBRSVG_SHARP_LIBS) \
+	$(WNCK_SHARP_10_LIBS)

=== added directory 'StandardPlugins/WorkspaceSwitcher/Resources'
=== added file 'StandardPlugins/WorkspaceSwitcher/Resources/WorkspaceSwitcher.addin.xml.in'
--- StandardPlugins/WorkspaceSwitcher/Resources/WorkspaceSwitcher.addin.xml.in	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/Resources/WorkspaceSwitcher.addin.xml.in	2010-07-21 11:16:11 +0000
@@ -0,0 +1,25 @@
+<Addin 
+	id="WorkspaceSwitcher"
+	namespace="Docky"
+	version="1.0"
+	isroot="false"
+	defaultEnabled="false"
+	name="Workspace Switcher"
+	description="Switch between your Desks"
+	author="Rico Tzschichholz"
+	icon="workspace-switcher"
+>
+ 
+ 	<Dependencies>
+		<Addin id="Items" version="1.0" />
+	</Dependencies>
+ 
+	<Runtime>
+		<Import assembly="WorkspaceSwitcher.dll"/>
+	</Runtime>
+	
+	<Extension path="/Docky/ItemProvider">
+		<ItemProvider type="WorkspaceSwitcher.WorkspaceSwitcherItemProvider" />
+	</Extension>	
+
+</Addin>

=== added file 'StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj'
--- StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/WorkspaceSwitcher.csproj	2010-07-21 11:16:11 +0000
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{66939AAB-0832-4D2D-8282-3E29AA772B69}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WorkspaceSwitcher</RootNamespace>
+    <AssemblyName>WorkspaceSwitcher</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <ReleaseVersion>2.0</ReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="src\WorkspaceSwitcherDockItem.cs" />
+    <Compile Include="src\WorkspaceSwitcherItemProvider.cs" />
+    <Compile Include="src\Desk.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\WorkspaceSwitcher.addin.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Docky.CairoHelper\Docky.CairoHelper.csproj">
+      <Project>{B23E0EDD-6443-4F99-9EAC-B7CC906F080D}</Project>
+      <Name>Docky.CairoHelper</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Items\Docky.Items.csproj">
+      <Project>{AB6E0EDD-6443-4F99-9EAC-DABC906F080D}</Project>
+      <Name>Docky.Items</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Windowing\Docky.Windowing.csproj">
+      <Project>{888FCD95-7C79-45C4-A744-9C840DF4B9B0}</Project>
+      <Name>Docky.Windowing</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Docky.Services\Docky.Services.csproj">
+      <Project>{8A6E0EDD-6443-4F99-9EAC-D9CC906F080D}</Project>
+      <Name>Docky.Services</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>glib-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>gtk-sharp-2.0</Package>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+      <Package>wnck-sharp-1.0</Package>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file

=== added directory 'StandardPlugins/WorkspaceSwitcher/src'
=== added file 'StandardPlugins/WorkspaceSwitcher/src/Desk.cs'
--- StandardPlugins/WorkspaceSwitcher/src/Desk.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/src/Desk.cs	2010-07-21 11:16:11 +0000
@@ -0,0 +1,205 @@
+//  
+//  Copyright (C) 2010 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+using Gdk;
+using Wnck;
+
+namespace WorkspaceSwitcher
+{
+	internal class Desk
+	{
+		public Wnck.Workspace Parent { get; private set; }
+		public string Name { get; private set; }
+		public int Number { get; private set; }
+		public Gdk.Rectangle Area { get; private set; }
+
+		Dictionary<Wnck.MotionDirection, Desk> neighbors;
+		Dictionary<Wnck.MotionDirection, Desk> wrapneighbors;
+		
+		public static Wnck.MotionDirection AlternateMovingDirection (Wnck.MotionDirection direction)
+		{
+			switch (direction) {
+			case MotionDirection.Down: return MotionDirection.Right;
+			case MotionDirection.Up: return MotionDirection.Left;
+			case MotionDirection.Left: return MotionDirection.Up;
+			case MotionDirection.Right: default: return MotionDirection.Down;
+			}
+		}
+
+		public static Wnck.MotionDirection OppositeDirection (Wnck.MotionDirection direction)
+		{
+			switch (direction) {
+			case MotionDirection.Down: return MotionDirection.Up;
+			case MotionDirection.Up: return MotionDirection.Down;
+			case MotionDirection.Left: return MotionDirection.Right;
+			case MotionDirection.Right: default: return MotionDirection.Left;
+			}
+		}
+		
+		public bool IsVirtual {
+			get {
+				return Parent.IsVirtual;
+			}
+		}
+		
+		public bool IsActive {
+			get {
+				if (!Parent.IsVirtual)
+					return Wnck.Screen.Default.ActiveWorkspace == Parent;
+				else
+					return Wnck.Screen.Default.ActiveWorkspace.ViewportX == Area.X && Wnck.Screen.Default.ActiveWorkspace.ViewportY == Area.Y;
+			}
+		}
+		
+		Desk GetUpperLeftDesk ()
+		{
+			Desk upperleft, next;
+			upperleft = this;
+			while ((next = upperleft.GetNeighbor (Wnck.MotionDirection.Up)) != null)
+				upperleft = next;
+			while ((next = upperleft.GetNeighbor (Wnck.MotionDirection.Left)) != null)
+				upperleft = next;
+			return upperleft;
+		}
+		
+		Gdk.Point GetDeskGridSize ()
+		{
+			int cols = 1;
+			int rows = 1;
+			Desk bottomright, next;
+			next = GetUpperLeftDesk ();
+			while ((bottomright = next.GetNeighbor (Wnck.MotionDirection.Down)) != null) {
+				next = bottomright;
+				rows++;
+			}
+			while ((bottomright = next.GetNeighbor (Wnck.MotionDirection.Right)) != null) {
+				next = bottomright;
+				cols++;
+			}
+			return new Gdk.Point (cols, rows);
+		}
+		
+		public Desk [,] GetDeskGridLayout ()
+		{
+			Desk next, desk = GetUpperLeftDesk ();
+			Gdk.Point gridsize = GetDeskGridSize ();
+			Desk [,] grid = new Desk [gridsize.X, gridsize.Y];
+			grid [0, 0] = desk;
+			int x = 0;
+			for (int y = 0; y < gridsize.Y; y++) {
+				x = 0;
+				while ((next = desk.GetNeighbor (Wnck.MotionDirection.Right)) != null) {
+					desk = next;
+					x++;
+					if (gridsize.X - 1 < x)
+						break;
+					grid [x, y] = desk;
+				}
+				if (gridsize.Y - 1 > y) {
+					desk = grid [0, y].GetNeighbor (Wnck.MotionDirection.Down);
+					grid [0, y+1] = desk;
+				}
+			}
+			return grid;
+		}
+		
+		public void Activate ()
+		{
+			if (Parent.Screen.ActiveWorkspace != Parent)
+				Parent.Activate (Gtk.Global.CurrentEventTime);
+			if (Parent.IsVirtual)
+				Parent.Screen.MoveViewport (Area.X, Area.Y);
+		}
+		
+		public void SetNeighbor (Wnck.MotionDirection direction, Desk newneighbor)
+		{
+			Desk oldneighbor = GetNeighbor (direction);
+			if (oldneighbor != null && oldneighbor != newneighbor) {
+				neighbors.Remove (direction);
+				if (oldneighbor.GetNeighbor (OppositeDirection (direction)) == this)
+					oldneighbor.SetNeighbor (OppositeDirection (direction), null);
+			}
+			if (oldneighbor != newneighbor && newneighbor != null) {
+				neighbors.Add (direction, newneighbor);
+				
+				if (GetNeighbor (OppositeDirection (direction)) == null) {
+					Desk oldwrapneighbor = newneighbor.GetWrapNeighbor (OppositeDirection (direction));
+					if (oldwrapneighbor != null) {
+						SetWrapNeighbor (OppositeDirection (direction), oldwrapneighbor);
+					} else {
+						SetWrapNeighbor (OppositeDirection (direction), newneighbor);
+					}
+				}
+				
+				newneighbor.SetNeighbor (OppositeDirection (direction), this);
+			}
+		}
+
+		public void SetWrapNeighbor (Wnck.MotionDirection direction, Desk newwrapneighbor)
+		{
+			Desk oldwrapneighbor = GetWrapNeighbor (direction);
+			if (oldwrapneighbor != null && oldwrapneighbor != newwrapneighbor) {
+				wrapneighbors.Remove (direction);
+				if (oldwrapneighbor.GetWrapNeighbor (OppositeDirection (direction)) == this)
+					oldwrapneighbor.SetWrapNeighbor (OppositeDirection (direction), null);
+			}
+			if (oldwrapneighbor != newwrapneighbor && newwrapneighbor != null) {
+				wrapneighbors.Add (direction, newwrapneighbor);
+				newwrapneighbor.SetWrapNeighbor (OppositeDirection (direction), this);
+			}
+		}
+		
+		public Desk GetNeighbor (Wnck.MotionDirection direction)
+		{
+			Desk desk;
+			neighbors.TryGetValue (direction, out desk);
+			return desk;
+		}
+
+		public Desk GetWrapNeighbor (Wnck.MotionDirection direction)
+		{
+			Desk desk;
+			wrapneighbors.TryGetValue (direction, out desk);
+			return desk;
+		}
+		
+		public Desk (string name, int number, Gdk.Rectangle area, Workspace parent)
+		{
+			Parent = parent;
+			Area = area;
+			Name = name;
+			Number = number;
+			neighbors = new Dictionary<MotionDirection, Desk> ();
+			wrapneighbors = new Dictionary<MotionDirection, Desk> ();
+		}
+		
+		public Desk (Workspace parent) : this (parent.Name, parent.Number, new Gdk.Rectangle (0, 0, parent.Width, parent.Height), parent)
+		{
+		}
+		
+		public void Dispose ()
+		{
+			neighbors.Clear ();
+			wrapneighbors.Clear ();
+		}
+	}
+}

=== added file 'StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs'
--- StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherDockItem.cs	2010-07-21 11:16:11 +0000
@@ -0,0 +1,365 @@
+//  
+//  Copyright (C) 2010 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+
+using Mono.Unix;
+
+using Cairo;
+using GLib;
+using Gdk;
+using Gtk;
+using Wnck;
+
+using Docky.CairoHelper;
+using Docky.Items;
+using Docky.Menus;
+using Docky.Services;
+
+namespace WorkspaceSwitcher
+{
+	public class WorkspaceSwitcherDockItem : IconDockItem
+	{
+		static IPreferences prefs = DockServices.Preferences.Get<WorkspaceSwitcherDockItem> ();
+		
+		bool? wrapped_scrolling;
+		bool WrappedScrolling {
+			get {
+				if (!wrapped_scrolling.HasValue)
+					wrapped_scrolling = prefs.Get<bool> ("WrappedScrolling", false);
+				return wrapped_scrolling.Value;
+			}
+		}
+				
+		public event EventHandler DesksChanged;
+		
+		List<Desk> Desks = new List<Desk> ();
+		Desk[,] DeskGrid = null;
+		
+		bool AreMultipleDesksAvailable {
+			get {
+				return Desks.Count () > 1;
+			}
+		}
+		
+		public override bool Square {
+			get { return false; }
+		}
+		
+		public WorkspaceSwitcherDockItem ()
+		{
+			HoverText = Catalog.GetString ("Switch Desks");
+			Icon = "workspace-switcher";
+			
+			UpdateDesks ();
+			UpdateItem ();
+			
+			Wnck.Screen.Default.ActiveWorkspaceChanged += HandleWnckScreenDefaultActiveWorkspaceChanged;;
+			Wnck.Screen.Default.ViewportsChanged += HandleWnckScreenDefaultViewportsChanged;
+			Wnck.Screen.Default.WorkspaceCreated += HandleWnckScreenDefaultWorkspaceCreated;
+			Wnck.Screen.Default.WorkspaceDestroyed += HandleWnckScreenDefaultWorkspaceDestroyed;
+		}
+
+		public override string UniqueID ()
+		{
+			return "WorkspaceSwitcher";
+		}
+		
+		protected override ClickAnimation OnClicked (uint button, Gdk.ModifierType mod, double xPercent, double yPercent)
+		{
+			if (!AreMultipleDesksAvailable || DeskGrid == null)
+				return ClickAnimation.None;
+			
+			if (button == 1 && DeskGrid != null && DeskGrid.GetLength (0) > 0 && DeskGrid.GetLength (1) > 0) {
+				int col = (int) (xPercent * DeskGrid.GetLength (0));
+				int row = (int) (yPercent * DeskGrid.GetLength (1));
+				if (DeskGrid [col,row] != null)
+					DeskGrid [col,row].Activate ();
+			}
+			
+			return ClickAnimation.None;
+		}
+		
+		protected override void OnScrolled (Gdk.ScrollDirection direction, Gdk.ModifierType mod)
+		{
+			if (!AreMultipleDesksAvailable || DeskGrid == null)
+				return;
+			
+			switch (direction) {
+			case ScrollDirection.Down:
+				if (((mod & ModifierType.ShiftMask) == ModifierType.ShiftMask) || DeskGrid.GetLength (1) == 1)
+					SwitchDesk (Wnck.MotionDirection.Right);
+				else
+					SwitchDesk (Wnck.MotionDirection.Down);
+				break;
+			case ScrollDirection.Right:
+				SwitchDesk (Wnck.MotionDirection.Right);
+				break;
+			case ScrollDirection.Up:
+				if (((mod & ModifierType.ShiftMask) == ModifierType.ShiftMask) || DeskGrid.GetLength (1) == 1)
+					SwitchDesk (Wnck.MotionDirection.Left);
+				else
+					SwitchDesk (Wnck.MotionDirection.Up);
+				break;
+			case ScrollDirection.Left:
+				SwitchDesk (Wnck.MotionDirection.Left);
+				break;
+			}
+		}
+
+		protected override MenuList OnGetMenuItems ()
+		{
+			MenuList list = new MenuList ();
+			
+			Desks.ForEach (d => {
+				Desk desk = d;
+				list[MenuListContainer.Actions].Add (new Docky.Menus.MenuItem (desk.Name, (desk.IsActive ? "desktop" : ""), (o, a) => desk.Activate ()));
+			});
+
+			return list;
+		}		
+
+		bool SwitchDesk (Wnck.MotionDirection direction)
+		{
+			Desk activedesk = Desks.Find (desk => desk.IsActive);
+			Desk nextdesk = activedesk.GetNeighbor (direction);
+			if (WrappedScrolling) {
+				// Walk through the columns/rows and jump between [1,1] and [n,m]
+				Desk tmp = activedesk.GetWrapNeighbor (direction);
+				if (tmp != null && (nextdesk = tmp.GetNeighbor (Desk.AlternateMovingDirection (direction))) == null)
+					if ((nextdesk = tmp.GetWrapNeighbor (Desk.AlternateMovingDirection (direction))) == null)
+						nextdesk = tmp;
+			}
+			if (nextdesk != null) {
+				nextdesk.Activate ();
+				return true;
+			}
+			return false;
+		}
+		
+		#region Update Switcher
+		void UpdateDesks ()
+		{
+			lock (Desks)
+			{
+				DeskGrid = null;
+				Desks.ForEach (desk => desk.Dispose());
+				Desks.Clear ();
+				
+				string DeskNameFormatString;
+				
+				if (Wnck.Screen.Default.WorkspaceCount > 1)
+					DeskNameFormatString = Catalog.GetString ("Desk") + " {0}";
+				else
+					DeskNameFormatString = Catalog.GetString ("Virtual Desk") + " {0}";
+				
+				foreach (Wnck.Workspace workspace in Wnck.Screen.Default.Workspaces) {
+					if (workspace.IsVirtual) {
+						int deskWidth = workspace.Screen.Width;
+						int deskHeight = workspace.Screen.Height;
+						int rows = workspace.Height / deskHeight;
+						int columns = workspace.Width / deskWidth;
+						
+						for (int row = 0; row < rows; row++) {
+							for (int col = 0; col < columns; col++) {
+								int desknumber = (int) (columns * row + col + 1);
+								Gdk.Rectangle area = new Gdk.Rectangle (col * deskWidth, row * deskHeight, deskWidth, deskHeight);
+								
+								Desk desk = new Desk (string.Format (DeskNameFormatString, desknumber), desknumber, area, workspace);
+								desk.SetNeighbor (Wnck.MotionDirection.Down, Desks.Find (d => d.Area.X == area.X && (d.Area.Y - deskHeight == area.Y)));
+								desk.SetNeighbor (Wnck.MotionDirection.Up, Desks.Find (d => d.Area.X == area.X && (d.Area.Y + deskHeight == area.Y)));
+								desk.SetNeighbor (Wnck.MotionDirection.Right, Desks.Find (d => (d.Area.X - deskWidth == area.X) && d.Area.Y == area.Y));
+								desk.SetNeighbor (Wnck.MotionDirection.Left, Desks.Find (d => (d.Area.X + deskWidth == area.X) && d.Area.Y == area.Y));
+								Desks.Add (desk);
+							}
+						}
+					} else {
+						Desk desk = new Desk (workspace);
+						desk.SetNeighbor (Wnck.MotionDirection.Down, Desks.Find (d => d.Parent == workspace.GetNeighbor (Wnck.MotionDirection.Down)));
+						desk.SetNeighbor (Wnck.MotionDirection.Up, Desks.Find (d => d.Parent == workspace.GetNeighbor (Wnck.MotionDirection.Up)));
+						desk.SetNeighbor (Wnck.MotionDirection.Right, Desks.Find (d => d.Parent == workspace.GetNeighbor (Wnck.MotionDirection.Right)));
+						desk.SetNeighbor (Wnck.MotionDirection.Left, Desks.Find (d => d.Parent == workspace.GetNeighbor (Wnck.MotionDirection.Left)));
+						Desks.Add (desk);
+					}
+				}
+
+				Desk activedesk = Desks.Find (d => d.IsActive);
+				if (activedesk != null)
+					DeskGrid = activedesk.GetDeskGridLayout ();
+			}
+			
+			if (DesksChanged != null)
+				DesksChanged (new object (), EventArgs.Empty);
+		}
+		
+		void UpdateItem ()
+		{
+			Desk activedesk = Desks.Find (desk => desk.IsActive);
+			if (activedesk != null)
+				HoverText = activedesk.Name;
+			else
+				HoverText = Catalog.GetString ("Switch Desks");
+		}
+
+		#endregion
+		
+		void HandleWnckScreenDefaultWorkspaceCreated (object o, WorkspaceCreatedArgs args)
+		{
+			UpdateDesks ();
+			UpdateItem ();
+			
+			QueueRedraw ();
+		}
+		
+		void HandleWnckScreenDefaultWorkspaceDestroyed (object o, WorkspaceDestroyedArgs args)
+		{
+			UpdateDesks ();
+			UpdateItem ();
+			
+			QueueRedraw ();
+		}
+		
+		void HandleWnckScreenDefaultActiveWorkspaceChanged (object o, ActiveWorkspaceChangedArgs args)
+		{
+			Desk activedesk = Desks.Find (desk => desk.IsActive);
+			if (activedesk != null && activedesk.Parent != args.PreviousWorkspace)
+				DeskGrid = activedesk.GetDeskGridLayout ();
+			UpdateItem ();
+			
+			QueueRedraw ();
+		}
+
+		void HandleWnckScreenDefaultViewportsChanged (object sender, EventArgs e)
+		{
+			UpdateDesks ();
+			UpdateItem ();
+			
+			QueueRedraw ();
+		}
+
+		#region Drawing
+		protected override DockySurface CreateIconBuffer (DockySurface model, int size)
+		{
+			if (DeskGrid == null) 
+				return new DockySurface (size, size, model);
+			
+			int height = size, width = size;
+			
+			if (Owner != null && Owner.IsOnVerticalDock)
+				height = Math.Min ((int) (IconSize * 2.5), Math.Max (size, (int) (size * DeskGrid.GetLength (1) * 0.5)));
+			else
+				width = Math.Min ((int) (IconSize * 2.5), Math.Max (size, (int) (size * DeskGrid.GetLength (0) * 0.5)));
+			
+			return new DockySurface (width, height, model);
+		}		
+		
+		protected override void PaintIconSurface (DockySurface surface)
+		{
+			if (DeskGrid == null)
+				return;
+			
+			int cols = DeskGrid.GetLength (0);
+			int rows = DeskGrid.GetLength (1);
+			
+			Gdk.Color gdkColor = Style.Backgrounds [(int) Gtk.StateType.Selected];
+			Cairo.Color selection_color = new Cairo.Color ((double) gdkColor.Red / ushort.MaxValue,
+											(double) gdkColor.Green / ushort.MaxValue,
+											(double) gdkColor.Blue / ushort.MaxValue,
+											0.5);
+			Context cr = surface.Context;
+
+			cr.AlphaPaint ();
+			
+			LinearGradient lg = new LinearGradient (0, 0, 0, surface.Height);
+			lg.AddColorStop (0, new Cairo.Color (.35, .35, .35, .6));
+			lg.AddColorStop (1, new Cairo.Color (.05, .05, .05, .7));
+			
+			for (int x = 0; x < cols; x++) {
+				for (int y = 0; y < rows; y++) {
+					Cairo.Rectangle area = DeskAreaOnIcon (surface.Width, surface.Height, x, y);
+					cr.Rectangle (area.X, area.Y, area.Width, area.Height);
+					cr.Pattern = lg;
+					cr.FillPreserve ();
+					if (DeskGrid[x,y].IsActive) {
+						cr.Color = selection_color;
+						cr.Fill ();
+						if (area.Width >= 16 && area.Height >= 16) {
+							using (Gdk.Pixbuf pbuf = DockServices.Drawing.LoadIcon ("desktop", (int) area.Width, (int) area.Height)) {
+								Gdk.CairoHelper.SetSourcePixbuf (cr, pbuf, (int) area.X + (area.Width - pbuf.Width) / 2, (int) area.Y + (area.Height - pbuf.Height) / 2);
+								cr.Paint ();
+							}
+						}
+					}
+					cr.NewPath ();
+				}
+			}
+			
+			lg.Destroy ();
+			
+			for (int x = 0; x < cols; x++) {
+				for (int y = 0; y < rows; y++) {
+					Cairo.Rectangle area = DeskAreaOnIcon (surface.Width, surface.Height, x, y);
+					cr.Rectangle (area.X, area.Y, area.Width, area.Height);
+				}
+			}
+			
+			lg = new LinearGradient (0, 0, 0, surface.Height);
+			lg.AddColorStop (0, new Cairo.Color (.95, .95, .95, .7));
+			lg.AddColorStop (1, new Cairo.Color (.5, .5, .5, .7));
+			cr.Pattern = lg;
+			cr.StrokePreserve ();
+			lg.Destroy ();
+		}
+		
+		Cairo.Rectangle DeskAreaOnIcon (int width, int height, int column, int row)
+		{
+			double BorderPercent = 0.05;
+			double Border = height * BorderPercent;
+			double boxWidth, boxHeight;
+			Cairo.Rectangle area;
+			
+			boxWidth = (width - 2 * Border) / DeskGrid.GetLength (0);
+			boxHeight = (height - 2 * Border) / DeskGrid.GetLength (1);
+			area = new Cairo.Rectangle (boxWidth * column + Border, boxHeight * row + Border, boxWidth, boxHeight);
+			
+			return area;
+		}
+		#endregion
+		
+		#region IDisposable implementation
+		public override void Dispose ()
+		{
+			Wnck.Screen.Default.ActiveWorkspaceChanged -= HandleWnckScreenDefaultActiveWorkspaceChanged;
+			Wnck.Screen.Default.ViewportsChanged -= HandleWnckScreenDefaultViewportsChanged;
+			Wnck.Screen.Default.WorkspaceCreated -= HandleWnckScreenDefaultWorkspaceCreated;
+			Wnck.Screen.Default.WorkspaceDestroyed -= HandleWnckScreenDefaultWorkspaceDestroyed;
+			
+			DeskGrid = null;
+			Desks.ForEach (desk => desk.Dispose ());
+			Desks.Clear ();
+			
+			base.Dispose ();
+		}
+
+		#endregion
+		
+	}
+}

=== added file 'StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherItemProvider.cs'
--- StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherItemProvider.cs	1970-01-01 00:00:00 +0000
+++ StandardPlugins/WorkspaceSwitcher/src/WorkspaceSwitcherItemProvider.cs	2010-07-21 11:16:11 +0000
@@ -0,0 +1,45 @@
+//  
+//  Copyright (C) 2010 Rico Tzschichholz
+// 
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+// 
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+// 
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 
+
+using System;
+using System.Collections.Generic;
+
+using Docky.Items;
+
+namespace WorkspaceSwitcher
+{
+	public class WorkspaceSwitcherItemProvider : AbstractDockItemProvider
+	{
+		#region IDockItemProvider implementation
+		
+		public override string Name {
+			get {
+				return "WorkspaceSwitcher";
+			}
+		}
+		
+		#endregion
+
+		WorkspaceSwitcherDockItem workspaceswitcher;
+
+		public WorkspaceSwitcherItemProvider ()
+		{
+			workspaceswitcher = new WorkspaceSwitcherDockItem ();
+			Items = workspaceswitcher.AsSingle<AbstractDockItem> ();
+		}
+	}
+}

=== modified file 'configure.ac'
--- configure.ac	2010-07-01 09:18:04 +0000
+++ configure.ac	2010-07-21 11:16:11 +0000
@@ -205,6 +205,8 @@
 StandardPlugins/Trash/Resources/Trash.addin.xml
 StandardPlugins/Weather/Makefile
 StandardPlugins/Weather/Resources/Weather.addin.xml
+StandardPlugins/WorkspaceSwitcher/Makefile
+StandardPlugins/WorkspaceSwitcher/Resources/WorkspaceSwitcher.addin.xml
 Makefile
 data/Makefile
 data/icons/Makefile