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

backend: remove Copy from BackendConnectorState

Browse source
This commit is contained in:
khyperia 2026-01-21 11:52:02 +01:00 • committed by Julian Orth
parent 6db1f84cb2
commit 11b3f08514
14 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ifs/head_management/jay_head_manager_session_v1.rs
View file

@ -258,8 +258,8 @@ impl JayHeadManagerSessionV1 {
let Some(connector) = self.client.state.connectors.get(&head.common.id) else {
return Err(HeadTransactionError::HeadRemoved(head.common.id));
};
let old = connector.state.get();
let mut new = old;
let old = connector.state.borrow().clone();
let mut new = old.clone();
new.enabled = desired.connector_enabled;
new.mode = desired.mode;
new.non_desktop_override = desired.override_non_desktop;

4
src/ifs/jay_randr.rs
View file

@ -72,7 +72,7 @@ impl JayRandr {
}
fn send_connector(&self, data: &ConnectorData) {
let state = data.state.get();
let state_enabled = data.state.borrow().enabled;
self.client.event(Connector {
self_id: self.id,
id: data.connector.id().raw() as _,
@ -81,7 +81,7 @@ impl JayRandr {
.as_ref()
.map(|d| d.dev.id().raw() as _)
.unwrap_or_default(),
enabled: state.enabled as _,
enabled: state_enabled as _,
name: &data.name,
});
let Some(output) = self.client.state.outputs.get(&data.connector.id()) else {

2
src/ifs/wl_output.rs
View file

@ -206,7 +206,7 @@ impl WlOutputGlobal {
) -> Self {
let (x, y) = persistent_state.pos.get();
let scale = persistent_state.scale.get();
let connector_state = connector.state.get();
let connector_state = connector.state.borrow();
let (width, height) = calculate_logical_size(
(connector_state.mode.width, connector_state.mode.height),
persistent_state.transform.get(),

2
src/ifs/wlr_output_manager/zwlr_output_configuration_v1.rs
View file

@ -73,7 +73,7 @@ impl ZwlrOutputConfigurationV1 {
}
let mut tran = ConnectorTransaction::new(&self.client.state);
for output in self.client.state.outputs.lock().values() {
let mut state = output.connector.state.get();
let mut state = output.connector.state.borrow().clone();
match self.enabled_outputs.get(&output.connector.id) {
None => {
if self.configured_outputs.not_contains(&output.connector.id) {

4
src/ifs/wlr_output_manager/zwlr_output_manager_v1.rs
View file

@ -131,7 +131,7 @@ impl ZwlrOutputManagerV1 {
}
};
let mi = &output.monitor_info;
let state = output.connector.state.get();
let state_mode = output.connector.state.borrow().mode;
let head_id = self.client.state.wlr_output_managers.head_ids.next();
let mut modes_list = vec![];
let mut modes = AHashMap::new();
@ -140,7 +140,7 @@ impl ZwlrOutputManagerV1 {
if modes.contains_key(mode) {
continue;
}
let current = !have_current && *mode == state.mode;
let current = !have_current && *mode == state_mode;
if current {
have_current = true;
}