Merge pull request #272 from adobe/glenn/drag-and-drop

Add brackets.app.getDroppedFiles() function

Author: RaymondLim

appshell/appshell_extensions.cpp

@@ -26,6 +26,10 @@
 #include "native_menu_model.h"
 #include "appshell_node_process.h"
 
+#include <algorithm>
+
+extern std::vector<CefString> gDroppedFiles;
+
 namespace appshell_extensions {
 
 class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate {
@@ -429,6 +433,34 @@ class ProcessMessageDelegate : public ClientHandler::ProcessMessageDelegate {
                 error = GetPendingFilesToOpen(files);
                 responseArgs->SetString(2, files.c_str());
             }
+        } else if (message_name == "GetDroppedFiles") {
+            // Parameters:
+            //  0: int32 - callback id
+            if (argList->GetSize() != 1) {
+                error = ERR_INVALID_PARAMS;
+            }
+            
+            if (error == NO_ERROR) {
+                std::wstring files;
+                
+                files = L"[";
+                for (unsigned int i = 0; i < gDroppedFiles.size(); i++) {
+                    std::wstring file(gDroppedFiles[i]);
+                    // Convert windows paths to unix paths
+                    replace(file.begin(), file.end(), '\\', '/');
+                    files += L"\"";
+                    files += file;
+                    files += L"\"";
+                    if (i < gDroppedFiles.size() - 1) {
+                        files += L", ";
+                    }
+                }
+                files += L"]";
+                gDroppedFiles.clear();
+                
+                responseArgs->SetString(2, files.c_str());
+            }
+            
         } else if (message_name == "AddMenu") {
             // Parameters:
             //  0: int32 - callback id

appshell/appshell_extensions.js

@@ -494,10 +494,27 @@ if (!appshell.app) {
     appshell.app.getPendingFilesToOpen = function (callback) {
         GetPendingFilesToOpen(function (err, files) {
             // "files" is a string, convert to Array
-            callback(err, err ? [] : (files ? JSON.parse(files) : []));
+            callback(err, (err || !files) ? [] : JSON.parse(files));
         });
     };
 
+    /**
+     * Get files and folders dropped onto the application.
+     *
+     * @param {function(err, files)} callback Asynchronous callback function with two arguments:
+     *          err - error code
+     *          files - Array of file paths
+     *
+     * @return None. This is an asynchronous call that sends all return information to the callback.
+     */
+    native function GetDroppedFiles();
+    appshell.app.getDroppedFiles = function (callback) {
+        GetDroppedFiles(function (err, files) {
+            // "files" is a string, convert to Array
+            callback(err, (err || !files) ? [] : JSON.parse(files));
+        });
+    };
+ 
     /**
      * Get the remote debugging port used by the appshell.
      *

appshell/cefclient_win.cpp

@@ -585,25 +585,12 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) {
   if (!hWndMain)
     return FALSE;
 
-  DragAcceptFiles(hWndMain, TRUE);
   RestoreWindowPlacement(hWndMain, showCmd);
   UpdateWindow(hWndMain);
 
   return TRUE;
 }
 
-LRESULT HandleDropFiles(HDROP hDrop, CefRefPtr<ClientHandler> handler, CefRefPtr<CefBrowser> browser) {
-    UINT fileCount = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
-    for (UINT i = 0; i < fileCount; i++) {
-        wchar_t filename[MAX_PATH];
-        DragQueryFile(hDrop, i, filename, MAX_PATH);
-        std::wstring pathStr(filename);
-        replace(pathStr.begin(), pathStr.end(), '\\', '/');
-        handler->SendOpenFileCommand(browser, CefString(pathStr));
-    }
-    return 0;
-}
-
 //
 //  FUNCTION: WndProc(HWND, UINT, WPARAM, LPARAM)
 //
@@ -880,12 +867,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam,
       PostQuitMessage(0);
       return 0;
 
-    case WM_DROPFILES:
-        if (g_handler.get()) {
-            return HandleDropFiles((HDROP)wParam, g_handler, g_handler->GetBrowser());
-        }
-        return 0;
-
     case WM_INITMENUPOPUP:
         // Notify before popping up
         g_handler->SendJSCommand(g_handler->GetBrowser(), APP_BEFORE_MENUPOPUP);

appshell/client_handler.cpp

@@ -120,6 +120,21 @@ void ClientHandler::OnBeforeClose(CefRefPtr<CefBrowser> browser) {
   }
 }
 
+std::vector<CefString> gDroppedFiles;
+
+bool ClientHandler::OnDragEnter(CefRefPtr<CefBrowser> browser,
+                                CefRefPtr<CefDragData> dragData,
+                                DragOperationsMask mask) {
+    REQUIRE_UI_THREAD();
+    
+    if (dragData->IsFile()) {
+        gDroppedFiles.clear();
+        // Store the dragged files in a vector for later use
+        dragData->GetFileNames(gDroppedFiles);
+    }
+    return false;
+}
+
 void ClientHandler::OnLoadStart(CefRefPtr<CefBrowser> browser,
                                 CefRefPtr<CefFrame> frame) {
   REQUIRE_UI_THREAD();

appshell/client_handler.h

@@ -20,13 +20,14 @@
 // ClientHandler implementation.
 class ClientHandler : public CefClient,
                       public CefLifeSpanHandler,
+                      public CefDragHandler,
                       public CefLoadHandler,
                       public CefRequestHandler,
                       public CefDisplayHandler,
                       public CefKeyboardHandler,
                       public CefGeolocationHandler,
                       public CefContextMenuHandler {
- public:
+public:
   // Interface for process message delegates. Do not perform work in the
   // RenderDelegate constructor.
   class ProcessMessageDelegate : public virtual CefBase {
@@ -70,6 +71,9 @@ class ClientHandler : public CefClient,
   virtual CefRefPtr<CefLifeSpanHandler> GetLifeSpanHandler() OVERRIDE {
     return this;
   }
+  virtual CefRefPtr<CefDragHandler> GetDragHandler() OVERRIDE {
+    return this;
+  }
   virtual CefRefPtr<CefLoadHandler> GetLoadHandler() OVERRIDE {
     return this;
   }
@@ -99,6 +103,11 @@ class ClientHandler : public CefClient,
   virtual void OnAfterCreated(CefRefPtr<CefBrowser> browser) OVERRIDE;
   virtual bool DoClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
   virtual void OnBeforeClose(CefRefPtr<CefBrowser> browser) OVERRIDE;
+  
+  // CefDragHandler methods
+  virtual bool OnDragEnter(CefRefPtr<CefBrowser> browser,
+                           CefRefPtr<CefDragData> dragData,
+                           DragOperationsMask mask) OVERRIDE;
 
   // CefLoadHandler methods
   virtual void OnLoadStart(CefRefPtr<CefBrowser> browser,

appshell/client_handler_win.cpp

@@ -16,13 +16,9 @@
 
 extern CefRefPtr<ClientHandler> g_handler;
 
-// WM_DROPFILES handler, defined in cefclient_win.cpp
-extern LRESULT HandleDropFiles(HDROP hDrop, CefRefPtr<ClientHandler> handler, CefRefPtr<CefBrowser> browser);
-
 // Additional globals
 extern HACCEL hAccelTable;
 
-
 void ClientHandler::OnAddressChange(CefRefPtr<CefBrowser> browser,
                                     CefRefPtr<CefFrame> frame,
                                     const CefString& url) {
@@ -147,12 +143,6 @@ LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
       }
       break;
 
-    case WM_DROPFILES:
-      if (g_handler.get() && browser.get()) {
-        return HandleDropFiles((HDROP)wParam, g_handler, browser);
-      }
-      break;
-
     case WM_INITMENUPOPUP:
         HMENU menu = (HMENU)wParam;
         int count = GetMenuItemCount(menu);