3866771b1b
#### ⚠️ this pr targets #9977 ## Summary of the Pull Request This adds support for part of the `monitor` property for `globalSummon`. It also goes a little off-spec: ```json "monitor": "any"|"toCurrent"|"toMouse" ``` * `monitor`: This controls the monitor that the window will be summoned from/to - `"any"`: Summon the MRU window, regardless of which monitor it's currently on. - `"toCurrent"`/omitted: (_default_): Summon the MRU window **TO** the monitor with the current **foreground** window. - [**NEW**] `"toMouse"`: Summon the MRU window **TO** the monitor where the **mouse** cursor is. When I was playing with this, It felt like `toMouse` was always what I wanted, not `toCurrent`. We can always just comment that out if we think that's contentious - I'm aware I didn't originally spec that. ## References * Original thread: #653 * Spec: #9274 * megathread: #8888 ## PR Checklist * [x] Closes https://github.com/microsoft/terminal/projects/5#card-60325291 * [x] I work here * [ ] Tests added/passed * [ ] Requires documentation to be updated 😢 ## Detailed Description of the Pull Request / Additional comments I made `toMouse` the default because it felt better. fite-me.jpg ## Validation Steps Performed my ever evolving blob: ```jsonc { "keys": "ctrl+`", "command": { "action": "quakeMode" } }, { "keys": "ctrl+1", "command": { "action": "globalSummon" } }, // { "keys": "ctrl+2", "command": { "action": "globalSummon", "desktop": "toCurrent" } }, // { "keys": "ctrl+2", "command": { "action": "globalSummon", "toggleVisibility": false } }, // { "keys": "ctrl+2", "command": { "action": "globalSummon", "dropdownDuration": 2000 } }, { "keys": "ctrl+2", "command": { "action": "globalSummon", "monitor": "any" } }, // { "keys": "ctrl+3", "command": { "action": "globalSummon", "desktop": "onCurrent" } }, { "keys": "ctrl+3", "command": { "action": "globalSummon", "monitor": "toMouse" } }, // { "keys": "ctrl+4", "command": { "action": "globalSummon", "desktop": "any" } }, { "keys": "ctrl+4", "command": { "action": "globalSummon", "monitor": "toMouse", "dropdownDuration": 500 } }, { "keys": "ctrl+5", "command": { "action": "globalSummon", "dropdownDuration": 500 } }, ```
81 lines
2.7 KiB
Plaintext
81 lines
2.7 KiB
Plaintext
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
namespace Microsoft.Terminal.Remoting
|
|
{
|
|
|
|
runtimeclass CommandlineArgs
|
|
{
|
|
CommandlineArgs();
|
|
CommandlineArgs(String[] args, String cwd);
|
|
|
|
String[] Commandline { get; set; };
|
|
String CurrentDirectory();
|
|
};
|
|
|
|
runtimeclass RenameRequestArgs
|
|
{
|
|
RenameRequestArgs(String newName);
|
|
String NewName { get; };
|
|
Boolean Succeeded;
|
|
};
|
|
|
|
runtimeclass WindowActivatedArgs
|
|
{
|
|
WindowActivatedArgs(UInt64 peasantID, Guid desktopID, Windows.Foundation.DateTime activatedTime);
|
|
WindowActivatedArgs(UInt64 peasantID, UInt64 hwnd, Guid desktopID, Windows.Foundation.DateTime activatedTime);
|
|
UInt64 PeasantID { get; };
|
|
UInt64 Hwnd { get; };
|
|
Guid DesktopID { get; };
|
|
Windows.Foundation.DateTime ActivatedTime { get; };
|
|
};
|
|
|
|
|
|
enum MonitorBehavior
|
|
{
|
|
InPlace,
|
|
ToCurrent,
|
|
ToMouse,
|
|
};
|
|
|
|
|
|
[default_interface] runtimeclass SummonWindowBehavior {
|
|
SummonWindowBehavior();
|
|
Boolean MoveToCurrentDesktop;
|
|
Boolean ToggleVisibility;
|
|
UInt32 DropdownDuration;
|
|
MonitorBehavior ToMonitor;
|
|
}
|
|
|
|
interface IPeasant
|
|
{
|
|
CommandlineArgs InitialArgs { get; };
|
|
|
|
void AssignID(UInt64 id);
|
|
UInt64 GetID();
|
|
UInt64 GetPID();
|
|
Boolean ExecuteCommandline(CommandlineArgs args);
|
|
void ActivateWindow(WindowActivatedArgs args);
|
|
WindowActivatedArgs GetLastActivatedArgs();
|
|
|
|
void DisplayWindowId(); // Tells us to display its own ID (which causes a DisplayWindowIdRequested to be raised)
|
|
|
|
String WindowName { get; };
|
|
void RequestIdentifyWindows(); // Tells us to raise a IdentifyWindowsRequested
|
|
void RequestRename(RenameRequestArgs args); // Tells us to raise a RenameRequested
|
|
void Summon(SummonWindowBehavior behavior);
|
|
|
|
event Windows.Foundation.TypedEventHandler<Object, WindowActivatedArgs> WindowActivated;
|
|
event Windows.Foundation.TypedEventHandler<Object, CommandlineArgs> ExecuteCommandlineRequested;
|
|
event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
|
|
event Windows.Foundation.TypedEventHandler<Object, Object> DisplayWindowIdRequested;
|
|
event Windows.Foundation.TypedEventHandler<Object, RenameRequestArgs> RenameRequested;
|
|
event Windows.Foundation.TypedEventHandler<Object, SummonWindowBehavior> SummonRequested;
|
|
};
|
|
|
|
[default_interface] runtimeclass Peasant : IPeasant
|
|
{
|
|
Peasant();
|
|
};
|
|
}
|