Merge lp:~jassmith/do/docky-file-drag-and-drop into lp:do

[Jason Smith]

[Alex Launi (alexlauni)]

cool stuff, works for me.

review: Approve

=== 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-04-28 08:08:21 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs	2009-05-05 03:44:50 +0000
@@ -259,7 +259,13 @@
 					}
 					if (writeable && Path.GetDirectoryName (identifier) != DesktopFilesDirectory) {
 						string newFile = Path.Combine (DesktopFilesDirectory, Path.GetFileName (identifier));
-						File.Copy (identifier, newFile);
+						try {
+							Log<ItemsService>.Error ("Could not add custom item with id: {0}, File already exists", identifier);
+							File.Copy (identifier, newFile);
+						} catch {
+							
+							return null; 
+						}
 						identifier = newFile;
 					}
 					Item o = Services.UniverseFactory.NewApplicationItem (identifier) as Item;
@@ -307,8 +313,8 @@
 				
 				Dictionary<string, int> sortDictionary = ReadSortDictionary ();
 				foreach (ItemDockItem item in OrderedItems.Where (di => di is ItemDockItem)) {
-					if (sortDictionary.ContainsKey (item.Element.UniqueId))
-						item.Position = sortDictionary [item.Element.UniqueId];
+					if (sortDictionary.ContainsKey (item.Item.UniqueId))
+						item.Position = sortDictionary [item.Item.UniqueId];
 				}
 				
 				CustomItemsRead = true;
@@ -336,11 +342,11 @@
 			
 			DateTime currentTime = DateTime.UtcNow;
 			foreach (Item item in mostUsedItems) {
-				if (local_cust.Any (di => di.Element.UniqueId == item.UniqueId))
+				if (local_cust.Any (di => di.Item.UniqueId == item.UniqueId))
 					continue;
 				
-				if (old_items.Any (di => di.Element == item)) {
-					stat_items.AddRange (old_items.Where (di => di.Element.UniqueId == item.UniqueId).Cast<AbstractDockItem> ());
+				if (old_items.Any (di => di.Item == item)) {
+					stat_items.AddRange (old_items.Where (di => di.Item.UniqueId == item.UniqueId).Cast<AbstractDockItem> ());
 				} else {
 					ItemDockItem di = new ItemDockItem (item);
 					RegisterDockItem (di);
@@ -482,7 +488,7 @@
 				
 				using (StreamWriter writer = new StreamWriter (SortDictionaryPath)) {
 					foreach (ItemDockItem di in OrderedItems.Where (di => di is ItemDockItem)) {
-						writer.WriteLine ("{0}|{1}", di.Element.UniqueId, di.Position);
+						writer.WriteLine ("{0}|{1}", di.Item.UniqueId, di.Position);
 					}
 				}
 			} catch (Exception e) {
@@ -750,7 +756,7 @@
 			
 			if (DockItems [item].WindowCount == 0) {
 				if (GetIconSource (DockItems [item]) == IconSource.Statistics && DockItems [item] is ItemDockItem) {
-					DockPreferences.AddBlacklistItem ((DockItems [item] as ItemDockItem).Element.UniqueId);
+					DockPreferences.AddBlacklistItem ((DockItems [item] as ItemDockItem).Item.UniqueId);
 					DockPreferences.AutomaticIcons = Math.Max (0, DockPreferences.AutomaticIcons - 1);
 					UpdateItems ();
 					ret_val = true;

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs	2009-05-02 18:42:09 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs	2009-05-05 07:59:11 +0000
@@ -57,6 +57,18 @@
 		{
 			this.parent = parent;
 			Wnck.Screen.Default.ActiveWindowChanged += HandleActiveWindowChanged;
+			Wnck.Screen.Default.WindowClosed += WnckScreenDefaultWindowClosed;
+			Wnck.Screen.Default.WindowOpened += WnckScreenDefaultWindowOpened;
+		}
+
+		void WnckScreenDefaultWindowOpened (object o, WindowOpenedArgs args)
+		{
+			UpdateWindowIntersect ();
+		}
+
+		void WnckScreenDefaultWindowClosed (object o, WindowClosedArgs args)
+		{
+			UpdateWindowIntersect ();
 		}
 
 		void HandleGeometryChanged (object sender, EventArgs e)

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-05-03 00:32:23 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea.cs	2009-05-05 06:30:38 +0000
@@ -381,7 +381,7 @@
 			window.Reposition ();
 		}
 		
-		void HandleSizeChanged(object sender, EventArgs e)
+		void HandleSizeChanged (object sender, EventArgs e)
 		{
 			Reconfigure ();
 		}
@@ -400,7 +400,7 @@
 			AnimatedDraw ();
 		}
 		
-		void HandleUniverseInitialized(object sender, EventArgs e)
+		void HandleUniverseInitialized (object sender, EventArgs e)
 		{
 			GLib.Timeout.Add (2000, delegate {
 				DockServices.ItemsService.ForceUpdate ();

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs	2009-04-28 07:15:19 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_DragAndDrop.cs	2009-05-05 06:30:38 +0000
@@ -60,10 +60,16 @@
 		Gdk.CursorType cursor_type;
 
 		Gdk.Window drag_proxy;
+		
+		Gdk.DragContext drag_context;
 
+		IEnumerable<string> uri_list;
+		
 		DragState DragState { get; set; }
 
 		bool GtkDragging { get; set; }
+		
+		bool PreviewIsDesktopFile { get; set; }
 
 		bool CursorNearTopDraggableEdge {
 			get {
@@ -106,14 +112,14 @@
 		void RegisterGtkDragSource ()
 		{
 			gtk_drag_source_set = true;
-			TargetEntry te = new TargetEntry ("text/uri-list", TargetFlags.OtherApp, 0);
+			TargetEntry te = new TargetEntry ("text/uri-list", TargetFlags.OtherApp | TargetFlags.App, 0);
 			Gtk.Drag.SourceSet (this, Gdk.ModifierType.Button1Mask, new [] {te}, DragAction.Copy);
 		}
 		
 		void RegisterGtkDragDest ()
 		{
 			TargetEntry dest_te = new TargetEntry ("text/uri-list", 0, 0);
-			Gtk.Drag.DestSet (this, DestDefaults.Motion | DestDefaults.Drop, new [] {dest_te}, Gdk.DragAction.Copy);
+			Gtk.Drag.DestSet (this, 0, new [] {dest_te}, Gdk.DragAction.Copy);
 		}
 		
 		void UnregisterGtkDragSource ()
@@ -155,8 +161,9 @@
 
 		void DragCursorUpdate ()
 		{
-			if (GtkDragging && (CursorModifier & ModifierType.Button1Mask) != ModifierType.Button1Mask)
+			if (GtkDragging && (CursorModifier & ModifierType.Button1Mask) != ModifierType.Button1Mask) {
 				GtkDragging = false;
+			}
 			SetDragProxy ();
 		}
 
@@ -178,36 +185,61 @@
 			} while (false);
 			
 			AnimatedDraw ();
-			return base.OnDragMotion (context, x, y, time);
+			
+			if (drag_context != context) {
+				Gdk.Atom target = Gtk.Drag.DestFindTarget (this, context, null);
+				Gtk.Drag.GetData (this, context, target, Gtk.Global.CurrentEventTime);
+				drag_context = context;
+			}
+			
+			Gdk.Drag.Status (context, DragAction.Copy, time);
+			base.OnDragMotion (context, x, y, time);
+			return true;
+		}
+		
+		protected override bool OnDragDrop (Gdk.DragContext context, int x, int y, uint time)
+		{
+			int index = PositionProvider.IndexAtPosition (Cursor);
+			if (CursorIsOverDockArea && index >= 0 && index < DockItems.Count) {
+				foreach (string uri in uri_list) {
+					if (CurrentDockItem != null && CurrentDockItem.IsAcceptingDrops && !uri.EndsWith (".desktop")) {
+						CurrentDockItem.ReceiveItem (uri);
+					} else {
+						Gdk.Point center = PositionProvider.IconUnzoomedPosition (index);
+						if (center.X < Cursor.X && index < DockItems.Count - 1)
+							index++;
+						DockServices.ItemsService.AddItemToDock (uri, index);
+					}
+				}
+			}
+			
+			Gtk.Drag.Finish (context, true, true, time);
+			return base.OnDragDrop (context, x, y, time);
 		}
 
 		protected override void OnDragDataReceived (Gdk.DragContext context, int x, int y, 
 		                                            Gtk.SelectionData selectionData, uint info, uint time)
 		{
-			if (!CursorIsOverDockArea) return;
-
-			string data = System.Text.Encoding.UTF8.GetString ( selectionData.Data );
-			data = System.Uri.UnescapeDataString (data);
-			//sometimes we get a null at the end, and it crashes us
-			data = data.TrimEnd ('\0'); 
-			
-			IEnumerable<string> uriList = Regex.Split (data, "\r\n")
-				.Where (uri => uri.StartsWith ("file://"))
-				.Select (uri => uri.Substring ("file://".Length));
-			
-			if (CurrentDockItem != null && CurrentDockItem.IsAcceptingDrops) {
-				uriList.ForEach (uri => CurrentDockItem.ReceiveItem (uri));
-			} else {
-				int index = PositionProvider.IndexAtPosition (Cursor);
-				Gdk.Point center = PositionProvider.IconUnzoomedPosition (index);
-				if (center.X < Cursor.X)
-					index++;
-				uriList.ForEach (uri => DockServices.ItemsService.AddItemToDock (uri, index));
+			IEnumerable<string> uriList;
+			try {
+				string data = System.Text.Encoding.UTF8.GetString (selectionData.Data);
+				data = System.Uri.UnescapeDataString (data);
+				//sometimes we get a null at the end, and it crashes us
+				data = data.TrimEnd ('\0'); 
+				
+				uriList = Regex.Split (data, "\r\n")
+					.Where (uri => uri.StartsWith ("file://"))
+					.Select (uri => uri.Substring ("file://".Length));
+			} catch {
+				uriList = Enumerable.Empty<string> ();
 			}
 			
+			
+			uri_list = uriList;
+				
+			PreviewIsDesktopFile = !uriList.Any () || uriList.Any (s => s.EndsWith (".desktop"));
+			
 			base.OnDragDataReceived (context, x, y, selectionData, info, time);
-			GtkDragging = false;
-			SetDragProxy ();
 		}
 		
 		protected override void OnDragBegin (Gdk.DragContext context)
@@ -235,7 +267,6 @@
 		
 		protected override void OnDragEnd (Gdk.DragContext context)
 		{
-			
 			if (CursorIsOverDockArea) {
 				int currentPosition = PositionProvider.IndexAtPosition (Cursor);
 				if (currentPosition != -1)
@@ -243,13 +274,15 @@
 			} else {
 				DockServices.ItemsService.RemoveItem (DragState.DragItem);
 			}
+			
 			DragState.IsFinished = true;
 			GtkDragging = false;
+			SetDragProxy ();
 			
 			AnimatedDraw ();
 			base.OnDragEnd (context);
 		}
-
+		
 		void BuildDragAndDrop ()
 		{
 			cursor_type = CursorType.LeftPtr;
@@ -302,13 +335,8 @@
 		{
 			drag_edge = DragEdge.None;
 			drag_resizing = false;
-			SetIconRegions ();
-			window.SetStruts ();
-			
-			AnimatedDraw ();
 			
 			ResetCursorTimer ();
-			
 			Reconfigure ();
 		}
 		

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-05-02 19:07:49 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs	2009-05-05 06:30:38 +0000
@@ -68,9 +68,8 @@
 
 		bool CanFastRender {
 			get {
-				bool result = next_fast_render;
-				next_fast_render = !RenderData.ForceFullRender && 
-					    RenderData.ZoomIn == 1 && 
+				bool result = next_fast_render && !RenderData.ForceFullRender;
+				next_fast_render = RenderData.ZoomIn == 1 && 
 						ZoomIn == 1 && 
 						!AnimationState [Animations.IconInsert] &&
 						!AnimationState [Animations.UrgencyChanged] &&
@@ -407,7 +406,7 @@
 				              iconPosition.X / scale, iconPosition.Y / scale);
 				cr.PaintWithAlpha (fadeInOpacity);
 				
-				bool shade_light = GtkDragging && 
+				bool shade_light = GtkDragging && !PreviewIsDesktopFile && CursorIsOverDockArea &&
 					dockItem.IsAcceptingDrops && icon == PositionProvider.IndexAtPosition (Cursor);
 				
 				bool shade_dark = animationType == ClickAnimationType.Darken;
@@ -692,8 +691,9 @@
 		
 		void RequestFullRender ()
 		{
-			if (RenderData != null)
+			if (RenderData != null) {
 				RenderData.ForceFullRender = true;
+			}
 		}
 		
 		void ResetBuffers()

=== modified file 'Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs'
--- Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs	2009-05-02 18:42:09 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/AbstractDockItem.cs	2009-05-04 21:34:50 +0000
@@ -188,6 +188,11 @@
 		/// </param>
 		public virtual void Clicked (uint button, ModifierType state, PointD position)
 		{
+			SetLastClick ();
+		}
+		
+		protected void SetLastClick ()
+		{
 			LastClick = DateTime.UtcNow;
 			time_since_click_overdue = 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-04-11 04:33:50 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ApplicationDockItem.cs	2009-05-04 21:34:50 +0000
@@ -88,6 +88,12 @@
 			}
 		}
 		
+		public override Item Item {
+			get {
+				return Launcher as Item;
+			}
+		}
+		
 		string Exec {
 			get {
 				string exec;

=== 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-04-29 06:22:41 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/ItemDockItem.cs	2009-05-04 21:34:50 +0000
@@ -43,25 +43,17 @@
 	
 	public class ItemDockItem : WnckDockItem, IRightClickable
 	{
-		const string ErrorMessage = "Docky could not move the file to the requested Directory.  " + 
-			"Please check file name and permissions and try again";
-		
-		Item element;
+		Item item;
 		int window_count;
 		uint handle_timer;
-		bool accepting_drops;
 		Gdk.Pixbuf drag_pixbuf;
 		Gdk.Rectangle icon_region;
 		List<Wnck.Window> windows;
 		
 		public event EventHandler RemoveClicked;
 		
-		public override bool IsAcceptingDrops { 
-			get { return accepting_drops; } 
-		}
-		
 		protected override string Icon { 
-			get { return element.Icon; } 
+			get { return item.Icon; } 
 		}
 		
 		string Name {
@@ -72,12 +64,12 @@
 				if (VisibleWindows.Any () && WindowCount == 1)
 					return VisibleWindows.First ().Name;
 				
-				return Element.Name;
+				return Item.Name;
 			}
 		}
 		
-		public Item Element { 
-			get { return element; } 
+		public override Item Item { 
+			get { return item; } 
 		}
 		
 		public override IEnumerable<Wnck.Window> Windows { 
@@ -96,56 +88,24 @@
 			get { return window_count; }
 		}
 		
-		public ItemDockItem (Item element) : base ()
+		public ItemDockItem (Item item) : base ()
 		{
 			Position = -1;
-			this.element = element;
+			this.item = item;
 			windows = new List<Wnck.Window> ();
 
 			UpdateApplication ();
 			NeedsAttention = DetermineUrgencyStatus ();
 			
-			if (element is IFileItem && Directory.Exists ((element as IFileItem).Path))
-				accepting_drops = true;
-			else
-				accepting_drops = false;
-			
 			SetText (Name);
 		}
 		
-		public override bool ReceiveItem (string item)
-		{
-			bool result = false;
-			if (!IsAcceptingDrops)
-				return result;
-			
-			if (item.StartsWith ("file://"))
-				item = item.Substring ("file://".Length);
-			
-			if (File.Exists (item)) {
-				try {
-					File.Move (item, System.IO.Path.Combine ((Element as IFileItem).Path, System.IO.Path.GetFileName (item)));
-					result = true;
-				} catch { 
-					Services.Notifications.Notify ("Docky Error", ErrorMessage);
-				}
-			} else if (Directory.Exists (item)) {
-				try {
-					Directory.Move (item, System.IO.Path.Combine ((Element as IFileItem).Path, System.IO.Path.GetFileName (item)));
-					result = true;
-				} catch { 
-					Services.Notifications.Notify ("Docky Error", ErrorMessage);
-				}
-			}
-			return result;
-		}
-		
 		public void UpdateApplication ()
 		{
 			UnregisterWindowEvents ();
 			
-			if (element is IApplicationItem) {
-				windows = WindowUtils.WindowListForCmd ((element as IApplicationItem).Exec);
+			if (item is IApplicationItem) {
+				windows = WindowUtils.WindowListForCmd ((item as IApplicationItem).Exec);
 				window_count = windows.Where (w => !w.IsSkipTasklist).Count ();
 			}
 			
@@ -218,8 +178,8 @@
 			
 			List<AbstractDockItem> dockitems = new List<AbstractDockItem> ();
 					
-			foreach (Act act in ActionsForItem (element)) {
-				dockitems.Add (new ActionDockItem (act, element));
+			foreach (Act act in ActionsForItem (item)) {
+				dockitems.Add (new ActionDockItem (act, item));
 			}
 			
 			Docky.Core.DockServices.ItemsService.HotSeatItem (this, dockitems);
@@ -235,10 +195,10 @@
 		
 		protected override void Launch ()
 		{
-			if (Element is IFileItem)
-				Services.Core.PerformDefaultAction (Element as Item, new [] { typeof (OpenAction), });
+			if (Item is IFileItem)
+				Services.Core.PerformDefaultAction (Item as Item, new [] { typeof (OpenAction), });
 			else
-				Services.Core.PerformDefaultAction (Element as Item, Type.EmptyTypes);
+				Services.Core.PerformDefaultAction (Item as Item, Type.EmptyTypes);
 		}
 		
 		public override void SetIconRegion (Gdk.Rectangle region)
@@ -258,7 +218,7 @@
 			if (other == null) return false;
 			
 			ItemDockItem di = other as ItemDockItem;
-			return di != null && di.Element != null && Element != null && di.Element.UniqueId == Element.UniqueId;
+			return di != null && di.Item != null && Item != null && di.Item.UniqueId == Item.UniqueId;
 		}
 
 		#region IDisposable implementation 
@@ -266,7 +226,7 @@
 		public override void Dispose ()
 		{
 			UnregisterWindowEvents ();
-			element = null;
+			item = null;
 			windows.Clear ();
 			
 			if (drag_pixbuf != null)
@@ -286,11 +246,11 @@
 			yield return new SeparatorMenuButtonArgs ();
 			
 			if (hasApps) {
-				foreach (Act act in ActionsForItem (element))
-					yield return new LaunchMenuButtonArgs (act, element, act.Name, act.Icon).AsDark ();
+				foreach (Act act in ActionsForItem (item))
+					yield return new LaunchMenuButtonArgs (act, item, act.Name, act.Icon).AsDark ();
 			} else {
-				foreach (Act act in ActionsForItem (element))
-					yield return new LaunchMenuButtonArgs (act, element, act.Name, act.Icon);
+				foreach (Act act in ActionsForItem (item))
+					yield return new LaunchMenuButtonArgs (act, item, act.Name, act.Icon);
 			}
 			
 			if (hasApps) {

=== 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-04-29 06:22:41 +0000
+++ Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/WnckDockItem.cs	2009-05-04 21:34:50 +0000
@@ -42,6 +42,9 @@
 	
 	public abstract class WnckDockItem : AbstractDockItem
 	{
+		const string ErrorMessage = "Docky could not move the file to the requested Directory.  " + 
+			"Please check file name and permissions and try again";
+		
 		// a bad hack, but it works
 		static string [] blacklist = new [] {
 			"CopyToClipboardAction", 
@@ -49,12 +52,15 @@
 		};
 		
 		int last_raised;
-
+		bool? accepting_drops;
+		
 		DateTime last_scroll = new DateTime (0);
 		TimeSpan scroll_rate = new TimeSpan (0, 0, 0, 0, 200);
 		
 		public abstract IEnumerable<Wnck.Window> Windows { get; }
 		
+		public abstract Item Item { get; }
+		
 		protected IEnumerable<Wnck.Window> VisibleWindows {
 			get { return Windows.Where (w => !w.IsSkipTasklist); }
 		}
@@ -67,6 +73,15 @@
 			}
 		}	
 		
+		public override bool IsAcceptingDrops {
+			get {
+				if (!accepting_drops.HasValue) {
+					accepting_drops = (Item is IFileItem && Directory.Exists ((Item as IFileItem).Path)) || (Item is IApplicationItem);
+				}
+				return accepting_drops.Value;
+			}
+		}
+		
 		public WnckDockItem() : base ()
 		{
 			last_raised = 0;
@@ -143,5 +158,43 @@
 			else if (last_raised < 0)
 				last_raised = WindowCount - 1;
 		}
+		
+		public override bool ReceiveItem (string item)
+		{
+			bool result = false;
+			if (!IsAcceptingDrops)
+				return result;
+			
+			if (item.StartsWith ("file://"))
+				item = item.Substring ("file://".Length);
+			
+			if (File.Exists (item)) {
+				if (Item is IApplicationItem) {
+					try {
+						(Item as IApplicationItem).LaunchWithFiles (Do.Platform.Services.UniverseFactory.NewFileItem (item).Cons (null));
+						SetLastClick ();
+						AnimationType = ClickAnimationType.Bounce;
+						result = true;
+					} catch {
+						Services.Notifications.Notify ("Docky Error", "Docky could not launch application");
+					}
+				} else {
+					try {
+						File.Move (item, System.IO.Path.Combine ((Item as IFileItem).Path, System.IO.Path.GetFileName (item)));
+						result = true;
+					} catch { 
+						Services.Notifications.Notify ("Docky Error", ErrorMessage);
+					}
+				}
+			} else if (Directory.Exists (item)) {
+				try {
+					Directory.Move (item, System.IO.Path.Combine ((Item as IFileItem).Path, System.IO.Path.GetFileName (item)));
+					result = true;
+				} catch { 
+					Services.Notifications.Notify ("Docky Error", ErrorMessage);
+				}
+			}
+			return result;
+		}
 	}
 }