Add support for dragging and dropping paths onto the Terminal by zadjii-msft · Pull Request #4323 · microsoft/terminal

zadjii-msft · 2020-01-21T22:00:41Z

Summary of the Pull Request

I took the code from conhost that handles this and just copy-pasted it into the terminal codebase.

References

Original conhost code:

terminal/src/interactivity/win32/windowproc.cpp

Lines 854 to 889 in 027f122

    
           // Routine Description: 
        
           // - This routine is called when ConsoleWindowProc receives a WM_DROPFILES message. 
        
           // - It initially calls DragQueryFile() to calculate the number of files dropped and then DragQueryFile() is called to retrieve the filename. 
        
           // - DoStringPaste() pastes the filename to the console window 
        
           // Arguments: 
        
           // - wParam  - Identifies the structure containing the filenames of the dropped files. 
        
           // - Console - Pointer to CONSOLE_INFORMATION structure 
        
           // Return Value: 
        
           // - <none> 
        
           void Window::_HandleDrop(const WPARAM wParam) const 
        
           { 
        
               WCHAR szPath[MAX_PATH]; 
        
               BOOL fAddQuotes; 
        
               if (DragQueryFile((HDROP)wParam, 0, szPath, ARRAYSIZE(szPath)) != 0) 
        
               { 
        
                   // Log a telemetry flag saying the user interacted with the Console 
        
                   // Only log when DragQueryFile succeeds, because if we don't when the console starts up, we're seeing 
        
                   // _HandleDrop get called multiple times (and DragQueryFile fail), 
        
                   // which can incorrectly mark this console session as interactive. 
        
                   Telemetry::Instance().SetUserInteractive(); 
        
                   fAddQuotes = (wcschr(szPath, L' ') != nullptr); 
        
                   if (fAddQuotes) 
        
                   { 
        
                       Clipboard::Instance().StringPaste(L"\"", 1); 
        
                   } 
        
                   Clipboard::Instance().StringPaste(szPath, wcslen(szPath)); 
        
                   if (fAddQuotes) 
        
                   { 
        
                       Clipboard::Instance().StringPaste(L"\"", 1); 
        
                   } 
        
               } 
        
           }

PR Checklist

Closes Drag and drop from File Explorer should put full path at cursor location in Windows Terminal #904
I work here
Tests added/passed
[n/a] Requires documentation to be updated

Detailed Description of the Pull Request / Additional comments

Okay it was a little more complicated than that. I had IslandWindow handle the drop, which then raises a generic event for AppHost to handle. AppHost handles this by writing the path as input to the terminal, traversing AppLogic, TerminalPage and finally landing in TermControl

Validation Steps Performed

Tested manually with both paths with and without spaces.

DHowett-MSFT · 2020-01-21T22:28:12Z

Not sure I like this- it won't work with universal terminal or anything that doesn't have a wndproc. Is there a XAML event we can listen to?

zadjii-msft · 2020-01-22T15:13:15Z

Not sure I like this- it won't work with universal terminal or anything that doesn't have a wndproc. Is there a XAML event we can listen to?

You've got a good point - I'll do that instead.

DHowett-MSFT

Giving my official NAK on this one to dequeue it

…ag-path # Conflicts: # src/cascadia/TerminalApp/AppLogic.cpp # src/cascadia/TerminalApp/TerminalPage.cpp # src/cascadia/TerminalApp/TerminalPage.h

DHowett-MSFT

Love it! We can probably back out all the non-TermControl changes, right?

carlos-zamora

A few minor things but nothing worth blocking over.

src/cascadia/TerminalControl/TermControl.cpp

miniksa

I saw nothing that Carlos didn't. Holding the check until Carlos's comments are complete, though.

src/cascadia/TerminalControl/TermControl.cpp

…ag-path

src/cascadia/TerminalControl/TermControl.cpp

DHowett-MSFT

I love it. Thanks!

ghost · 2020-01-30T17:39:00Z

Hello @zadjii-msft!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

zadjii-msft · 2020-01-30T18:33:53Z

/azp run

azure-pipelines · 2020-01-30T18:34:04Z

Azure Pipelines successfully started running 1 pipeline(s).

zadjii-msft · 2020-01-30T19:53:20Z

/azp run

azure-pipelines · 2020-01-30T19:53:31Z

Azure Pipelines successfully started running 1 pipeline(s).

ghost · 2020-02-13T18:03:17Z

🎉Windows Terminal Preview v0.9.433.0 has been released which incorporates this pull request.:tada:

Handy links:

Add support for dragging and dropping paths onto the Terminal

754ead8

zadjii-msft added Area-UserInterface Issues pertaining to the user interface of the Console or Terminal Product-Terminal The new Windows Terminal. labels Jan 21, 2020

zadjii-msft requested review from DHowett-MSFT, carlos-zamora, leonMSFT and miniksa January 21, 2020 22:00

DHowett-MSFT suggested changes Jan 24, 2020

View reviewed changes

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 24, 2020

zadjii-msft added 2 commits January 24, 2020 14:39

Merge branch 'master' into dev/migrie/f/904-drag-path

c473d54

Why doesn't this work??

08c7129

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 24, 2020

zadjii-msft added 3 commits January 27, 2020 08:34

do the UWP drag-drop instead

aefd6d9

Remove some code that's no longer needed

f468a4f

Merge remote-tracking branch 'origin/master' into dev/migrie/f/904-dr…

695b2ee

…ag-path # Conflicts: # src/cascadia/TerminalApp/AppLogic.cpp # src/cascadia/TerminalApp/TerminalPage.cpp # src/cascadia/TerminalApp/TerminalPage.h

DHowett-MSFT suggested changes Jan 27, 2020

View reviewed changes

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 27, 2020

Revert a bunch of changes that weren't needed anymore

0d734d8

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 27, 2020

zadjii-msft requested a review from DHowett-MSFT January 27, 2020 17:29

carlos-zamora approved these changes Jan 29, 2020

View reviewed changes

miniksa reviewed Jan 29, 2020

View reviewed changes

DHowett-MSFT suggested changes Jan 29, 2020

View reviewed changes

src/cascadia/TerminalControl/TermControl.cpp Outdated Show resolved Hide resolved

ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 29, 2020

Merge remote-tracking branch 'origin/master' into dev/migrie/f/904-dr…

b0ec743

…ag-path

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Jan 30, 2020

nits from pr

c17cc3d

DHowett-MSFT reviewed Jan 30, 2020

View reviewed changes

src/cascadia/TerminalControl/TermControl.cpp Outdated Show resolved Hide resolved

zadjii-msft mentioned this pull request Jan 30, 2020

Trying to figure out x64 test failures, don't review #4384

Closed

Write _all_ the files to the terminal for @DHowett-MSFT

5ac347f

DHowett-MSFT approved these changes Jan 30, 2020

View reviewed changes

zadjii-msft added the AutoMerge Marked for automatic merge by the bot when requirements are met label Jan 30, 2020

ghost merged commit 4ad77d9 into master Jan 30, 2020

ghost deleted the dev/migrie/f/904-drag-path branch January 30, 2020 20:14

ghost mentioned this pull request Feb 13, 2020

Drag and drop from File Explorer should put full path at cursor location in Windows Terminal #904

Closed

This pull request was closed.

	// Routine Description:
	// - This routine is called when ConsoleWindowProc receives a WM_DROPFILES message.
	// - It initially calls DragQueryFile() to calculate the number of files dropped and then DragQueryFile() is called to retrieve the filename.
	// - DoStringPaste() pastes the filename to the console window
	// Arguments:
	// - wParam - Identifies the structure containing the filenames of the dropped files.
	// - Console - Pointer to CONSOLE_INFORMATION structure
	// Return Value:
	// - <none>
	void Window::_HandleDrop(const WPARAM wParam) const
	{
	WCHAR szPath[MAX_PATH];
	BOOL fAddQuotes;

	if (DragQueryFile((HDROP)wParam, 0, szPath, ARRAYSIZE(szPath)) != 0)
	{
	// Log a telemetry flag saying the user interacted with the Console
	// Only log when DragQueryFile succeeds, because if we don't when the console starts up, we're seeing
	// _HandleDrop get called multiple times (and DragQueryFile fail),
	// which can incorrectly mark this console session as interactive.
	Telemetry::Instance().SetUserInteractive();

	fAddQuotes = (wcschr(szPath, L' ') != nullptr);
	if (fAddQuotes)
	{
	Clipboard::Instance().StringPaste(L"\"", 1);
	}

	Clipboard::Instance().StringPaste(szPath, wcslen(szPath));

	if (fAddQuotes)
	{
	Clipboard::Instance().StringPaste(L"\"", 1);
	}
	}
	}

Conversation

zadjii-msft commented Jan 21, 2020

Summary of the Pull Request

References

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

DHowett-MSFT commented Jan 21, 2020

Uh oh!

zadjii-msft commented Jan 22, 2020

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

carlos-zamora left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

miniksa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

ghost commented Jan 30, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

zadjii-msft commented Jan 30, 2020

Uh oh!

azure-pipelines bot commented Jan 30, 2020

Uh oh!

zadjii-msft commented Jan 30, 2020

Uh oh!

azure-pipelines bot commented Jan 30, 2020

Uh oh!

ghost commented Feb 13, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.