Add support for multiple panes in the same window #825

zadjii-msft · 2019-05-15T16:09:23Z

This is probably good enough to PR, but might not be polished enough to ship quite yet. There's a LOT of work to still do one panes, even after this is checked in. See #1000 for the megathread of all panes related issues.

Things that might need todo's, and what issue they're linked to:

Clicking on a pane focuses it, but also starts a selection. This is probably Terminal selects a char when bringing window to foreground #670
You can tab between panes. That's obviously unwanted. This is also related to Shift-Tab through powershell window goes back one command then switches outside of window #744
If you click on the separator's between panes, then on panes will be focused. Related to Clicking in a non-terminal control area should not steal focus from the terminal control #528 but definitely different. If you click on the separators between panes, then no panes will be focused #999
You can't resize panes. They're always 50% of their parent. Panes should be resizable with the keyboard. #991 Panes should be resizable with the mouse #992
You have to exit the shell to close the pane, there's no shortcut for "ClosePane" Add a shortcut for Close Pane #993
You can only open a pane with the default profile Open panes with a specific profile #998
- I left space for adding support for opening a specific pane, but it didn't really seem like there was a good keychord for doing this currently. Maybe if we added support for multi-key keychords, then it'd make more sense.
There's no real UI to indicate that a particular pane is focused, other than the blinking cursor. Add a UI to indicate a pane is focused. #994
You can't navigate the focus of panes with the keyboard currently. The user should be able to navigate the focus of panes with the keyboard #995
I'm not sure Ctrl+Shift+plus and Ctrl+Shift+- are the right combo for splitting. Maybe we move them to Alt+Shift+plus/-
- This would nicely fit with Alt+Shift+Arrows to navigate focus.
- I'm removing the default keybinding entirely. If people want to start using this experimental feature, they can add the keybinding manually. The fundamentals of this PR should be in sooner than later, but the feature probably isn't ready for most people yet.

I'm pretty sure most of these don't need to be addressed in the initial PR, and can have follow-up tasks created, but they're all important to note.

This pretty aggressively touches Tab.cpp and App.cpp. App.cpp was doing a lot of work that assumed there was one control per tab. I figured that getting the structure in now would be beneficial, before we add any more code that assumes that.

Closes #532

* adds two keybindings, Ctrl+Shift++ and Ctrl+Shift+- for horizontal and vertical split, respectively. * Splits only open the default profile - This should probably be a setting, whether to use the default or a new copy of the current pane. There should also be a keystroke for opening a pane with a specific profile. * Only supports one pane ATM. * need to figure out which control is actively focused. Having an IsFocused method on the TermControl seems wrong.

Moving focus between panes is still a janky - selection isn't dismissed when the TermControl loses focus, and the cursor remains visible. Switching to a tab with panes doesn't focus _any_ control, so that's bad.

On reload of settings, change the icon of the tab to that of the last focused pane

# Conflicts: # src/cascadia/TerminalApp/App.cpp # src/cascadia/TerminalApp/AppKeyBindings.cpp # src/cascadia/TerminalApp/AppKeyBindings.idl

But something seems fucky with the closing of the tabs. I'm getting crashes, when I close with `exit` from the commandline and `closeOnExit:true`, but I don't think it has anything to with my change. Gonna mess with master and see if it's busted.

…ably _more_ wrong.

…t's probably _more_ wrong." This reverts commit 23930b5.

…s closed.

mdtauk · 2019-05-15T16:20:13Z

Will those panes need their own TabView controls?

I am assuming these panes are live consoles, and not just an area to pin/copy output for easy reference, as per #644 which I submitted?

zadjii-msft · 2019-05-15T16:35:36Z

@mdtauk That's correct, these are full terminal instances.

@DHowett-MSFT and I previously discussed the merits of having top-level tabs and then nested panes vs toplevel panes with nested tabs, and felt that toplevel tabs (similar to tmux) would be the better UX. If each pane had it's own tabview, that would result in a good amount of window real estate being dedicated to just displaying tabs.

This could in the future be used to support pinning content in a new pane. Theoretically you don't even need to limit it to another terminal control in the pane (though this PR is definitely limited to a terminal in the pane). I'll leave that discussion for #644.

DHowett-MSFT · 2019-05-15T16:38:11Z

Wow! Phone thoughts before reviewing:

Ctrl+Shift+_ looks like a divider... and so does |!

Neither of those characters have a direct VT representation, I believe?

DHowett-MSFT

I'd love to see a design doc on this go into docs/specs; it'll be good to get a quick overview of why it works the way it does.. and also what "the way it does" is.
Should SplitVertical/Horizontal be AddSplit(const Pane::SplitState)?

src/cascadia/TerminalApp/App.cpp

src/cascadia/TerminalApp/CascadiaSettings.cpp

src/cascadia/TerminalApp/Pane.cpp

src/cascadia/TerminalApp/Tab.cpp

src/cascadia/TerminalControl/TermControl.cpp

miniksa · 2019-05-16T03:34:03Z

Wow! Phone thoughts before reviewing:

Ctrl+Shift+_ looks like a divider... and so does |!

Neither of those characters have a direct VT representation, I believe?

That's super creative and I love it if it doesn't conflict with a VT sequence.

mdtauk · 2019-05-16T17:14:04Z

I am assuming there will be keyboard shortcuts for creating these panes. Might I suggest they be added to the Context Menu also.
------------
Split Right
Split Below
------------

src/cascadia/TerminalApp/Pane.cpp

# Conflicts: # src/cascadia/TerminalApp/App.cpp # src/cascadia/TerminalApp/AppKeyBindings.cpp

zadjii-msft · 2019-05-17T16:46:29Z

My only qualm with | and - as the shortcuts for new panes is that the key for | is a layout-dependent vkey:

https://docs.microsoft.com/en-us/windows/desktop/inputdev/virtual-key-codes

Constant/value	Description
VK_OEM_5 0xDC	Used for miscellaneous characters; it can vary by keyboard. For the US standard keyboard, the '\|' key

So it'll work great on EN-US, but I don't know about other locales. + didn't have that problem.

I really like that Ctrl+| isn't otherwise a VT sequence though. (Technically ctrl+\ is, but ctrl+shift+\ == ctrl+|). ctrl+- is not a sequence, while ctrl+shift+- == ctrl+_ is.

My thinking with moving to Alt+Shift+plus and Alt+Shift+- (^[+ and ^[_) is to put moving between panes on alt+arrow, and generally putting pane-like operations on alt.

Actually, playing with this more, Ctrl+= and Ctrl+- are both not VT sequences...

# Conflicts: # src/cascadia/TerminalApp/AppKeyBindings.cpp

doc/cascadia/Panes.md

DHowett-MSFT · 2019-06-07T18:33:50Z

src/cascadia/TerminalApp/Pane.h

+
+#pragma once
+#include <winrt/Microsoft.Terminal.TerminalControl.h>
+#include "../../cascadia/inc/cppwinrt_utils.h"


src/cascadia/TerminalApp/Tab.cpp

Don't capture a dead reference Co-Authored-By: Dustin L. Howett (MSFT) <[email protected]>

miniksa

src/cascadia/TerminalApp/Tab.cpp

Let's try and write code in github

Summon528 · 2019-06-08T02:15:34Z

You might also want to close #745 and #541

wclr · 2019-07-08T14:40:59Z

When this can be expected on Insiders update?

zadjii-msft · 2019-07-08T14:59:50Z

@whitecolor this is in the version that's currently available on the Store. You need to add splitHorizontal and splitVertical keybindings manually. Note though that panes are super beta and kinda buggy and unpolished ATM.

wclr · 2019-07-08T21:20:12Z

@zadjii-msft I tried it so a little buggy but actually may work)

Is it possible to close exiting split pane, is there a command? Ctrl+W closes tab would be better to close the current split.
Is there commands to jump between splits? (Alt +arrow) I think is used often for this.

zadjii-msft · 2019-07-09T12:17:32Z

@whitecolor Not yet, but most of these are being tracked by #1000

Weilet · 2019-11-08T14:33:28Z

Is there any possibility to custom the style of the splitter?

zadjii-msft · 2019-11-08T14:48:03Z

@Weilet Not currently. I'll direct your attention to:

Add a setting to manually set the Pane highlight color #3061 Add a setting to manually set the Pane highlight color
Add a configuration object for focused vs unfocused state #3062 Add a configuration object for focused vs unfocused state
Add a setting to manually set the Pane border width #3063 Add a setting to manually set the Pane border width

And others listed in #1000

Meir017 · 2019-11-26T17:48:16Z

Amazing feature 👍
Is there a plan to add support for typing into multiple panes?

zadjii-msft · 2019-11-26T18:00:16Z

@Meir017 You're probably looking for "Support broadcast input? #2634"

Meir017 · 2019-11-26T18:24:21Z

@zadjii-msft exactly 💯

zadjii-msft added 16 commits May 8, 2019 17:28

Start working on adding support for panes

606dd57

This works for nesting panes

a600b20

Moving focus between panes is still a janky - selection isn't dismissed when the TermControl loses focus, and the cursor remains visible. Switching to a tab with panes doesn't focus _any_ control, so that's bad.

Switching tabs keeps focus on the last active pane now

faaba47

Reload settings for the panes.

9b792d3

On reload of settings, change the icon of the tab to that of the last focused pane

Get titles working again

7ca3e8d

Update the icon too

db7523a

Pull these two guys into helpers

7258a71

Merge remote-tracking branch 'origin/master' into dev/migrie/f/panes

29464ea

# Conflicts: # src/cascadia/TerminalApp/App.cpp # src/cascadia/TerminalApp/AppKeyBindings.cpp # src/cascadia/TerminalApp/AppKeyBindings.idl

This is me trying to mess with the tab closing, but I think it's prob…

23930b5

…ably _more_ wrong.

Revert "This is me trying to mess with the tab closing, but I think i…

a4fbc53

…t's probably _more_ wrong." This reverts commit 23930b5.

TONS of polish. Doc comments, etc.

b353e89

Correctly close a pane when one of it's children has children

dc3f522

Correctly move focus to a child with children when the focused pane i…

d45a9aa

…s closed.

doc comments for days

0a96ed4

zadjii-msft added Issue-Feature Complex enough to require an in depth planning process and actual budgeted, scheduled work. Area-User Interface Issues pertaining to the user interface of the Console or Terminal labels May 15, 2019

zadjii-msft added this to the Windows Terminal v1.0 milestone May 15, 2019

DHowett-MSFT suggested changes May 15, 2019

View reviewed changes

DHowett-MSFT mentioned this pull request May 15, 2019

Feature request: suppress VT title and prefer profile name (or something else) #608

Closed

mKay00 reviewed May 16, 2019

View reviewed changes

src/cascadia/TerminalApp/Pane.cpp Outdated Show resolved Hide resolved

Merge remote-tracking branch 'origin/master' into dev/migrie/f/panes

a754474

# Conflicts: # src/cascadia/TerminalApp/App.cpp # src/cascadia/TerminalApp/AppKeyBindings.cpp

This is most all of the PR feedback

ff21bd2

zadjii-msft mentioned this pull request Jun 7, 2019

Feature Request: Split windows #532

Closed

zadjii-msft and others added 3 commits June 7, 2019 08:59

Clean up some typos

c6311f7

Merge remote-tracking branch 'origin/master' into dev/migrie/f/panes

a76db18

# Conflicts: # src/cascadia/TerminalApp/AppKeyBindings.cpp

Fixed build error

c265317

carlos-zamora approved these changes Jun 7, 2019

View reviewed changes

DHowett-MSFT approved these changes Jun 7, 2019

View reviewed changes

zadjii-msft commented Jun 7, 2019

View reviewed changes

src/cascadia/TerminalApp/Tab.cpp Show resolved Hide resolved

Apply suggestions from code review

14f3ffa

Don't capture a dead reference Co-Authored-By: Dustin L. Howett (MSFT) <[email protected]>

miniksa approved these changes Jun 7, 2019

View reviewed changes

zadjii-msft commented Jun 7, 2019

View reviewed changes

src/cascadia/TerminalApp/Tab.cpp Outdated Show resolved Hide resolved

zadjii-msft commented Jun 7, 2019

View reviewed changes

src/cascadia/TerminalApp/Tab.cpp Outdated Show resolved Hide resolved

src/cascadia/TerminalApp/Tab.cpp Outdated Show resolved Hide resolved

Apply suggestions from code review

f945c18

Let's try and write code in github

zadjii-msft merged commit 2da5b0b into master Jun 7, 2019

zadjii-msft deleted the dev/migrie/f/panes branch June 7, 2019 21:56

zadjii-msft mentioned this pull request Jun 7, 2019

Scenario: Add support for panes #1000

Open

59 tasks

This was referenced Jun 9, 2019

Add the keybinding for panes back #1190

Merged

There's a resource leak somewhere in the App/Control/Connection stack #745

Closed

DHowett-MSFT mentioned this pull request Jun 11, 2019

Tab teardown crashing resulting from renewed renderer destruction order issues #1198

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for multiple panes in the same window #825

Add support for multiple panes in the same window #825

zadjii-msft commented May 15, 2019 •

edited

Loading

mdtauk commented May 15, 2019

zadjii-msft commented May 15, 2019

DHowett-MSFT commented May 15, 2019

DHowett-MSFT left a comment

miniksa commented May 16, 2019

mdtauk commented May 16, 2019

zadjii-msft commented May 17, 2019

DHowett-MSFT Jun 7, 2019

miniksa left a comment

Summon528 commented Jun 8, 2019

wclr commented Jul 8, 2019

zadjii-msft commented Jul 8, 2019

wclr commented Jul 8, 2019

zadjii-msft commented Jul 9, 2019

Weilet commented Nov 8, 2019

zadjii-msft commented Nov 8, 2019

Meir017 commented Nov 26, 2019

zadjii-msft commented Nov 26, 2019

Meir017 commented Nov 26, 2019

Add support for multiple panes in the same window #825

Add support for multiple panes in the same window #825

Conversation

zadjii-msft commented May 15, 2019 • edited Loading

mdtauk commented May 15, 2019

zadjii-msft commented May 15, 2019

DHowett-MSFT commented May 15, 2019

DHowett-MSFT left a comment

Choose a reason for hiding this comment

miniksa commented May 16, 2019

mdtauk commented May 16, 2019

zadjii-msft commented May 17, 2019

DHowett-MSFT Jun 7, 2019

Choose a reason for hiding this comment

miniksa left a comment

Choose a reason for hiding this comment

Summon528 commented Jun 8, 2019

wclr commented Jul 8, 2019

zadjii-msft commented Jul 8, 2019

wclr commented Jul 8, 2019

zadjii-msft commented Jul 9, 2019

Weilet commented Nov 8, 2019

zadjii-msft commented Nov 8, 2019

Meir017 commented Nov 26, 2019

zadjii-msft commented Nov 26, 2019

Meir017 commented Nov 26, 2019

zadjii-msft commented May 15, 2019 •

edited

Loading