Skip to content

Commit

Permalink
the combined prototype works :)
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Mar 31, 2022
1 parent 0d349df commit 479c6c9
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 4 deletions.
10 changes: 10 additions & 0 deletions src/cascadia/TerminalControl/ControlCore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1712,6 +1712,16 @@ namespace winrt::Microsoft::Terminal::Control::implementation
_connection.WriteInput(showOrHide ? L"\x1b[1t" : L"\x1b[2t");
}

void ControlCore::GotFocus()
{
_connection.WriteInput(L"\x1b[I");
}

void ControlCore::LostFocus()
{
_connection.WriteInput(L"\x1b[O");
}

bool ControlCore::_isBackgroundTransparent()
{
// If we're:
Expand Down
3 changes: 3 additions & 0 deletions src/cascadia/TerminalControl/ControlCore.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
void PasteText(const winrt::hstring& hstr);
bool CopySelectionToClipboard(bool singleLine, const Windows::Foundation::IReference<CopyFormat>& formats);

void GotFocus();
void LostFocus();

void ToggleShaderEffects();
void AdjustOpacity(const double adjustment);
void ResumeRendering();
Expand Down
4 changes: 4 additions & 0 deletions src/cascadia/TerminalControl/ControlInteractivity.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
THROW_IF_FAILED(_uiaEngine->Enable());
}

_core->GotFocus();

_updateSystemParameterSettings();
}

Expand All @@ -120,6 +122,8 @@ namespace winrt::Microsoft::Terminal::Control::implementation
{
THROW_IF_FAILED(_uiaEngine->Disable());
}

_core->LostFocus();
}

// Method Description
Expand Down
7 changes: 7 additions & 0 deletions src/host/outputStream.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,3 +915,10 @@ void ConhostInternalGetSet::ReparentWindow(const uint64_t handle)
LOG_LAST_ERROR_IF_NULL(::SetParent(psuedoHwnd, reinterpret_cast<HWND>(handle)));
}
}

void ConhostInternalGetSet::FocusChanged(const bool focused)
{
auto& g = ServiceLocator::LocateGlobals();
auto& gci = g.getConsoleInformation();
gci.ProcessHandleList.ModifyConsoleProcessFocus(focused);
}
3 changes: 2 additions & 1 deletion src/host/outputStream.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ class ConhostInternalGetSet final : public Microsoft::Console::VirtualTerminal::
const SIZE cellSize,
const size_t centeringHint) override;

void ReparentWindow(const uint64_t handle);
void ReparentWindow(const uint64_t handle) override;
void FocusChanged(const bool focused) override;

private:
void _modifyLines(const size_t count, const bool insert);
Expand Down
5 changes: 3 additions & 2 deletions src/server/IoDispatchers.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,9 +456,10 @@ PCONSOLE_API_MSG IoDispatchers::ConsoleHandleConnectionRequest(_In_ PCONSOLE_API
return pReceiveMsg;
}

const bool inConpty{ gci.IsInVtIoMode() };
// const bool inConpty{ gci.IsInVtIoMode() };
const bool hasFocus{ WI_IsFlagSet(gci.Flags, CONSOLE_HAS_FOCUS) };
const auto grantFG{ inConpty || hasFocus };
// const auto grantFG{ inConpty || hasFocus };
const auto grantFG{ hasFocus };
gci.ProcessHandleList.ModifyConsoleProcessFocus(grantFG);

// Create the handles.
Expand Down
3 changes: 2 additions & 1 deletion src/terminal/adapter/InteractDispatch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,10 @@ bool InteractDispatch::IsVtInputEnabled() const

bool InteractDispatch::FocusChanged(const bool focused) const
{
// * TODO!: plumb through to conapi and then gci.ProcessHandleList.ModifyConsoleProcessFocus(focused);
// * We should assume this is false by default?
// * TODO!: ConPTY should ask for this mode? Yea? Lets make sure that VTE will send that sequence even without other mouse sequences enabled.
// - in the past, this is something we've made opt-in (request cursor, for example. Maybe also the other mouse modes, can't recall)
// * gotta make sure that we can always handle the focus events, even if the client hasn't requested them.
_pConApi->FocusChanged(focused);
return true;
}
1 change: 1 addition & 0 deletions src/terminal/adapter/conGetSet.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,6 @@ namespace Microsoft::Console::VirtualTerminal
const size_t centeringHint) = 0;

virtual void ReparentWindow(const uint64_t handle) = 0;
virtual void FocusChanged(const bool focused) = 0;
};
}

1 comment on commit 479c6c9

@github-actions
Copy link

@github-actions github-actions bot commented on 479c6c9 Mar 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

Unrecognized words, please review:

  • deiconify
  • IXP
  • messagebox
  • SHOWDEFAULT
  • SHOWNA
  • toolbar
Previously acknowledged words that are now absent azurewebsites cxcy DCompile debolden deconstructed devicefamily GETKEYSTATE guardxfg Iconify LLVM LPCHARSETINFO MAPVIRTUALKEY MSDL ned NOWAIT pgorepro pgort PGU redistributable Timeline timelines toolbars unintense UWA UWAs VKKEYSCAN WResult xfg
To accept these unrecognized words as correct (and remove the previously acknowledged and now absent words), run the following commands

... in a clone of the [email protected]:microsoft/terminal.git repository
on the dev/migrie/b/2988-merged-prototypes branch:

update_files() {
perl -e '
my @expect_files=qw('".github/actions/spelling/expect/alphabet.txt
.github/actions/spelling/expect/expect.txt
.github/actions/spelling/expect/web.txt"');
@ARGV=@expect_files;
my @stale=qw('"$patch_remove"');
my $re=join "|", @stale;
my $suffix=".".time();
my $previous="";
sub maybe_unlink { unlink($_[0]) if $_[0]; }
while (<>) {
if ($ARGV ne $old_argv) { maybe_unlink($previous); $previous="$ARGV$suffix"; rename($ARGV, $previous); open(ARGV_OUT, ">$ARGV"); select(ARGV_OUT); $old_argv = $ARGV; }
next if /^(?:$re)(?:(?:\r|\n)*$| .*)/; print;
}; maybe_unlink($previous);'
perl -e '
my $new_expect_file=".github/actions/spelling/expect/479c6c9f08cf273768e64f9f7fbc74a2c231b815.txt";
use File::Path qw(make_path);
use File::Basename qw(dirname);
make_path (dirname($new_expect_file));
open FILE, q{<}, $new_expect_file; chomp(my @words = <FILE>); close FILE;
my @add=qw('"$patch_add"');
my %items; @items{@words} = @words x (1); @items{@add} = @add x (1);
@words = sort {lc($a)."-".$a cmp lc($b)."-".$b} keys %items;
open FILE, q{>}, $new_expect_file; for my $word (@words) { print FILE "$word\n" if $word =~ /\w/; };
close FILE;
system("git", "add", $new_expect_file);
'
}

comment_json=$(mktemp)
curl -L -s -S \
  --header "Content-Type: application/json" \
  "https://api.github.com/repos/microsoft/terminal/comments/70021185" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

patch_remove=$(perl -ne 'next unless s{^</summary>(.*)</details>$}{$1}; print' < "$comment_body")
  

patch_add=$(perl -e '$/=undef;
$_=<>;
s{<details>.*}{}s;
s{^#.*}{};
s{\n##.*}{};
s{(?:^|\n)\s*\*}{}g;
s{\s+}{ }g;
print' < "$comment_body")
  
update_files
rm $comment_body
git add -u
✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. You can copy the contents of each perl command excluding the outer ' marks and dropping any '"/"' quotation mark pairs into a file and then run perl file.pl from the root of the repository to run the code. Alternatively, you can manually insert the items...

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

🗜️ If you see a bunch of garbage

If it relates to a ...

well-formed pattern

See if there's a pattern that would match it.

If not, try writing one and adding it to a patterns/{file}.txt.

Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

Note that patterns can't match multiline strings.

binary-ish string

Please add a file path to the excludes.txt file instead of just accepting the garbage.

File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

Please sign in to comment.