Call cont_child() more liberally #3996
Merged
Conversation
This file contains hidden or 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
Following the reproduction instructions from i3#3242 (comment) For me, i3#3242 happened when the following sequence executed: 1. Fullscreening window correctly calls `stop_child()` in https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L685 2. Xrandr change, `reconfig_windows()` is called and `output->visible` is set to `true` in this line: https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L1791 3. When the window's fullscreen is disabled, `handle_visibility_notify()` returns in this line: https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L677 because previously `output->visible` was set to `true` To fix this, I call `cont_child()` more leniently since it is a no-op when the child is not stopped. Fixes i3#3242 Closes i3#3761
stapelberg
reviewed
Apr 9, 2020
| /* Wake the child only when transitioning from 0 to 1 visible bar. | ||
| * We cannot transition from 0 to 2 or more visible bars at once since | ||
| * visibility events are delivered to each window separately */ | ||
| } else { |
There was a problem hiding this comment.
Wouldn’t it be sufficient to only remove lines 676-678 above to fix the specific scenario you’re describing?
I’m not saying we shouldn’t also do the other change, just want to make sure I understand what you’re suggesting :)
There was a problem hiding this comment.
Yes, you are correct.
IMO reduces the cognitive load and avoids potential future problems.
Airblader
approved these changes
Apr 9, 2020
stapelberg
approved these changes
Apr 9, 2020
7 tasks
stapelberg
pushed a commit
that referenced
this pull request
Apr 22, 2020
Following the reproduction instructions from #3242 (comment) For me, #3242 happened when the following sequence executed: 1. Fullscreening window correctly calls `stop_child()` in https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L685 2. Xrandr change, `reconfig_windows()` is called and `output->visible` is set to `true` in this line: https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L1791 3. When the window's fullscreen is disabled, `handle_visibility_notify()` returns in this line: https://github.com/i3/i3/blob/6e24e2ad6f4b1e32cfa27805a3a948d0de50f3b1/i3bar/src/xcb.c#L677 because previously `output->visible` was set to `true` To fix this, I call `cont_child()` more leniently since it is a no-op when the child is not stopped. Fixes #3242 Closes #3761
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.
Following the reproduction instructions from
#3242 (comment)
For me, #3242 happened when the following sequence executed:
stop_child()ini3/i3bar/src/xcb.c
Line 685 in 6e24e2a
reconfig_windows()is called andoutput->visibleisset to
truein this line:i3/i3bar/src/xcb.c
Line 1791 in 6e24e2a
handle_visibility_notify()returns in this line:i3/i3bar/src/xcb.c
Line 677 in 6e24e2a
because previously
output->visiblewas set totrueTo fix this, I call
cont_child()more leniently since it is a no-opwhen the child is not stopped.
Fixes #3242
Closes #3761