fdo-mirrors/helvum
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/helvum.git synced 2026-05-07 18:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to the new clone! macro syntax

Browse source 
This makes it possible for `rustfmt` to understand the inside of the
macro, and thus reformat it accordingly.
This commit is contained in:
Emmanuel Gil Peyrot 2025-03-11 05:49:29 +01:00
parent bdf17e297c
commit 153d8dfefe
5 changed files with 227 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/application.rs
View file

@ -64,10 +64,14 @@ mod imp {
let zoom_set_action =
gio::SimpleAction::new("set-zoom", Some(&f64::static_variant_type()));
zoom_set_action.connect_activate(clone!(@weak graphview => move|_, param| {
let zoom_factor = param.unwrap().get::<f64>().unwrap();
graphview.set_zoom_factor(zoom_factor, None)
}));
zoom_set_action.connect_activate(clone!(
#[weak]
graphview,
move |_, param| {
let zoom_factor = param.unwrap().get::<f64>().unwrap();
graphview.set_zoom_factor(zoom_factor, None)
}
));
self.window.add_action(&zoom_set_action);
self.window.show();
@ -101,9 +105,13 @@ mod imp {
// Add <Control-Q> shortcut for quitting the application.
let quit = gtk::gio::SimpleAction::new("quit", None);
quit.connect_activate(clone!(@weak obj => move |_, _| {
obj.quit();
}));
quit.connect_activate(clone!(
#[weak]
obj,
move |_, _| {
obj.quit();
}
));
obj.set_accels_for_action("app.quit", &["<Control>Q"]);
obj.add_action(&quit);
@ -148,16 +156,21 @@ mod imp {
);
let current_remote_label = obj.imp().window.current_remote_label();
obj.connect_handle_local_options(clone!(@strong pw_sender => move |_, opts| {
match opts.lookup::<String>("socket") {
Ok(p) => {
current_remote_label.set_label(p.as_deref().unwrap_or(DEFAULT_REMOTE_NAME));
pw_sender.send(GtkMessage::Connect(p)).unwrap();
},
Err(e) => error!("Invalid socket path: {e}"),
obj.connect_handle_local_options(clone!(
#[strong]
pw_sender,
move |_, opts| {
match opts.lookup::<String>("socket") {
Ok(p) => {
current_remote_label
.set_label(p.as_deref().unwrap_or(DEFAULT_REMOTE_NAME));
pw_sender.send(GtkMessage::Connect(p)).unwrap();
}
Err(e) => error!("Invalid socket path: {e}"),
}
-1
}
-1
}));
));
}
}
}

19
src/graph_manager.rs
View file

@ -176,15 +176,20 @@ mod imp {
port.connect_local(
"port_toggled",
false,
glib::clone!(@weak self as app => @default-return None, move |args| {
// Args always look like this: &[widget, id_port_from, id_port_to]
let port_from = args[1].get::<u32>().unwrap();
let port_to = args[2].get::<u32>().unwrap();
glib::clone!(
#[weak(rename_to = app)]
self,
#[upgrade_or_default]
move |args| {
// Args always look like this: &[widget, id_port_from, id_port_to]
let port_from = args[1].get::<u32>().unwrap();
let port_to = args[2].get::<u32>().unwrap();
app.toggle_link(port_from, port_to);
app.toggle_link(port_from, port_to);
None
}),
None
}
),
);
items.insert(id, port.clone().upcast());

177
src/pipewire_connection/mod.rs
View file

@ -92,8 +92,12 @@ pub(super) fn thread_main(
// Wait PipeWire service to connect from command line arguments.
let receiver = pw_receiver.attach(mainloop.loop_(), {
clone!(@strong mainloop, @strong loop_state => move |msg|
if loop_state.borrow_mut().handle_message(msg) {
clone!(
#[strong]
mainloop,
#[strong]
loop_state,
move |msg| if loop_state.borrow_mut().handle_message(msg) {
mainloop.quit();
}
)
@ -117,17 +121,23 @@ pub(super) fn thread_main(
// If connection is failed, try to connect again in 200ms
let interval = Some(Duration::from_millis(200));
let timer = mainloop
.loop_()
.add_timer(clone!(@strong mainloop => move |_| {
let timer = mainloop.loop_().add_timer(clone!(
#[strong]
mainloop,
move |_| {
mainloop.quit();
}));
}
));
timer.update_timer(interval, None).into_result().unwrap();
let receiver = pw_receiver.attach(mainloop.loop_(), {
clone!(@strong mainloop, @strong loop_state => move |msg|
if loop_state.borrow_mut().handle_message(msg) {
clone!(
#[strong]
mainloop,
#[strong]
loop_state,
move |msg| if loop_state.borrow_mut().handle_message(msg) {
mainloop.quit();
}
)
@ -154,63 +164,104 @@ pub(super) fn thread_main(
let state = Rc::new(RefCell::new(State::new()));
let receiver = pw_receiver.attach(mainloop.loop_(), {
clone!(@strong mainloop, @weak core, @weak registry, @strong state, @strong loop_state => move |msg| match msg {
GtkMessage::ToggleLink { port_from, port_to } => toggle_link(port_from, port_to, &core, &registry, &state),
GtkMessage::Terminate | GtkMessage::Connect(_) => {
loop_state.borrow_mut().handle_message(msg);
mainloop.quit();
clone!(
#[strong]
mainloop,
#[weak]
core,
#[weak]
registry,
#[strong]
state,
#[strong]
loop_state,
move |msg| match msg {
GtkMessage::ToggleLink { port_from, port_to } =>
toggle_link(port_from, port_to, &core, &registry, &state),
GtkMessage::Terminate | GtkMessage::Connect(_) => {
loop_state.borrow_mut().handle_message(msg);
mainloop.quit();
}
}
})
)
});
let _listener = core
.add_listener_local()
.error(
clone!(@strong mainloop, @strong gtk_sender => move |id, _seq, res, message| {
.error(clone!(
#[strong]
mainloop,
#[strong]
gtk_sender,
move |id, _seq, res, message| {
if id != PW_ID_CORE {
return;
}
if res == -libc::EPIPE {
gtk_sender.send_blocking(PipewireMessage::Disconnected)
gtk_sender
.send_blocking(PipewireMessage::Disconnected)
.expect("Failed to send message");
mainloop.quit();
} else {
let serr = SpaResult::from_c(res).into_result().unwrap_err();
error!("Pipewire Core received error {serr}: {message}");
}
}),
)
}
))
.register();
let _listener = registry
.add_listener_local()
.global(clone!(@strong gtk_sender, @weak registry, @strong proxies, @strong state =>
.global(clone!(
#[strong]
gtk_sender,
#[weak]
registry,
#[strong]
proxies,
#[strong]
state,
move |global| match global.type_ {
ObjectType::Node => handle_node(global, &gtk_sender, &registry, &proxies, &state),
ObjectType::Port => handle_port(global, &gtk_sender, &registry, &proxies, &state),
ObjectType::Link => handle_link(global, &gtk_sender, &registry, &proxies, &state),
ObjectType::Node =>
handle_node(global, &gtk_sender, &registry, &proxies, &state),
ObjectType::Port =>
handle_port(global, &gtk_sender, &registry, &proxies, &state),
ObjectType::Link =>
handle_link(global, &gtk_sender, &registry, &proxies, &state),
_ => {
// Other objects are not interesting to us
}
}
))
.global_remove(clone!(@strong gtk_sender, @strong proxies, @strong state => move |id| {
if let Some(item) = state.borrow_mut().remove(id) {
gtk_sender.send_blocking(match item {
Item::Node { .. } => PipewireMessage::NodeRemoved {id},
Item::Port { node_id } => PipewireMessage::PortRemoved {id, node_id},
Item::Link { .. } => PipewireMessage::LinkRemoved {id},
}).expect("Failed to send message");
} else {
warn!(
"Attempted to remove item with id {} that is not saved in state",
id
);
}
.global_remove(clone!(
#[strong]
gtk_sender,
#[strong]
proxies,
#[strong]
state,
move |id| {
if let Some(item) = state.borrow_mut().remove(id) {
gtk_sender
.send_blocking(match item {
Item::Node { .. } => PipewireMessage::NodeRemoved { id },
Item::Port { node_id } => {
PipewireMessage::PortRemoved { id, node_id }
}
Item::Link { .. } => PipewireMessage::LinkRemoved { id },
})
.expect("Failed to send message");
} else {
warn!(
"Attempted to remove item with id {} that is not saved in state",
id
);
}
proxies.borrow_mut().remove(&id);
}))
proxies.borrow_mut().remove(&id);
}
))
.register();
mainloop.run();
@ -279,9 +330,15 @@ fn handle_node(
let proxy: Node = registry.bind(node).expect("Failed to bind to node proxy");
let listener = proxy
.add_listener_local()
.info(clone!(@strong sender, @strong proxies => move |info| {
handle_node_info(info, &sender, &proxies);
}))
.info(clone!(
#[strong]
sender,
#[strong]
proxies,
move |info| {
handle_node_info(info, &sender, &proxies);
}
))
.register();
proxies.borrow_mut().insert(
@ -333,16 +390,26 @@ fn handle_port(
let proxy: Port = registry.bind(port).expect("Failed to bind to port proxy");
let listener = proxy
.add_listener_local()
.info(
clone!(@strong proxies, @strong state, @strong sender => move |info| {
.info(clone!(
#[strong]
proxies,
#[strong]
state,
#[strong]
sender,
move |info| {
handle_port_info(info, &proxies, &state, &sender);
}),
)
.param(clone!(@strong sender => move |_, param_id, _, _, param| {
if param_id == ParamType::EnumFormat {
handle_port_enum_format(port_id, param, &sender)
}
}))
))
.param(clone!(
#[strong]
sender,
move |_, param_id, _, _, param| {
if param_id == ParamType::EnumFormat {
handle_port_enum_format(port_id, param, &sender)
}
}
))
.register();
proxies.borrow_mut().insert(
@ -443,9 +510,15 @@ fn handle_link(
let proxy: Link = registry.bind(link).expect("Failed to bind to link proxy");
let listener = proxy
.add_listener_local()
.info(clone!(@strong state, @strong sender => move |info| {
handle_link_info(info, &state, &sender);
}))
.info(clone!(
#[strong]
state,
#[strong]
sender,
move |info| {
handle_link_info(info, &state, &sender);
}
))
.register();
proxies.borrow_mut().insert(

45
src/ui/graph/graph_view.rs
View file

@ -391,14 +391,18 @@ mod imp {
Port::static_type(),
glib::Priority::DEFAULT,
Option::<&gio::Cancellable>::None,
clone!(@weak self as imp => move|value| {
let Ok(value) = value else {
return;
};
let port: &Port = value.get().expect("Value should contain a port");
clone!(
#[weak(rename_to = imp)]
self,
move |value| {
let Ok(value) = value else {
return;
};
let port: &Port = value.get().expect("Value should contain a port");
imp.dragged_port.set(Some(port));
}),
imp.dragged_port.set(Some(port));
}
),
);
self.obj().queue_draw();
@ -704,8 +708,11 @@ mod imp {
}
if let Some(adjustment) = adjustment {
adjustment
.connect_value_changed(clone!(@weak obj => move |_| obj.queue_allocate() ));
adjustment.connect_value_changed(clone!(
#[weak]
obj,
move |_| obj.queue_allocate()
));
}
}
@ -854,15 +861,23 @@ impl GraphView {
pub fn add_link(&self, link: Link) {
link.connect_notify_local(
Some("active"),
glib::clone!(@weak self as graph => move |_, _| {
graph.queue_draw();
}),
glib::clone!(
#[weak(rename_to = graph)]
self,
move |_, _| {
graph.queue_draw();
}
),
);
link.connect_notify_local(
Some("media-type"),
glib::clone!(@weak self as graph => move |_, _| {
graph.queue_draw();
}),
glib::clone!(
#[weak(rename_to = graph)]
self,
move |_, _| {
graph.queue_draw();
}
),
);
self.imp().links.borrow_mut().insert(link);
self.queue_draw();

46
src/ui/graph/zoomentry.rs
View file

@ -65,37 +65,49 @@ mod imp {
fn constructed(&self) {
self.parent_constructed();
self.zoom_out_button
.connect_clicked(clone!(@weak self as imp => move |_| {
self.zoom_out_button.connect_clicked(clone!(
#[weak(rename_to = imp)]
self,
move |_| {
let graphview = imp.graphview.borrow();
if let Some(ref graphview) = *graphview {
graphview.set_zoom_factor(graphview.zoom_factor() - 0.1, None);
}
}));
}
));
self.zoom_in_button
.connect_clicked(clone!(@weak self as imp => move |_| {
self.zoom_in_button.connect_clicked(clone!(
#[weak(rename_to = imp)]
self,
move |_| {
let graphview = imp.graphview.borrow();
if let Some(ref graphview) = *graphview {
graphview.set_zoom_factor(graphview.zoom_factor() + 0.1, None);
}
}));
}
));
self.entry
.connect_activate(clone!(@weak self as imp => move |entry| {
self.entry.connect_activate(clone!(
#[weak(rename_to = imp)]
self,
move |entry| {
if let Ok(zoom_factor) = entry.text().trim_matches('%').parse::<f64>() {
let graphview = imp.graphview.borrow();
if let Some(ref graphview) = *graphview {
graphview.set_zoom_factor(zoom_factor / 100.0, None);
}
}
}));
self.entry
.connect_icon_press(clone!(@weak self as imp => move |_, pos| {
}
));
self.entry.connect_icon_press(clone!(
#[weak(rename_to = imp)]
self,
move |_, pos| {
if pos == gtk::EntryIconPosition::Secondary {
imp.popover.show();
}
}));
}
));
self.popover.set_parent(&self.entry.get());
}
@ -132,9 +144,13 @@ mod imp {
if let Some(ref widget) = widget {
widget.connect_notify_local(
Some("zoom-factor"),
clone!(@weak self as imp => move |graphview, _| {
imp.update_zoom_factor_text(graphview.zoom_factor());
}),
clone!(
#[weak(rename_to = imp)]
self,
move |graphview, _| {
imp.update_zoom_factor_text(graphview.zoom_factor());
}
),
);
self.update_zoom_factor_text(widget.zoom_factor());
}