Chunk Selection Expansion for Double/Triple Click Selection by carlos-zamora · Pull Request #2184 · microsoft/terminal

carlos-zamora · 2019-07-31T22:48:21Z

Summary of the Pull Request

Double/Triple click create a selection expanding beyond one cell. This PR makes it so that when you're dragging your mouse to expand the selection, you expand to the next delimiter defined by double/triple click.

So, double click expands by doubleClickDelimiter ranges. Triple click expands by line.

When you double/triple click, a word/line is selected. When you drag, that word/line will remain selected after the expansion occurs.

References

PR Checklist

Closes Feature Request - Chunk Selection #1933
CLA signed.
Tests ~~added/passed~~ not necessary
Requires documentation to be updated
I am a core contributor

Detailed Description of the Pull Request / Additional comments

Rather than resizing the selection when the mouse event occurs, I figured I'd do what I did with wide glyph selection: expand at render time.

We needed an enum multiClickSelectionMode to keep track of which expansion mode we're in.

Minor modifications to _ExpandDoubleClickSelection*(COORD) had to be made so that we can re-use them.

Actual expansion occurs in _GetSelectionRects()

Validation Steps Performed

generic double click test
- dir or ls
- double click a word
- drag up
- Works! ✔
double click on delimiter test
- dir or ls
- double click a word delimiter (i.e.: space between words)
- drag up
- Works! ✔
generic triple click test
- dir or ls
- triple click a line
- drag up
- Works! ✔
ALT + double click test
- dir or ls
- hold ALT
- double click a word
- drag up
- Works! ✔

repeat above tests in following scenarios:

when at top of scrollback
drag down instead of up

carlos-zamora · 2019-07-31T22:50:11Z

src/cascadia/TerminalCore/TerminalSelection.cpp

        }

+        // expand selection for Double/Triple Click
+        if (multiClickSelectionMode == selectionExpansionMode::Word && _selectionAnchor != _endSelectionPosition)


so, this little section here: _selectionAnchor != _endSelectionPosition is something that I can call a function in in #2152

I'll be sure to clean it up if (a) that PR goes in first or (b) after I do a general cleanup to address #1327

zadjii-msft

I think I'd really love to see some extra tests added for this in the TerminalCore tests.

src/cascadia/TerminalCore/TerminalSelection.cpp

carlos-zamora · 2019-08-01T17:20:01Z

~~BUG REPORT:~~
~~- double click~~
~~- drag to leftmost highlighted cell~~

~~Expected Behavior: entire word stays highlighted~~

~~Actual Behavior: selection changes to a 1x1 cell selection~~

#Resolved

throw HR if out of bounds

src/cascadia/TerminalCore/Terminal.hpp

DHowett-MSFT · 2019-08-13T23:21:03Z

src/cascadia/TerminalCore/TerminalSelection.cpp

+    if (viewportPos.X < 0 || viewportPos.X > _buffer->GetSize().RightInclusive())
    {
-        return viewportPos;
+        THROW_HR(E_INVALIDARG);


y new except

Theoretically, we should never hit this case. But, if somebody somehow did a double click OUTSIDE of the terminal, I think it makes sense to clamp it to the nearest valid buffer cell. So how does this sound?

positionWithOffsets.X = std::clamp(viewportPos.X, static_cast<SHORT>(0), _buffer->GetSize().RightInclusive()); positionWithOffsets.Y = std::clamp(viewportPos.Y, static_cast<SHORT>(0), _buffer->GetSize().BottomInclusive());

Note that this is explicitly should not be clamped to the viewport to allow for selections outside of the region we can see. This mainly affects scroll interactions (i.e.: auto scroll, scrolling into an existing selection, etc...).

src/cascadia/UnitTests_TerminalCore/ScreenSizeLimitsTest.cpp

zadjii-msft

Double/Triple Click testing

src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp

src/cascadia/TerminalCore/TerminalSelection.cpp

DHowett-MSFT · 2019-08-14T23:40:17Z

SA is out of disk space.

ghost · 2019-08-27T16:09:20Z

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

Handy links:

Chunk selection

35ca5d6

carlos-zamora self-assigned this Jul 31, 2019

carlos-zamora commented Jul 31, 2019

View reviewed changes

zadjii-msft reviewed Aug 1, 2019

View reviewed changes

src/cascadia/TerminalCore/TerminalSelection.cpp Outdated Show resolved Hide resolved

src/cascadia/TerminalCore/TerminalSelection.cpp Show resolved Hide resolved

carlos-zamora added 4 commits August 1, 2019 10:34

bugfix: double-click delimiter

c7ac572

throw HR if out of bounds

I hate the formatter, but it makes my code look better

3035815

Double/Triple Click testing

fa0198f

MOAR CODE FORMATTING

ceae2b8

This was referenced Aug 8, 2019

Bug Report: Double Click Selection should span delimiter runs #2353

Closed

Bug Report: Double Click should select delimiter runs #2206

Closed

DHowett-MSFT reviewed Aug 13, 2019

View reviewed changes

src/cascadia/TerminalCore/Terminal.hpp Outdated Show resolved Hide resolved

carlos-zamora added the Area-Interaction Interacting with the vintage console window (as opposed to driving via API or hooks) label Aug 13, 2019

PR change - enum nit

35c06f9

DHowett-MSFT approved these changes Aug 13, 2019

View reviewed changes

carlos-zamora added 3 commits August 13, 2019 16:26

Merge branch 'master' into dev/cazamor/chunk-selection

08c6e24

DHowett-MSFT's suggestions

8d9e9c3

code format AGAIN

b51d008

zadjii-msft approved these changes Aug 14, 2019

View reviewed changes

fix x86 failure

8dd436b

DHowett-MSFT suggested changes Aug 14, 2019

View reviewed changes

src/cascadia/UnitTests_TerminalCore/SelectionTest.cpp Show resolved Hide resolved

src/cascadia/TerminalCore/TerminalSelection.cpp 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 Aug 14, 2019

tests: add namespace

c4ea3fe

ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label Aug 14, 2019

DHowett-MSFT approved these changes Aug 14, 2019

View reviewed changes

DHowett-MSFT merged commit 1f41fd3 into master Aug 14, 2019

DHowett-MSFT deleted the dev/cazamor/chunk-selection branch August 14, 2019 23:41

ghost mentioned this pull request Aug 27, 2019

Feature Request - Chunk Selection #1933

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chunk Selection Expansion for Double/Triple Click Selection#2184

Chunk Selection Expansion for Double/Triple Click Selection#2184
DHowett-MSFT merged 11 commits intomasterfrom
dev/cazamor/chunk-selection

carlos-zamora commented Jul 31, 2019 •

edited

Loading

Uh oh!

carlos-zamora Jul 31, 2019

Uh oh!

zadjii-msft left a comment

Uh oh!

Uh oh!

Uh oh!

carlos-zamora commented Aug 1, 2019 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT Aug 13, 2019

Uh oh!

carlos-zamora Aug 14, 2019

Uh oh!

Uh oh!

zadjii-msft left a comment

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT commented Aug 14, 2019

Uh oh!

ghost commented Aug 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

carlos-zamora commented Jul 31, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of the Pull Request

References

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

carlos-zamora Jul 31, 2019

Choose a reason for hiding this comment

Uh oh!

zadjii-msft left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

carlos-zamora commented Aug 1, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT Aug 13, 2019

Choose a reason for hiding this comment

Uh oh!

carlos-zamora Aug 14, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

zadjii-msft left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT commented Aug 14, 2019

Uh oh!

ghost commented Aug 27, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

carlos-zamora commented Jul 31, 2019 •

edited

Loading

carlos-zamora commented Aug 1, 2019 •

edited

Loading