Add support for the `windowingBehavior` setting #9118

zadjii-msft · 2021-02-11T18:07:59Z

Adds support for the windowingBehavior global setting. This setting
controls how mutiple instances of wt behave in the absence of the -w
parameter. This setting has three values:

"useNew": (default) Multiple wt invocations (without the -w
param) always create new windows.
"useAnyExisting": When starting a new wt, we'll instead default to
any existing windows. wt -w -1 will still create new windows.
"useExisting": Similar to useAnyExisting, but limits to
windows on the current desktop.

The IVirtualDesktopManager interface is very limited. Hence why we
have to track the HWNDs manually, and ask if they're on the current
desktop.

Validation Steps Performed

I've been playing with it for a week now.

References #5000
References projects/5
References #8898
Spec'd in #8135
Closes #2227
Closes https://github.com/microsoft/terminal/projects/5#card-51431448
Closes https://github.com/microsoft/terminal/projects/5#card-51431433

…ompile a String[]

…then back!

…!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

…safely tear it down. It _seems_ like it.

….dll

…galactic-empire

…ndow should be. It just always says 0 for now, but in the future it could actually give us useful info.

zadjii-msft · 2021-02-18T12:09:29Z

Now the setting works right in the UI as well:

carlos-zamora

This is great! Just tagged Kayla on one thing because I don't want us to have to revisit the wordsmithing conversation later.

doc/cascadia/profiles.schema.json

src/cascadia/TerminalApp/AppLogic.cpp

carlos-zamora · 2021-02-18T17:53:46Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

+  <data name="Globals_WindowingBehavior.Header" xml:space="preserve">
+    <value>New windows open in...</value>
+  </data>
+  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+    <value>Controls how new terminal instances attach to existing windows.</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseNew.Content" xml:space="preserve">
+    <value>a new window</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseAnyExisting.Content" xml:space="preserve">
+    <value>the most recently used window</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseExisting.Content" xml:space="preserve">
+    <value>the most recently used window on this desktop</value>
+  </data>


@cinnamon-msft please take a look here. Easier to get the wording correct now than have to get it localized and change it later.

DHowett · 2021-02-18T20:33:00Z

minor minor nit: PR body needs updating to reflect current enum names for things

DHowett · 2021-02-18T20:47:36Z

DO NOT AUTOMERGE

…dowingBehavior

cinnamon-msft · 2021-02-18T23:31:20Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

@@ -232,6 +232,22 @@
  <data name="Globals_LaunchModeMaximized.Content" xml:space="preserve">
    <value>Maximized</value>
  </data>
+  <data name="Globals_WindowingBehavior.Header" xml:space="preserve">
+    <value>New windows open in...</value>


Suggested change

<value>New windows open in...</value>

<value>wt.exe window behavior</value>

Hmmmmm... this will be weird when Def Term is in

@cinnamon-msft Yea I concur. Plus I'm just not sure that the users will always think "ah yes, I'm running wt.exe". Like when running from the start menu - that's also going to behave this way.

I'm fine flipping these back since what's proposed is basically what I had originally - I just want to make sure we're sure, and I'm not so sure about mentioning "wt.exe"

Maybe Launch window behavior?

cinnamon-msft · 2021-02-18T23:31:52Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

+    <value>Controls how new terminal instances attach to existing windows.</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseNew.Content" xml:space="preserve">
+    <value>a new window</value>


Suggested change

<value>a new window</value>

<value>Create a new window</value>

cinnamon-msft · 2021-02-18T23:33:45Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

+    <value>a new window</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseAnyExisting.Content" xml:space="preserve">
+    <value>the most recently used window</value>


Suggested change

<value>the most recently used window</value>

<value>Attach to the most recently used window</value>

cinnamon-msft · 2021-02-18T23:34:03Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

+    <value>the most recently used window</value>
+  </data>
+  <data name="Globals_WindowingBehaviorUseExisting.Content" xml:space="preserve">
+    <value>the most recently used window on this desktop</value>


Suggested change

<value>the most recently used window on this desktop</value>

<value>Attach to the most recently used window on this desktop</value>

cinnamon-msft · 2021-02-18T23:34:43Z

src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw

+    <comment>This text is a fragment of a sentence that indicates the options below it, in a user interface. It is a header, but it should be read like a sentence that ends with one of {Globals_WindowingBehaviorUseNew.Content}, {Globals_WindowingBehaviorUseAnyExisting.Content}, or {Globals_WindowingBehaviorUseExisting.Content}.</comment>
+  </data>
+  <data name="Globals_WindowingBehavior.HelpText" xml:space="preserve">
+    <value>Controls how new terminal instances attach to existing windows.</value>


Suggested change

<value>Controls how new terminal instances attach to existing windows.</value>

<value>Controls how new terminal instances launched from wt.exe attach to existing windows.</value>

This feels a little redundant though, right? Like, all the windows are ones spawned from wt.exe. Do we really need to specify that?

DHowett · 2021-02-19T18:23:37Z

(I personally love the sentenceized version of it ("new windows open in..."))

DHowett · 2021-02-19T18:24:54Z

Demo gif moved from main body

DHowett

LOVE THIS.

ghost · 2021-02-19T21:01:37Z

Hello @DHowett!

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.

DHowett · 2021-02-19T21:12:20Z

I guess I am incredibly bad at reading and got too excited AND AUTOMERGED THE "DO NOT AUTOMERGE" PR.

Finally implements the `newWindow` action. It does so by `ShellExecute`ing `wt.exe` with commandline args corresponding to the ones that would create the same `NewTerminalArgs`. This works with #8898 and #9118 to allow new windows (even with `windowingBehavior: useExisting`) This is taken from my auto-elevate branch, hence the references to elevation References #5000 References projects/5 References #8898 References #9118 Closes #1051

ghost · 2021-03-01T18:04:24Z

🎉Windows Terminal Preview v1.7.572.0 has been released which incorporates this pull request.:tada:

Handy links:

zadjii-msft added 30 commits December 16, 2020 07:59

Get all the projects created and hooked up to the sln

3bef7bb

Yank all the M/P files, this builds?!

1f52d35

Shockingly, this works, it works elevated, and it works unpackaged

5a9cdc8

This won't work, but I'm committing this becaus I finally got it to c…

36539cf

…ompile a String[]

whoop, we pass the commandline from the peasant, to the monarch, and …

27ace16

…then back!

HOLY SHIT I GOT THE COMANDLINE TO EXECUTE IN THE CURRENT WINDOW!!!!!!…

9a41647

…!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

add a note to future me

5cabcfb

This works as a unittest, but not a local test. That's batty

03bfc6e

this macro makes me feel dirty

590b9ff

LocalTests_Remoting -> UnitTests_Remoting

0579b24

finish renaming this test

a3faed6

Clean up a lot for review

9c6eac4

cleanup Peasant for review

0103331

Final cleanup for review

b4fe1bf

_final_ final cleanup for review

d08e65c

pr nits

e101efd

This seems to work to create a thread listening for the monarch, and …

e1402d8

…safely tear it down. It _seems_ like it.

it's hard to believe he's gone / were it so easy

f978a9c

Oh yea actually remove the thing

5939636

last commit before the holidays

c088895

Merge remote-tracking branch 'origin/main' into dev/migrie/f/remoting…

fa2df47

….dll

Enable audit mode

0f5c24f

nits

921d915

Merge branch 'dev/migrie/f/remoting.dll' into dev/migrie/f/the-first-…

00184e7

…galactic-empire

Ask the TerminalApp to parse the commandline, and tell us what the wi…

658db6b

…ndow should be. It just always says 0 for now, but in the future it could actually give us useful info.

Holy bajesus, this works like a charm

977db46

Add a note about commiting suicide

bcbef34

notes, comments, cleanup

813dbc6

activate windows

0f0df5e

add some tracelogging

9fc2f0e

carlos-zamora approved these changes Feb 18, 2021

View reviewed changes

zadjii-msft mentioned this pull request Feb 18, 2021

Add support for the newWindow action #9208

Merged

zadjii-msft added 2 commits February 18, 2021 15:03

some PR nits

cb311d8

Merge remote-tracking branch 'origin/main' into dev/migrie/f/2227-win…

5eff079

…dowingBehavior

zadjii-msft unassigned carlos-zamora Feb 18, 2021

cinnamon-msft reviewed Feb 18, 2021

View reviewed changes

zadjii-msft assigned cinnamon-msft Feb 19, 2021

zadjii-msft mentioned this pull request Feb 19, 2021

Scenario: Windows Terminal 2.0 Process Model Improvements #5000

Closed

80 tasks

words r hard

fa96b5d

zadjii-msft requested a review from DHowett February 19, 2021 20:48

DHowett approved these changes Feb 19, 2021

View reviewed changes

DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label Feb 19, 2021

ghost merged commit 69318d3 into main Feb 19, 2021

ghost deleted the dev/migrie/f/2227-windowingBehavior branch February 19, 2021 21:09

DHowett mentioned this pull request Feb 25, 2021

Open new tab instead of window #9291

Closed

ghost mentioned this pull request Mar 1, 2021

Feature Request: Option to only allow one instance #2227

Closed

zadjii-msft mentioned this pull request Apr 7, 2021

Setting startingDirectory to WSL path causes indefinite application hang #9541

Closed

This pull request was closed.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for the `windowingBehavior` setting #9118

Add support for the `windowingBehavior` setting #9118

zadjii-msft commented Feb 11, 2021 •

edited by DHowett

Loading

zadjii-msft commented Feb 18, 2021

carlos-zamora left a comment

carlos-zamora Feb 18, 2021

DHowett commented Feb 18, 2021

DHowett commented Feb 18, 2021

cinnamon-msft Feb 18, 2021

DHowett Feb 18, 2021

zadjii-msft Feb 19, 2021

cinnamon-msft Feb 19, 2021

cinnamon-msft Feb 18, 2021

cinnamon-msft Feb 18, 2021

cinnamon-msft Feb 18, 2021

cinnamon-msft Feb 18, 2021

zadjii-msft Feb 19, 2021

DHowett commented Feb 19, 2021

DHowett commented Feb 19, 2021

DHowett left a comment

ghost commented Feb 19, 2021

DHowett commented Feb 19, 2021 •

edited

Loading

ghost commented Mar 1, 2021

	<value>New windows open in...</value>
	<value>wt.exe window behavior</value>

	<value>a new window</value>
	<value>Create a new window</value>

	<value>the most recently used window</value>
	<value>Attach to the most recently used window</value>

	<value>the most recently used window on this desktop</value>
	<value>Attach to the most recently used window on this desktop</value>

	<value>Controls how new terminal instances attach to existing windows.</value>
	<value>Controls how new terminal instances launched from wt.exe attach to existing windows.</value>

Add support for the windowingBehavior setting #9118

Add support for the windowingBehavior setting #9118

Conversation

zadjii-msft commented Feb 11, 2021 • edited by DHowett Loading

Validation Steps Performed

zadjii-msft commented Feb 18, 2021

carlos-zamora left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DHowett commented Feb 18, 2021

DHowett commented Feb 18, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DHowett commented Feb 19, 2021

DHowett commented Feb 19, 2021

DHowett left a comment

Choose a reason for hiding this comment

ghost commented Feb 19, 2021

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.

DHowett commented Feb 19, 2021 • edited Loading

ghost commented Mar 1, 2021

Add support for the `windowingBehavior` setting #9118

Add support for the `windowingBehavior` setting #9118

zadjii-msft commented Feb 11, 2021 •

edited by DHowett

Loading

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.

DHowett commented Feb 19, 2021 •

edited

Loading