Fix mouseshape to be set correctly when using 'r' or 'gr' #12157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #12157 +/- ##
==========================================
- Coverage 81.95% 81.94% -0.01%
==========================================
Files 160 164 +4
Lines 193810 194091 +281
Branches 43840 43829 -11
==========================================
+ Hits 158834 159052 +218
- Misses 22138 22207 +69
+ Partials 12838 12832 -6
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 34 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
ychin
force-pushed
the
fix-mouseshape-single-replace-mode
branch
from
78af162
to
620f5b8
Compare
Currently, when entering the "pretend" or single character replace modes using `r` or `gr`, the mouse cursor doesn't immediately update until you have re-focused the window or moved the mouse. This is because it's not calling `update_mouseshape(-1)` immediately, so the cursor will only be updated when it's called by other functions like `gui_mouse_focus`. To fix this, just make sure we call this `update_mouseshape(-1)`. It's what we do when entering Insert or Replace modes for example. I noticed this when trying to figure out why MacVim CI is failing in `Test_mouse_shape_after_cancelling_gr` (introduced in vim#12110), but I think that test is only passing in Vim GTK CI by accident, since this issue happens there too. I think the window captured focus after the mouse `gr` call which triggers a mouse shape change but it probably would have failed under other circumstances.
ychin
force-pushed
the
fix-mouseshape-single-replace-mode
branch
from
620f5b8
to
bea9ff8
Compare
|
Currently, when entering the "pretend" or single character replace
modes using `r` or `gr`, the mouse cursor doesn't immediately update
until you have re-focused the window or moved the mouse. This is
because it's not calling `update_mouseshape(-1)` immediately, so the
cursor will only be updated when it's called by other functions like
`gui_mouse_focus`.
To fix this, just make sure we call this `update_mouseshape(-1)`. It's
what we do when entering Insert or Replace modes for example.
I noticed this when trying to figure out why MacVim CI is failing in
`Test_mouse_shape_after_cancelling_gr` (introduced in #12110), but I
think that test is only passing in Vim GTK CI by accident, since this
issue happens there too. I think the window captured focus after the
mouse `gr` call which triggers a mouse shape change but it probably
would have failed under other circumstances.
Thanks for looking into this. Could you add a test for this? There are
some examples at the end of src/testdir/test_normal.vim. However, the
ugly "sleep 300m" should be removed, use WaitForAssert() instead.
…--
Every person is responsible for the choices he makes.
/// Bram Moolenaar -- ***@***.*** -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
|
Sure. Let me take a look. |
|
Any updates on this? |
|
I remember the tests were a little tricky to actually write to make it a proper regression test, and then other things came up and I neglected to follow up on this. Let me take a look again. |
|
any updates here please ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, when entering the "pretend" or single character replace modes using
rorgr(in GUI), the mouse cursor doesn't immediately update until you have re-focused the window or moved the mouse. This is because it's not callingupdate_mouseshape(-1)immediately, so the cursor will only be updated when it's called by other functions likegui_mouse_focus(which happens just if you move the mouse or re-focus the application).To fix this, just make sure we call this
update_mouseshape(-1). It's what we do when entering Insert or Replace modes for example.I noticed this when trying to figure out why MacVim CI is failing in
Test_mouse_shape_after_cancelling_gr(introduced in #12110), but I think that test is only passing in Vim GTK CI by accident, since this issue happens there too. I think the window captured focus after the mousegrcall which triggers a mouse shape change but it probably would have failed under other circumstances.