mirror of
https://github.com/kunkundi/crossdesk.git
synced 2026-10-28 00:33:06 +08:00
[feat] add lock screen on disconnect option, refs #125
This commit is contained in:
@@ -14,6 +14,7 @@
|
||||
#include "platform.h"
|
||||
#include "platform/video_renderer.h"
|
||||
#include "rd_log.h"
|
||||
#include "screen_lock.h"
|
||||
#include "runtime/device_presence_request.h"
|
||||
#include "runtime/gui_runtime.h"
|
||||
|
||||
@@ -198,6 +199,8 @@ void GuiRuntime::HandleServerControllerDisconnected(
|
||||
{
|
||||
std::unique_lock lock(connection_status_mutex_);
|
||||
connection_status_.erase(remote_id);
|
||||
disconnect_lock_.Disconnected(remote_id,
|
||||
config_center_->IsLockOnDisconnect());
|
||||
remote_input_.Disconnect(remote_id);
|
||||
devices_.OnControllerConnectionsChanged();
|
||||
connection_host_names_.erase(remote_id);
|
||||
@@ -258,6 +261,17 @@ void GuiRuntime::HandleServerControllerDisconnected(
|
||||
audio_capture_ = false;
|
||||
}
|
||||
|
||||
void GuiRuntime::HandleScreenLock() {
|
||||
// Serialize request consumption with incoming admission so a reconnect
|
||||
// cancels a pending lock before it can interrupt the new controller.
|
||||
std::unique_lock lock(connection_status_mutex_);
|
||||
if (!disconnect_lock_.TakeRequest(config_center_->IsLockOnDisconnect()))
|
||||
return;
|
||||
#if defined(_WIN32) || defined(__APPLE__) || (defined(__linux__) && !defined(__OHOS__))
|
||||
if (LockScreen()) LOG_INFO("Requested screen lock after last controller disconnected");
|
||||
#endif
|
||||
}
|
||||
|
||||
int GuiRuntime::RequestSingleDevicePresence(const std::string& remote_id,
|
||||
const char* password,
|
||||
bool remember_password) {
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* @Author: DI JUNKUN
|
||||
* @Date: 2026-10-25
|
||||
* Copyright (c) 2026 by DI JUNKUN, All Rights Reserved.
|
||||
*/
|
||||
|
||||
#ifndef _DISCONNECT_LOCK_POLICY_H_
|
||||
#define _DISCONNECT_LOCK_POLICY_H_
|
||||
|
||||
#include <string>
|
||||
#include <unordered_set>
|
||||
#include <utility>
|
||||
|
||||
namespace crossdesk {
|
||||
|
||||
// Guarded by GuiRuntime's connection_status_mutex_. Only incoming sessions
|
||||
// that reached Connected can request a lock; terminal callbacks may repeat.
|
||||
class DisconnectLockPolicy {
|
||||
public:
|
||||
void Connected(const std::string& remote_id) {
|
||||
controllers_.insert(remote_id);
|
||||
pending_ = false;
|
||||
}
|
||||
|
||||
void Disconnected(const std::string& remote_id, bool enabled) {
|
||||
if (controllers_.erase(remote_id) && controllers_.empty() && enabled)
|
||||
pending_ = true;
|
||||
}
|
||||
|
||||
bool TakeRequest(bool enabled) {
|
||||
return std::exchange(pending_, false) && enabled && controllers_.empty();
|
||||
}
|
||||
|
||||
private:
|
||||
std::unordered_set<std::string> controllers_;
|
||||
bool pending_ = false;
|
||||
};
|
||||
|
||||
} // namespace crossdesk
|
||||
|
||||
#endif
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "network/lan/lan_session_manager.h"
|
||||
#include "privacy_controller.h"
|
||||
#include "runtime/gui_state.h"
|
||||
#include "runtime/disconnect_lock_policy.h"
|
||||
#include "runtime/announcement_inbox.h"
|
||||
#include "runtime/peer_event_handler.h"
|
||||
#include "runtime/privacy_session_policy.h"
|
||||
@@ -102,6 +103,7 @@ class GuiRuntime : protected gui_detail::GuiState {
|
||||
const char* reason);
|
||||
void HandleWindowsServiceIntegration();
|
||||
void HandlePrivacy();
|
||||
void HandleScreenLock();
|
||||
bool IsAuthorizedController(const std::string& remote_id);
|
||||
void SetControllerPrivacySupport(const std::string& remote_id, bool supported);
|
||||
// Caller holds connection_status_mutex_ exclusively. Turns privacy off when
|
||||
@@ -157,6 +159,7 @@ class GuiRuntime : protected gui_detail::GuiState {
|
||||
bool unattended_host_ = false;
|
||||
AnnouncementInbox announcements_;
|
||||
PrivacySessionPolicy privacy_sessions_;
|
||||
DisconnectLockPolicy disconnect_lock_;
|
||||
std::mutex privacy_commands_mutex_;
|
||||
std::deque<std::pair<std::string, PrivacyCommand>> privacy_commands_;
|
||||
uint32_t last_privacy_revision_ = 0;
|
||||
|
||||
@@ -458,6 +458,7 @@ void PeerEventHandler::DispatchConnectionStatus(ConnectionStatus status,
|
||||
{
|
||||
std::unique_lock lock(runtime->connection_status_mutex_);
|
||||
if (status == ConnectionStatus::Connected) {
|
||||
runtime->disconnect_lock_.Connected(remote_id);
|
||||
// Local privacy requires explicit desktop capability. Host info may
|
||||
// arrive before Connected; consume that saved capability here.
|
||||
const bool automatic_enable = runtime->privacy_sessions_.Connected(
|
||||
|
||||
Reference in New Issue
Block a user