Skip to content

feat: Configure default screen lock state - #9205

Merged
sithlord48 merged 1 commit into
deskflow:masterfrom
PseudoResonance:feat/screen-lock-default
Nov 27, 2025
Merged

feat: Configure default screen lock state#9205
sithlord48 merged 1 commit into
deskflow:masterfrom
PseudoResonance:feat/screen-lock-default

Conversation

@PseudoResonance

Copy link
Copy Markdown
Contributor

Adds toggle option to change the default screen lock state.

Compared to #9201, this allows users to achieve the same result, but also opens the ability to unlock/relock via keybinds if desired.

Fixes: #7907

Comment thread src/lib/gui/config/ServerConfig.cpp
@PseudoResonance
PseudoResonance marked this pull request as ready for review November 24, 2025 23:57
@PseudoResonance
PseudoResonance requested a review from a team November 24, 2025 23:57

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I can't test correctly since on wayland hotkeys dont work (on the server) . with it on i was not able to leave my server so that is good sign that is does work

With this setting enabled when you do move into the client, what happens to the lock ? Can i move from the client back to the server (or another client) without pressing the key again ? Or does this lock again when you cross a screen border.

@PseudoResonance

Copy link
Copy Markdown
Contributor Author

I can't test correctly since on wayland hotkeys dont work (on the server) . with it on i was not able to leave my server so that is good sign that is does work

With this setting enabled when you do move into the client, what happens to the lock ? Can i move from the client back to the server (or another client) without pressing the key again ? Or does this lock again when you cross a screen border.

It should be perpetually locked until a hotkey disables it.

However, I'll try testing it again in a bit just to be absolutely sure, because maybe I missed something.

@sithlord48

Copy link
Copy Markdown
Member

Got ya.

@sithlord48
sithlord48 force-pushed the feat/screen-lock-default branch from 3dfdc56 to 2f3c63f Compare November 25, 2025 23:56
@sithlord48
sithlord48 self-requested a review November 25, 2025 23:56

@sithlord48 sithlord48 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Looks good to me we can further improve the Gui if needed after this

@PseudoResonance

PseudoResonance commented Nov 26, 2025

Copy link
Copy Markdown
Contributor Author

I can't test correctly since on wayland hotkeys dont work (on the server) . with it on i was not able to leave my server so that is good sign that is does work

With this setting enabled when you do move into the client, what happens to the lock ? Can i move from the client back to the server (or another client) without pressing the key again ? Or does this lock again when you cross a screen border.

Also this is unrelated, but I can't check at the moment. Is the hotkey issue because it only takes control when leaving the screen? Is it also related to why clipboard can't be synchronized from client -> server? (Wayland -> Wayland) I tried switching my server to it yesterday and spent like an hour messing around... Didn't realize it was broken.

@PseudoResonance

Copy link
Copy Markdown
Contributor Author

Got ya.

Yup, working as expected. I only have a Windows -> Wayland setup to test, but I was able to start locked, switch screens and stay locked. Then hit an unlock hotkey, and was able to switch screens unlocked. Toggling lock on/off on either screen works as expected too.

@sithlord48

sithlord48 commented Nov 26, 2025

Copy link
Copy Markdown
Member

Also this is unrelated, but I can't check at the moment. Is the hotkey issue because it only takes control when leaving the screen? Is it also related to why clipboard can't be synchronized from client -> server? (Wayland -> Wayland) I tried switching my server to it yesterday and spent like an hour messing around... Didn't realize it was broken.

No hotkeys on the wayland server need to be communicated to the server via the hotkey portal. The client just gets faked input so those seam to work (at least last i checked i was able to use scroll lock on a client but not the host). Its an unrelated issue to this PR. #7596

@nbolton nbolton left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, sorry I'm a bit swamped right now and don't have time to test this one but if @sithlord48 tested then it's fine to land.

@sithlord48
sithlord48 force-pushed the feat/screen-lock-default branch from 2f3c63f to db1b2d4 Compare November 27, 2025 13:05
@sithlord48
sithlord48 enabled auto-merge (rebase) November 27, 2025 13:05
@sithlord48
sithlord48 merged commit d35716f into deskflow:master Nov 27, 2025
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Setting to use Hotkeys only for switching

3 participants