liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

desktop: Made tcp_connections Option

This commit is contained in:
Nathan Adams 2024-04-24 01:27:58 +02:00
parent 9a74da2782
commit 86c2015524
5 changed files with 83 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -4351,6 +4351,7 @@ dependencies = [
"gilrs",
"image 0.25.1",
"os_info",
"rand",
"rfd",
"ruffle_core",
"ruffle_frontend_utils",

1
desktop/Cargo.toml
View File

@ -47,6 +47,7 @@ tokio = { workspace = true, features = ["rt-multi-thread", "macros"]}
# Deliberately held back to match tracy client used by profiling crate
tracing-tracy = { version = "=0.10.4", optional = true }
rand = "0.8.5"
[target.'cfg(windows)'.dependencies]
winapi = "0.3.9"

4
desktop/src/cli.rs
View File

@ -127,8 +127,8 @@ pub struct Opt {
pub socket_allow: Vec<String>,
/// Define how to deal with TCP Socket connections.
#[clap(long = "tcp-connections", default_value = "ask")]
pub tcp_connections: SocketMode,
#[clap(long = "tcp-connections")]
pub tcp_connections: Option<SocketMode>,
/// Replace all embedded HTTP URLs with HTTPS.
#[clap(long, action)]

125
desktop/src/gui/dialogs/open_dialog.rs
View File

@ -3,12 +3,14 @@ use crate::gui::text;
use crate::gui::widgets::PathOrUrlField;
use crate::player::LaunchOptions;
use egui::{
Align2, Button, Checkbox, ComboBox, DragValue, Grid, Slider, TextEdit, Ui, Widget, Window,
Align2, Button, Checkbox, ComboBox, DragValue, Grid, Layout, Slider, TextEdit, Ui, Widget,
Window,
};
use ruffle_core::backend::navigator::{OpenURLMode, SocketMode};
use ruffle_core::config::Letterbox;
use ruffle_core::{LoadBehavior, StageAlign, StageScaleMode};
use ruffle_render::quality::StageQuality;
use std::borrow::Cow;
use std::ops::RangeInclusive;
use std::time::Duration;
use unic_langid::LanguageIdentifier;
@ -30,6 +32,7 @@ pub struct OpenDialog {
framerate_enabled: bool,
script_timeout: OptionalField<DurationField>,
tcp_connections: OptionalField<EnumDropdownField<SocketMode>>,
}
impl OpenDialog {
@ -58,6 +61,18 @@ impl OpenDialog {
.map(Duration::as_secs_f64),
DurationField::new(1.0..=600.0, 30.0),
);
let tcp_connections = OptionalField::new(
defaults.tcp_connections,
EnumDropdownField::new(
SocketMode::Ask,
vec![SocketMode::Allow, SocketMode::Ask, SocketMode::Deny],
Box::new(|value, locale| match value {
SocketMode::Allow => text(locale, "tcp-connections-allow"),
SocketMode::Ask => text(locale, "tcp-connections-ask"),
SocketMode::Deny => text(locale, "tcp-connections-deny"),
}),
),
);
Self {
options: defaults,
@ -69,6 +84,7 @@ impl OpenDialog {
framerate: 30.0,
framerate_enabled: false,
script_timeout,
tcp_connections,
}
}
@ -180,29 +196,8 @@ impl OpenDialog {
ui.end_row();
ui.label(text(locale, "tcp-connections"));
ComboBox::from_id_source("open-file-advanced-options-tcp-connections")
.selected_text(match self.options.tcp_connections {
SocketMode::Allow => text(locale, "tcp-connections-allow"),
SocketMode::Ask => text(locale, "tcp-connections-ask"),
SocketMode::Deny => text(locale, "tcp-connections-deny"),
})
.show_ui(ui, |ui| {
ui.selectable_value(
&mut self.options.tcp_connections,
SocketMode::Allow,
text(locale, "tcp-connections-allow"),
);
ui.selectable_value(
&mut self.options.tcp_connections,
SocketMode::Ask,
text(locale, "tcp-connections-ask"),
);
ui.selectable_value(
&mut self.options.tcp_connections,
SocketMode::Deny,
text(locale, "tcp-connections-deny"),
);
});
self.tcp_connections
.ui(ui, &mut self.options.tcp_connections, locale);
ui.end_row();
// TODO: This should probably be a global setting somewhere, not per load
@ -550,13 +545,7 @@ trait InnerField {
fn value_if_missing(&self) -> Self::Value;
fn widget<'a>(
&self,
ui: &Ui,
value: &'a mut Self::Value,
error: bool,
locale: &LanguageIdentifier,
) -> impl Widget + 'a;
fn ui(&self, ui: &mut Ui, value: &mut Self::Value, error: bool, locale: &LanguageIdentifier);
fn value_to_result(&self, value: &Self::Value) -> Result<Self::Result, ()>;
}
@ -579,13 +568,7 @@ impl InnerField for UrlField {
String::new()
}
fn widget<'a>(
&self,
ui: &Ui,
value: &'a mut Self::Value,
error: bool,
_locale: &LanguageIdentifier,
) -> impl Widget + 'a {
fn ui(&self, ui: &mut Ui, value: &mut Self::Value, error: bool, _locale: &LanguageIdentifier) {
TextEdit::singleline(value)
.hint_text(self.hint)
.text_color_opt(if error {
@ -593,6 +576,7 @@ impl InnerField for UrlField {
} else {
None
})
.ui(ui);
}
fn value_to_result(&self, value: &Self::Value) -> Result<Self::Result, ()> {
@ -622,14 +606,10 @@ impl InnerField for DurationField {
self.default_seconds
}
fn widget<'a>(
&self,
_ui: &Ui,
value: &'a mut Self::Value,
_error: bool,
locale: &LanguageIdentifier,
) -> impl Widget + 'a {
Slider::new(value, self.range.clone()).suffix(text(locale, "max-execution-duration-suffix"))
fn ui(&self, ui: &mut Ui, value: &mut Self::Value, _error: bool, locale: &LanguageIdentifier) {
Slider::new(value, self.range.clone())
.suffix(text(locale, "max-execution-duration-suffix"))
.ui(ui);
}
fn value_to_result(&self, value: &Self::Value) -> Result<Self::Result, ()> {
@ -641,6 +621,53 @@ impl InnerField for DurationField {
}
}
type ValueToTextFn<T> = dyn Fn(T, &LanguageIdentifier) -> Cow<'static, str>;
struct EnumDropdownField<T: Copy> {
id: egui::Id,
default: T,
value_to_name: Box<ValueToTextFn<T>>,
possible_values: Vec<T>,
}
impl<T: Copy> EnumDropdownField<T> {
pub fn new(default: T, possible_values: Vec<T>, value_to_name: Box<ValueToTextFn<T>>) -> Self {
Self {
id: egui::Id::new(rand::random::<u64>()),
default,
value_to_name,
possible_values,
}
}
}
impl<T: Copy + PartialEq> InnerField for EnumDropdownField<T> {
type Value = T;
type Result = T;
fn value_if_missing(&self) -> Self::Value {
self.default
}
fn ui(&self, ui: &mut Ui, value: &mut Self::Value, _error: bool, locale: &LanguageIdentifier) {
ComboBox::from_id_source(self.id)
.selected_text((self.value_to_name)(*value, locale))
.show_ui(ui, |ui| {
for possible_value in &self.possible_values {
ui.selectable_value(
value,
*possible_value,
(self.value_to_name)(*possible_value, locale),
);
}
});
}
fn value_to_result(&self, value: &Self::Value) -> Result<Self::Result, ()> {
Ok(*value)
}
}
struct OptionalField<Inner: InnerField> {
value: Inner::Value,
error: bool,
@ -676,8 +703,10 @@ impl<Inner: InnerField> OptionalField<Inner> {
ui.horizontal(|ui| {
Checkbox::without_text(&mut self.enabled).ui(ui);
ui.add_enabled_ui(self.enabled, |ui| {
let widget = self.inner.widget(ui, &mut self.value, self.error, locale);
ui.add_sized(ui.available_size(), widget);
let layout = Layout::centered_and_justified(ui.layout().main_dir());
ui.allocate_ui_with_layout(ui.available_size(), layout, |ui| {
self.inner.ui(ui, &mut self.value, self.error, locale);
});
});
});

4
desktop/src/player.rs
View File

@ -47,7 +47,7 @@ pub struct LaunchOptions {
pub force_scale: bool,
pub proxy: Option<Url>,
pub socket_allowed: HashSet<String>,
pub tcp_connections: SocketMode,
pub tcp_connections: Option<SocketMode>,
pub upgrade_to_https: bool,
pub fullscreen: bool,
pub load_behavior: LoadBehavior,
@ -173,7 +173,7 @@ impl ActivePlayer {
opt.upgrade_to_https,
opt.open_url_mode,
opt.socket_allowed.clone(),
opt.tcp_connections,
opt.tcp_connections.unwrap_or(SocketMode::Ask),
Rc::new(content),
RfdNavigatorInterface,
);