libscreensaver: fix detection of monitor hotplug #463
Merged
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
vamposdecampos
commented
Oct 30, 2024
libcscreensaver/cs-screen-x11.c
Outdated
| @@ -416,7 +416,7 @@ is_full_change (CsScreen *screen) | |||
| { | |||
| // Check to see if the union of monitor rects is the same size as the screen | |||
|
|
|||
| GdkRectangle total_monitors; | |||
| GdkRectangle total_monitors = {}; | |||
There was a problem hiding this comment.
Zeroing worksforme, but perhaps it can have issues if there's no monitor starting at (0,0)? That could be avoided by having total_monitors = screen->monitor_infos[0].rect initially. Let me know if that's preferable, I can cook up another patch.
There was a problem hiding this comment.
can you initialize it to {0} (this is the more accepted method).
This function is a sanity check for the monitor layout - the inclusive monitor rect should always match the screen rectangle. I may have been shooting myself in the foot here, mistaking where bad values were coming from.
Some of this also may not even be necessary anymore. The 'loop' described in d23d1ea ended up being a muffin issue (linuxmint/muffin@bf234250143), but I never had a chance to re-evaluate things here.
Thanks!
|
Can you paste what you get in debug mode after applying the patch? |
When hot-adding monitors (e.g. DisplayPort), I was seeing unobscured content behind the screensaver. Debug mode revealed: CsScreen received 'monitors-changed' signal from GdkScreen 25675900 Found 2 Xinerama screens on display :0 Monitor 0 is 0,0 1920 x 1080 Monitor 1 is 1920,0 1920 x 1200 Cinnamon Screensaver compiled without Solaris Xinerama support Scale factor of 1 applied. Monitor 0 is 0,0 1920 x 1080 Scale factor of 1 applied. Monitor 1 is 1920,0 1920 x 1200 Screen rect (0,0-3840x1200) and 2 monitor rects (0,0-503284330x1200) DO NOT add up, skipping change notification cinnamon-screensaver This could be caused by `total_monitors` rect being uninitialized; zero it. Might fix linuxmint#437. Seems like this could fix linuxmint#460, though the log therein does _not_ say "DO NOT add up". Ref: linuxmint#437 Ref: linuxmint#460 Fixes: d23d1ea "Rework behavior surrounding sleep, display changes, fractional scaling." Signed-off-by: Alex Badea <[email protected]>
vamposdecampos
force-pushed
the
fix-monitor-hotplug
branch
from
0ab7c7b to
23e7cc8
Compare
Yeah. This was started with 3 monitors, and unplugging 2 of them (i.e. the docking station): which does show a (transient) case when they still don't add up. Then plugging the docking station (2 monitors) back in: or in summary: |
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.
When hot-adding monitors (e.g. DisplayPort), I was seeing unobscured content behind the screensaver. Debug mode revealed:
This could be caused by
total_monitorsrect being uninitialized; zero it. Might fix #437. Seems like this could fix #460, though the log therein does not say "DO NOT add up".Ref: #437
Ref: #460
Fixes: d23d1ea "Rework behavior surrounding sleep, display changes, fractional scaling."