mirror of
https://github.com/servo/servo.git
synced 2025-09-30 00:29:14 +01:00
servoshell: Port desktop servoshell to use delegate API (#35284)
Signed-off-by: Martin Robinson <mrobinson@igalia.com> Co-authored-by: Delan Azabani <dazabani@igalia.com> Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
parent
6b12499077
commit
5f08e4fa76
15 changed files with 1109 additions and 1258 deletions
686
ports/servoshell/desktop/app_state.rs
Normal file
686
ports/servoshell/desktop/app_state.rs
Normal file
|
@ -0,0 +1,686 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::cell::{Ref, RefCell, RefMut};
|
||||
use std::collections::HashMap;
|
||||
use std::path::PathBuf;
|
||||
use std::rc::Rc;
|
||||
use std::thread;
|
||||
|
||||
use arboard::Clipboard;
|
||||
use euclid::Vector2D;
|
||||
use keyboard_types::{Key, KeyboardEvent, Modifiers, ShortcutMatcher};
|
||||
use log::{error, info, warn};
|
||||
use servo::base::id::WebViewId;
|
||||
use servo::config::pref;
|
||||
use servo::ipc_channel::ipc::IpcSender;
|
||||
use servo::webrender_api::units::{DeviceIntPoint, DeviceIntSize};
|
||||
use servo::webrender_api::ScrollLocation;
|
||||
use servo::{
|
||||
AllowOrDenyRequest, CompositorEventVariant, FilterPattern, GamepadHapticEffectType, LoadStatus,
|
||||
PermissionPrompt, PermissionRequest, PromptCredentialsInput, PromptDefinition, PromptOrigin,
|
||||
PromptResult, Servo, ServoDelegate, ServoError, TouchEventType, WebView, WebViewDelegate,
|
||||
};
|
||||
use tinyfiledialogs::{self, MessageBoxIcon, OkCancel};
|
||||
use url::Url;
|
||||
|
||||
use super::app::{Present, PumpResult};
|
||||
use super::dialog::Dialog;
|
||||
use super::gamepad::GamepadSupport;
|
||||
use super::keyutils::CMD_OR_CONTROL;
|
||||
use super::window_trait::{WindowPortsMethods, LINE_HEIGHT};
|
||||
|
||||
pub(crate) enum AppState {
|
||||
Initializing,
|
||||
Running(Rc<RunningAppState>),
|
||||
ShuttingDown,
|
||||
}
|
||||
|
||||
pub(crate) struct RunningAppState {
|
||||
/// A handle to the Servo instance of the [`RunningAppState`]. This is not stored inside
|
||||
/// `inner` so that we can keep a reference to Servo in order to spin the event loop,
|
||||
/// which will in turn call delegates doing a mutable borrow on `inner`.
|
||||
servo: Servo,
|
||||
inner: RefCell<RunningAppStateInner>,
|
||||
}
|
||||
|
||||
pub struct RunningAppStateInner {
|
||||
/// Whether or not this is a headless servoshell window.
|
||||
headless: bool,
|
||||
|
||||
/// The clipboard to use for this collection of [`WebView`]s.
|
||||
pub(crate) clipboard: Option<Clipboard>,
|
||||
|
||||
/// List of top-level browsing contexts.
|
||||
/// Modified by EmbedderMsg::WebViewOpened and EmbedderMsg::WebViewClosed,
|
||||
/// and we exit if it ever becomes empty.
|
||||
webviews: HashMap<WebViewId, WebView>,
|
||||
|
||||
/// The order in which the webviews were created.
|
||||
creation_order: Vec<WebViewId>,
|
||||
|
||||
/// The webview that is currently focused.
|
||||
/// Modified by EmbedderMsg::WebViewFocused and EmbedderMsg::WebViewBlurred.
|
||||
focused_webview_id: Option<WebViewId>,
|
||||
|
||||
/// The current set of open dialogs.
|
||||
dialogs: HashMap<WebViewId, Vec<Dialog>>,
|
||||
|
||||
/// A handle to the Window that Servo is rendering in -- either headed or headless.
|
||||
window: Rc<dyn WindowPortsMethods>,
|
||||
|
||||
/// Gamepad support, which may be `None` if it failed to initialize.
|
||||
gamepad_support: Option<GamepadSupport>,
|
||||
|
||||
/// Whether or not the application interface needs to be updated.
|
||||
need_update: bool,
|
||||
|
||||
/// Whether or not the application needs to be redrawn.
|
||||
need_present: bool,
|
||||
}
|
||||
|
||||
impl Drop for RunningAppState {
|
||||
fn drop(&mut self) {
|
||||
self.servo.deinit();
|
||||
}
|
||||
}
|
||||
|
||||
impl RunningAppState {
|
||||
pub fn new(
|
||||
servo: Servo,
|
||||
window: Rc<dyn WindowPortsMethods>,
|
||||
headless: bool,
|
||||
) -> RunningAppState {
|
||||
RunningAppState {
|
||||
servo,
|
||||
inner: RefCell::new(RunningAppStateInner {
|
||||
headless,
|
||||
clipboard: Clipboard::new().ok(),
|
||||
webviews: HashMap::default(),
|
||||
creation_order: Default::default(),
|
||||
focused_webview_id: None,
|
||||
dialogs: Default::default(),
|
||||
window,
|
||||
gamepad_support: GamepadSupport::maybe_new(),
|
||||
need_update: false,
|
||||
need_present: false,
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn new_toplevel_webview(self: &Rc<Self>, url: Url) {
|
||||
let webview = self.servo().new_webview(url);
|
||||
webview.set_delegate(self.clone());
|
||||
self.add(webview);
|
||||
}
|
||||
|
||||
pub(crate) fn inner(&self) -> Ref<RunningAppStateInner> {
|
||||
self.inner.borrow()
|
||||
}
|
||||
|
||||
pub(crate) fn inner_mut(&self) -> RefMut<RunningAppStateInner> {
|
||||
self.inner.borrow_mut()
|
||||
}
|
||||
|
||||
pub(crate) fn servo(&self) -> &Servo {
|
||||
&self.servo
|
||||
}
|
||||
|
||||
/// Spins the internal application event loop.
|
||||
///
|
||||
/// - Notifies Servo about incoming gamepad events
|
||||
/// - Spin the Servo event loop, which will run the compositor and trigger delegate methods.
|
||||
pub(crate) fn pump_event_loop(&self) -> PumpResult {
|
||||
if pref!(dom_gamepad_enabled) {
|
||||
self.handle_gamepad_events();
|
||||
}
|
||||
|
||||
let should_continue = self.servo().spin_event_loop();
|
||||
|
||||
// Delegate handlers may have asked us to present or update compositor contents.
|
||||
let need_present = std::mem::replace(&mut self.inner_mut().need_present, false);
|
||||
let need_update = std::mem::replace(&mut self.inner_mut().need_update, false);
|
||||
|
||||
if !should_continue {
|
||||
return PumpResult::Shutdown;
|
||||
}
|
||||
|
||||
// Currently, egui-file-dialog dialogs need to be constantly presented or animations aren't fluid.
|
||||
let need_present = need_present || self.has_active_file_dialog();
|
||||
|
||||
let present = if need_present {
|
||||
Present::Deferred
|
||||
} else {
|
||||
Present::None
|
||||
};
|
||||
|
||||
PumpResult::Continue {
|
||||
update: need_update,
|
||||
present,
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn add(&self, webview: WebView) {
|
||||
self.inner_mut().creation_order.push(webview.id());
|
||||
self.inner_mut().webviews.insert(webview.id(), webview);
|
||||
}
|
||||
|
||||
pub(crate) fn shutdown(&self) {
|
||||
self.inner_mut().webviews.clear();
|
||||
}
|
||||
|
||||
pub(crate) fn for_each_active_dialog(&self, callback: impl Fn(&mut Dialog) -> bool) {
|
||||
let Some(webview_id) = self.focused_webview().as_ref().map(WebView::id) else {
|
||||
return;
|
||||
};
|
||||
|
||||
if let Some(dialogs) = self.inner_mut().dialogs.get_mut(&webview_id) {
|
||||
dialogs.retain_mut(callback);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn close_webview(&self, webview_id: WebViewId) {
|
||||
// This can happen because we can trigger a close with a UI action and then get the
|
||||
// close event from Servo later.
|
||||
let mut inner = self.inner_mut();
|
||||
if !inner.webviews.contains_key(&webview_id) {
|
||||
return;
|
||||
}
|
||||
|
||||
inner.webviews.retain(|&id, _| id != webview_id);
|
||||
inner.creation_order.retain(|&id| id != webview_id);
|
||||
inner.focused_webview_id = None;
|
||||
inner.dialogs.remove(&webview_id);
|
||||
|
||||
let last_created = inner
|
||||
.creation_order
|
||||
.last()
|
||||
.and_then(|id| inner.webviews.get(id));
|
||||
|
||||
match last_created {
|
||||
Some(last_created_webview) => last_created_webview.focus(),
|
||||
None => self.servo.start_shutting_down(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn focused_webview(&self) -> Option<WebView> {
|
||||
self.inner()
|
||||
.focused_webview_id
|
||||
.and_then(|id| self.inner().webviews.get(&id).cloned())
|
||||
}
|
||||
|
||||
// Returns the webviews in the creation order.
|
||||
pub fn webviews(&self) -> Vec<(WebViewId, WebView)> {
|
||||
let inner = self.inner();
|
||||
inner
|
||||
.creation_order
|
||||
.iter()
|
||||
.map(|id| (*id, inner.webviews.get(id).unwrap().clone()))
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn handle_gamepad_events(&self) {
|
||||
let Some(active_webview) = self.focused_webview() else {
|
||||
return;
|
||||
};
|
||||
if let Some(gamepad_support) = self.inner_mut().gamepad_support.as_mut() {
|
||||
gamepad_support.handle_gamepad_events(active_webview);
|
||||
}
|
||||
}
|
||||
|
||||
pub(crate) fn focus_webview_by_index(&self, index: usize) {
|
||||
if let Some((_, webview)) = self.webviews().get(index) {
|
||||
webview.focus();
|
||||
}
|
||||
}
|
||||
|
||||
fn has_active_file_dialog(&self) -> bool {
|
||||
let Some(webview) = self.focused_webview() else {
|
||||
return false;
|
||||
};
|
||||
let inner = self.inner();
|
||||
let Some(dialogs) = inner.dialogs.get(&webview.id()) else {
|
||||
return false;
|
||||
};
|
||||
dialogs.iter().any(Dialog::is_file_dialog)
|
||||
}
|
||||
|
||||
pub(crate) fn get_focused_webview_index(&self) -> Option<usize> {
|
||||
let focused_id = self.inner().focused_webview_id?;
|
||||
self.webviews()
|
||||
.iter()
|
||||
.position(|webview| webview.0 == focused_id)
|
||||
}
|
||||
|
||||
/// Handle servoshell key bindings that may have been prevented by the page in the focused webview.
|
||||
fn handle_overridable_key_bindings(&self, webview: ::servo::WebView, event: KeyboardEvent) {
|
||||
let origin = webview.rect().min.ceil().to_i32();
|
||||
ShortcutMatcher::from_event(event)
|
||||
.shortcut(CMD_OR_CONTROL, '=', || {
|
||||
webview.set_zoom(1.1);
|
||||
})
|
||||
.shortcut(CMD_OR_CONTROL, '+', || {
|
||||
webview.set_zoom(1.1);
|
||||
})
|
||||
.shortcut(CMD_OR_CONTROL, '-', || {
|
||||
webview.set_zoom(1.0 / 1.1);
|
||||
})
|
||||
.shortcut(CMD_OR_CONTROL, '0', || {
|
||||
webview.reset_zoom();
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::PageDown, || {
|
||||
let scroll_location = ScrollLocation::Delta(Vector2D::new(
|
||||
0.0,
|
||||
-self.inner().window.page_height() + 2.0 * LINE_HEIGHT,
|
||||
));
|
||||
webview.notify_scroll_event(scroll_location, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::PageUp, || {
|
||||
let scroll_location = ScrollLocation::Delta(Vector2D::new(
|
||||
0.0,
|
||||
self.inner().window.page_height() - 2.0 * LINE_HEIGHT,
|
||||
));
|
||||
webview.notify_scroll_event(scroll_location, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::Home, || {
|
||||
webview.notify_scroll_event(ScrollLocation::Start, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::End, || {
|
||||
webview.notify_scroll_event(ScrollLocation::End, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::ArrowUp, || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, 3.0 * LINE_HEIGHT));
|
||||
webview.notify_scroll_event(location, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::ArrowDown, || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(0.0, -3.0 * LINE_HEIGHT));
|
||||
webview.notify_scroll_event(location, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::ArrowLeft, || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(LINE_HEIGHT, 0.0));
|
||||
webview.notify_scroll_event(location, origin, TouchEventType::Move);
|
||||
})
|
||||
.shortcut(Modifiers::empty(), Key::ArrowRight, || {
|
||||
let location = ScrollLocation::Delta(Vector2D::new(-LINE_HEIGHT, 0.0));
|
||||
webview.notify_scroll_event(location, origin, TouchEventType::Move);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
impl ServoDelegate for RunningAppState {
|
||||
fn notify_devtools_server_started(&self, _servo: &Servo, port: u16, _token: String) {
|
||||
info!("Devtools Server running on port {port}");
|
||||
}
|
||||
|
||||
fn request_devtools_connection(&self, _servo: &Servo, request: AllowOrDenyRequest) {
|
||||
request.allow();
|
||||
}
|
||||
|
||||
fn notify_error(&self, _servo: &Servo, error: ServoError) {
|
||||
error!("Saw Servo error: {error:?}!");
|
||||
}
|
||||
}
|
||||
|
||||
impl WebViewDelegate for RunningAppState {
|
||||
fn notify_status_text_changed(&self, _webview: servo::WebView, _status: Option<String>) {
|
||||
self.inner_mut().need_update = true;
|
||||
}
|
||||
|
||||
fn notify_page_title_changed(&self, webview: servo::WebView, title: Option<String>) {
|
||||
if webview.focused() {
|
||||
let window_title = format!("{} - Servo", title.clone().unwrap_or_default());
|
||||
self.inner().window.set_title(&window_title);
|
||||
self.inner_mut().need_update = true;
|
||||
}
|
||||
}
|
||||
|
||||
fn request_move_to(&self, _: servo::WebView, new_position: DeviceIntPoint) {
|
||||
self.inner().window.set_position(new_position);
|
||||
}
|
||||
|
||||
fn request_resize_to(&self, webview: servo::WebView, new_size: DeviceIntSize) {
|
||||
let mut rect = webview.rect();
|
||||
rect.set_size(new_size.to_f32());
|
||||
webview.move_resize(rect);
|
||||
self.inner().window.request_resize(&webview, new_size);
|
||||
}
|
||||
|
||||
fn show_prompt(
|
||||
&self,
|
||||
webview: servo::WebView,
|
||||
definition: PromptDefinition,
|
||||
origin: PromptOrigin,
|
||||
) {
|
||||
let res = if self.inner().headless {
|
||||
match definition {
|
||||
PromptDefinition::Alert(_message, sender) => sender.send(()),
|
||||
PromptDefinition::OkCancel(_message, sender) => sender.send(PromptResult::Primary),
|
||||
PromptDefinition::Input(_message, default, sender) => {
|
||||
sender.send(Some(default.to_owned()))
|
||||
},
|
||||
PromptDefinition::Credentials(sender) => sender.send(PromptCredentialsInput {
|
||||
username: None,
|
||||
password: None,
|
||||
}),
|
||||
}
|
||||
} else {
|
||||
thread::Builder::new()
|
||||
.name("AlertDialog".to_owned())
|
||||
.spawn(move || match definition {
|
||||
PromptDefinition::Alert(mut message, sender) => {
|
||||
if origin == PromptOrigin::Untrusted {
|
||||
message = tiny_dialog_escape(&message);
|
||||
}
|
||||
tinyfiledialogs::message_box_ok(
|
||||
"Alert!",
|
||||
&message,
|
||||
MessageBoxIcon::Warning,
|
||||
);
|
||||
sender.send(())
|
||||
},
|
||||
PromptDefinition::OkCancel(mut message, sender) => {
|
||||
if origin == PromptOrigin::Untrusted {
|
||||
message = tiny_dialog_escape(&message);
|
||||
}
|
||||
let result = tinyfiledialogs::message_box_ok_cancel(
|
||||
"",
|
||||
&message,
|
||||
MessageBoxIcon::Warning,
|
||||
OkCancel::Cancel,
|
||||
);
|
||||
sender.send(match result {
|
||||
OkCancel::Ok => PromptResult::Primary,
|
||||
OkCancel::Cancel => PromptResult::Secondary,
|
||||
})
|
||||
},
|
||||
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)
|
||||
},
|
||||
PromptDefinition::Credentials(sender) => {
|
||||
// TODO: figure out how to make the message a localized string
|
||||
let username = tinyfiledialogs::input_box("", "username", "");
|
||||
let password = tinyfiledialogs::input_box("", "password", "");
|
||||
sender.send(PromptCredentialsInput { username, password })
|
||||
},
|
||||
})
|
||||
.unwrap()
|
||||
.join()
|
||||
.expect("Thread spawning failed")
|
||||
};
|
||||
|
||||
if let Err(e) = res {
|
||||
webview.send_error(format!("Failed to send Prompt response: {e}"))
|
||||
}
|
||||
}
|
||||
|
||||
fn request_open_auxiliary_webview(
|
||||
&self,
|
||||
parent_webview: servo::WebView,
|
||||
) -> Option<servo::WebView> {
|
||||
let webview = self.servo.new_auxiliary_webview();
|
||||
webview.set_delegate(parent_webview.delegate());
|
||||
self.add(webview.clone());
|
||||
Some(webview)
|
||||
}
|
||||
|
||||
fn notify_ready_to_show(&self, webview: servo::WebView) {
|
||||
let scale = self.inner().window.hidpi_factor().get();
|
||||
let toolbar = self.inner().window.toolbar_height().get();
|
||||
|
||||
// Adjust for our toolbar height.
|
||||
// TODO: Adjust for egui window decorations if we end up using those
|
||||
let mut rect = self
|
||||
.inner()
|
||||
.window
|
||||
.get_coordinates()
|
||||
.get_viewport()
|
||||
.to_f32();
|
||||
rect.min.y += toolbar * scale;
|
||||
|
||||
webview.focus();
|
||||
webview.move_resize(rect);
|
||||
webview.raise_to_top(true);
|
||||
}
|
||||
|
||||
fn notify_closed(&self, webview: servo::WebView) {
|
||||
self.close_webview(webview.id());
|
||||
}
|
||||
|
||||
fn notify_focus_changed(&self, webview: servo::WebView, focused: bool) {
|
||||
let mut inner_mut = self.inner_mut();
|
||||
if focused {
|
||||
webview.show(true);
|
||||
inner_mut.need_update = true;
|
||||
inner_mut.focused_webview_id = Some(webview.id());
|
||||
} else if inner_mut.focused_webview_id == Some(webview.id()) {
|
||||
inner_mut.focused_webview_id = None;
|
||||
}
|
||||
}
|
||||
|
||||
fn notify_keyboard_event(&self, webview: servo::WebView, keyboard_event: KeyboardEvent) {
|
||||
self.handle_overridable_key_bindings(webview, keyboard_event);
|
||||
}
|
||||
|
||||
fn clear_clipboard_contents(&self, _webview: servo::WebView) {
|
||||
self.inner_mut()
|
||||
.clipboard
|
||||
.as_mut()
|
||||
.and_then(|clipboard| clipboard.clear().ok());
|
||||
}
|
||||
|
||||
fn get_clipboard_contents(&self, _webview: servo::WebView, result_sender: IpcSender<String>) {
|
||||
let contents = self
|
||||
.inner_mut()
|
||||
.clipboard
|
||||
.as_mut()
|
||||
.and_then(|clipboard| clipboard.get_text().ok())
|
||||
.unwrap_or_default();
|
||||
if let Err(e) = result_sender.send(contents) {
|
||||
warn!("Failed to send clipboard ({})", e);
|
||||
}
|
||||
}
|
||||
|
||||
fn set_clipboard_contents(&self, _webview: servo::WebView, text: String) {
|
||||
if let Some(clipboard) = self.inner_mut().clipboard.as_mut() {
|
||||
if let Err(e) = clipboard.set_text(text) {
|
||||
warn!("Error setting clipboard contents ({})", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn notify_cursor_changed(&self, _webview: servo::WebView, cursor: servo::Cursor) {
|
||||
self.inner().window.set_cursor(cursor);
|
||||
}
|
||||
|
||||
fn notify_load_status_changed(&self, _webview: servo::WebView, _status: LoadStatus) {
|
||||
self.inner_mut().need_update = true;
|
||||
}
|
||||
|
||||
fn request_fullscreen_state_change(&self, _webview: servo::WebView, fullscreen_state: bool) {
|
||||
self.inner().window.set_fullscreen(fullscreen_state);
|
||||
}
|
||||
|
||||
fn show_bluetooth_device_dialog(
|
||||
&self,
|
||||
webview: servo::WebView,
|
||||
devices: Vec<String>,
|
||||
response_sender: IpcSender<Option<String>>,
|
||||
) {
|
||||
let selected = platform_get_selected_devices(devices);
|
||||
if let Err(e) = response_sender.send(selected) {
|
||||
webview.send_error(format!(
|
||||
"Failed to send GetSelectedBluetoothDevice response: {e}"
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
fn show_file_selection_dialog(
|
||||
&self,
|
||||
webview: servo::WebView,
|
||||
filter_pattern: Vec<FilterPattern>,
|
||||
allow_select_mutiple: bool,
|
||||
response_sender: IpcSender<Option<Vec<PathBuf>>>,
|
||||
) {
|
||||
let mut inner_mut = self.inner_mut();
|
||||
inner_mut
|
||||
.dialogs
|
||||
.entry(webview.id())
|
||||
.or_default()
|
||||
.push(Dialog::new_file_dialog(
|
||||
allow_select_mutiple,
|
||||
response_sender,
|
||||
filter_pattern,
|
||||
));
|
||||
inner_mut.need_update = true;
|
||||
inner_mut.need_present = true;
|
||||
}
|
||||
|
||||
fn request_permission(
|
||||
&self,
|
||||
_webview: servo::WebView,
|
||||
prompt: PermissionPrompt,
|
||||
result_sender: IpcSender<PermissionRequest>,
|
||||
) {
|
||||
let _ = result_sender.send(match self.inner().headless {
|
||||
true => PermissionRequest::Denied,
|
||||
false => prompt_user(prompt),
|
||||
});
|
||||
}
|
||||
|
||||
fn notify_new_frame_ready(&self, _webview: servo::WebView) {
|
||||
self.inner_mut().need_present = true;
|
||||
}
|
||||
|
||||
fn notify_event_delivered(&self, webview: servo::WebView, event: CompositorEventVariant) {
|
||||
if let CompositorEventVariant::MouseButtonEvent = event {
|
||||
webview.raise_to_top(true);
|
||||
webview.focus();
|
||||
}
|
||||
}
|
||||
|
||||
fn play_gamepad_haptic_effect(
|
||||
&self,
|
||||
_webview: servo::WebView,
|
||||
index: usize,
|
||||
effect_type: GamepadHapticEffectType,
|
||||
effect_complete_sender: IpcSender<bool>,
|
||||
) {
|
||||
match self.inner_mut().gamepad_support.as_mut() {
|
||||
Some(gamepad_support) => {
|
||||
gamepad_support.play_haptic_effect(index, effect_type, effect_complete_sender);
|
||||
},
|
||||
None => {
|
||||
let _ = effect_complete_sender.send(false);
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn stop_gamepad_haptic_effect(
|
||||
&self,
|
||||
_webview: servo::WebView,
|
||||
index: usize,
|
||||
haptic_stop_sender: IpcSender<bool>,
|
||||
) {
|
||||
let stopped = match self.inner_mut().gamepad_support.as_mut() {
|
||||
Some(gamepad_support) => gamepad_support.stop_haptic_effect(index),
|
||||
None => false,
|
||||
};
|
||||
let _ = haptic_stop_sender.send(stopped);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
fn prompt_user(prompt: PermissionPrompt) -> PermissionRequest {
|
||||
use tinyfiledialogs::YesNo;
|
||||
|
||||
let message = match prompt {
|
||||
PermissionPrompt::Request(permission_name) => {
|
||||
format!("Do you want to grant permission for {:?}?", permission_name)
|
||||
},
|
||||
PermissionPrompt::Insecure(permission_name) => {
|
||||
format!(
|
||||
"The {:?} feature is only safe to use in secure context, but servo can't guarantee\n\
|
||||
that the current context is secure. Do you want to proceed and grant permission?",
|
||||
permission_name
|
||||
)
|
||||
},
|
||||
};
|
||||
|
||||
match tinyfiledialogs::message_box_yes_no(
|
||||
"Permission request dialog",
|
||||
&message,
|
||||
MessageBoxIcon::Question,
|
||||
YesNo::No,
|
||||
) {
|
||||
YesNo::Yes => PermissionRequest::Granted,
|
||||
YesNo::No => PermissionRequest::Denied,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
fn prompt_user(_prompt: PermissionPrompt) -> PermissionRequest {
|
||||
// TODO popup only supported on linux
|
||||
PermissionRequest::Denied
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
|
||||
thread::Builder::new()
|
||||
.name("DevicePicker".to_owned())
|
||||
.spawn(move || {
|
||||
let dialog_rows: Vec<&str> = devices.iter().map(|s| s.as_ref()).collect();
|
||||
let dialog_rows: Option<&[&str]> = Some(dialog_rows.as_slice());
|
||||
|
||||
match tinyfiledialogs::list_dialog("Choose a device", &["Id", "Name"], dialog_rows) {
|
||||
Some(device) => {
|
||||
// The device string format will be "Address|Name". We need the first part of it.
|
||||
device.split('|').next().map(|s| s.to_string())
|
||||
},
|
||||
None => None,
|
||||
}
|
||||
})
|
||||
.unwrap()
|
||||
.join()
|
||||
.expect("Thread spawning failed")
|
||||
}
|
||||
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
fn platform_get_selected_devices(devices: Vec<String>) -> Option<String> {
|
||||
for device in devices {
|
||||
if let Some(address) = device.split('|').next().map(|s| s.to_string()) {
|
||||
return Some(address);
|
||||
}
|
||||
}
|
||||
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()
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue