Merge lp:~azzar1/unity/dnd-enhancements into lp:unity

[Andrea Azzarone]

THE DNDCOLLECTION WINDOW
The first objective of this branch is creating a DNDCollectionWindow to get nux/x drag and drop (dnd) data as soon as dnd starts and not when mouse pointer enters launcher window.
The DNDcolletionWindow hides itself as soon as processdndmove is called or when dnd ends (so there should be no "invisble window" problem). After that it emits a collected signal that is handled by the launcher.

THE DNDDATA CLASS
So I have created this facility class to manage the 1-N relationship between uris and uris types. This class uses std::set to avoid data duplication.

C++0x FOR
I have rewrited some for loops using new c++0x for.

[Jason Smith (jassmith)]

Im sorry it took me so long to get to this, I was gone last week.

I will be reviewing this with excitement tomorrow! Good work :)

[Jason Smith (jassmith)]

So after running the branch, it does a great job making the launcher appear and do the hinting as soon as a drag starts, however the actual act of dropping something on the launcher is broken in this branch.

review: Needs Fixing

[Andrea Azzarone (azzar1)]

So I should fix that?

[Jason Smith (jassmith)]

Yes

[Andrea Azzarone (azzar1)]

The problem should be gone away...

[Jason Smith (jassmith)]

Looking great!

review: Approve

=== modified file 'plugins/unityshell/src/AbstractLauncherIcon.h'
--- plugins/unityshell/src/AbstractLauncherIcon.h	2011-08-05 06:20:39 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.h	2011-08-19 08:55:26 +0000
@@ -31,6 +31,8 @@
 
 #include <libdbusmenu-glib/menuitem.h>
 
+#include "DndData.h"
+
 class ActionArg
 {
 public:
@@ -161,9 +163,9 @@
 
   virtual std::list<DbusmenuMenuitem*> Menus() = 0;
 
-  virtual nux::DndAction QueryAcceptDrop(std::list<char*> paths) = 0;
+  virtual nux::DndAction QueryAcceptDrop(unity::DndData& dnd_data) = 0;
 
-  virtual void AcceptDrop(std::list<char*> paths) = 0;
+  virtual void AcceptDrop(unity::DndData& dnd_data) = 0;
 
   virtual void SendDndEnter() = 0;
 

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-08-18 00:38:22 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-08-19 08:55:26 +0000
@@ -21,12 +21,11 @@
 #include "Nux/BaseWindow.h"
 
 #include "BamfLauncherIcon.h"
+#include "FavoriteStore.h"
 #include "Launcher.h"
 #include "PluginAdapter.h"
-#include "FavoriteStore.h"
-
+#include "UBusMessages.h"
 #include "ubus-server.h"
-#include "UBusMessages.h"
 
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
@@ -34,6 +33,8 @@
 #include <core/core.h>
 #include <core/atoms.h>
 
+#include <UnityCore/GLibWrapper.h>
+
 using unity::FavoriteStore;
 
 struct _ShortcutData
@@ -133,7 +134,9 @@
 }
 
 BamfLauncherIcon::BamfLauncherIcon(Launcher* IconManager, BamfApplication* app, CompScreen* screen)
-  :   SimpleLauncherIcon(IconManager)
+  : SimpleLauncherIcon(IconManager)
+  , _supported_types_filled(false)
+  , _fill_supported_types_id(0)
 {
   _cached_desktop_file = NULL;
   _cached_name = NULL;
@@ -188,8 +191,11 @@
   PluginAdapter::Default()->window_minimized.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnWindowMinimized));
   IconManager->hidden_changed.connect(sigc::mem_fun(this, &BamfLauncherIcon::OnLauncherHiddenChanged));
 
-  /* hack */
+  // hack
   SetProgress(0.0f);
+  
+  // Calls when there are no higher priority events pending to the default main loop.
+  _fill_supported_types_id = g_idle_add((GSourceFunc)FillSupportedTypes, this);
 
 }
 
@@ -213,6 +219,9 @@
   if (_on_desktop_file_changed_handler_id != 0)
     g_signal_handler_disconnect((gpointer) _desktop_file_monitor,
                                 _on_desktop_file_changed_handler_id);
+                                
+  if (_fill_supported_types_id != 0)
+    g_source_remove(_fill_supported_types_id);
 
   g_signal_handlers_disconnect_by_func(m_App, (void*) &BamfLauncherIcon::OnChildRemoved,       this);
   g_signal_handlers_disconnect_by_func(m_App, (void*) &BamfLauncherIcon::OnChildAdded,         this);
@@ -352,11 +361,10 @@
   return owns;
 }
 
-void BamfLauncherIcon::OpenInstanceWithUris(std::list<char*> uris)
+void BamfLauncherIcon::OpenInstanceWithUris(std::set<std::string> uris)
 {
   GDesktopAppInfo* appInfo;
   GError* error = NULL;
-  std::list<char*>::iterator it;
 
   appInfo = g_desktop_app_info_new_from_filename(bamf_application_get_desktop_file(BAMF_APPLICATION(m_App)));
 
@@ -364,18 +372,19 @@
   {
     GList* list = NULL;
 
-    for (it = uris.begin(); it != uris.end(); it++)
-      list = g_list_prepend(list, *it);
+    for (auto  it : uris)
+      list = g_list_prepend(list, g_strdup(it.c_str()));
 
     g_app_info_launch_uris(G_APP_INFO(appInfo), list, NULL, &error);
-    g_list_free(list);
+    g_list_free_full(list, g_free);
   }
   else if (g_app_info_supports_files(G_APP_INFO(appInfo)))
   {
     GList* list = NULL, *l;
-    for (it = uris.begin(); it != uris.end(); it++)
+    
+    for (auto it : uris)
     {
-      GFile* file = g_file_new_for_uri(*it);
+      GFile* file = g_file_new_for_uri(it.c_str());
       list = g_list_prepend(list, file);
     }
     g_app_info_launch(G_APP_INFO(appInfo), list, NULL, &error);
@@ -403,7 +412,7 @@
 
 void BamfLauncherIcon::OpenInstanceLauncherIcon(ActionArg arg)
 {
-  std::list<char*> empty;
+  std::set<std::string> empty;
   OpenInstanceWithUris(empty);
   ubus_server_send_message(ubus_server_get_default(), UBUS_LAUNCHER_ACTION_DONE, NULL);
 }
@@ -1038,62 +1047,21 @@
   return _remote_uri;
 }
 
-std::list<char*> BamfLauncherIcon::ValidateUrisForLaunch(std::list<char*> uris)
+std::set<std::string> BamfLauncherIcon::ValidateUrisForLaunch(unity::DndData& uris)
 {
-  GKeyFile* key_file;
-  const char* desktop_file;
-  GError* error = NULL;
-  std::list<char*> results;
-
-  desktop_file = DesktopFile();
-
-  if (!desktop_file || strlen(desktop_file) <= 1)
-    return results;
-
-  key_file = g_key_file_new();
-  g_key_file_load_from_file(key_file, desktop_file, (GKeyFileFlags) 0, &error);
-
-  if (error)
-  {
-    g_error_free(error);
-    g_key_file_free(key_file);
-    return results;
-  }
-
-  char** mimes = g_key_file_get_string_list(key_file, "Desktop Entry", "MimeType", NULL, NULL);
-  if (!mimes)
-  {
-    g_key_file_free(key_file);
-    return results;
-  }
-
-  std::list<char*>::iterator it;
-  for (it = uris.begin(); it != uris.end(); it++)
-  {
-    GFile* file = g_file_new_for_uri(*it);
-    GFileInfo* info = g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
-    const char* content_type = g_file_info_get_content_type(info);
-
-    int i = 0;
-    for (; mimes[i]; i++)
-    {
-      char* super_type = g_content_type_from_mime_type(mimes[i]);
-      if (g_content_type_is_a(content_type, super_type))
+  std::set<std::string> result;
+  
+  for (auto i : uris.Types())
+    for (auto j : GetSupportedTypes())
+      if (g_content_type_is_a(i.c_str(), j.c_str()))
       {
-        results.push_back(*it);
+        for (auto k : uris.UrisByType(i))
+          result.insert(k);
+          
         break;
       }
-      g_free(super_type);
-    }
-
-
-    g_object_unref(file);
-    g_object_unref(info);
-  }
-
-  g_strfreev(mimes);
-  g_key_file_free(key_file);
-  return results;
+    
+  return result;
 }
 
 gboolean BamfLauncherIcon::OnDndHoveredTimeout(gpointer data)
@@ -1121,14 +1089,14 @@
   _dnd_hover_timer = 0;
 }
 
-nux::DndAction BamfLauncherIcon::OnQueryAcceptDrop(std::list<char*> uris)
+nux::DndAction BamfLauncherIcon::OnQueryAcceptDrop(unity::DndData& dnd_data)
 {
-  return ValidateUrisForLaunch(uris).empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
+  return ValidateUrisForLaunch(dnd_data).empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
 }
 
-void  BamfLauncherIcon::OnAcceptDrop(std::list<char*> uris)
+void  BamfLauncherIcon::OnAcceptDrop(unity::DndData& dnd_data)
 {
-  OpenInstanceWithUris(ValidateUrisForLaunch(uris));
+  OpenInstanceWithUris(ValidateUrisForLaunch(dnd_data));
 }
 
 void BamfLauncherIcon::OnDesktopFileChanged(GFileMonitor*        monitor,
@@ -1181,3 +1149,65 @@
   g_list_free(children);
   return result;
 }
+
+const std::set<std::string>&
+BamfLauncherIcon::GetSupportedTypes()
+{
+  if (!_supported_types_filled)
+    FillSupportedTypes(this);
+    
+  return _supported_types;
+}
+
+gboolean
+BamfLauncherIcon::FillSupportedTypes(gpointer data)
+{
+  BamfLauncherIcon* self = (BamfLauncherIcon*) data;
+  
+  if (self->_fill_supported_types_id)
+  {
+    g_source_remove(self->_fill_supported_types_id);
+    self->_fill_supported_types_id = 0;
+  }
+  
+  if (!self->_supported_types_filled)
+  {
+    self->_supported_types_filled = true;
+    
+    self->_supported_types.clear();
+    
+    const char* desktop_file = self->DesktopFile();
+
+    if (!desktop_file || strlen(desktop_file) <= 1)
+      return false;
+      
+    GKeyFile* key_file = g_key_file_new();
+    unity::glib::Error error;
+
+    g_key_file_load_from_file(key_file, desktop_file, (GKeyFileFlags) 0, &error);
+
+    if (error)
+    {
+      g_key_file_free(key_file);
+      return false;
+    }
+    
+    char** mimes = g_key_file_get_string_list(key_file, "Desktop Entry", "MimeType", NULL, NULL);
+    if (!mimes)
+    {
+      g_key_file_free(key_file);
+      return false;
+    }
+    
+    for (int i=0; mimes[i]; i++)
+    {
+      unity::glib::String super_type(g_content_type_from_mime_type(mimes[i]));
+      self->_supported_types.insert(super_type.Str());
+    }
+    
+    g_key_file_free(key_file);
+    g_strfreev(mimes);
+  }
+
+  return false;
+}

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-08-04 20:19:46 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2011-08-19 08:55:26 +0000
@@ -63,14 +63,14 @@
 
   const gchar* GetRemoteUri();
 
-  nux::DndAction OnQueryAcceptDrop(std::list<char*> uris);
-  void OnAcceptDrop(std::list<char*> uris);
+  nux::DndAction OnQueryAcceptDrop(unity::DndData& dnd_data);
+  void OnAcceptDrop(unity::DndData& dnd_data);
   void OnDndEnter();
   void OnDndLeave();
 
   void OpenInstanceLauncherIcon(ActionArg arg);
 
-  std::list<char*> ValidateUrisForLaunch(std::list<char*> uris);
+  std::set<std::string> ValidateUrisForLaunch(unity::DndData& dnd_data);
 
   const char* BamfName();
 
@@ -89,15 +89,18 @@
   gchar* _cached_desktop_file;
   gchar* _cached_name;
 
-
   GFileMonitor* _desktop_file_monitor;
   gulong _on_desktop_file_changed_handler_id;
+  
+  std::set<std::string> _supported_types;
+  bool _supported_types_filled;
+  guint _fill_supported_types_id;
 
   void EnsureWindowState();
 
   void UpdateMenus();
 
-  void OpenInstanceWithUris(std::list<char*> uris);
+  void OpenInstanceWithUris(std::set<std::string> uris);
   void Focus();
   bool Spread(int state, bool force);
 
@@ -105,6 +108,8 @@
 
   void OnWindowMinimized(guint32 xid);
   bool OwnsWindow(Window w);
+  
+  const std::set<std::string>& GetSupportedTypes();
 
   static void OnClosed(BamfView* view, gpointer data);
   static void OnUserVisibleChanged(BamfView* view, gboolean visible, gpointer data);
@@ -125,6 +130,7 @@
                                    gpointer             data);
 
   static gboolean OnDndHoveredTimeout(gpointer data);
+  static gboolean FillSupportedTypes(gpointer data);
 };
 
 #endif // BAMFLAUNCHERICON_H

=== added file 'plugins/unityshell/src/DNDCollectionWindow.cpp'
--- plugins/unityshell/src/DNDCollectionWindow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/DNDCollectionWindow.cpp	2011-08-19 08:55:26 +0000
@@ -0,0 +1,63 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2011 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* 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/>.
+*
+* Authored by: Andrea Azzarone <[e-mail]>
+*/
+
+#include "DNDCollectionWindow.h"
+
+namespace unity {
+  
+NUX_IMPLEMENT_OBJECT_TYPE(DNDCollectionWindow);
+
+DNDCollectionWindow::DNDCollectionWindow(CompScreen* screen)
+  : nux::BaseWindow("")
+{
+  SetBackgroundColor(nux::Color(0x00000000));
+  SetBaseSize(screen->width(), screen->height());
+  SetBaseXY(0, 0);
+  
+  ShowWindow(true);
+  PushToBack();
+  // Hack
+  EnableInputWindow(true, "DNDCollectionWindow");
+  EnableInputWindow(false, "DNDCollectionWindow");
+  SetDndEnabled(false, true);
+}
+
+DNDCollectionWindow::~DNDCollectionWindow()
+{
+  for (auto it : mimes_)
+    g_free(it);
+}
+
+void DNDCollectionWindow::ProcessDndMove(int x, int y, std::list<char*> mimes)
+{  
+  // Hide the window as soon as possible
+  EnableInputWindow(false, "DNDCollectionWindow");
+
+  for (auto it : mimes_)
+    g_free(it);
+  mimes_.clear();
+  
+  // Duplicate the list
+  for (auto it : mimes)
+    mimes_.push_back(g_strdup(it));
+  
+  collected.emit(mimes_);
+}
+  
+} // namespace unity

=== added file 'plugins/unityshell/src/DNDCollectionWindow.h'
--- plugins/unityshell/src/DNDCollectionWindow.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/DNDCollectionWindow.h	2011-08-19 08:55:26 +0000
@@ -0,0 +1,55 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2011 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* 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/>.
+*
+* Authored by: Andrea Azzarone <[e-mail]>
+*/
+
+#ifndef DNDCOLLECTIONWINDOW_H
+#define DNDCOLLECTIONWINDOW_H
+
+#include <list>
+
+#include <core/screen.h>
+#include <Nux/Nux.h>
+#include <Nux/BaseWindow.h>
+#include <sigc++/sigc++.h>
+
+namespace unity {
+  
+class DNDCollectionWindow : public nux::BaseWindow
+{
+NUX_DECLARE_OBJECT_TYPE(DNDCollectionWindow, nux::BaseWindow);
+
+// Methods
+public:
+  DNDCollectionWindow(CompScreen* screen);
+  ~DNDCollectionWindow();
+  
+private:
+  void ProcessDndMove(int x, int y, std::list<char*> mimes);
+
+// Members
+public:
+  sigc::signal<void, const std::list<char*>&> collected;
+  
+private:
+  std::list<char*> mimes_;
+  
+};
+  
+} // namespace unity
+
+#endif // DNDCOLLECTIONWINDOW_H

=== added file 'plugins/unityshell/src/DndData.cpp'
--- plugins/unityshell/src/DndData.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/DndData.cpp	2011-08-19 08:55:26 +0000
@@ -0,0 +1,63 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2011 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* 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/>.
+*
+* Authored by: Andrea Azzarone <[e-mail]>
+*/
+
+#include "DndData.h"
+
+#include <cstring>
+#include <vector>
+
+#include <gio/gio.h>
+
+#include <UnityCore/GLibWrapper.h>
+
+namespace unity {
+  
+void DndData::Fill(char* uris)
+{ 
+  Reset();
+  
+  char* pch = strtok (uris, "\r\n");
+  while (pch != NULL)
+  {
+    glib::Object<GFile> file(g_file_new_for_uri(pch));
+    glib::Object<GFileInfo> info(g_file_query_info(file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL));
+    const char* content_type = g_file_info_get_content_type(info);
+    
+    uris_.insert(pch);
+    
+    if (content_type != NULL)
+    {
+      types_.insert(content_type);
+      uris_to_types_[pch] = content_type;
+      types_to_uris_[content_type].insert(pch);
+    }
+       
+    pch = strtok (NULL, "\r\n");
+  }
+}
+
+void DndData::Reset()
+{
+  uris_.clear();
+  types_.clear();
+  uris_to_types_.clear();
+  types_to_uris_.clear();
+}
+
+} // namespace unity

=== added file 'plugins/unityshell/src/DndData.h'
--- plugins/unityshell/src/DndData.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/DndData.h	2011-08-19 08:55:26 +0000
@@ -0,0 +1,71 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+* Copyright (C) 2011 Canonical Ltd
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 3 as
+* published by the Free Software Foundation.
+*
+* 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/>.
+*
+* Authored by: Andrea Azzarone <[e-mail]>
+*/
+
+#ifndef DNDDATA_H
+#define DNDDATA_H
+
+#include <map>
+#include <set>
+#include <string>
+
+namespace unity {
+
+class DndData
+{
+public:
+  /**
+   * Fills the object given a list of uris.
+   **/
+  void Fill(char* uris);
+  
+  /**
+   * Resets the object. Call this function when no longer need data
+   **/
+  void Reset();
+  
+  /**
+   * Returns a std::set<std::string> with all the uris.
+   **/
+  std::set<std::string>& Uris() { return uris_; }
+  
+  /**
+   * Returns a std::set<std::string> with all the types.
+   **/
+  std::set<std::string>& Types() { return types_; }
+  
+  /**
+   * Returns a std::set<std::string> with all uris of a given type.
+   **/
+  std::set<std::string>& UrisByType(const std::string& type) { return types_to_uris_[type]; }
+  
+  /**
+   * Returns a std::set<std::string> with all types of a given uri.
+   **/
+  std::string& TypeByUri(const std::string& uris) { return uris_to_types_[uris]; }
+
+private:
+  std::set<std::string> uris_;
+  std::set<std::string> types_;
+  std::map<std::string, std::string> uris_to_types_;
+  std::map<std::string, std::set<std::string>> types_to_uris_;
+};
+
+} // namespace unity
+
+#endif // DNDDATA_H

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-08-13 06:17:26 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-08-19 08:55:26 +0000
@@ -48,12 +48,11 @@
 #include "ubus-server.h"
 #include "UBusMessages.h"
 
+#include <UnityCore/GLibWrapper.h>
 #include <UnityCore/Variant.h>
 
 using namespace unity::ui;
 
-using namespace unity::ui;
-
 namespace
 {
 
@@ -136,13 +135,15 @@
 Launcher::Launcher(nux::BaseWindow* parent,
                    CompScreen*      screen,
                    NUX_FILE_LINE_DECL)
-  :   View(NUX_FILE_LINE_PARAM)
-  ,   m_ContentOffsetY(0)
-  ,   m_BackgroundLayer(0)
-  ,   _model(0)
-  ,   _background_color (nux::color::DimGray)
-  ,   _dash_is_open (false)
+  : View(NUX_FILE_LINE_PARAM)
+  , m_ContentOffsetY(0)
+  , m_BackgroundLayer(0)
+  , _model(0)
+  , _collection_window(NULL)
+  , _background_color(nux::color::DimGray)
+  , _dash_is_open(false)
 {
+  
   _parent = parent;
   _screen = screen;
   _active_quicklist = 0;
@@ -263,6 +264,11 @@
   _bfb_width = 1;
   _bfb_height = 1;
 
+  _data_checked = false;
+  _collection_window = new unity::DNDCollectionWindow(_screen);
+  _collection_window->SinkReference();
+  _on_data_collected_connection = _collection_window->collected.connect(sigc::mem_fun(this, &Launcher::OnDNDDataCollected));
+
   // 0 out timers to avoid wonky startups
   int i;
   for (i = 0; i < TIME_LAST; ++i)
@@ -271,6 +277,7 @@
     _times[i].tv_nsec = 0;
   }
 
+  _dnd_hovered_icon = NULL;
   _drag_window = NULL;
   _offscreen_drag_texture = nux::GetGraphicsDisplay()->GetGpuDevice()->CreateSystemCapableDeviceTexture(2, 2, 1, nux::BITFMT_R8G8B8A8);
 
@@ -350,6 +357,9 @@
 
   if (_launcher_animation_timeout > 0)
     g_source_remove(_launcher_animation_timeout);
+    
+  if (_on_data_collected_connection.connected())
+      _on_data_collected_connection.disconnect();
 
   UBusServer* ubus = ubus_server_get_default();
   for (unsigned int i = 0; i < G_N_ELEMENTS(_ubus_handles); ++i)
@@ -359,6 +369,9 @@
   }
 
   g_idle_remove_by_data(this);
+  
+  if (_collection_window)
+    _collection_window->UnReference();
 
   delete _hover_machine;
   delete _hide_machine;
@@ -656,7 +669,7 @@
   time = icon->GetQuirkTime(LauncherIcon::QUIRK_PROGRESS);
   if (TimeDelta(&current, &time) < ANIM_DURATION)
     return true;
-
+    
   time = icon->GetQuirkTime(LauncherIcon::QUIRK_DROP_DIM);
   if (TimeDelta(&current, &time) < ANIM_DURATION)
     return true;
@@ -1091,7 +1104,7 @@
     arg.alpha *= size_modifier;
     center.z = 300.0f * (1.0f - size_modifier);
   }
-
+  
   float drop_dim_value = 0.2f + 0.8f * IconDropDimValue(icon, current);
 
   if (drop_dim_value < 1.0f)
@@ -1513,7 +1526,7 @@
   _parent->EnableInputWindow(!hidden, "launcher", false, false);
 
   if (!hidden && GetActionState() == ACTION_DRAG_EXTERNAL)
-    ProcessDndLeave();
+    DndLeave();
 
   EnsureAnimation();
 
@@ -1614,10 +1627,19 @@
 
   if (drag_owner && (mask & (Button1Mask | Button2Mask | Button3Mask)))
   {
-    self->_hide_machine->SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
+    if (self->_data_checked == false)
+    {
+      self->_data_checked = true;
+      self->_collection_window->EnableInputWindow(true, "DNDCollectionWindow");
+    } 
+    
     return true;
   }
+  
+  self->_data_checked = false;
+  self->_collection_window->EnableInputWindow(false, "DNDCollectionWindow");
 
+  self->DndLeave();
   self->_hide_machine->SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, false);
   self->_hide_machine->SetQuirk(LauncherHideMachine::DND_PUSHED_OFF, false);
 
@@ -1681,11 +1703,6 @@
   
   if (_hidemode == LAUNCHER_HIDE_NEVER)
     return;
-    
-  if (PluginAdapter::Default ()->IsScaleActive ())                   
-    _parent->InputWindowEnableStruts (true);
-  else
-    _parent->InputWindowEnableStruts (false);
 }
 
 Launcher::LauncherHideMode Launcher::GetHideMode()
@@ -2803,10 +2820,51 @@
   nux::GetWindowCompositor().RestoreRenderingSurface();
 }
 
+void Launcher::OnDNDDataCollected(const std::list<char*>& mimes)
+{
+  _dnd_data.Reset();
+
+  unity::glib::String uri_list_const(g_strdup("text/uri-list"));
+
+  for (auto it : mimes)
+  {    
+    if (!g_str_equal(it, uri_list_const.Value()))
+      continue;
+
+    _dnd_data.Fill(nux::GetWindow().GetDndData(uri_list_const.Value()));
+    break;
+  }
+  
+  if (!_dnd_data.Uris().size())
+    return;
+    
+  _hide_machine->SetQuirk(LauncherHideMachine::EXTERNAL_DND_ACTIVE, true);
+  
+  for (auto it : _dnd_data.Uris())
+  {
+    if (g_str_has_suffix(it.c_str(), ".desktop"))
+    {
+      _steal_drag = true;
+      break;
+    }
+  }
+  
+  if (!_steal_drag)
+  {
+    for (auto it : *_model)
+    {
+      if (it->QueryAcceptDrop(_dnd_data) != nux::DNDACTION_NONE)
+        it->SetQuirk(LauncherIcon::QUIRK_DROP_PRELIGHT, true);
+      else
+        it->SetQuirk(LauncherIcon::QUIRK_DROP_DIM, true);
+    }
+  }  
+}
+
 void
 Launcher::ProcessDndEnter()
 {
-  _drag_data.clear();
+  _dnd_data.Reset();
   _drag_action = nux::DNDACTION_NONE;
   _steal_drag = false;
   _data_checked = false;
@@ -2815,35 +2873,32 @@
 }
 
 void
+Launcher::DndLeave()
+{
+  
+  _dnd_data.Reset();
+
+  for (auto it : *_model)
+  {
+    it->SetQuirk(LauncherIcon::QUIRK_DROP_PRELIGHT, false);
+    it->SetQuirk(LauncherIcon::QUIRK_DROP_DIM, false);
+  }
+  
+  ProcessDndLeave();
+}
+
+void
 Launcher::ProcessDndLeave()
 {
   SetStateMouseOverLauncher(false);
   _drag_edge_touching = false;
 
   SetActionState(ACTION_NONE);
-
-  if (!_drag_data.empty())
-  {
-    std::list<char*>::iterator it;
-    for (it = _drag_data.begin(); it != _drag_data.end(); it++)
-    {
-      g_free(*it);
-    }
-  }
-  _drag_data.clear();
-
-  LauncherModel::iterator it;
-  for (it = _model->begin(); it != _model->end(); it++)
-  {
-    (*it)->SetQuirk(LauncherIcon::QUIRK_DROP_PRELIGHT, false);
-    (*it)->SetQuirk(LauncherIcon::QUIRK_DROP_DIM, false);
-  }
-
+  
   if (_steal_drag && _dnd_hovered_icon)
   {
     _dnd_hovered_icon->SetQuirk(LauncherIcon::QUIRK_VISIBLE, false);
     _dnd_hovered_icon->remove.emit(_dnd_hovered_icon);
-
   }
 
   if (!_steal_drag && _dnd_hovered_icon)
@@ -2854,58 +2909,33 @@
 
   _steal_drag = false;
   _dnd_hovered_icon = 0;
-
-}
-
-std::list<char*>
-Launcher::StringToUriList(char* input)
-{
-  std::list<char*> result;
-
-  if (!input)
-    return result;
-
-  char** imtrappedinastringfactory = g_strsplit(input, "\r\n", -1);
-  int i = 0;
-  while (imtrappedinastringfactory[i]) // get kinda bored
-  {
-    // empty string check
-    if (imtrappedinastringfactory[i][0])
-      result.push_back(g_strdup(imtrappedinastringfactory[i]));
-    ++i;
-  }
-
-  g_strfreev(imtrappedinastringfactory);
-
-  return result;
 }
 
 void
 Launcher::ProcessDndMove(int x, int y, std::list<char*> mimes)
 {
-  std::list<char*>::iterator it;
   nux::Area* parent = GetToplevel();
-  char* uri_list_const = g_strdup("text/uri-list");
+  unity::glib::String uri_list_const(g_strdup("text/uri-list"));
 
   if (!_data_checked)
   {
     _data_checked = true;
-    _drag_data.clear();
+    _dnd_data.Reset();
 
     // get the data
-    for (it = mimes.begin(); it != mimes.end(); it++)
-    {
-      if (!g_str_equal(*it, uri_list_const))
+    for (auto it : mimes)
+    {    
+      if (!g_str_equal(it, uri_list_const.Value()))
         continue;
 
-      _drag_data = StringToUriList(nux::GetWindow().GetDndData(uri_list_const));
+      _dnd_data.Fill(nux::GetWindow().GetDndData(uri_list_const.Value()));
       break;
     }
-
+  
     // see if the launcher wants this one
-    for (it = _drag_data.begin(); it != _drag_data.end(); it++)
+    for (auto it : _dnd_data.Uris())
     {
-      if (g_str_has_suffix(*it, ".desktop"))
+      if (g_str_has_suffix(it.c_str(), ".desktop"))
       {
         _steal_drag = true;
         break;
@@ -2916,19 +2946,18 @@
     SetActionState(ACTION_DRAG_EXTERNAL);
     SetStateMouseOverLauncher(true);
 
-    LauncherModel::iterator it;
-    for (it = _model->begin(); it != _model->end() && !_steal_drag; it++)
+    if (!_steal_drag)
     {
-      if ((*it)->QueryAcceptDrop(_drag_data) != nux::DNDACTION_NONE && !_steal_drag)
-        (*it)->SetQuirk(LauncherIcon::QUIRK_DROP_PRELIGHT, true);
-      else
-        (*it)->SetQuirk(LauncherIcon::QUIRK_DROP_DIM, true);
+      for (auto it : *_model)
+      {
+        if (it->QueryAcceptDrop(_dnd_data) != nux::DNDACTION_NONE)
+          it->SetQuirk(LauncherIcon::QUIRK_DROP_PRELIGHT, true);
+        else
+          it->SetQuirk(LauncherIcon::QUIRK_DROP_DIM, true);
+      }
     }
-
   }
 
-  g_free(uri_list_const);
-
   SetMousePosition(x - parent->GetGeometry().x, y - parent->GetGeometry().y);
 
   if (_mouse_position.x == 0 && _mouse_position.y <= (_parent->GetGeometry().height - _icon_size - 2 * _space_between_icons) && !_drag_edge_touching)
@@ -2991,7 +3020,7 @@
       if (hovered_icon)
       {
         hovered_icon->SendDndEnter();
-        _drag_action = hovered_icon->QueryAcceptDrop(_drag_data);
+        _drag_action = hovered_icon->QueryAcceptDrop(_dnd_data);
       }
       else
       {
@@ -3020,23 +3049,21 @@
   if (_steal_drag)
   {
     char* path = 0;
-    std::list<char*>::iterator it;
 
-    for (it = _drag_data.begin(); it != _drag_data.end(); it++)
+    for (auto it : _dnd_data.Uris())
     {
-      if (g_str_has_suffix(*it, ".desktop"))
+      if (g_str_has_suffix(it.c_str(), ".desktop"))
       {
-        if (g_str_has_prefix(*it, "application://"))
+        if (g_str_has_prefix(it.c_str(), "application://"))
         {
-          const char* tmp = *it + strlen("application://");
-          char* tmp2 = g_strdup_printf("file:///usr/share/applications/%s", tmp);
-          path = g_filename_from_uri(tmp2, NULL, NULL);
-          g_free(tmp2);
+          const char* tmp = it.c_str() + strlen("application://");
+          unity::glib::String tmp2(g_strdup_printf("file:///usr/share/applications/%s", tmp));
+          path = g_filename_from_uri(tmp2.Value(), NULL, NULL);
           break;
         }
-        else if (g_str_has_prefix(*it, "file://"))
+        else if (g_str_has_prefix(it.c_str(), "file://"))
         {
-          path = g_filename_from_uri(*it, NULL, NULL);
+          path = g_filename_from_uri(it.c_str(), NULL, NULL);
           break;
         }
       }
@@ -3050,7 +3077,7 @@
   }
   else if (_dnd_hovered_icon && _drag_action != nux::DNDACTION_NONE)
   {
-    _dnd_hovered_icon->AcceptDrop(_drag_data);
+    _dnd_hovered_icon->AcceptDrop(_dnd_data);
   }
 
   if (_drag_action != nux::DNDACTION_NONE)
@@ -3059,10 +3086,9 @@
     SendDndFinished(false, _drag_action);
 
   // reset our shiz
-  ProcessDndLeave();
+  DndLeave();
 }
 
-
 /*
  * Returns the current selected icon if it is in keynavmode
  * It will return NULL if it is not on keynavmode

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-08-13 06:17:26 +0000
+++ plugins/unityshell/src/Launcher.h	2011-08-19 08:55:26 +0000
@@ -27,6 +27,10 @@
 #include <Nux/View.h>
 #include <Nux/BaseWindow.h>
 
+#include "AbstractIconRenderer.h"
+#include "DNDCollectionWindow.h"
+#include "DndData.h"
+#include "GeisAdapter.h"
 #include "Introspectable.h"
 #include "LauncherIcon.h"
 #include "LauncherDragWindow.h"
@@ -35,9 +39,6 @@
 #include "NuxGraphics/IOpenGLAsmShader.h"
 #include "Nux/TimerProc.h"
 #include "PluginAdapter.h"
-#include "GeisAdapter.h"
-
-#include "AbstractIconRenderer.h"
 
 #define ANIM_DURATION_SHORT 125
 #define ANIM_DURATION       200
@@ -204,6 +205,7 @@
   const gchar* GetName();
   void AddProperties(GVariantBuilder* builder);
 
+  void DndLeave();
   void ProcessDndEnter();
   void ProcessDndLeave();
   void ProcessDndMove(int x, int y, std::list<char*> mimes);
@@ -361,9 +363,9 @@
 
   gboolean TapOnSuper();
 
-  std::list<char*> StringToUriList(char* input);
-
   static void SettingsChanged(GSettings* settings, gchar* key, Launcher* self);
+  
+  void OnDNDDataCollected(const std::list<char*>& mimes);
 
   nux::HLayout* m_Layout;
   int m_ContentOffsetY;
@@ -446,12 +448,14 @@
   LauncherHoverMachine* _hover_machine;
   CompScreen* _screen;
 
-  std::list<char*> _drag_data;
+  unity::DndData _dnd_data;
   nux::DndAction    _drag_action;
   bool              _data_checked;
   bool              _steal_drag;
   bool              _drag_edge_touching;
   LauncherIcon*     _dnd_hovered_icon;
+  unity::DNDCollectionWindow* _collection_window;
+  sigc::connection _on_data_collected_connection;
 
   Atom              _selection_atom;
 
@@ -489,5 +493,3 @@
 };
 
 #endif // LAUNCHER_H
-
-

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2011-08-10 12:12:18 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2011-08-19 08:55:26 +0000
@@ -804,10 +804,10 @@
 {
   if (_quirks[quirk] == value)
     return;
-    
+      
   if (quirk == QUIRK_PULSE_ONCE)
     _launcher->HideMachine()->SetQuirk(LauncherHideMachine::LAUNCHER_PULSE, value);
-
+  
   _quirks[quirk] = value;
   if (quirk == QUIRK_VISIBLE)
     Launcher::SetTimeStruct(&(_quirk_times[quirk]), &(_quirk_times[quirk]), ANIM_DURATION_SHORT);

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2011-08-07 23:19:44 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2011-08-19 08:55:26 +0000
@@ -21,6 +21,9 @@
 #ifndef LAUNCHERICON_H
 #define LAUNCHERICON_H
 
+#include <set>
+#include <string>
+
 #include <Nux/Nux.h>
 #include <Nux/BaseWindow.h>
 #include <NuxCore/Math/MathInc.h>
@@ -43,7 +46,6 @@
 
 class Launcher;
 
-
 class LauncherIcon : public AbstractLauncherIcon, public unity::Introspectable, public nux::InitiallyUnownedObject
 {
   NUX_DECLARE_OBJECT_TYPE(LauncherIcon, nux::InitiallyUnownedObject);
@@ -150,14 +152,14 @@
 
   void RemoveEntryRemote(LauncherEntryRemote* remote);
 
-  nux::DndAction QueryAcceptDrop(std::list<char*> paths)
+  nux::DndAction QueryAcceptDrop(unity::DndData& dnd_data)
   {
-    return OnQueryAcceptDrop(paths);
+    return OnQueryAcceptDrop(dnd_data);
   }
 
-  void AcceptDrop(std::list<char*> paths)
+  void AcceptDrop(unity::DndData& dnd_data)
   {
-    return OnAcceptDrop(paths);
+    return OnAcceptDrop(dnd_data);
   }
 
   void SendDndEnter()
@@ -221,12 +223,12 @@
     return 0;
   }
 
-  virtual nux::DndAction OnQueryAcceptDrop(std::list<char*> files)
+  virtual nux::DndAction OnQueryAcceptDrop(unity::DndData& dnd_data)
   {
     return nux::DNDACTION_NONE;
   }
 
-  virtual void OnAcceptDrop(std::list<char*> files) {}
+  virtual void OnAcceptDrop(unity::DndData& dnd_data) {}
 
   virtual void OnDndEnter() {}
 
@@ -327,7 +329,7 @@
 
   std::list<LauncherEntryRemote*> _entry_list;
   std::map<std::string, std::vector<nux::Vector4> > transform_map;
-
+  
 };
 
 #endif // LAUNCHERICON_H

=== modified file 'plugins/unityshell/src/MockLauncherIcon.h'
--- plugins/unityshell/src/MockLauncherIcon.h	2011-08-04 20:19:46 +0000
+++ plugins/unityshell/src/MockLauncherIcon.h	2011-08-19 08:55:26 +0000
@@ -179,12 +179,12 @@
     return std::list<DbusmenuMenuitem*> ();
   }
 
-  nux::DndAction QueryAcceptDrop(std::list<char*> paths)
+  nux::DndAction QueryAcceptDrop(unity::DndData& dnd_data)
   {
     return nux::DNDACTION_NONE;
   }
 
-  void AcceptDrop(std::list<char*> paths) {}
+  void AcceptDrop(unity::DndData& dnd_data) {}
 
   void SendDndEnter() {}
 

=== modified file 'plugins/unityshell/src/TrashLauncherIcon.cpp'
--- plugins/unityshell/src/TrashLauncherIcon.cpp	2011-07-30 09:00:43 +0000
+++ plugins/unityshell/src/TrashLauncherIcon.cpp	2011-08-19 08:55:26 +0000
@@ -18,15 +18,17 @@
  */
 
 #include "TrashLauncherIcon.h"
+
+#include <Nux/WindowCompositor.h>
+
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
+#include <gconf/gconf-client.h>
+
 #include "Launcher.h"
-#include "Nux/WindowCompositor.h"
-
 #include "QuicklistManager.h"
 #include "QuicklistMenuItemLabel.h"
 
-#include <gio/gio.h>
-#include <glib/gi18n-lib.h>
-#include <gconf/gconf-client.h>
 
 #define ASK_CONFIRMATION_KEY "/apps/nautilus/preferences/confirm_trash"
 
@@ -277,19 +279,17 @@
 }
 
 nux::DndAction
-TrashLauncherIcon::OnQueryAcceptDrop(std::list<char*> uris)
+TrashLauncherIcon::OnQueryAcceptDrop(unity::DndData& dnd_data)
 {
   return nux::DNDACTION_MOVE;
 }
 
 void
-TrashLauncherIcon::OnAcceptDrop(std::list<char*> uris)
+TrashLauncherIcon::OnAcceptDrop(unity::DndData& dnd_data)
 {
-  std::list<char*>::iterator it;
-
-  for (it = uris.begin(); it != uris.end(); it++)
+  for (auto it : dnd_data.Uris())
   {
-    GFile* file = g_file_new_for_uri(*it);
+    GFile* file = g_file_new_for_uri(it.c_str());
     g_file_trash(file, NULL, NULL);
     g_object_unref(file);
   }

=== modified file 'plugins/unityshell/src/TrashLauncherIcon.h'
--- plugins/unityshell/src/TrashLauncherIcon.h	2011-07-21 14:59:25 +0000
+++ plugins/unityshell/src/TrashLauncherIcon.h	2011-08-19 08:55:26 +0000
@@ -20,6 +20,7 @@
 #ifndef TRASHLAUNCHERICON_H
 #define TRASHLAUNCHERICON_H
 
+#include "DndData.h"
 #include "SimpleLauncherIcon.h"
 
 class TrashLauncherIcon : public SimpleLauncherIcon
@@ -35,8 +36,8 @@
 protected:
   void UpdateTrashIcon();
 
-  nux::DndAction OnQueryAcceptDrop(std::list<char*> uris);
-  void OnAcceptDrop(std::list<char*> uris);
+  nux::DndAction OnQueryAcceptDrop(unity::DndData& dnd_data);
+  void OnAcceptDrop(unity::DndData& dnd_data);
 
 private:
   gulong _on_trash_changed_handler_id;