Skip to content

Commit

Permalink
A bunch of dead ends for #11561
Browse files Browse the repository at this point in the history
  • Loading branch information
@zadjii-msft
zadjii-msft committed Oct 28, 2021
1 parent 9662bc6 commit b729444
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/cascadia/TerminalApp/TerminalPage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,8 @@ namespace winrt::TerminalApp::implementation
// - <none>
void TerminalPage::_CompleteInitialization()
{
Background(WUX::Media::SolidColorBrush{ Windows::UI::Colors::Transparent() });

_startupState = StartupState::Initialized;
_InitializedHandlers(*this, nullptr);
}
Expand Down
1 change: 0 additions & 1 deletion src/cascadia/TerminalApp/TerminalPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
xmlns:local="using:TerminalApp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:mux="using:Microsoft.UI.Xaml.Controls"
Background="Transparent"
mc:Ignorable="d">

<Grid x:Name="Root"
Expand Down
67 changes: 67 additions & 0 deletions src/cascadia/WindowsTerminal/IslandWindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ using namespace ::Microsoft::Console::Types;
using VirtualKeyModifiers = winrt::Windows::System::VirtualKeyModifiers;

#define XAML_HOSTING_WINDOW_CLASS_NAME L"CASCADIA_HOSTING_WINDOW_CLASS"
static constexpr const wchar_t* coverClassName{ L"COVER_WINDOW_CLASS" };

const UINT WM_TASKBARCREATED = RegisterWindowMessage(L"TaskbarCreated");

Expand Down Expand Up @@ -55,6 +56,9 @@ void IslandWindow::MakeWindow() noexcept
wc.style = CS_HREDRAW | CS_VREDRAW;
wc.lpfnWndProc = WndProc;
wc.hIcon = LoadIconW(wc.hInstance, MAKEINTRESOURCEW(IDI_APPICON));
// wc.hbrBackground = reinterpret_cast<HBRUSH>(GetStockObject(LTGRAY_BRUSH));
// CreateSolidBrush(RGB(255, 0, 0));
wc.hbrBackground = CreateSolidBrush(RGB(255, 0, 0));
RegisterClass(&wc);
WINRT_ASSERT(!_window);

Expand Down Expand Up @@ -82,6 +86,40 @@ void IslandWindow::MakeWindow() noexcept
this));

WINRT_ASSERT(_window);

// static ATOM coverWindowClass{ []() {
// WNDCLASSEX wcEx{};
// wcEx.cbSize = sizeof(wcEx);
// wcEx.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS;
// wcEx.lpszClassName = coverClassName;
// // wcEx.hbrBackground = reinterpret_cast<HBRUSH>(GetStockObject(BLACK_BRUSH));
// wcEx.hbrBackground = CreateSolidBrush(RGB(255, 0, 0));
// wcEx.hCursor = LoadCursor(nullptr, IDC_ARROW);
// wcEx.lpfnWndProc = DefWindowProcW; // &NonClientIslandWindow::_StaticInputSinkWndProc;
// wcEx.hInstance = wil::GetModuleInstanceHandle();
// // wcEx.cbWndExtra = sizeof(NonClientIslandWindow*);
// return RegisterClassEx(&wcEx);
// }() };

// til::rectangle ourSize{ GetWindowRect() };

// // The drag bar window is a child window of the top level window that is put
// // right on top of the drag bar. The XAML island window "steals" our mouse
// // messages which makes it hard to implement a custom drag area. By putting
// // a window on top of it, we prevent it from "stealing" the mouse messages.
// _coverWindow.reset(CreateWindowExW(0,
// coverClassName,
// L"",
// WS_CHILD,
// 0,
// 0,
// ourSize.width<int>(),
// ourSize.height<int>(),
// GetHandle(),
// nullptr,
// wil::GetModuleInstanceHandle(),
// this));
// THROW_HR_IF_NULL(E_UNEXPECTED, _coverWindow);
}

// Method Description:
Expand Down Expand Up @@ -324,6 +362,13 @@ void IslandWindow::Initialize()
// Enable vintage opacity by removing the XAML emergency backstop, GH#603.
// We don't really care if this failed or not.
TerminalTrySetTransparentBackground(true);

// auto wsEx{ GetWindowLong(_window.get(), GWL_EXSTYLE) };
// SetWindowLong(_window.get(), GWL_EXSTYLE, wsEx | WS_EX_NOREDIRECTIONBITMAP);
// SetWindowPos(_window.get(), nullptr, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_FRAMECHANGED);

HBRUSH brush = CreateSolidBrush(RGB(0, 0, 255));
SetClassLongPtr(_window.get(), GCLP_HBRBACKGROUND, (LONG_PTR)brush);
}

void IslandWindow::OnSize(const UINT width, const UINT height)
Expand Down Expand Up @@ -608,6 +653,28 @@ long IslandWindow::_calculateTotalSize(const bool isWidth, const long clientSize
_NotifyNotificationIconMenuItemSelectedHandlers((HMENU)lparam, (UINT)wparam);
return 0;
}
case WM_ERASEBKGND:
{
HBRUSH hbrWhite = reinterpret_cast<HBRUSH>(GetStockObject(WHITE_BRUSH));
HBRUSH hbrGray = reinterpret_cast<HBRUSH>(GetStockObject(LTGRAY_BRUSH));
RECT rc;
auto hdc = (HDC)wparam;
GetClientRect(_window.get(), &rc);
SetMapMode(hdc, MM_ANISOTROPIC);
SetWindowExtEx(hdc, 100, 100, NULL);
SetViewportExtEx(hdc, rc.right, rc.bottom, NULL);
FillRect(hdc, &rc, hbrWhite);

for (int i = 0; i < 13; i++)
{
auto x = (i * 40) % 100;
auto y = ((i * 40) / 100) * 20;
SetRect(&rc, x, y, x + 20, y + 20);
FillRect(hdc, &rc, hbrGray);
}
return 1L;
}

default:
// We'll want to receive this message when explorer.exe restarts
// so that we can re-add our icon to the notification area.
Expand Down
1 change: 1 addition & 0 deletions src/cascadia/WindowsTerminal/IslandWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class IslandWindow :
winrt::Windows::UI::Xaml::Hosting::DesktopWindowXamlSource _source;
winrt::Windows::UI::Xaml::Controls::Grid _rootGrid;
wil::com_ptr<ITaskbarList3> _taskbar;
wil::unique_hwnd _coverWindow;

std::function<void(const HWND, const RECT, winrt::Microsoft::Terminal::Settings::Model::LaunchMode& launchMode)> _pfnCreateCallback;
std::function<float(bool, float)> _pfnSnapDimensionCallback;
Expand Down

1 comment on commit b729444

@github-actions
Copy link

@github-actions github-actions bot commented on b729444 Oct 28, 2021 •
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:

  • GCLP
  • HBRBACKGROUND
  • LTGRAY
Previously acknowledged words that are now absent carlos dpg sid SPACEBAR Unregister vcvarsall xIcon yIcon zamora
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 git@github.com:microsoft/terminal.git repository
on the dev/migrie/b/11561-dead-ends 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/b729444a349962831031e43bdd5df3ed58df2128.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/58873911" > "$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.