Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass through double clicks and hover events in Win32 mouse mode #10138

Merged
15 commits merged into from
May 24, 2021

Conversation

PankajBhojwani
Copy link
Contributor

@PankajBhojwani PankajBhojwani commented May 20, 2021

Each mouse-down event's time and position is now stored, and if we
process a left-mouse-down event at the same position as the previous one
and within the double click time we set the double click flag.

Also adds a case statement to _UpdateSGRMouseButtonState so that we
send hover events instead of ignoring them.

Note: The 'right-click menu in far manager shows up at the wrong
location' bug still exists with this, as it seems to use the cursor
position as told by user32.

Related to #376

Validation Steps Performed

Double click in far manager works, hover in far manager works (hovering
over items in the right-click menu correctly highlights them)

@github-actions
Copy link

github-actions bot commented May 20, 2021

@check-spelling-bot Report

Unrecognized words, please review:

  • difftime
To accept these unrecognized words as correct, run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/pabhoj/fix_mouse_mode branch:

update_files() {
perl -e '
my $new_expect_file=".github/actions/spelling/expect/c3bf8a5d25b52633a66ad8721bb6ac5363db95fc.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/issues/comments/844822390" > "$comment_json"
comment_body=$(mktemp)
jq -r .body < "$comment_json" > $comment_body
rm $comment_json

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).

@DHowett
Copy link
Member

DHowett commented May 20, 2021

Recommendations from 1:1 chat:

  • Steal the std::optional<...time_point> code from HwndTerminal
  • Use time_point instead of time-as-an-integer
  • add a function that the unit tests can call to reset the clock, or just literally reach inside the ISME and reset the clock

@PankajBhojwani PankajBhojwani changed the title Pass through double click in Win 32 mouse mode Pass through double clicks and hover events in Win 32 mouse mode May 21, 2021
Copy link
Member

@DHowett DHowett left a comment

Choose a reason for hiding this comment

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

Please make sure you write tests for the new behavior! The existing ISME SGR mouse code is well tested.

src/terminal/parser/InputStateMachineEngine.cpp Outdated Show resolved Hide resolved
src/terminal/parser/InputStateMachineEngine.cpp Outdated Show resolved Hide resolved
src/terminal/parser/InputStateMachineEngine.cpp Outdated Show resolved Hide resolved
src/terminal/parser/InputStateMachineEngine.cpp Outdated Show resolved Hide resolved
src/terminal/parser/InputStateMachineEngine.cpp Outdated Show resolved Hide resolved
@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label May 21, 2021
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label May 21, 2021
@PankajBhojwani
Copy link
Contributor Author

Please make sure you write tests for the new behavior!

Added!

@ghost ghost added the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label May 21, 2021
@ghost ghost removed the Needs-Author-Feedback The original author of the issue/PR needs to come back and respond to something label May 22, 2021
Copy link
Member

@zadjii-msft zadjii-msft left a comment

Choose a reason for hiding this comment

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

I'm only not hitting ✔️ because I'm worried about the onecore thing

@DHowett DHowett changed the title Pass through double clicks and hover events in Win 32 mouse mode Pass through double clicks and hover events in Win32 mouse mode May 24, 2021
@DHowett DHowett added the AutoMerge Marked for automatic merge by the bot when requirements are met label May 24, 2021
@ghost
Copy link

ghost commented May 24, 2021

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.

@ghost ghost merged commit 0d61466 into main May 24, 2021
@ghost ghost deleted the dev/pabhoj/fix_mouse_mode branch May 24, 2021 17:24
@ghost
Copy link

ghost commented May 25, 2021

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

Handy links:

@ghost
Copy link

ghost commented Jul 14, 2021

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

Handy links:

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
AutoMerge Marked for automatic merge by the bot when requirements are met
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants