add wpf control · Pull Request #2004 · microsoft/terminal

ghost · 2019-07-17T15:51:58Z

Summary of the Pull Request

This PR adds a WPF control to the terminal repo. This should be mostly ready to merge, barring anywhere where I might have missed renaming source files / assembly names to something more appropriate. Missing features from the control are theming support (to be added in a later PR) and accesibility, for Accesibility I was hoping to get some help from the console team since the UIA tree work is relatively new and your team knows that code the best.

References

PR Checklist

Closes #xxx
CLA signed. If not, go over here and sign the CLA
Tests added/passed
Requires documentation to be updated
I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Validation Steps Performed

Control was added to a test application and verified to work.

add scroll support

cleanup erroneous code

add text selection

properly destruct hwnd when closing

build managed code in "AnyCPU" mode

render default background color in the gutter

Added text selection handling for clipboard on right click

cleanup namespaces

OpenConsole.sln

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

src/cascadia/PublicTerminalCore/Source.cpp

src/cascadia/WpfTerminalControl/TerminalContainer.cs

src/cascadia/WpfTerminalControl/TerminalControl.xaml.cs

src/cascadia/WpfTerminalControl/Themes/Generic.xaml

Unify input handling across terminal implementations

…tor) through interfaces. Add protected default constructors where necessary to satisfy children base construction needs.

rub8n · 2019-10-09T20:30:59Z

Labeled Needs-Second to call team attention to it because it's a big one and will take time to review.

Any estimates on when we'll be able to finalize the integration?

DHowett-MSFT · 2019-10-09T20:32:39Z

@rub8n I'm looking at it.

DHowett-MSFT

Overall good, but mostly some questions I'd like answers to.

Broadly, I am most concerned about the changes to TerminalInput as it is shared with conhost. Just so long as nothing breaks there.

I wonder if lhecker's changes in #3117 and #2836 impact the new shared code?

src/buffer/out/textBuffer.hpp

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

src/terminal/input/terminalInput.cpp

DHowett-MSFT

I'm fine with this.

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

DHowett-MSFT · 2019-10-11T00:32:50Z

Can't merge until SA passes.

ghost · 2019-10-11T16:52:38Z

@DHowett-MSFT or @miniksa do you know why SA is giving me errors in textBuffer.hpp when I haven't changed the file at all? I'm also not sure what the error means and how to correct it.

Edit: nevermind, I went through the commit history and realized this were fixes @miniksa added when we turned on auditing for the new project. I'll re-add the textbuffer edit I removed earlier.

DHowett-MSFT

@ZoeyR so static analysis is somewhat viral: you hadn’t changed textBuffer, but you added a project to SA that depends on it so its header comes under SA purview

DHowett-MSFT

This looks awesome. Thank you, @ZoeyR.

DHowett-MSFT · 2019-10-11T18:48:11Z

@miniksa you're not green any longer. Merge at will.

miniksa

I'm good with this, but if you wouldn't mind doing the last two non-W to W function substitutions Dustin mentioned, I'd appreciate it. Then I'll hit the good ol' merge.

miniksa · 2019-10-11T20:26:33Z

@ZoeyR, excellent. I'll watch this spot and merge it when the checks finish.

ghost · 2019-10-11T21:00:10Z

@miniksa aaaaaand we're green!

Daniel Griffen and others added 15 commits June 20, 2019 10:19

add wpf control

9cc1b9c

add scroll support

19421ad

Merge pull request #1 from dgriffen/dev/dgriffen/scrolling

74130f9

add scroll support

cleanup erroneous code

fcb88a5

Merge pull request #2 from dgriffen/dev/dgriffen/minor-cleanup

ef9baf9

cleanup erroneous code

add text selection

8e770d8

render default background color in the gutter

70d4b3f

Merge pull request #3 from dgriffen/dev/dgriffen/text-selection

d753ad6

add text selection

build managed code in "AnyCPU" mode

91948a5

properly destruct hwnd when closing

94539d8

Merge pull request #6 from dgriffen/dev/dgriffen/cleanup-window

3a59e83

properly destruct hwnd when closing

Merge pull request #5 from dgriffen/dev/dgriffen/anycpu-building

b477cdf

build managed code in "AnyCPU" mode

Merge pull request #4 from dgriffen/dev/dgriffen/gutter-color

8a06409

render default background color in the gutter

Added text selection handling for clipboard on right click

53dd2be

Merge pull request #7 from dgriffen/dev/jadelaga/RightClickCopyPaste

dbab0bf

Added text selection handling for clipboard on right click

ghost mentioned this pull request Jul 17, 2019

[WIP] add wpf control #1347

Closed

5 tasks

Daniel Griffen added 5 commits July 17, 2019 10:55

cleanup namespaces

ad4e851

remove unneeded xml tag

cff8d52

Merge pull request #8 from dgriffen/dev/dgriffen/cleanup-namespaces

e9bd0b3

cleanup namespaces

Merge branch 'master' into team/wpfcontrol

c9c0ccb

fix warnings and potential memory corruption

82fa3c3

This was referenced Jul 24, 2019

Add chocolatey installation method #2044

Closed

Feature Request: Make it easier for others to reuse Terminal code for Win7 #2077

Closed

miniksa reviewed Jul 24, 2019

View reviewed changes

Daniel Griffen added 6 commits July 25, 2019 10:05

remove nuget dependencies

c7c542c

address some feedback

9fb4eb9

Merge branch 'master' into team/wpfcontrol

ae2f549

move typing handlers to shared location

ca903f0

use the shared typing handler in wpf control

961f525

Merge pull request #9 from dgriffen/dev/dgriffen/unify-input-handling

265bfab

Unify input handling across terminal implementations

miniksa and others added 5 commits October 4, 2019 13:00

Fix warnings in PublicTerminalCore.

2541f48

Warnings in dependent projects (except rule of five warning C26432).

fccc315

Apply rule of 5 (copy/move constructor, copy/move assignment, destruc…

b12ca63

…tor) through interfaces. Add protected default constructors where necessary to satisfy children base construction needs.

fix formatting

1d49bb4

enable terminal settings build in audit mode

607a8ea

DHowett-MSFT suggested changes Oct 9, 2019

View reviewed changes

ghost added Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something and removed Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something labels Oct 9, 2019

Zoey Riordan added 2 commits October 10, 2019 12:21

address more feedback

143d3fe

fix resize bug when the font is updated

e8bd4a5

ghost requested a review from DHowett-MSFT October 10, 2019 22:53

DHowett-MSFT approved these changes Oct 11, 2019

View reviewed changes

src/cascadia/PublicTerminalCore/HwndTerminal.cpp Outdated Show resolved Hide resolved

fix focus issues

af72a69

re-add textbuffer fix

f5ba2c7

DHowett-MSFT reviewed Oct 11, 2019

View reviewed changes

address some nits

79fe23f

ghost requested a review from miniksa October 11, 2019 18:25

DHowett-MSFT approved these changes Oct 11, 2019

View reviewed changes

miniksa approved these changes Oct 11, 2019

View reviewed changes

use 'W' variants of methods

494aa18

miniksa merged commit b9233c0 into microsoft:master Oct 11, 2019

This was referenced Nov 1, 2019

Error building the project for first time - "Unable to resolve .vcxproj file for .NetFramework" #3400

Closed

dx: don't check the OS version multiple times #3480

Merged

Conversation

ghost commented Jul 17, 2019

Summary of the Pull Request

References

PR Checklist

Validation Steps Performed

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rub8n commented Oct 9, 2019

Uh oh!

DHowett-MSFT commented Oct 9, 2019

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DHowett-MSFT left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DHowett-MSFT commented Oct 11, 2019

Uh oh!

ghost commented Oct 11, 2019 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

DHowett-MSFT commented Oct 11, 2019

Uh oh!

miniksa left a comment

Choose a reason for hiding this comment

Uh oh!

miniksa commented Oct 11, 2019

Uh oh!

ghost commented Oct 11, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ghost commented Oct 11, 2019 •

edited by ghost

Loading