Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

servoshell: Port input dialog code to use egui intead of tinyfiledialogs (#35464)

Browse source 
Signed-off-by: L Ashwin B <lashwinib@gmail.com>
This commit is contained in:
chickenleaf 2025-02-14 20:32:39 +05:30 • committed by GitHub
parent 3e1d15da9b
commit 32c13bcb1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 56 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

48
ports/servoshell/desktop/app_state.rs
View file

@ -357,7 +357,7 @@ impl WebViewDelegate for RunningAppState {
&self,
webview: servo::WebView,
definition: PromptDefinition,
origin: PromptOrigin,
_origin: PromptOrigin,
) {
if self.inner().headless {
let _ = match definition {
@ -378,24 +378,9 @@ impl WebViewDelegate for RunningAppState {
let okcancel_dialog = Dialog::new_okcancel_dialog(message, sender);
self.add_dialog(webview, okcancel_dialog);
},
_ => {
let _ = thread::Builder::new()
.name("AlertDialog".to_owned())
.spawn(move || match definition {
PromptDefinition::Input(mut message, mut default, sender) => {
if origin == PromptOrigin::Untrusted {
message = tiny_dialog_escape(&message);
default = tiny_dialog_escape(&default);
}
let result = tinyfiledialogs::input_box("", &message, &default);
sender.send(result)
},
_ => Ok(()),
})
.unwrap()
.join()
.expect("Thread spawning failed");
PromptDefinition::Input(message, default, sender) => {
let input_dialog = Dialog::new_input_dialog(message, default, sender);
self.add_dialog(webview, input_dialog);
},
}
}
@ -598,28 +583,3 @@ fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
}
None
}
// This is a mitigation for #25498, not a verified solution.
// There may be codepaths in tinyfiledialog.c that this is
// inadquate against, as it passes the string via shell to
// different programs depending on what the user has installed.
#[cfg(target_os = "linux")]
fn tiny_dialog_escape(raw: &str) -> String {
let s: String = raw
.chars()
.filter_map(|c| match c {
'\n' => Some('\n'),
'\0'..='\x1f' => None,
'<' => Some('\u{FF1C}'),
'>' => Some('\u{FF1E}'),
'&' => Some('\u{FF06}'),
_ => Some(c),
})
.collect();
shellwords::escape(&s)
}
#[cfg(not(target_os = "linux"))]
fn tiny_dialog_escape(raw: &str) -> String {
raw.to_string()
}