kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

toml-config: make FnBuilder::new take &self

Browse source
This commit is contained in:
Julian Orth 2025-07-21 11:45:13 +02:00
parent 441166b122
commit e160aa3406
1 changed files with 65 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

119
toml-config/src/lib.rs
View file

@ -65,35 +65,46 @@ fn default_seat() -> Seat {
} }
trait FnBuilder: Sized { trait FnBuilder: Sized {
fn new<F: Fn() + 'static>(f: F) -> Self; type Output;
#[expect(clippy::wrong_self_convention)]
fn new<F: Fn() + 'static>(&self, f: F) -> Self::Output;
} }
impl FnBuilder for Box<dyn Fn()> { struct BoxFnBuilder;
fn new<F: Fn() + 'static>(f: F) -> Self {
impl FnBuilder for BoxFnBuilder {
type Output = Box<dyn Fn()>;
fn new<F: Fn() + 'static>(&self, f: F) -> Self::Output {
Box::new(f) Box::new(f)
} }
} }
impl FnBuilder for Rc<dyn Fn()> { struct RcFnBuilder;
fn new<F: Fn() + 'static>(f: F) -> Self {
impl FnBuilder for RcFnBuilder {
type Output = Rc<dyn Fn()>;
fn new<F: Fn() + 'static>(&self, f: F) -> Self::Output {
Rc::new(f) Rc::new(f)
} }
} }
impl Action { impl Action {
fn into_fn(self, state: &Rc<State>) -> Box<dyn Fn()> { fn into_fn(self, state: &Rc<State>) -> Box<dyn Fn()> {
self.into_fn_impl(state) self.into_fn_impl(&BoxFnBuilder, state)
} }
fn into_rc_fn(self, state: &Rc<State>) -> Rc<dyn Fn()> { fn into_rc_fn(self, state: &Rc<State>) -> Rc<dyn Fn()> {
self.into_fn_impl(state) self.into_fn_impl(&RcFnBuilder, state)
} }
fn into_fn_impl<B: FnBuilder>(self, state: &Rc<State>) -> B { fn into_fn_impl<B: FnBuilder>(self, b: &B, state: &Rc<State>) -> B::Output {
macro_rules! client_action { macro_rules! client_action {
($name:ident, $opt:expr) => {{ ($name:ident, $opt:expr) => {{
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
if let Some($name) = state.client.get() { if let Some($name) = state.client.get() {
$opt $opt
} }
@ -104,7 +115,7 @@ impl Action {
macro_rules! window_or_seat { macro_rules! window_or_seat {
($name:ident, $expr:expr) => {{ ($name:ident, $expr:expr) => {{
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
if let Some($name) = state.window.get() { if let Some($name) = state.window.get() {
if let Some($name) = $name { if let Some($name) = $name {
$expr; $expr;
@ -118,7 +129,7 @@ impl Action {
} }
match self { match self {
Action::SimpleCommand { cmd } => match cmd { Action::SimpleCommand { cmd } => match cmd {
SimpleCommand::Focus(dir) => B::new(move || s.focus(dir)), SimpleCommand::Focus(dir) => b.new(move || s.focus(dir)),
SimpleCommand::Move(dir) => window_or_seat!(s, s.move_(dir)), SimpleCommand::Move(dir) => window_or_seat!(s, s.move_(dir)),
SimpleCommand::Split(axis) => window_or_seat!(s, s.create_split(axis)), SimpleCommand::Split(axis) => window_or_seat!(s, s.create_split(axis)),
SimpleCommand::ToggleSplit => window_or_seat!(s, s.toggle_split()), SimpleCommand::ToggleSplit => window_or_seat!(s, s.toggle_split()),
@ -127,75 +138,75 @@ impl Action {
SimpleCommand::SetMono(b) => window_or_seat!(s, s.set_mono(b)), SimpleCommand::SetMono(b) => window_or_seat!(s, s.set_mono(b)),
SimpleCommand::ToggleFullscreen => window_or_seat!(s, s.toggle_fullscreen()), SimpleCommand::ToggleFullscreen => window_or_seat!(s, s.toggle_fullscreen()),
SimpleCommand::SetFullscreen(b) => window_or_seat!(s, s.set_fullscreen(b)), SimpleCommand::SetFullscreen(b) => window_or_seat!(s, s.set_fullscreen(b)),
SimpleCommand::FocusParent => B::new(move || s.focus_parent()), SimpleCommand::FocusParent => b.new(move || s.focus_parent()),
SimpleCommand::Close => window_or_seat!(s, s.close()), SimpleCommand::Close => window_or_seat!(s, s.close()),
SimpleCommand::DisablePointerConstraint => { SimpleCommand::DisablePointerConstraint => {
B::new(move || s.disable_pointer_constraint()) b.new(move || s.disable_pointer_constraint())
} }
SimpleCommand::ToggleFloating => window_or_seat!(s, s.toggle_floating()), SimpleCommand::ToggleFloating => window_or_seat!(s, s.toggle_floating()),
SimpleCommand::SetFloating(b) => window_or_seat!(s, s.set_floating(b)), SimpleCommand::SetFloating(b) => window_or_seat!(s, s.set_floating(b)),
SimpleCommand::Quit => B::new(quit), SimpleCommand::Quit => b.new(quit),
SimpleCommand::ReloadConfigToml => { SimpleCommand::ReloadConfigToml => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || load_config(false, &persistent)) b.new(move || load_config(false, &persistent))
} }
SimpleCommand::ReloadConfigSo => B::new(reload), SimpleCommand::ReloadConfigSo => b.new(reload),
SimpleCommand::None => B::new(|| ()), SimpleCommand::None => b.new(|| ()),
SimpleCommand::Forward(bool) => B::new(move || s.set_forward(bool)), SimpleCommand::Forward(bool) => b.new(move || s.set_forward(bool)),
SimpleCommand::EnableWindowManagement(bool) => { SimpleCommand::EnableWindowManagement(bool) => {
B::new(move || s.set_window_management_enabled(bool)) b.new(move || s.set_window_management_enabled(bool))
} }
SimpleCommand::SetFloatAboveFullscreen(bool) => { SimpleCommand::SetFloatAboveFullscreen(bool) => {
B::new(move || set_float_above_fullscreen(bool)) b.new(move || set_float_above_fullscreen(bool))
} }
SimpleCommand::ToggleFloatAboveFullscreen => B::new(toggle_float_above_fullscreen), SimpleCommand::ToggleFloatAboveFullscreen => b.new(toggle_float_above_fullscreen),
SimpleCommand::SetFloatPinned(pinned) => { SimpleCommand::SetFloatPinned(pinned) => {
window_or_seat!(s, s.set_float_pinned(pinned)) window_or_seat!(s, s.set_float_pinned(pinned))
} }
SimpleCommand::ToggleFloatPinned => window_or_seat!(s, s.toggle_float_pinned()), SimpleCommand::ToggleFloatPinned => window_or_seat!(s, s.toggle_float_pinned()),
SimpleCommand::KillClient => client_action!(c, c.kill()), SimpleCommand::KillClient => client_action!(c, c.kill()),
SimpleCommand::ShowBar(show) => B::new(move || set_show_bar(show)), SimpleCommand::ShowBar(show) => b.new(move || set_show_bar(show)),
SimpleCommand::ToggleBar => B::new(toggle_show_bar), SimpleCommand::ToggleBar => b.new(toggle_show_bar),
SimpleCommand::FocusHistory(timeline) => { SimpleCommand::FocusHistory(timeline) => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.focus_history(timeline)) b.new(move || persistent.seat.focus_history(timeline))
} }
SimpleCommand::FocusLayerRel(direction) => { SimpleCommand::FocusLayerRel(direction) => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.focus_layer_rel(direction)) b.new(move || persistent.seat.focus_layer_rel(direction))
} }
SimpleCommand::FocusTiles => { SimpleCommand::FocusTiles => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.focus_tiles()) b.new(move || persistent.seat.focus_tiles())
} }
SimpleCommand::CreateMark => { SimpleCommand::CreateMark => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.create_mark(None)) b.new(move || persistent.seat.create_mark(None))
} }
SimpleCommand::JumpToMark => { SimpleCommand::JumpToMark => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.jump_to_mark(None)) b.new(move || persistent.seat.jump_to_mark(None))
} }
}, },
Action::Multi { actions } => { Action::Multi { actions } => {
let actions: Vec<_> = actions.into_iter().map(|a| a.into_fn(state)).collect(); let actions: Vec<_> = actions.into_iter().map(|a| a.into_fn(state)).collect();
B::new(move || { b.new(move || {
for action in &actions { for action in &actions {
action(); action();
} }
}) })
} }
Action::Exec { exec } => B::new(move || create_command(&exec).spawn()), Action::Exec { exec } => b.new(move || create_command(&exec).spawn()),
Action::SwitchToVt { num } => B::new(move || switch_to_vt(num)), Action::SwitchToVt { num } => b.new(move || switch_to_vt(num)),
Action::ShowWorkspace { name } => { Action::ShowWorkspace { name } => {
let workspace = get_workspace(&name); let workspace = get_workspace(&name);
B::new(move || s.show_workspace(workspace)) b.new(move || s.show_workspace(workspace))
} }
Action::MoveToWorkspace { name } => { Action::MoveToWorkspace { name } => {
let workspace = get_workspace(&name); let workspace = get_workspace(&name);
window_or_seat!(s, s.set_workspace(workspace)) window_or_seat!(s, s.set_workspace(workspace))
} }
Action::ConfigureConnector { con } => B::new(move || { Action::ConfigureConnector { con } => b.new(move || {
for c in connectors() { for c in connectors() {
if con.match_.matches(c) { if con.match_.matches(c) {
con.apply(c); con.apply(c);
@ -204,7 +215,7 @@ impl Action {
}), }),
Action::ConfigureInput { input } => { Action::ConfigureInput { input } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
for c in input_devices() { for c in input_devices() {
if input.match_.matches(c, &state) { if input.match_.matches(c, &state) {
input.apply(c, &state); input.apply(c, &state);
@ -214,7 +225,7 @@ impl Action {
} }
Action::ConfigureOutput { out } => { Action::ConfigureOutput { out } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
for c in connectors() { for c in connectors() {
if out.match_.matches(c, &state) { if out.match_.matches(c, &state) {
out.apply(c); out.apply(c);
@ -222,36 +233,36 @@ impl Action {
} }
}) })
} }
Action::SetEnv { env } => B::new(move || { Action::SetEnv { env } => b.new(move || {
for (k, v) in &env { for (k, v) in &env {
set_env(k, v); set_env(k, v);
} }
}), }),
Action::UnsetEnv { env } => B::new(move || { Action::UnsetEnv { env } => b.new(move || {
for k in &env { for k in &env {
unset_env(k); unset_env(k);
} }
}), }),
Action::SetKeymap { map } => { Action::SetKeymap { map } => {
let state = state.clone(); let state = state.clone();
B::new(move || state.set_keymap(&map)) b.new(move || state.set_keymap(&map))
} }
Action::SetStatus { status } => { Action::SetStatus { status } => {
let state = state.clone(); let state = state.clone();
B::new(move || state.set_status(&status)) b.new(move || state.set_status(&status))
} }
Action::SetTheme { theme } => { Action::SetTheme { theme } => {
let state = state.clone(); let state = state.clone();
B::new(move || state.apply_theme(&theme)) b.new(move || state.apply_theme(&theme))
} }
Action::SetLogLevel { level } => B::new(move || set_log_level(level)), Action::SetLogLevel { level } => b.new(move || set_log_level(level)),
Action::SetGfxApi { api } => B::new(move || set_gfx_api(api)), Action::SetGfxApi { api } => b.new(move || set_gfx_api(api)),
Action::ConfigureDirectScanout { enabled } => { Action::ConfigureDirectScanout { enabled } => {
B::new(move || set_direct_scanout_enabled(enabled)) b.new(move || set_direct_scanout_enabled(enabled))
} }
Action::ConfigureDrmDevice { dev } => { Action::ConfigureDrmDevice { dev } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
for d in drm_devices() { for d in drm_devices() {
if dev.match_.matches(d, &state) { if dev.match_.matches(d, &state) {
dev.apply(d); dev.apply(d);
@ -261,7 +272,7 @@ impl Action {
} }
Action::SetRenderDevice { dev } => { Action::SetRenderDevice { dev } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
for d in drm_devices() { for d in drm_devices() {
if dev.matches(d, &state) { if dev.matches(d, &state) {
d.make_render_device(); d.make_render_device();
@ -269,7 +280,7 @@ impl Action {
} }
}) })
} }
Action::ConfigureIdle { idle, grace_period } => B::new(move || { Action::ConfigureIdle { idle, grace_period } => b.new(move || {
if let Some(idle) = idle { if let Some(idle) = idle {
set_idle(Some(idle)) set_idle(Some(idle))
} }
@ -279,7 +290,7 @@ impl Action {
}), }),
Action::MoveToOutput { output, workspace } => { Action::MoveToOutput { output, workspace } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
let output = 'get_output: { let output = 'get_output: {
for connector in connectors() { for connector in connectors() {
if connector.connected() && output.matches(connector, &state) { if connector.connected() && output.matches(connector, &state) {
@ -295,13 +306,13 @@ impl Action {
}) })
} }
Action::SetRepeatRate { rate } => { Action::SetRepeatRate { rate } => {
B::new(move || s.set_repeat_rate(rate.rate, rate.delay)) b.new(move || s.set_repeat_rate(rate.rate, rate.delay))
} }
Action::DefineAction { name, action } => { Action::DefineAction { name, action } => {
let state = state.clone(); let state = state.clone();
let action = action.into_rc_fn(&state); let action = action.into_rc_fn(&state);
let name = Rc::new(name); let name = Rc::new(name);
B::new(move || { b.new(move || {
state state
.persistent .persistent
.actions .actions
@ -311,13 +322,13 @@ impl Action {
} }
Action::UndefineAction { name } => { Action::UndefineAction { name } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
state.persistent.actions.borrow_mut().remove(&name); state.persistent.actions.borrow_mut().remove(&name);
}) })
} }
Action::NamedAction { name } => { Action::NamedAction { name } => {
let state = state.clone(); let state = state.clone();
B::new(move || { b.new(move || {
let depth = state.action_depth.get(); let depth = state.action_depth.get();
if depth >= state.action_depth_max { if depth >= state.action_depth_max {
log::error!("Maximum action depth reached"); log::error!("Maximum action depth reached");
@ -334,15 +345,15 @@ impl Action {
} }
Action::CreateMark(m) => { Action::CreateMark(m) => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.create_mark(Some(m))) b.new(move || persistent.seat.create_mark(Some(m)))
} }
Action::JumpToMark(m) => { Action::JumpToMark(m) => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.jump_to_mark(Some(m))) b.new(move || persistent.seat.jump_to_mark(Some(m)))
} }
Action::CopyMark(s, d) => { Action::CopyMark(s, d) => {
let persistent = state.persistent.clone(); let persistent = state.persistent.clone();
B::new(move || persistent.seat.copy_mark(s, d)) b.new(move || persistent.seat.copy_mark(s, d))
} }
} }
} }