mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
Build cross platform desktop apps with JavaScript, HTML, and CSS. It's easier than you think. If you can build a website, you can build a desktop app. Electron is a framework for creating native applications with web technologies like JavaScript, HTML, and CSS. It takes care of the hard parts so you can focus on the core of your application. WWW: https://electronjs.org/
169 lines
7.6 KiB
C++
169 lines
7.6 KiB
C++
--- remoting/host/remoting_me2me_host.cc.orig 2024-08-14 20:55:09 UTC
|
|
+++ remoting/host/remoting_me2me_host.cc
|
|
@@ -129,7 +129,7 @@
|
|
#include "remoting/host/mac/permission_utils.h"
|
|
#endif // BUILDFLAG(IS_APPLE)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#if defined(REMOTING_USE_X11)
|
|
#include <gtk/gtk.h>
|
|
#endif // defined(REMOTING_USE_X11)
|
|
@@ -140,13 +140,13 @@
|
|
#endif // defined(REMOTING_USE_X11)
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#include "base/linux_util.h"
|
|
#include "remoting/host/audio_capturer_linux.h"
|
|
#include "remoting/host/linux/certificate_watcher.h"
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "remoting/host/host_utmp_logger.h"
|
|
#endif
|
|
|
|
@@ -159,7 +159,7 @@
|
|
#include "remoting/host/win/session_desktop_environment.h"
|
|
#endif // BUILDFLAG(IS_WIN)
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
#include "remoting/host/linux/wayland_manager.h"
|
|
#include "remoting/host/linux/wayland_utils.h"
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
@@ -189,7 +189,7 @@ const char kStdinConfigPath[] = "-";
|
|
const char kStdinConfigPath[] = "-";
|
|
#endif // !defined(REMOTING_MULTI_PROCESS)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// The command line switch used to pass name of the pipe to capture audio on
|
|
// linux.
|
|
const char kAudioPipeSwitchName[] = "audio-pipe-name";
|
|
@@ -397,7 +397,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
|
|
std::unique_ptr<ChromotingHostContext> context_;
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Watch for certificate changes and kill the host when changes occur
|
|
std::unique_ptr<CertificateWatcher> cert_watcher_;
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
@@ -466,7 +466,7 @@ class HostProcess : public ConfigWatcher::Delegate,
|
|
|
|
std::unique_ptr<HostStatusLogger> host_status_logger_;
|
|
std::unique_ptr<HostEventLogger> host_event_logger_;
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
|
|
#endif
|
|
std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
|
|
@@ -773,7 +773,7 @@ void HostProcess::ShutdownOnNetworkThread() {
|
|
void HostProcess::ShutdownOnNetworkThread() {
|
|
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
config_watcher_.reset();
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
cert_watcher_.reset();
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
}
|
|
@@ -808,7 +808,7 @@ void HostProcess::CreateAuthenticatorFactory() {
|
|
base::MakeRefCounted<CorpSessionAuthzServiceClientFactory>(
|
|
context_->url_loader_factory(), service_account_email_,
|
|
oauth_refresh_token_));
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
if (!cert_watcher_) {
|
|
cert_watcher_ = std::make_unique<CertificateWatcher>(
|
|
base::BindRepeating(&HostProcess::ShutdownHost,
|
|
@@ -953,13 +953,13 @@ void HostProcess::StartOnUiThread() {
|
|
base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
|
|
base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
if (IsRunningWayland()) {
|
|
WaylandManager::Get()->Init(context_->ui_task_runner());
|
|
}
|
|
#endif // BUILDFLAG(IS_LINUX)
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// If an audio pipe is specific on the command-line then initialize
|
|
// AudioCapturerLinux to capture from it.
|
|
base::FilePath audio_pipe_name =
|
|
@@ -1036,7 +1036,7 @@ void HostProcess::ShutdownOnUiThread() {
|
|
// It is now safe for the HostProcess to be deleted.
|
|
self_ = nullptr;
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
// Cause the global AudioPipeReader to be freed, otherwise the audio
|
|
// thread will remain in-use and prevent the process from exiting.
|
|
// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
|
|
@@ -1044,7 +1044,7 @@ void HostProcess::ShutdownOnUiThread() {
|
|
AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
|
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
|
|
context_->input_task_runner()->PostTask(
|
|
FROM_HERE,
|
|
base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
|
|
@@ -1401,7 +1401,7 @@ bool HostProcess::OnUsernamePolicyUpdate(const base::V
|
|
// Returns false: never restart the host after this policy update.
|
|
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
|
std::optional<bool> host_username_match_required =
|
|
policies.FindBool(policy::key::kRemoteAccessHostMatchUsername);
|
|
if (!host_username_match_required.has_value()) {
|
|
@@ -1849,7 +1849,7 @@ void HostProcess::StartHost() {
|
|
corp_host_status_logger_->StartObserving(*session_manager);
|
|
}
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
|
|
desktop_environment_options_.set_enable_remote_webauthn(is_googler_);
|
|
#endif
|
|
|
|
@@ -1882,7 +1882,7 @@ void HostProcess::StartHost() {
|
|
host_status_logger_ = std::make_unique<HostStatusLogger>(
|
|
host_->status_monitor(), log_to_server_.get());
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
|
if (cmd_line->HasSwitch(kEnableUtempter)) {
|
|
host_utmp_logger_ =
|
|
@@ -1914,7 +1914,7 @@ void HostProcess::StartHost() {
|
|
|
|
host_->Start(host_owner_);
|
|
|
|
-#if BUILDFLAG(IS_LINUX)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
|
// For Windows, ChromotingHostServices connections are handled by the daemon
|
|
// process, then the message pipe is forwarded to the network process.
|
|
host_->StartChromotingHostServices();
|
|
@@ -2048,7 +2048,7 @@ int HostProcessMain() {
|
|
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
|
|
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
|
|
|
|
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
|
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
|
#if defined(REMOTING_USE_X11)
|
|
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
|
|
// use X11 safely (such as the WebRTC capturer, GTK ...)
|
|
@@ -2097,7 +2097,7 @@ int HostProcessMain() {
|
|
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
|
|
net::NetworkChangeNotifier::CreateIfNeeded());
|
|
|
|
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
|
|
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
|
|
// Create an X11EventSource on all UI threads, so the global X11 connection
|
|
// (x11::Connection::Get()) can dispatch X events.
|
|
auto event_source =
|