Merge lp:~jassmith/do/glitch-free-docky into lp:do

[Jason Smith]

[lp:~jassmith/do/glitch-free-docky]

1135. By Jason Smith on 2009-04-01

remove debug

[Alex Launi (alexlauni)]

Can you combine HandleWindowClosed and Opened methods? They do exactly the same thing, you should be able to at the very least use EventArgs, but they probably both inherit from a higher level base class. Take a look.

Constify the delay in DelayedUpdate. Magic numbers are evil!

on diff line 182, i really dont like the variable name api, it's confusing since api has a meaning.

There are a bunch of WriteLines, clean them up. If you need them, make them into Log.Debugs

In UnregisterWindowEvents why do you need a try catch? Whats going to throw an exception adding and removing an event handler?

Diff line 960: Do you need to GetString? This should be done before you get passed the string.

removed the commented out line from ScreenUtils.cs

Again, constify the delay in WindowControl.cs, FocusWindows ()

Looks good otherwise! Fix those things then merge!

review: Approve

[lp:~jassmith/do/glitch-free-docky]

1136. By Jason Smith on 2009-04-01

Fix issues found in review

1137. By Jason Smith on 2009-04-02

merge trunk

1138. By Jason Smith on 2009-04-02

Implement tiling code

1139. By Jason Smith on 2009-04-04

Add show desktop command

=== removed file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.dll.config'
--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.dll.config	2009-01-11 20:30:50 +0000
+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.dll.config	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<configuration>
-	<dllmap dll="X11" target="libX11.so.6"/>
-	<dllmap dll="libgdk-x11" target="libgdk-x11-2.0.so.0"/>
-</configuration>

=== modified file 'Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp'
--- Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/Do.Interface.Linux.Docky.mdp	2009-03-31 03:39:44 +0000
@@ -19,7 +19,6 @@
     <File name="src" subtype="Directory" buildaction="Compile" />
     <File name="Resources" subtype="Directory" buildaction="Compile" />
     <File name="Resources/Do.Interface.Linux.Docky.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
-    <File name="src/XLib" subtype="Directory" buildaction="Compile" />
     <File name="src/Docky.Interface" subtype="Directory" buildaction="Compile" />
     <File name="src/Docky.Utilities" subtype="Directory" buildaction="Compile" />
     <File name="src/Docky.Interface/DockArea.cs" subtype="Code" buildaction="Compile" />
@@ -32,8 +31,6 @@
     <File name="src/Docky.Interface/Docky.Interface.Painters/SummonModeRenderer.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Utilities/DockPreferences.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Utilities/GtkUtils.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/XLib/X11Atoms.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/XLib/Xlib.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/IRightClickable.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/UpdateRequestArgs.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Docky.Interface/DockAnimationState.cs" subtype="Code" buildaction="Compile" />

=== modified file 'Do.Interface.Linux.Docky/Makefile.am'
--- Do.Interface.Linux.Docky/Makefile.am	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/Makefile.am	2009-03-31 16:33:58 +0000
@@ -65,9 +65,7 @@
 	src/Docky.Interface/Util.cs \
 	src/Docky.Utilities/DockOrientation.cs \
 	src/Docky.Utilities/DockPreferences.cs \
-	src/Docky.Utilities/GtkUtils.cs \
-	src/XLib/X11Atoms.cs \
-	src/XLib/Xlib.cs
+	src/Docky.Utilities/GtkUtils.cs
 
 RESOURCES = \
 	Resources/Do.Interface.Linux.Docky.addin.xml \
@@ -91,6 +89,3 @@
 	Do.Interface.Wink \
 	Do.Platform \
 	Do.Universe
-
-module_DATA += $(ASSEMBLY).dll.config
-EXTRA_DIST += $(ASSEMBLY).dll.config

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs'
--- Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs	2009-04-01 01:08:07 +0000
@@ -199,14 +199,15 @@
 
 		void HandleWindowOpened(object o, WindowOpenedArgs args)
 		{
+			// we do a delayed update so that we allow a small gap for wnck to catch up
 			if (!args.Window.IsSkipTasklist)
-				UpdateItems ();
+				DelayUpdateItems ();
 		}
 
 		void HandleWindowClosed(object o, WindowClosedArgs args)
 		{
 			if (!args.Window.IsSkipTasklist)
-				UpdateItems ();
+				DelayUpdateItems ();
 		}
 
 		void HandleUniverseInitialized(object sender, EventArgs e)
@@ -259,17 +260,25 @@
 				item.Position = i++;
 		}
 		
+		void DelayUpdateItems ()
+		{
+			GLib.Timeout.Add (20, delegate {
+				UpdateItems ();
+				return false;
+			});
+		}
+		
 		void UpdateItems ()
 		{
 			if (!UpdatesEnabled)
 				return;
 			
-			UpdateStatItems ();
-			
 			if (!CustomItemsRead) {
 				foreach (string s in ReadCustomItems ())
 					InternalAddItemToDock (s, LastPosition + 1);
 				
+				UpdateStatItems ();
+				
 				Dictionary<string, int> sortDictionary = ReadSortDictionary ();
 				foreach (ItemDockItem item in OrderedItems.Where (di => di is ItemDockItem)) {
 					if (sortDictionary.ContainsKey (item.Element.UniqueId))
@@ -277,6 +286,8 @@
 				}
 				
 				CustomItemsRead = true;
+			} else {
+				UpdateStatItems ();
 			}
 			
 			UpdateTaskItems ();
@@ -329,24 +340,22 @@
 		
 		void UpdateTaskItems ()
 		{
-			foreach (ItemDockItem item in OrderedItems.Where (di => di is ItemDockItem)) {
+			foreach (ItemDockItem item in OrderedItems.Where (di => di is ItemDockItem))
 				item.UpdateApplication ();
-			}
 			
 			List<ApplicationDockItem> out_items = new List<ApplicationDockItem> ();
 
-			IEnumerable<int> knownPids = OrderedItems
+			IEnumerable<Window> knownWindows = OrderedItems
 				    .Where (di => di is ItemDockItem)
 					.Cast<ItemDockItem> ()
-					.SelectMany (di => di.Pids);
-			
-			IEnumerable<Application> prunedApps = WindowUtils.GetApplications ()
-				.Where (app => app.Windows.Any (w => !w.IsSkipTasklist))
-				.Where (app => !knownPids.Contains (app.Pid) && app.Windows.Any ());
-			
-			foreach (IEnumerable<Wnck.Application> apps in prunedApps
-			         .GroupBy (app => (app as Wnck.Application).Windows [0].ClassGroup.ResClass)) {
-				ApplicationDockItem api = new ApplicationDockItem (apps);
+					.SelectMany (di => di.Windows);
+			
+			var prunedWindows = WindowUtils.GetWindows ()
+				    .Where (w => !w.IsSkipTasklist && !knownWindows.Contains (w))
+					.GroupBy (w => SafeResClass (w));
+			
+			foreach (IEnumerable<Wnck.Window> windows in prunedWindows) {
+				ApplicationDockItem api = new ApplicationDockItem (windows);
 
 				if (task_items.Any (di => di.Equals (api))) {
 					AbstractDockItem match = task_items.Where (di => di.Equals (api)).First ();
@@ -374,6 +383,13 @@
 			task_items.AddRange (out_items.Cast<AbstractDockItem> ());
 		}
 		
+		string SafeResClass (Wnck.Window window)
+		{
+			if (window.ClassGroup != null && window.ClassGroup.ResClass != null)
+				return window.ClassGroup.ResClass;
+			return string.Empty;
+		}
+		
 		void OnDockItemsChanged ()
 		{
 			output_items.Clear ();
@@ -506,15 +522,6 @@
 			return DockItems.Contains (item) && 0 <= position && position < DockItems.Count;
 		}
 		
-		int LastNonTaskItemPosition ()
-		{
-			if (!OrderedItems.Any (di => !(di is ApplicationDockItem)))
-				return 0;
-			return OrderedItems
-				.Where (di => !(di is ApplicationDockItem))
-				.Max ((Func<AbstractDockItem, int>) (di => di.Position));
-		}
-		
 		/// <summary>
 		/// Returns the most used items out of GNOME Do and does a tiny bit of filtering and sorting on them
 		/// This is mostly to encourage a better first run experience, but overall this can be improved
@@ -616,19 +623,22 @@
 					continue;
 				}
 				
-				if (item is ApplicationDockItem && position <= LastNonTaskItemPosition ()) {
+				if (item is ApplicationDockItem) {
 					ApplicationDockItem api = item as ApplicationDockItem;
-					string desktop_file = api.DesktopFile;
-					
-					if (string.IsNullOrEmpty (desktop_file)) continue;
-					
-					AbstractDockItem newItem = MaybeCreateCustomItem (desktop_file);
-					
-					if (newItem == null) continue;
+					
+					if (api.Launcher == null) continue;
+					
+					Item launcher = api.Launcher as Item;
+					if (launcher == null)
+						continue;
+					
+					AbstractDockItem newItem = new ItemDockItem (launcher);
 					
 					newItem.Position = item.Position;
 					newItem.DockAddItem = item.DockAddItem;
-					custom_items [desktop_file] = newItem;
+					custom_items [launcher.UniqueId] = newItem;
+					
+					RegisterDockItem (newItem);
 					UpdateItems ();
 					WriteData ();
 				}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-03-15 17:41:40 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-04-01 01:08:07 +0000
@@ -26,6 +26,7 @@
 using Gtk;
 
 using Do.Platform;
+using Do.Interface.Xlib;
 
 using Docky.Core;
 using Docky.Utilities;
@@ -99,14 +100,14 @@
 				
 				switch (DockPreferences.Orientation) {
 				case DockOrientation.Bottom:
-					values [(int) XLib.Struts.Bottom] = (uint) (DockHeight + (Screen.Height - (geo.Y + geo.Height)));
-					values [(int) XLib.Struts.BottomStart] = (uint) geo.X;
-					values [(int) XLib.Struts.BottomEnd] = (uint) (geo.X + geo.Width - 1);
+					values [(int) Struts.Bottom] = (uint) (DockHeight + (Screen.Height - (geo.Y + geo.Height)));
+					values [(int) Struts.BottomStart] = (uint) geo.X;
+					values [(int) Struts.BottomEnd] = (uint) (geo.X + geo.Width - 1);
 					break;
 				case DockOrientation.Top:
-					values [(int) XLib.Struts.Top] = (uint) (DockHeight + geo.Y);
-					values [(int) XLib.Struts.TopStart] = (uint) geo.X;
-					values [(int) XLib.Struts.TopEnd] = (uint) (geo.X + geo.Width - 1);
+					values [(int) Struts.Top] = (uint) (DockHeight + geo.Y);
+					values [(int) Struts.TopStart] = (uint) geo.X;
+					values [(int) Struts.TopEnd] = (uint) (geo.X + geo.Width - 1);
 					break;
 				}
 				return values;
@@ -175,8 +176,11 @@
 							break;
 						}
 					}
+					
 					CursorIsOverDockArea = dockRegion.Contains (cursor);
 				}
+				Console.WriteLine (cursor);
+				Console.WriteLine (dockRegion);
 				
 				// When we change over this boundry, it will normally trigger an animation, we need to be sure to catch it
 				if (CursorIsOverDockArea != cursorIsOverDockArea) {

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-03-11 16:29:55 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-04-01 01:08:07 +0000
@@ -207,6 +207,8 @@
 		
 		void DrawDrock (Context cr)
 		{
+			Console.WriteLine (VerticalOffset);
+			Console.WriteLine (CursorIsOverDockArea);
 			Gdk.Rectangle dockArea = GetDockArea ();
 			DockBackgroundRenderer.RenderDockBackground (cr, dockArea);
 

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-03-15 18:30:41 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs	2009-04-01 01:09:29 +0000
@@ -25,11 +25,11 @@
 using Cairo;
 
 using Docky.Utilities;
-using Docky.XLib;
 
 using Do.Universe;
 using Do.Platform;
 using Do.Interface;
+using Do.Interface.Xlib;
 using Do.Interface.CairoUtils;
 using Do.Interface.AnimationBase;
 
@@ -243,7 +243,9 @@
 				results_window.Move ((geo.X + geo.Width / 2) - res.Width / 2, geo.Y + dock_area.DockHeight);
 				break;
 			}
-			Display.Sync ();
+			
+			if (Display != null)
+				Display.Sync ();
 			
 			is_repositioned_hidden = false;
 		}
@@ -264,7 +266,8 @@
 				break;
 			}
 
-			Display.Sync ();
+			if (Display != null)
+				Display.Sync ();
 			
 			is_repositioned_hidden = true;
 		}
@@ -272,20 +275,21 @@
 		public void WindowHideOffset (out int x, out int y)
 		{
 			x = y = 0;
-			
-			if (!is_repositioned_hidden) {
-				return;
-			}
-			
-			Gdk.Rectangle main;
-			GetSize (out main.Width, out main.Height);
+
+			Gdk.Rectangle main, geo;
+			main.Width = dock_area.Width;
+			main.Height = dock_area.Height;
+			GetBufferedPosition (out main.X, out main.Y);
+			geo = LayoutUtils.MonitorGemonetry ();
+			
+			
 			switch (DockPreferences.Orientation) {
 			case DockOrientation.Bottom:
-				y = main.Height;
-				break;
+				y = main.Y - ((geo.Y + geo.Height) - main.Height);
+				return;
 			case DockOrientation.Top:
-				y = 0 - main.Height;
-				break;
+				y = main.Y - geo.Y;
+				return;
 			}
 		}
 		
@@ -308,7 +312,7 @@
 		
 		public bool SetStruts ()
 		{
-			X11Atoms atoms = new X11Atoms (GdkWindow);
+			X11Atoms atoms = X11Atoms.Instance;
 
 			uint [] struts = dock_area.StrutRequest;
 			uint [] first_struts = new [] { struts [0], struts [1], struts [2], struts [3] };
@@ -318,10 +322,10 @@
 			if (!IsRealized)
 				return false;
 			Xlib.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT_PARTIAL, atoms.XA_CARDINAL,
-			                      (int) XLib.PropertyMode.PropModeReplace, struts);
+			                      (int) PropertyMode.PropModeReplace, struts);
 			
 			Xlib.XChangeProperty (GdkWindow, atoms._NET_WM_STRUT, atoms.XA_CARDINAL, 
-			                      (int) XLib.PropertyMode.PropModeReplace, first_struts);
+			                      (int) PropertyMode.PropModeReplace, first_struts);
 				
 			return false;
 		}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-04-01 02:13:22 +0000
@@ -43,16 +43,6 @@
 	{
 		public event EventHandler RemoveClicked;
 		
-		static readonly IEnumerable<string> DesktopFilesDirectories = new [] {
-				"~/.local/share/applications/wine",
-				"~/.local/share/applications",
-				"/usr/share/applications",
-				"/usr/share/applications/kde",
-				"/usr/share/applications/kde4",
-				"/usr/share/gdm/applications",
-				"/usr/local/share/applications",
-		};
-		
 		string MinimizeRestoreText = Catalog.GetString ("Minimize") + "/" + Catalog.GetString ("Restore");
 		string MaximizeText = Catalog.GetString ("Maximize");
 		string CloseText = Catalog.GetString ("Close All");
@@ -77,33 +67,23 @@
 		Gdk.Rectangle icon_region;
 		Gdk.Pixbuf drag_pixbuf;
 		
-		IEnumerable<Wnck.Application> applications;
-		
-		string desktop_file;
-		bool checked_desktop_file;
-		
-		public string DesktopFile {
+		IEnumerable<Wnck.Window> windows;
+		
+		IApplicationItem launcher;
+		
+		public IApplicationItem Launcher {
 			get {
-				if (desktop_file == null && !checked_desktop_file) {
-					checked_desktop_file = true;
-					foreach (string s in GetIconGuesses ()) {
-						desktop_file = GetDesktopFile (s);
-						if (desktop_file != null)
-							break;
-					}
+				if (launcher == null && Exec != null) {
+					string command = WindowUtils.ProcessExecString (Exec);
+					launcher = Services.UniverseFactory.MaybeApplicationItemFromCommand (command);
 				}
-				return desktop_file;
+				return launcher;
 			}
 		}
 		
 		string Exec {
 			get {
 				string exec;
-				foreach (Wnck.Application app in Applications) {
-					exec = MaybeGetExecStringForPID (app.Pid);
-					if (exec != null)
-						return exec;
-				}
 
 				foreach (Wnck.Window win in VisibleWindows) {
 					exec = MaybeGetExecStringForPID (win.Pid);
@@ -130,34 +110,23 @@
 		protected override Gdk.Pixbuf GetSurfacePixbuf (int size)
 		{
 			Gdk.Pixbuf pbuf = null;
-			foreach (string guess in GetIconGuesses ()) {
-				if (pbuf != null) {
+			
+			if (Launcher == null) {
+				foreach (string guess in GetIconGuesses ()) {
+					bool found = IconProvider.PixbufFromIconName (guess, size, out pbuf);
+					if (found && (pbuf.Width == size || pbuf.Height == size))
+						break;
+					
 					pbuf.Dispose ();
 					pbuf = null;
 				}
-				
-				bool found = IconProvider.PixbufFromIconName (guess, size, out pbuf);
-				if (found && (pbuf.Width == size || pbuf.Height == size))
-					break;
-				
-				pbuf.Dispose ();
-				pbuf = null;
-			
-				string desktopPath = GetDesktopFile (guess);
-				if (!string.IsNullOrEmpty (desktopPath)) {
-					try {
-						string icon = Services.UniverseFactory.NewApplicationItem (desktopPath).Icon;
-						pbuf = IconProvider.PixbufFromIconName (icon, size);
-						break;
-					} catch {
-						continue;
-					}
-				}
+			} else {
+				IconProvider.PixbufFromIconName (Launcher.Icon, size, out pbuf);
 			}
 			
 			// we failed to find an icon, lets use an uggggly one
 			if (pbuf == null)
-				pbuf = Applications.First ().Icon;
+				pbuf = Windows.First ().Icon;
 			
 			if (pbuf.Height != size && pbuf.Width != size ) {
 				double scale = (double)size / Math.Max (pbuf.Width, pbuf.Height);
@@ -170,14 +139,16 @@
 		
 		string Name {
 			get {
-				foreach (Wnck.Application application in Applications) {
-					if (StringIsValidName (application.IconName))
-						return application.IconName;
-					else if (StringIsValidName (application.Name))
-						return application.Name;
-				}
-
+				if (NeedsAttention) {
+					return VisibleWindows.Where (w => w.NeedsAttention ()).First ().Name;
+				}
+				if (VisibleWindows.Any () && VisibleWindows.Count () == 1) {
+					return VisibleWindows.First ().Name;
+				}
+				
 				foreach (Wnck.Window window in VisibleWindows) {
+					if (StringIsValidName (window.ClassGroup.ResClass))
+						return window.ClassGroup.ResClass;
 					if (StringIsValidName (window.IconName))
 						return window.IconName;
 					else if (StringIsValidName (window.Name))
@@ -191,13 +162,13 @@
 			get { return windowCount; }
 		}
 		
-		protected override IEnumerable<Wnck.Application> Applications { 
-			get { return applications; } 
+		public override IEnumerable<Wnck.Window> Windows { 
+			get { return windows; } 
 		}
 
-		public ApplicationDockItem (IEnumerable<Wnck.Application> applications) : base ()
+		public ApplicationDockItem (IEnumerable<Wnck.Window> windows) : base ()
 		{
-			this.applications = applications;
+			this.windows = windows;
 			windowCount = VisibleWindows.Count ();
 			
 			foreach (Wnck.Window w in VisibleWindows) {
@@ -227,41 +198,49 @@
 				if (VisibleWindows.Count () == 0)
 					Core.DockServices.ItemsService.ForceUpdate ();
 			}
+			
+			SetText (Name);
 		}
 		
 		IEnumerable<string> GetIconGuesses ()
 		{
 			List<string> guesses = new List<string> ();
 			
-			if (!string.IsNullOrEmpty (Exec)) {
-				yield return Exec;
-				yield return Exec.Split ('-')[0];
+			// open office hack...
+			if (VisibleWindows.Any () &&
+			    VisibleWindows.First ().ClassGroup != null &&
+			    VisibleWindows.First ().ClassGroup.ResClass.ToLower ().Contains ("openoffice")) {
+				yield return "openoffice";
+				yield break;
 			}
 			
-			foreach (Wnck.Application app in Applications) {
-				if (!guesses.Contains (PrepName (app.Name)))
-					guesses.Add (PrepName (app.Name));
-				if (!guesses.Contains (PrepName (app.IconName)))
-					guesses.Add (PrepName (app.IconName));
+			string exec = Exec;
+			if (!string.IsNullOrEmpty (exec)) {
+				yield return exec;
+				yield return exec.Split ('-')[0];
+				yield return WindowUtils.ProcessExecString (exec);
 			}
 
 			foreach (Wnck.Window win in VisibleWindows) {
 				if (!guesses.Contains (PrepName (win.Name)))
 					guesses.Add (PrepName (win.Name));
+				
 				if (!guesses.Contains (PrepName (win.IconName)))
 					guesses.Add (PrepName (win.IconName));
+				
+				if (win.ClassGroup == null)
+					continue;
+				
 				if (!guesses.Contains (PrepName (win.ClassGroup.ResClass)))
 					guesses.Add (PrepName (win.ClassGroup.ResClass));
+				
+				if (!guesses.Contains (PrepName (win.ClassGroup.Name)))
+					guesses.Add (PrepName (win.ClassGroup.Name));
 			}
 			
-			foreach (string s in guesses)
+			foreach (string s in guesses) {
 				yield return s;
-			
-			foreach (string s in guesses)
-				yield return "gnome-" + s;
-			
-			if (Name.Length > 4 && Name.Contains (" "))
-				yield return Name.Split (' ') [0].ToLower ();
+			}
 		}
 
 		string PrepName (string s)
@@ -283,27 +262,14 @@
 			return exec;
 		}
 		
-		string GetDesktopFile (string base_name)
-		{
-			foreach (string dir in DesktopFilesDirectories) {
-				try {
-					if (File.Exists (System.IO.Path.Combine (dir, base_name+".desktop")))
-						return System.IO.Path.Combine (dir, base_name+".desktop");
-					if (File.Exists (System.IO.Path.Combine (dir, "gnome-"+base_name+".desktop")))
-						return System.IO.Path.Combine (dir, "gnome-"+base_name+".desktop");
-				} catch { return null; }
-			}
-			return null;
-		}
-		
 		bool StringIsValidName (string s)
 		{
 			s = s.Trim ();
 			if (string.IsNullOrEmpty (s) || s == "<unknown>")
 				return false;
 			
-			foreach (string prefix in WindowUtils.BadPrefixes) {
-				if (string.Compare (s, prefix, true) == 0)
+			foreach (System.Text.RegularExpressions.Regex prefix in WindowUtils.BadPrefixes) {
+				if (prefix.IsMatch (s))
 					return false;
 			}
 			
@@ -324,14 +290,15 @@
 			if (!(other is ApplicationDockItem))
 				return false;
 
-			return Applications.Any (app => (other as ApplicationDockItem).Applications.Contains (app));
+			return Windows.Any (w => (other as ApplicationDockItem).Windows.Contains (w));
 		}
 		
 		public IEnumerable<AbstractMenuArgs> GetMenuItems ()
 		{
 			yield return new SeparatorMenuButtonArgs ();
 			
-			if (DesktopFile == null) {
+			Item item = Launcher as Item;
+			if (item == null) {
 				yield return new SimpleMenuButtonArgs (() => WindowControl.MinimizeRestoreWindows (VisibleWindows), 
 				                                       MinimizeRestoreText, MinimizeIcon).AsDark ();
 				
@@ -341,8 +308,6 @@
 				yield return new SimpleMenuButtonArgs (() => WindowControl.CloseWindows (VisibleWindows), 
 				                                       CloseText, CloseIcon).AsDark ();
 			} else {
-				Item item = Services.UniverseFactory.NewApplicationItem (DesktopFile) as Item;
-				
 				foreach (Act act in ActionsForItem (item))
 					yield return new LaunchMenuButtonArgs (act, item, act.Name, act.Icon).AsDark ();
 			}
@@ -352,6 +317,12 @@
 				yield return new WindowMenuButtonArgs (window, window.Name, WindowIcon);
 			}
 		}
+		
+		protected override void Launch ()
+		{
+			if (Launcher != null)
+				Launcher.Run ();
+		}
 
 		public override void Dispose ()
 		{

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-03-25 03:40:59 +0000
@@ -52,7 +52,7 @@
 		bool accepting_drops;
 		Gdk.Pixbuf drag_pixbuf;
 		Gdk.Rectangle icon_region;
-		List<Wnck.Application> apps;
+		List<Wnck.Window> windows;
 		
 		public event EventHandler RemoveClicked;
 		
@@ -64,16 +64,32 @@
 			get { return element.Icon; } 
 		}
 		
+		string Name {
+			get {
+				if (NeedsAttention && AttentionWindows.Any ())
+					return AttentionWindows.First ().Name;
+				
+				if (VisibleWindows.Any () && WindowCount == 1)
+					return VisibleWindows.First ().Name;
+				
+				return Element.Name;
+			}
+		}
+		
 		public Item Element { 
 			get { return element; } 
 		}
 		
-		protected override IEnumerable<Wnck.Application> Applications { 
-			get { return apps; } 
+		public override IEnumerable<Wnck.Window> Windows { 
+			get { return windows; } 
+		}
+		
+		IEnumerable<Wnck.Window> AttentionWindows {
+			get { return VisibleWindows.Where (w => w.NeedsAttention ()); }
 		}
 		
 		public IEnumerable<int> Pids { 
-			get { return apps.Select (win => win.Pid).ToArray (); } 
+			get { return windows.Select (win => win.Pid).ToArray (); } 
 		}
 		
 		public override int WindowCount {
@@ -84,9 +100,7 @@
 		{
 			Position = -1;
 			this.element = element;
-			apps = new List<Wnck.Application> ();
-
-			SetText (element.Name);
+			windows = new List<Wnck.Window> ();
 
 			UpdateApplication ();
 			NeedsAttention = DetermineUrgencyStatus ();
@@ -95,6 +109,8 @@
 				accepting_drops = true;
 			else
 				accepting_drops = false;
+			
+			SetText (Name);
 		}
 		
 		public override bool ReceiveItem (string item)
@@ -126,46 +142,49 @@
 		
 		public void UpdateApplication ()
 		{
-			UnregisterStateChangeEvents ();
+			UnregisterWindowEvents ();
 			
 			if (element is IApplicationItem) {
-				apps = WindowUtils.GetApplicationList ((element as IApplicationItem).Exec);
-				window_count = Applications.SelectMany (a => a.Windows).Where (w => !w.IsSkipTasklist).Count ();
+				windows = WindowUtils.WindowListForCmd ((element as IApplicationItem).Exec);
+				window_count = windows.Where (w => !w.IsSkipTasklist).Count ();
 			}
 			
-			RegisterStateChangeEvents ();
-		}
-		
-		void RegisterStateChangeEvents ()
-		{
-			foreach (Application app in Applications) {
-				foreach (Wnck.Window w in app.Windows) {
-					if (!w.IsSkipTasklist)
-						w.StateChanged += OnWindowStateChanged;
-				}
-			}
-		}
-		
-		void UnregisterStateChangeEvents ()
-		{
-			foreach (Application app in Applications) {
-				foreach (Wnck.Window w in app.Windows) {
-					try {
-						w.StateChanged -= OnWindowStateChanged;
-					} catch {}
-				}
-			}
-		}
-		
-		void OnWindowStateChanged (object o, StateChangedArgs args)
+			RegisterWindowEvents ();
+			SetText (Name);
+		}
+		
+		void RegisterWindowEvents ()
+		{
+			foreach (Wnck.Window w in VisibleWindows) {
+				w.StateChanged += HandleStateChanged;
+				w.NameChanged += HandleNameChanged;
+			}
+		}
+		
+		void UnregisterWindowEvents ()
+		{
+			foreach (Wnck.Window w in Windows) {
+				try {
+					w.StateChanged -= HandleStateChanged;
+					w.NameChanged += HandleNameChanged;
+				} catch {}
+			}
+		}
+		
+		void HandleStateChanged (object o, StateChangedArgs args)
 		{
 			if (handle_timer > 0) return;
 			// we do this delayed so that we dont get a flood of these events.  Certain windows behave badly.
 			handle_timer = GLib.Timeout.Add (100, HandleUpdate);
-			window_count = Applications.SelectMany (a => a.Windows).Where (w => !w.IsSkipTasklist).Count ();
+			window_count = VisibleWindows.Count ();
 			SetIconRegionFromCache ();
 		}
 		
+		void HandleNameChanged(object sender, EventArgs e)
+		{
+			SetText (Name);
+		}
+		
 		bool HandleUpdate ()
 		{
 			bool needed_attention = NeedsAttention;
@@ -180,6 +199,7 @@
 				OnUpdateNeeded (new UpdateRequestArgs (this, req));
 			}
 			
+			SetText (Name);
 			handle_timer = 0;
 			return false;
 		}
@@ -250,9 +270,9 @@
 		
 		public override void Dispose ()
 		{
-			UnregisterStateChangeEvents ();
+			UnregisterWindowEvents ();
 			element = null;
-			apps.Clear ();
+			windows.Clear ();
 			
 			if (drag_pixbuf != null)
 				drag_pixbuf.Dispose ();

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs	2009-04-01 01:08:07 +0000
@@ -42,20 +42,26 @@
 	
 	public abstract class WnckDockItem : AbstractDockItem
 	{
+		// a bad hack, but it works
+		static string [] blacklist = new [] {
+			"CopyToClipboardAction", 
+			"WindowFocusAction",
+		};
+		
 		int last_raised;
 
 		DateTime last_scroll = new DateTime (0);
 		TimeSpan scroll_rate = new TimeSpan (0, 0, 0, 0, 300);
 		
-		protected abstract IEnumerable<Wnck.Application> Applications { get; }
+		public abstract IEnumerable<Wnck.Window> Windows { get; }
 		
 		protected IEnumerable<Wnck.Window> VisibleWindows {
-			get { return Applications.SelectMany (a => a.Windows).Where (w => !w.IsSkipTasklist); }
+			get { return Windows.Where (w => !w.IsSkipTasklist); }
 		}
 		
 		protected bool HasVisibleApps {
 			get {
-				if (Applications == null)
+				if (Windows == null)
 					return false;
 				return VisibleWindows.Any ();
 			}
@@ -69,7 +75,7 @@
 		protected IEnumerable<Act> ActionsForItem (Item item) 
 		{
 			return Services.Core.GetActionsForItemOrderedByRelevance (item, false)
-				    .Where (act => act.GetType ().Name != "CopyToClipboardAction")
+				    .Where (act => !blacklist.Contains (act.GetType ().Name))
 					.OrderByDescending (act => act.GetType ().Name != "WindowCloseAction")
 					.ThenByDescending (act => act.GetType ().Name != "WindowMaximizeAction")
 					.ThenByDescending (act => act.GetType ().Name != "WindowMinimizeAction")
@@ -77,10 +83,7 @@
 					.ThenBy (act => act.Name);
 		}
 		
-		protected virtual void Launch ()
-		{
-			return;
-		}
+		protected abstract void Launch ();
 		
 		public override void Scrolled (Gdk.ScrollDirection direction)
 		{
@@ -115,12 +118,12 @@
 		
 		public override void Clicked (uint button, Gdk.ModifierType state, Gdk.Point position)
 		{
-			if (!Applications.Any () || !HasVisibleApps || button == 2) {
+			if (!Windows.Any () || !HasVisibleApps || button == 2) {
 				AnimationType = ClickAnimationType.Bounce;
 				Launch ();
 			} else if (button == 1) {
 				AnimationType = ClickAnimationType.Darken;
-				WindowUtils.PerformLogicalClick (Applications);
+				WindowUtils.PerformLogicalClick (Windows);
 			} else {
 				AnimationType = ClickAnimationType.None;
 			}

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs	2009-03-07 22:50:28 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/AbstractMenuButtonArgs.cs	2009-03-26 14:42:21 +0000
@@ -39,7 +39,8 @@
 		const int Height = 22;
 		
 		Gtk.Widget widget;
-		bool hovered;
+		bool hovered, tooltip;
+		string description, icon;
 		
 		public bool Dark { get; set; }
 		
@@ -47,33 +48,60 @@
 			get { return 1; }
 		}
 		
-		public override Gtk.Widget Widget { 
-			get {
-				if (widget == null)
-					widget = BuildWidget ();
-				return widget;
-			}
-		}
-		
-		protected virtual string Description { get; set; }
-		
-		protected virtual string Icon { get; set; }
-		
-		protected virtual bool UseTooltip { get; set; }
+		public override Gtk.Widget Widget {
+			get { return widget; } 
+		}
+		
+		private Gdk.Pixbuf Pixbuf { get; set; }
+		
+		protected string Description { 
+			get {
+				return description;
+			}
+			set {
+				description = value;
+				BuildWidget ();
+			}
+		}
+		
+		protected string Icon { 
+			get {
+				return icon;
+			}
+			set {
+				icon = value;
+				BuildWidget ();
+			}
+		}
+		
+		protected bool UseTooltip {
+			get {
+				return tooltip;
+			}
+			set {
+				
+				tooltip = value;
+				BuildWidget ();
+			}
+		}
 		
 		public AbstractMenuButtonArgs ()
 		{
-			
 		}
 		
 		public AbstractMenuButtonArgs (string description, string icon)
 		{
-			Description = GLib.Markup.EscapeText (Catalog.GetString (description));
-			Icon = icon;
+			this.description = GLib.Markup.EscapeText (Catalog.GetString (description));
+			this.icon = icon;
+			
+			BuildWidget ();
 		}
 		
-		Widget BuildWidget ()
+		void BuildWidget ()
 		{
+			if (widget != null)
+				widget.Destroy ();
+			
 			DrawingArea button = new DrawingArea ();
 			
 			button.ExposeEvent += HandleExposeEvent;
@@ -88,7 +116,12 @@
 			if (UseTooltip)
 				button.TooltipText = Description;
 			
-			return button;
+			widget = button;
+			
+			if (Pixbuf != null)
+				Pixbuf.Dispose ();
+			
+			Pixbuf = GetPixbuf (Height - 8);
 		}
 		
 		void HandleButtonReleaseEvent(object o, ButtonReleaseEventArgs args)
@@ -135,27 +168,31 @@
 				
 				int width = area.Width - WidthBuffer * 2 - 25;
 				
-				TextRenderContext renderContext = new TextRenderContext (cr, string.Format (FormatString, Description), width);
-				
-				renderContext.LeftCenteredPoint = new Gdk.Point (area.X + WidthBuffer + 25, area.Y + area.Height / 2);
-				renderContext.Alignment = Pango.Alignment.Left;
-				renderContext.EllipsizeMode = Pango.EllipsizeMode.End;
-				
-				DockServices.DrawingService.TextPathAtPoint (renderContext);
-				
-				cr.Color = new Cairo.Color (1, 1, 1);
-				cr.Fill ();
-				
-				Gdk.Pixbuf pbuf = GetPixbuf (Height - 8);
-				CairoHelper.SetSourcePixbuf (cr, pbuf, WidthBuffer, (Height - pbuf.Height) / 2);
-				cr.PaintWithAlpha (IconOpacity);
-				pbuf.Dispose ();
+				if (!string.IsNullOrEmpty (Description)) {
+					TextRenderContext renderContext = new TextRenderContext (cr, string.Format (FormatString, Description), width);
+					
+					renderContext.LeftCenteredPoint = new Gdk.Point (area.X + WidthBuffer + 25, area.Y + area.Height / 2);
+					renderContext.Alignment = Pango.Alignment.Left;
+					renderContext.EllipsizeMode = Pango.EllipsizeMode.End;
+					
+					DockServices.DrawingService.TextPathAtPoint (renderContext);
+					
+					cr.Color = new Cairo.Color (1, 1, 1);
+					cr.Fill ();
+				}
+				
+				if (Pixbuf != null) {
+					CairoHelper.SetSourcePixbuf (cr, Pixbuf, WidthBuffer, (Height - Pixbuf.Height) / 2);
+					cr.PaintWithAlpha (IconOpacity);
+				}
 			}
 		}
 		
 		protected virtual Gdk.Pixbuf GetPixbuf (int size)
 		{
-			return IconProvider.PixbufFromIconName (Icon, size);
+			if (!string.IsNullOrEmpty (Icon))
+				return IconProvider.PixbufFromIconName (Icon, size);
+			return null;
 		}
 		
 		public abstract void Action ();
@@ -169,6 +206,7 @@
 		public override void Dispose ()
 		{
 			Widget.Destroy ();
+			Pixbuf.Dispose ();
 			base.Dispose ();
 		}
 

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Menus/WindowMenuButtonArgs.cs	2009-03-26 04:33:12 +0000
@@ -38,7 +38,6 @@
 				return (window.IsMinimized) ? .5 : base.IconOpacity;
 			}
 		}
-
 		
 		public WindowMenuButtonArgs (Wnck.Window window, string description, string icon) : base (description, icon)
 		{

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Util.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Util.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Util.cs	2009-03-24 16:08:07 +0000
@@ -78,7 +78,8 @@
 		                                              DockOrientation orientation)
 		{
 			Surface sr;
-			sr = similar.CreateSimilar (similar.Content, maxWidth, Height);
+			// we are going to give ourselves a bit of a buffer due to pango weirdness
+			sr = similar.CreateSimilar (similar.Content, maxWidth + 5, Height);
 			
 			Context cr = new Context (sr);
 			
@@ -89,7 +90,7 @@
 			cr.NewPath ();
 			
 			int localHeight = textArea.Height;
-			cr.SetRoundedRectanglePath (textArea.X + .5,  .5, textArea.Width + 20 - 1,  localHeight + 10 - 1, 5);
+			cr.SetRoundedRectanglePath (textArea.X + .5, .5, textArea.Width + 20 - 1, localHeight + 10 - 1, 5);
 			
 			cr.Color = new Cairo.Color (0.1, 0.1, 0.1, .75);
 			cr.FillPreserve ();

=== modified file 'Do.Interface.Wink/Do.Interface.Wink.mdp'
--- Do.Interface.Wink/Do.Interface.Wink.mdp	2009-03-20 20:43:06 +0000
+++ Do.Interface.Wink/Do.Interface.Wink.mdp	2009-03-31 03:39:44 +0000
@@ -20,11 +20,20 @@
     <File name="src/AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Interface.Wink/WindowControl.cs" subtype="Code" buildaction="Compile" />
     <File name="src/Do.Interface.Wink/WindowUtils.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Interface.Wink/ClickAction.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Interface.Wink/ScreenUtils.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Interface.Wink/Viewport.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Interface.Xlib" subtype="Directory" buildaction="Compile" />
+    <File name="src/Do.Interface.Xlib/X11Atoms.cs" subtype="Code" buildaction="Compile" />
+    <File name="src/Do.Interface.Xlib/Xlib.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="True" refto="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="System.Core, Version=3.5.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="True" refto="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="True" refto="Do.Platform" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
   </References>
 </Project>
\ No newline at end of file

=== modified file 'Do.Interface.Wink/Makefile.am'
--- Do.Interface.Wink/Makefile.am	2009-03-20 23:06:10 +0000
+++ Do.Interface.Wink/Makefile.am	2009-03-31 16:23:23 +0000
@@ -8,8 +8,13 @@
 
 FILES = \
 	src/AssemblyInfo.cs \
+	src/Do.Interface.Xlib/Xlib.cs \
+	src/Do.Interface.Xlib/X11Atoms.cs \
+	src/Do.Interface.Wink/ClickAction.cs \
 	src/Do.Interface.Wink/WindowControl.cs \
-	src/Do.Interface.Wink/WindowUtils.cs
+	src/Do.Interface.Wink/WindowUtils.cs \
+	src/Do.Interface.Wink/ScreenUtils.cs \ 
+	src/Do.Interface.Wink/Viewport.cs
 
 #RESOURCES = \
 #	Resources/Do.Interface.Wnck.addin.xml
@@ -17,11 +22,12 @@
 REFERENCES =  \
 	System \
 	System.Core \
+	Mono.Posix \
 	$(GTK_SHARP_20_LIBS) \
 	$(WNCK_SHARP_10_LIBS)
 
 PROJECT_REFERENCES = \
 	Do.Platform
 
-#module_DATA += $(ASSEMBLY).dll.config
-#EXTRA_DIST += $(ASSEMBLY).dll.config
+module_DATA += $(ASSEMBLY).dll.config
+EXTRA_DIST += $(ASSEMBLY).dll.config

=== added file 'Do.Interface.Wink/src/Do.Interface.Wink/ClickAction.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/ClickAction.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/ClickAction.cs	2009-03-25 19:49:42 +0000
@@ -0,0 +1,31 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  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;
+
+namespace Do.Interface.Wink
+{
+	
+	
+	public enum ClickAction
+	{
+		Focus,
+		Minimize,
+		Restore,
+		None,
+	}
+}

=== added file 'Do.Interface.Wink/src/Do.Interface.Wink/ScreenUtils.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/ScreenUtils.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/ScreenUtils.cs	2009-04-01 01:08:07 +0000
@@ -0,0 +1,138 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  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.Linq;
+
+using Mono.Unix;
+
+using Wnck;
+
+namespace Do.Interface.Wink
+{
+	
+	
+	public static class ScreenUtils
+	{
+		static string ViewportFormatString = Catalog.GetString ("Desktop") + " {0}";
+		static List<Viewport> viewports;
+		
+		public static Viewport ActiveViewport {
+			get {
+				Workspace wsp = Wnck.Screen.Default.ActiveWorkspace;
+				Gdk.Rectangle geo = new Gdk.Rectangle (wsp.ViewportX, wsp.ViewportY, wsp.Screen.Width, wsp.Screen.Height);
+				if (viewports.Any (vp => vp.Area == geo))
+					return viewports.First (vp => vp.Area == geo);
+				return null;
+			}
+		}
+		
+		public static IEnumerable<Viewport> Viewports {
+			get { return viewports.AsEnumerable (); }
+		}
+		
+		static ScreenUtils ()
+		{
+			Wnck.Screen.Default.ViewportsChanged += HandleViewportsChanged;
+			Wnck.Screen.Default.WorkspaceCreated += HandleWorkspaceCreated;
+			Wnck.Screen.Default.WorkspaceDestroyed += HandleWorkspaceDestroyed;
+			
+//				Wnck.Screen.Default.ForceUpdate ();
+			UpdateViewports ();
+		}
+
+		static void HandleWorkspaceDestroyed(object o, WorkspaceDestroyedArgs args)
+		{
+			UpdateViewports ();
+		}
+
+		static void HandleWorkspaceCreated(object o, WorkspaceCreatedArgs args)
+		{
+			UpdateViewports ();
+		}
+
+		static void HandleViewportsChanged(object sender, EventArgs e)
+		{
+			UpdateViewports ();
+		}
+		
+		public static bool DesktopShow (Screen screen)
+		{
+			return screen.ShowingDesktop;
+		}
+		
+		public static void ShowDesktop (Screen screen)
+		{
+			if (!screen.ShowingDesktop)
+				screen.ToggleShowingDesktop (true);
+		}
+		
+		public static void UnshowDesktop (Screen screen)
+		{
+			if (screen.ShowingDesktop)
+				screen.ToggleShowingDesktop (false);
+		}
+		
+		public static IEnumerable<Window> ViewportWindows (Viewport viewport)
+		{
+			var windows = WindowUtils.GetWindows ()
+			        .Where (w => w.WindowType != WindowType.Dock && !w.IsSkipTasklist);
+			
+			foreach (Window window in windows) {
+				if (viewport.WindowCenterInViewport (window))
+					yield return window;
+			}
+		}
+		
+		static void UpdateViewports ()
+		{
+			viewports = new List<Viewport> ();
+			int currentViewport = 1;
+			foreach (Wnck.Workspace workspace in Wnck.Screen.Default.Workspaces) {
+				if (workspace.IsVirtual) {
+					int viewportWidth;
+					int viewportHeight;
+					viewportWidth = workspace.Screen.Width;
+					viewportHeight = workspace.Screen.Height;
+					
+					int rows = workspace.Height / viewportHeight;
+					int columns = workspace.Width / viewportWidth;
+					
+					for (int i = 0; i < rows; i++) {
+						for (int j = 0; j < columns; j++) {
+							Gdk.Rectangle area = new Gdk.Rectangle (j * viewportWidth,
+							                                        i * viewportHeight,
+							                                        viewportWidth,
+							                                        viewportHeight);
+							viewports.Add (new Viewport (string.Format (ViewportFormatString, currentViewport),
+							                             area,
+							                             workspace));
+							currentViewport++;
+						}
+					}
+				} else {
+					Viewport viewport = new Viewport (string.Format (ViewportFormatString, currentViewport),
+					                                  new Gdk.Rectangle (0, 0, workspace.Width, workspace.Height),
+					                                  workspace);
+					viewports.Add (viewport);
+					currentViewport++;
+				}
+			}
+		}
+	}
+}

=== added file 'Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs	1970-01-01 00:00:00 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/Viewport.cs	2009-03-31 16:23:23 +0000
@@ -0,0 +1,142 @@
+//  
+//  Copyright (C) 2009 GNOME Do
+// 
+//  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.Runtime.InteropServices;
+
+
+using Gdk;
+using Wnck;
+
+using Do.Platform;
+using Do.Interface.Xlib;
+
+namespace Do.Interface.Wink
+{
+	
+	
+	public class Viewport
+	{
+		Workspace parent;
+		Rectangle area;
+		
+		public string Name { get; private set; }
+		
+		internal Rectangle Area {
+			get { return area; }
+		}
+		
+		internal Viewport(string name, Rectangle area, Workspace parent)
+		{
+			this.area = area;
+			this.parent = parent;
+			Name = name;
+		}
+		
+		public void MoveWindowInto (Wnck.Window window)
+		{
+			if (parent.IsVirtual) {
+				Rectangle geo;
+				window.GetGeometry (out geo.X, out geo.Y, out geo.Width, out geo.Height);
+				
+				geo.X += window.Workspace.ViewportX;
+				geo.Y += window.Workspace.ViewportY;
+				
+				int x = area.X + (geo.X % area.Width);
+				int y = area.Y + (geo.Y % area.Height);
+				
+				x -= window.Workspace.ViewportX;
+				y -= window.Workspace.ViewportY;
+				
+				if (string.Compare (window.Screen.WindowManagerName, "compiz", true) == 0) {
+					// This is a compiz-ism.  Don't know when they will fix it. You must subtract the top and left
+					// frame extents from a move operation to get the window to actually show in the right spot.
+					// Save for maybe kwin, I think only compiz uses Viewports anyhow, so this is ok.
+					int [] extents = GetWindowFrameExtents (window);
+					int left_extent = extents [0];
+					int top_extent = extents [2];
+					
+					x -= left_extent;
+					y -= top_extent;
+				}
+				
+				WindowMoveResizeMask mask = WindowMoveResizeMask.X | WindowMoveResizeMask.Y;
+				window.SetGeometry (WindowGravity.Current, mask, x, y, 0, 0);
+			} else {
+				window.MoveToWorkspace (parent);
+			}
+		}
+		
+		int[] GetWindowFrameExtents (Wnck.Window window)
+		{
+			X11Atoms atoms = X11Atoms.Instance;
+			
+			IntPtr display;
+			IntPtr type;
+			int format;
+			IntPtr prop_return;
+			IntPtr nitems, bytes_after;
+			int result;
+			int [] extents = new int[4];
+			
+			IntPtr window_handle = (IntPtr) window.Xid;
+			
+			display = Xlib.Xlib.GdkDisplayXDisplay (Gdk.Screen.Default.Display);
+			type = IntPtr.Zero;
+			
+			result = Xlib.Xlib.XGetWindowProperty (display, window_handle, atoms._NET_FRAME_EXTENTS, (IntPtr) 0,
+			                                  (IntPtr) System.Int32.MaxValue, false, atoms.XA_CARDINAL, out type, out format,
+			                                  out nitems, out bytes_after, out prop_return);
+			
+			if (type == atoms.XA_CARDINAL && format == 32) {
+				extents = new int [(int) nitems];
+				for (int i = 0; i < (int) nitems; i++) {
+					extents [i] = Marshal.ReadInt32 (prop_return, i * 4);
+				}
+			}
+			
+			return extents;
+		}
+		
+		public bool WindowVisibleInVeiwport (Wnck.Window window)
+		{
+			Rectangle geo;
+			window.GetGeometry (out geo.X, out geo.Y, out geo.Width, out geo.Height);
+			geo.X += parent.ViewportX;
+			geo.Y += parent.ViewportY;
+			
+			return area.IntersectsWith (geo);
+		}
+		
+		public bool WindowCenterInViewport (Wnck.Window window)
+		{
+			Rectangle geo;
+			window.GetGeometry (out geo.X, out geo.Y, out geo.Width, out geo.Height);
+			geo.X += parent.ViewportX;
+			geo.Y += parent.ViewportY;
+			
+			Point center = new Point (geo.X + geo.Width / 2, geo.Y + geo.Height / 2);
+			return Contains (center);
+		}
+		
+		public bool Contains (Gdk.Point point)
+		{
+			return area.Contains (point);
+		}
+	}
+}

=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs	2009-03-20 20:43:06 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/WindowControl.cs	2009-03-31 03:39:44 +0000
@@ -88,11 +88,18 @@
 		
 		public static void FocusWindows (IEnumerable<Window> windows)
 		{
-			foreach (Window window in windows.Reverse ()) {
-				if (window.IsInViewport (window.Screen.ActiveWorkspace) && !window.IsMinimized) {
-					window.CenterAndFocusWindow ();
-					System.Threading.Thread.Sleep (SleepTime);
+			if (!windows.Any ())
+				return;
+			
+			if (windows.Any (w => w.IsInViewport (w.Screen.ActiveWorkspace))) {
+				foreach (Window window in windows.Reverse ()) {
+					if (window.IsInViewport (window.Screen.ActiveWorkspace) && !window.IsMinimized) {
+						window.CenterAndFocusWindow ();
+						System.Threading.Thread.Sleep (SleepTime);
+					}
 				}
+			} else {
+				windows.First ().CenterAndFocusWindow ();
 			}
 			
 			if (windows.Count () <= 1)
@@ -102,7 +109,9 @@
 			// sometimes compiz plays badly.  This hacks around it
 			uint time = Gtk.Global.CurrentEventTime + 200;
 			GLib.Timeout.Add (200, delegate {
-				windows.Where (w => w.IsInViewport (w.Screen.ActiveWorkspace) && !w.IsMinimized).First ().Activate (time);
+				try { //unimportant if this fails, its just "nice"
+					windows.Where (w => w.IsInViewport (w.Screen.ActiveWorkspace) && !w.IsMinimized).First ().Activate (time);
+				} catch { }
 				return false;
 			});
 		}
@@ -187,6 +196,17 @@
 			window.Maximize ();
 		}
 		
+		public static void MoveToWorkspace (Window window, Workspace workspace)
+		{
+			MoveToWorkspace (new [] {window}, workspace);
+		}
+		
+		public static void MoveToWorkspace (IEnumerable<Window> windows, Workspace workspace)
+		{
+			foreach (Window window in windows.Where (w => w.Workspace != workspace))
+				window.MoveToWorkspace (workspace);
+		}
+		
 		/// <summary>
 		/// Moves the current viewport to the selected window and then raises it
 		/// </summary>

=== modified file 'Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs'
--- Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs	2009-03-21 02:35:05 +0000
+++ Do.Interface.Wink/src/Do.Interface.Wink/WindowUtils.cs	2009-04-01 01:08:07 +0000
@@ -29,12 +29,6 @@
 
 namespace Do.Interface.Wink
 {
-	public enum ClickAction {
-		Focus,
-		Minimize,
-		Restore,
-		None,
-	}
 	
 	public static class WindowUtils
 	{
@@ -42,7 +36,7 @@
 			get { return Path.Combine (Services.Paths.UserDataDirectory, "RemapFile"); }
 		}
 		
-		public static IEnumerable<string> BadPrefixes {
+		static IEnumerable<string> PrefixStrings {
 			get {
 				yield return "gksu";
 				yield return "sudo";
@@ -55,35 +49,46 @@
 			}
 		}
 		
+		public static IEnumerable<Regex> BadPrefixes { get; private set; }
+		
 		static Dictionary<string, string> RemapDictionary { get; set; }
 		
-		static List<Application> application_list;
-		static bool application_list_update_needed;
+		static List<Window> window_list;
+		static bool window_list_update_needed;
 		
 		static Dictionary<int, string> exec_lines = new Dictionary<int, string> ();
 		static DateTime last_update = new DateTime (0);
 		
+		#region ctor
 		static WindowUtils ()
 		{
+			List<Regex> regex = new List<Regex> ();
+			foreach (string s in PrefixStrings) {
+				 regex.Add (new Regex (string.Format ("^{0}$", s), RegexOptions.IgnoreCase));
+			}
+			BadPrefixes = regex.AsEnumerable ();
+			
 			Wnck.Screen.Default.WindowClosed += delegate {
-				application_list_update_needed = true;
+				window_list_update_needed = true;
 			};
 			
 			Wnck.Screen.Default.WindowOpened += delegate {
-				application_list_update_needed = true;
+				window_list_update_needed = true;
 			};
 			
 			Wnck.Screen.Default.ApplicationOpened += delegate {
-				application_list_update_needed = true;
+				window_list_update_needed = true;
 			};
 			
 			Wnck.Screen.Default.ApplicationClosed += delegate {
-				application_list_update_needed = true;
+				window_list_update_needed = true;
 			};
 			
 			BuildRemapDictionary ();
 		}
+		#endregion
 		
+		#region Private Methods
 		static void BuildRemapDictionary ()
 		{
 			if (!File.Exists (RemapFile)) {
@@ -151,117 +156,39 @@
 			return remapDict;
 		}
 		
-		/// <summary>
-		/// Returns a list of all applications on the default screen
-		/// </summary>
-		/// <returns>
-		/// A <see cref="Application"/> array
-		/// </returns>
-		public static List<Application> GetApplications ()
-		{
-			if (application_list == null || application_list_update_needed) {
-				application_list = new List<Application> ();
-				foreach (Window w in Wnck.Screen.Default.Windows) {
-					if (!application_list.Contains (w.Application))
-						application_list.Add (w.Application);
-				}
-			}
-			return application_list;
-		}
-		
-		/// <summary>
-		/// Gets the command line excec string for a PID
-		/// </summary>
-		/// <param name="pid">
-		/// A <see cref="System.Int32"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="System.String"/>
-		/// </returns>
-		public static string CmdLineForPid (int pid)
-		{
-			StreamReader reader;
-			string cmdline = null;
-			
-			try {
-				string procPath = new [] { "/proc", pid.ToString (), "cmdline" }.Aggregate (Path.Combine);
-				reader = new StreamReader (procPath);
-				cmdline = reader.ReadLine ().Replace (Convert.ToChar (0x0), ' ');
-				reader.Close ();
-				reader.Dispose ();
-			} catch { }
-			
-			return cmdline;
-		}
-		
-		/// <summary>
-		/// Returns a list of applications that match an exec string
-		/// </summary>
-		/// <param name="exec">
-		/// A <see cref="System.String"/>
-		/// </param>
-		/// <returns>
-		/// A <see cref="List"/>
-		/// </returns>
-		public static List<Application> GetApplicationList (string exec)
-		{
-			List<Application> apps = new List<Application> ();
-			if (string.IsNullOrEmpty (exec))
-				return apps;
-			
-			exec = ProcessExecString (exec);
-			if (string.IsNullOrEmpty (exec))
-				return apps;
-			
-			UpdateExecList ();
-
-			foreach (KeyValuePair<int, string> kvp in exec_lines) {
-				if (kvp.Value != null && kvp.Value.Contains (exec)) {
-					foreach (Application app in GetApplications ()) {
-						if (app == null)
-							continue;
-						
-						if (app.Pid == kvp.Key || app.Windows.Any (w => w.Pid == kvp.Key)) {
-							if (app.Windows.Any (win => !win.IsSkipTasklist))
-								apps.Add (app);
-							break;
-						}
-					}
-				}
-			}
-			return apps;
-		}
-		
 		static void UpdateExecList ()
 		{
 			if ((DateTime.UtcNow - last_update).TotalMilliseconds < 200) return;
 			
-			exec_lines.Clear ();
+			Dictionary<int, string> old = exec_lines;
+			
+			exec_lines = new Dictionary<int, string> ();
 			
 			foreach (string dir in Directory.GetDirectories ("/proc")) {
 				int pid;
 				try { pid = Convert.ToInt32 (Path.GetFileName (dir)); } 
 				catch { continue; }
 				
+				if (old.ContainsKey (pid)) {
+					exec_lines [pid] = old [pid];
+					continue;
+				}
+				
 				string exec_line = CmdLineForPid (pid);
 				if (string.IsNullOrEmpty (exec_line))
 					continue;
 				
 				if (exec_line.Contains ("java") && exec_line.Contains ("jar")) {
-					foreach (Application app in GetApplications ()) {
-						if (app == null)
+					foreach (Window window in GetWindows ()) {
+						if (window == null)
 							continue;
 						
-						if (app.Pid == pid || app.Windows.Any (w => w.Pid == pid)) {
-							foreach (Wnck.Window window in app.Windows.Where (win => !win.IsSkipTasklist)) {
-								exec_line = window.ClassGroup.ResClass;
+						if (window.Pid == pid || window.Application.Pid == pid) {
+							exec_line = window.ClassGroup.ResClass;
 								
-								// Vuze is retarded
-								if (exec_line == "SWT")
-									exec_line = window.Name;
-								Console.WriteLine (exec_line);
-								break;
-							}
+							// Vuze is retarded
+							if (exec_line == "SWT")
+								exec_line = window.Name;
 						}
 					}
 				}	
@@ -273,16 +200,126 @@
 			
 			last_update = DateTime.UtcNow;
 		}
-
+		
+		static ClickAction GetClickAction (IEnumerable<Window> windows)
+		{
+			if (!windows.Any ())
+				return ClickAction.None;
+			
+			if (windows.Any (w => w.IsMinimized && w.IsInViewport (Wnck.Screen.Default.ActiveWorkspace)))
+				return ClickAction.Restore;
+			
+			if (windows.Any (w => w.IsActive && w.IsInViewport (Wnck.Screen.Default.ActiveWorkspace)))
+				return ClickAction.Minimize;
+			
+			return ClickAction.Focus;
+		}
+		#endregion
+		
+		#region Public Methods
+		/// <summary>
+		/// Returns a list of all windows on the default screen
+		/// </summary>
+		/// <returns>
+		/// A <see cref="List"/>
+		/// </returns>
+		public static List<Window> GetWindows ()
+		{
+			if (window_list == null || window_list_update_needed)
+				window_list = new List<Window> (Wnck.Screen.Default.WindowsStacked);
+			
+			return window_list;
+		}
+		
+		/// <summary>
+		/// Gets the command line excec string for a PID
+		/// </summary>
+		/// <param name="pid">
+		/// A <see cref="System.Int32"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.String"/>
+		/// </returns>
+		public static string CmdLineForPid (int pid)
+		{
+			string cmdline = null;
+			
+			try {
+				string procPath = new [] { "/proc", pid.ToString (), "cmdline" }.Aggregate (Path.Combine);
+				using (StreamReader reader = new StreamReader (procPath)) {
+					cmdline = reader.ReadLine ();
+					reader.Close ();
+				}
+			} catch { }
+			
+			return cmdline;
+		}
+		
+		public static List<Window> WindowListForCmd (string exec)
+		{
+			List<Window> windows = new List<Window> ();
+			if (string.IsNullOrEmpty (exec))
+				return windows;
+			
+			exec = ProcessExecString (exec);
+			if (string.IsNullOrEmpty (exec))
+				return windows;
+			
+			UpdateExecList ();
+			
+			foreach (KeyValuePair<int, string> kvp in exec_lines) {
+				if (!string.IsNullOrEmpty (kvp.Value) && kvp.Value.Contains (exec)) {
+					// we have a matching exec, now we just find every window whose PID matches this exec
+					foreach (Window window in GetWindows ()) {
+						if (window == null)
+							continue;
+						
+						// this window matches the right PID and exec string, we can match it.
+						bool pidMatch = window.Pid == kvp.Key || 
+							(window.Application != null && window.Application.Pid == kvp.Key);
+						
+						if (pidMatch && !windows.Contains (window))
+							windows.Add (window);
+					}
+				}
+			}
+			
+			return windows;
+		}
+		
+		/// <summary>
+		/// This method takes in an "execution string" from proc and applies a heureustic to try
+		/// to magic out the name of the actual executing application.  The executing binary is not
+		/// the desired target all the time.
+		/// </summary>
+		/// <param name="exec">
+		/// A <see cref="System.String"/>
+		/// </param>
+		/// <returns>
+		/// A <see cref="System.String"/>
+		/// </returns>
 		public static string ProcessExecString (string exec)
 		{
+			if (string.IsNullOrEmpty (exec))
+				return exec;
+			
+			// lower it and trim off white space so we can abuse whitespace a bit
 			exec = exec.ToLower ().Trim ();
 			
+			// if the user has specified a specific mapping, we can use that here
 			if (RemapDictionary.ContainsKey (exec))
 				return RemapDictionary [exec];
 			
+			// this is the "split" character or the argument separator.  If the string contains a null
+			// it was fetched from /proc/PID/cmdline and will be nicely split up. Otherwise things get a bit
+			// nasty, and it likely came from a .desktop file.
+			char splitChar = Convert.ToChar (0x0);
+			splitChar = exec.Contains (splitChar) ? splitChar : ' ';
+			
+			// this part is here soley for the remap file so that users may specify to remap based on just the name
+			// without the full path.  If no remap file match is found, the net effect of this is nothing.
 			if (exec.StartsWith ("/")) {
-				string first_part = exec.Split (' ') [0];
+				string first_part = exec.Split (splitChar) [0];
 				int length = first_part.Length;
 				first_part = first_part.Split ('/').Last ();
 				
@@ -294,25 +331,38 @@
 				}
 			}
 			
-			string [] parts = exec.Split (' ');
+			string [] parts = exec.Split (splitChar);
 			for (int i = 0; i < parts.Length; i++) {
-				if (parts [i].StartsWith ("-"))
+				// we're going to use this a lot
+				string out_val = parts [i];
+				
+				// arguments are useless
+				if (out_val.StartsWith ("-"))
 					continue;
 				
-				if (parts [i].Contains ("/"))
-					parts [i] = parts [i].Split ('/').Last ();
-				
-				Regex regex;
-				foreach (string prefix in BadPrefixes) {
-					regex = new Regex (string.Format ("^{0}$", prefix), RegexOptions.IgnoreCase);
-					if (regex.IsMatch (parts [i])) {
-						parts [i] = null;
+				// we want the end of paths
+				if (out_val.Contains ("/"))
+					out_val = out_val.Split ('/').Last ();
+				
+				// wine apps can do it backwards... who knew?
+				if (out_val.Contains ("\\"))
+					out_val = out_val.Split ('\\').Last ();
+				
+				// null out our part if is a bad prefix
+				foreach (Regex regex in BadPrefixes) {
+					if (regex.IsMatch (out_val)) {
+						out_val = null;
 						break;
 					}
 				}
 				
-				if (!string.IsNullOrEmpty (parts [i])) {
-					string out_val = parts [i];
+				// check if it was a bad prefix...
+				if (!string.IsNullOrEmpty (out_val)) {
+					// sometimes we hide things with shell scripts.  This is the most common method of doing it.
+					if (out_val.EndsWith (".real"))
+						out_val = out_val.Substring (0, out_val.Length - ".real".Length);
+					
+					// give the remap dictionary one last shot at this
 					if (RemapDictionary.ContainsKey (out_val))
 						out_val = RemapDictionary [out_val];
 					return out_val;
@@ -327,12 +377,10 @@
 		/// <param name="apps">
 		/// A <see cref="IEnumerable"/>
 		/// </param>
-		public static void PerformLogicalClick (IEnumerable<Application> apps)
+		public static void PerformLogicalClick (IEnumerable<Window> windows)
 		{
 			List<Window> stack = new List<Window> (Wnck.Screen.Default.WindowsStacked);
-			IEnumerable<Window> windows = apps
-				.SelectMany (app => app.Windows)
-				.OrderByDescending (w => stack.IndexOf (w));
+			windows = windows.OrderByDescending (w => stack.IndexOf (w));
 			
 			bool not_in_viewport = !windows.Any (w => !w.IsSkipTasklist && w.IsInViewport (w.Screen.ActiveWorkspace));
 			bool urgent = windows.Any (w => w.NeedsAttention ());
@@ -348,7 +396,7 @@
 				}
 			}
 			
-			switch (GetClickAction (apps)) {
+			switch (GetClickAction (windows)) {
 			case ClickAction.Focus:
 				WindowControl.FocusWindows (windows);
 				break;
@@ -361,26 +409,6 @@
 			}
 		}
 		
-		static ClickAction GetClickAction (IEnumerable<Application> apps)
-		{
-			if (!apps.Any ())
-				return ClickAction.None;
-			
-			foreach (Wnck.Application app in apps) {
-				foreach (Wnck.Window window in app.Windows) {
-					if (window.IsMinimized && window.IsInViewport (Wnck.Screen.Default.ActiveWorkspace))
-						return ClickAction.Restore;
-				}
-			}
-			
-			foreach (Wnck.Application app in apps) {
-				foreach (Wnck.Window window in app.Windows) {
-					if (window.IsActive && window.IsInViewport (Wnck.Screen.Default.ActiveWorkspace))
-						return ClickAction.Minimize;
-				}
-			}
-			
-			return ClickAction.Focus;
-		}
+		#endregion
 	}
 }

=== added directory 'Do.Interface.Wink/src/Do.Interface.Xlib'
=== renamed file 'Do.Interface.Linux.Docky/src/XLib/X11Atoms.cs' => 'Do.Interface.Wink/src/Do.Interface.Xlib/X11Atoms.cs'
--- Do.Interface.Linux.Docky/src/XLib/X11Atoms.cs	2009-02-23 04:01:36 +0000
+++ Do.Interface.Wink/src/Do.Interface.Xlib/X11Atoms.cs	2009-03-31 16:23:23 +0000
@@ -23,9 +23,18 @@
 
 using System;
 
-namespace Docky.XLib {
+namespace Do.Interface.Xlib {
 
-	internal class X11Atoms {
+	public class X11Atoms {
+		
+		static X11Atoms instance;
+		public static X11Atoms Instance {
+			get {
+				if (instance == null)
+					instance = new X11Atoms (Gdk.Screen.Default.Display);
+				return instance;
+			}
+		}
 
 		// Our atoms
 		public readonly IntPtr AnyPropertyType		= (IntPtr)0;
@@ -169,8 +178,8 @@
 		public readonly IntPtr AsyncAtom;
 
 
-		public X11Atoms (Gdk.Window window) {
-			IntPtr display = XLib.Xlib.GdkDrawableXDisplay (window);
+		X11Atoms (Gdk.Display dsp) {
+			IntPtr display = Xlib.GdkDisplayXDisplay (dsp);
 			// make sure this array stays in sync with the statements below
 			string [] atom_names = new string[] {
 				"WM_PROTOCOLS",

=== renamed file 'Do.Interface.Linux.Docky/src/XLib/Xlib.cs' => 'Do.Interface.Wink/src/Do.Interface.Xlib/Xlib.cs'
--- Do.Interface.Linux.Docky/src/XLib/Xlib.cs	2009-01-12 20:15:41 +0000
+++ Do.Interface.Wink/src/Do.Interface.Xlib/Xlib.cs	2009-03-31 16:23:23 +0000
@@ -27,7 +27,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Docky.XLib {
+namespace Do.Interface.Xlib {
 
 	public enum PropertyMode
 	{
@@ -52,7 +52,7 @@
 		BottomEnd = 11
 	}
 	
-	internal class Xlib {
+	public static class Xlib {
 		const string libX11 = "X11";
 		const string libGdkX11 = "libgdk-x11";
 		
@@ -61,7 +61,24 @@
 		
 		[DllImport (libGdkX11)]
 		static extern IntPtr gdk_x11_drawable_get_xdisplay (IntPtr handle);
+		
+		[DllImport (libGdkX11)]
+        static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
 
+		[DllImport (libX11)]
+		public extern static IntPtr XOpenDisplay (IntPtr display);
+		
+		[DllImport (libX11)]
+		public extern static int XInternAtoms (IntPtr display, string[] atom_names, int atom_count, bool only_if_exists, IntPtr[] atoms);
+		
+		[DllImport (libX11)]
+		extern static int XChangeProperty (IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, int mode, IntPtr[] data, int nelements);
+	
+		[DllImport (libX11)]
+		public extern static int XGetWindowProperty (IntPtr display, IntPtr window, IntPtr atom, IntPtr long_offset, 
+		                                             IntPtr long_length, bool delete, IntPtr req_type, out IntPtr actual_type, 
+		                                             out int actual_format, out IntPtr nitems, out IntPtr bytes_after, out IntPtr prop);
+		
 		public static IntPtr GdkWindowX11Xid (Gdk.Window window)
 		{
 			return gdk_x11_drawable_get_xid (window.Handle);
@@ -72,19 +89,16 @@
 			return gdk_x11_drawable_get_xdisplay (window.Handle);
 		}
 		
-		[DllImport (libX11)]
-		public extern static IntPtr XOpenDisplay (IntPtr display);
-		
-		[DllImport (libX11)]
-		public extern static int XInternAtoms (IntPtr display, string[] atom_names, int atom_count, bool only_if_exists, IntPtr[] atoms);
-		
-		[DllImport (libX11)]
-		extern static int XChangeProperty (IntPtr display, IntPtr window, IntPtr property, IntPtr type, int format, int mode, IntPtr[] data, int nelements);
-	
+		public static IntPtr GdkDisplayXDisplay (Gdk.Display display)
+		{
+			return gdk_x11_display_get_xdisplay (display.Handle);
+		}
+		
 		public static int XChangeProperty (Gdk.Window window, IntPtr property, IntPtr type, int mode, uint[] data)
 		{
 			IntPtr [] dataArray = data.Select (i => (IntPtr) i).ToArray ();
 			return XChangeProperty (GdkDrawableXDisplay (window), GdkWindowX11Xid (window), property, type, 32, mode, dataArray, data.Length); 
 		}
+
 	}
 }

=== modified file 'Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/UniverseFactoryService.cs'
--- Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/UniverseFactoryService.cs	2009-01-21 23:44:40 +0000
+++ Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/UniverseFactoryService.cs	2009-03-24 15:04:23 +0000
@@ -18,6 +18,8 @@
 //
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 using Do.Universe;
 using Do.Universe.Linux;
@@ -28,7 +30,6 @@
 	
 	public class UniverseFactoryService : IUniverseFactoryService
 	{
-		
 		public IFileItem NewFileItem (string path)
 		{
 			return new FileItem (path);
@@ -41,5 +42,10 @@
 			IApplicationItem maybe = ApplicationItem.MaybeCreateFromDesktopItem (path);
 			return maybe ?? new NullApplicationItem (path);
 		}
+		
+		public IApplicationItem MaybeApplicationItemFromCommand (string cmd)
+		{
+			return ApplicationItem.MaybeCreateFromCmd (cmd);
+		}
 	}
 }

=== modified file 'Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs'
--- Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs	2009-01-23 23:01:37 +0000
+++ Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs	2009-03-29 17:52:17 +0000
@@ -22,6 +22,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 
 using Gnome;
 using Mono.Unix;
@@ -68,6 +69,34 @@
 			}
 			return appItem;
 		}
+		
+		public static ApplicationItem MaybeCreateFromCmd (string cmd)
+		{
+			ApplicationItem appItem = null;
+			
+			if (string.IsNullOrEmpty (cmd))
+				return appItem;
+			
+			cmd = Regex.Escape (cmd);
+			Regex regex = new Regex (string .Format ("(^| ){0}( |)", cmd));
+			foreach (ApplicationItem item in Instances.Values) {
+				string path = item.Location;
+				try {
+					if (path.StartsWith ("file://"))
+						path = path.Substring ("file://".Length); 
+				
+					path = Path.GetFileName (path);
+				} catch { continue; }
+				
+				if (regex.IsMatch (path) || regex.IsMatch (item.Exec)) {
+					appItem = item;
+					if (item.IsAppropriateForCurrentDesktop && !item.Hidden)
+						break;
+				}
+			}
+			
+			return appItem;
+		}
 
 		protected DesktopItem item;
 		string name, description, icon, mimetype;
@@ -115,6 +144,10 @@
 		public string Exec {
 			get { return item.GetString ("Exec"); }
 		}
+		
+		protected string Location {
+			get { return item.Location; }
+		}
 
 		public bool Hidden {
 			get { return item.GetBoolean ("NoDisplay"); }

=== modified file 'Do.Platform/src/Do.Platform/Do.Platform.Default/UniverseFactoryService.cs'
--- Do.Platform/src/Do.Platform/Do.Platform.Default/UniverseFactoryService.cs	2008-12-12 01:41:51 +0000
+++ Do.Platform/src/Do.Platform/Do.Platform.Default/UniverseFactoryService.cs	2009-03-24 15:04:23 +0000
@@ -41,6 +41,12 @@
 			Log.Debug ("Default IUniverseFactoryService cannot return a useful IApplicationItem.");
 			return new EmptyApplicationItem ();
 		}
+		
+		public IApplicationItem MaybeApplicationItemFromCommand (string cmd)
+		{
+			Log.Debug ("Default IUniverseFactoryService cannot return a useful IApplicationItem.");
+			return null;
+		}
 
 		class EmptyFileItem : EmptyItem, IFileItem
 		{

=== modified file 'Do.Platform/src/Do.Platform/IUniverseFactoryService.cs'
--- Do.Platform/src/Do.Platform/IUniverseFactoryService.cs	2008-12-22 00:36:53 +0000
+++ Do.Platform/src/Do.Platform/IUniverseFactoryService.cs	2009-03-24 15:04:23 +0000
@@ -31,5 +31,6 @@
 	{
 		IFileItem NewFileItem (string path);
 		IApplicationItem NewApplicationItem (string path);	
+		IApplicationItem MaybeApplicationItemFromCommand (string cmd);
 	}
 }

=== modified file 'Do.mds'
--- Do.mds	2009-03-28 15:34:37 +0000
+++ Do.mds	2009-03-31 17:48:02 +0000
@@ -64,4 +64,4 @@
     <Entry filename="Do.Interface.Linux.HUD/Do.Interface.Linux.HUD.mdp" />
     <Entry filename="Do.Interface.Wink/Do.Interface.Wink.mdp" />
   </Entries>
-</Combine>
+</Combine>
\ No newline at end of file

=== modified file 'Do/gnome-do.in'
--- Do/gnome-do.in	2008-10-27 07:23:04 +0000
+++ Do/gnome-do.in	2009-03-24 15:04:23 +0000
@@ -18,8 +18,8 @@
 
 # If Do is not running, run it.
 if pgrep -u "`id -un`" '^gnome-do$' >/dev/null; then
-	mono "$GNOME_DO_EXE" "$@"
+	mono --debug "$GNOME_DO_EXE" "$@" > ~/do.trace 2>&1
 fi
 while [ "$?" -eq "20" ]; do
-	mono "$GNOME_DO_EXE" "$@"
+	mono --debug "$GNOME_DO_EXE" "$@" > ~/do.trace 2>&1
 done