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

[pull] master from google:master #24

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Oct 15, 2021

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

No actual "contentful" changes expected here.
@pull pull bot added the ⤵️ pull label Oct 15, 2021
@pull pull bot requested a review from stuwilkins October 15, 2021 19:32
@pull pull bot added the merge-conflict Resolve conflicts manually label Oct 15, 2021
divVerent and others added 13 commits October 16, 2021 16:00
This reverts commit 66abedd.

Somehow I failed there.
Upstream xscreensaver is using `/usr/libexec` instead of `/usr/lib` since version 4.21
* configurable background color with XSECURELOCK_BACKGROUND_COLOR

* Add docs regarding `XSECURELOCK_MULTIPLEX_BACKGROUND_COLOR`

Co-authored-by: Cullen Ross <[email protected]>
This enables children some time to initialize and prepare their
content. They are started before the main loop, we sleep
XSECURELOCK_SAVER_DELAY_MS, then map the windows. The saver window is
mapped first, then the background window and the obscurer window. This
order works fine for me and I don't get a black flash anymore, despite
the saver being written in Python.

On shutdown, the order is also a bit altered to reduce the flash due
to the obscurer window in white.

The multiplexer is left untouched as its parent window is not mapped.

Fix #94
Useful for waking up the locker on system resume from suspend and
similar events not visible to X.
Got new features.
The correct name should be XSECURELOCK_SAVER_STOP_ON_BLANK. We also
starts children when screensaver is on, but screen is not blanked, or
when screensaver is one and screen is blanked, but this option is not
enabled.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants