Skip to content

Commit 5f2432c

Browse files
Desktop: Open links in default browser and prevent popups (#3006)
* Deny all browser popups * Open links with default browser * Fix review comments
1 parent 0462d0e commit 5f2432c

File tree

7 files changed

+124
-5
lines changed

7 files changed

+124
-5
lines changed

Cargo.lock

Lines changed: 37 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ include_dir = "0.7.4"
164164
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
165165
tracing = "0.1.41"
166166
rfd = "0.15.4"
167+
open = "5.3.2"
167168

168169
[profile.dev]
169170
opt-level = 1

desktop/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,4 @@ glam = { workspace = true }
3838
vello = { workspace = true }
3939
derivative = { workspace = true }
4040
rfd = { workspace = true }
41+
open = { workspace = true }

desktop/src/app.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,15 @@ impl WinitApp {
107107
}
108108
}
109109

110+
for message in responses.extract_if(.., |m| matches!(m, FrontendMessage::TriggerVisitLink { .. })) {
111+
let _ = thread::spawn(move || {
112+
let FrontendMessage::TriggerVisitLink { url } = message else { unreachable!() };
113+
if let Err(e) = open::that(&url) {
114+
tracing::error!("Failed to open URL: {}: {}", url, e);
115+
}
116+
});
117+
}
118+
110119
if responses.is_empty() {
111120
return;
112121
}

desktop/src/cef/internal.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
mod browser_process_app;
22
mod browser_process_client;
33
mod browser_process_handler;
4+
mod browser_process_life_span_handler;
45
mod render_handler;
56
mod render_process_app;
67
mod render_process_handler;
78
mod render_process_v8_handler;
89

9-
pub(crate) use browser_process_app::BrowserProcessAppImpl;
10-
pub(crate) use browser_process_client::BrowserProcessClientImpl;
11-
pub(crate) use render_handler::RenderHandlerImpl;
12-
pub(crate) use render_process_app::RenderProcessAppImpl;
10+
pub(super) use browser_process_app::BrowserProcessAppImpl;
11+
pub(super) use browser_process_client::BrowserProcessClientImpl;
12+
pub(super) use render_handler::RenderHandlerImpl;
13+
pub(super) use render_process_app::RenderProcessAppImpl;

desktop/src/cef/internal/browser_process_client.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
use cef::rc::{Rc, RcImpl};
22
use cef::sys::{_cef_client_t, cef_base_ref_counted_t};
3-
use cef::{ImplClient, RenderHandler, WrapClient};
3+
use cef::{ImplClient, LifeSpanHandler, RenderHandler, WrapClient};
44

55
use crate::cef::CefEventHandler;
66
use crate::cef::ipc::{MessageType, UnpackMessage, UnpackedMessage};
77

8+
use super::browser_process_life_span_handler::BrowserProcessLifeSpanHandlerImpl;
9+
810
pub(crate) struct BrowserProcessClientImpl<H: CefEventHandler> {
911
object: *mut RcImpl<_cef_client_t, Self>,
1012
render_handler: RenderHandler,
@@ -47,6 +49,10 @@ impl<H: CefEventHandler> ImplClient for BrowserProcessClientImpl<H> {
4749
Some(self.render_handler.clone())
4850
}
4951

52+
fn life_span_handler(&self) -> Option<cef::LifeSpanHandler> {
53+
Some(LifeSpanHandler::new(BrowserProcessLifeSpanHandlerImpl::new()))
54+
}
55+
5056
fn get_raw(&self) -> *mut _cef_client_t {
5157
self.object.cast()
5258
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
use cef::rc::{Rc, RcImpl};
2+
use cef::sys::{_cef_life_span_handler_t, cef_base_ref_counted_t};
3+
use cef::{ImplLifeSpanHandler, WrapLifeSpanHandler};
4+
5+
pub(crate) struct BrowserProcessLifeSpanHandlerImpl {
6+
object: *mut RcImpl<_cef_life_span_handler_t, Self>,
7+
}
8+
impl BrowserProcessLifeSpanHandlerImpl {
9+
pub(crate) fn new() -> Self {
10+
Self { object: std::ptr::null_mut() }
11+
}
12+
}
13+
14+
impl ImplLifeSpanHandler for BrowserProcessLifeSpanHandlerImpl {
15+
fn on_before_popup(
16+
&self,
17+
_browser: Option<&mut cef::Browser>,
18+
_frame: Option<&mut cef::Frame>,
19+
_popup_id: ::std::os::raw::c_int,
20+
target_url: Option<&cef::CefString>,
21+
_target_frame_name: Option<&cef::CefString>,
22+
_target_disposition: cef::WindowOpenDisposition,
23+
_user_gesture: ::std::os::raw::c_int,
24+
_popup_features: Option<&cef::PopupFeatures>,
25+
_window_info: Option<&mut cef::WindowInfo>,
26+
_client: Option<&mut Option<impl cef::ImplClient>>,
27+
_settings: Option<&mut cef::BrowserSettings>,
28+
_extra_info: Option<&mut Option<cef::DictionaryValue>>,
29+
_no_javascript_access: Option<&mut ::std::os::raw::c_int>,
30+
) -> ::std::os::raw::c_int {
31+
let target = target_url.map(|url| url.to_string()).unwrap_or("unknown".to_string());
32+
tracing::error!("Browser tried to open a popup at URL: {}", target);
33+
34+
// Deny any popup by returning 1
35+
1
36+
}
37+
38+
fn get_raw(&self) -> *mut _cef_life_span_handler_t {
39+
self.object.cast()
40+
}
41+
}
42+
43+
impl Clone for BrowserProcessLifeSpanHandlerImpl {
44+
fn clone(&self) -> Self {
45+
unsafe {
46+
let rc_impl = &mut *self.object;
47+
rc_impl.interface.add_ref();
48+
}
49+
Self { object: self.object }
50+
}
51+
}
52+
impl Rc for BrowserProcessLifeSpanHandlerImpl {
53+
fn as_base(&self) -> &cef_base_ref_counted_t {
54+
unsafe {
55+
let base = &*self.object;
56+
std::mem::transmute(&base.cef_object)
57+
}
58+
}
59+
}
60+
impl WrapLifeSpanHandler for BrowserProcessLifeSpanHandlerImpl {
61+
fn wrap_rc(&mut self, object: *mut RcImpl<_cef_life_span_handler_t, Self>) {
62+
self.object = object;
63+
}
64+
}

0 commit comments

Comments
 (0)