aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock4
-rw-r--r--src/backend/tty.rs4
-rw-r--r--src/handlers/mod.rs16
3 files changed, 12 insertions, 12 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a3cc043a..ecdb2a83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3507,7 +3507,7 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
[[package]]
name = "smithay"
version = "0.7.0"
-source = "git+https://github.com/Smithay/smithay.git#7c1fc8951060a46a175d1adae7c8da66f3cfe67e"
+source = "git+https://github.com/Smithay/smithay.git#1d05641d72fd1d8ee077c969f956631502207c66"
dependencies = [
"aliasable",
"appendlist",
@@ -3581,7 +3581,7 @@ dependencies = [
[[package]]
name = "smithay-drm-extras"
version = "0.1.0"
-source = "git+https://github.com/Smithay/smithay.git#7c1fc8951060a46a175d1adae7c8da66f3cfe67e"
+source = "git+https://github.com/Smithay/smithay.git#1d05641d72fd1d8ee077c969f956631502207c66"
dependencies = [
"drm",
"libdisplay-info",
diff --git a/src/backend/tty.rs b/src/backend/tty.rs
index 4c8801f9..7b0303fd 100644
--- a/src/backend/tty.rs
+++ b/src/backend/tty.rs
@@ -972,7 +972,7 @@ impl Tty {
surface,
None,
allocator.clone(),
- GbmFramebufferExporter::new(device.gbm.clone(), Some(device.render_node)),
+ GbmFramebufferExporter::new(device.gbm.clone(), device.render_node.into()),
SUPPORTED_COLOR_FORMATS,
// This is only used to pick a good internal format, so it can use the surface's render
// formats, even though we only ever render on the primary GPU.
@@ -1002,7 +1002,7 @@ impl Tty {
surface,
None,
allocator,
- GbmFramebufferExporter::new(device.gbm.clone(), Some(device.render_node)),
+ GbmFramebufferExporter::new(device.gbm.clone(), device.render_node.into()),
SUPPORTED_COLOR_FORMATS,
render_formats,
device.drm.cursor_size(),
diff --git a/src/handlers/mod.rs b/src/handlers/mod.rs
index 5955bcec..5878e3be 100644
--- a/src/handlers/mod.rs
+++ b/src/handlers/mod.rs
@@ -312,8 +312,8 @@ impl SelectionHandler for State {
}
impl DataDeviceHandler for State {
- fn data_device_state(&self) -> &DataDeviceState {
- &self.niri.data_device_state
+ fn data_device_state(&mut self) -> &mut DataDeviceState {
+ &mut self.niri.data_device_state
}
}
@@ -392,23 +392,23 @@ impl ServerDndGrabHandler for State {}
delegate_data_device!(State);
impl PrimarySelectionHandler for State {
- fn primary_selection_state(&self) -> &PrimarySelectionState {
- &self.niri.primary_selection_state
+ fn primary_selection_state(&mut self) -> &mut PrimarySelectionState {
+ &mut self.niri.primary_selection_state
}
}
delegate_primary_selection!(State);
impl WlrDataControlHandler for State {
- fn data_control_state(&self) -> &WlrDataControlState {
- &self.niri.wlr_data_control_state
+ fn data_control_state(&mut self) -> &mut WlrDataControlState {
+ &mut self.niri.wlr_data_control_state
}
}
delegate_data_control!(State);
impl ExtDataControlHandler for State {
- fn data_control_state(&self) -> &ExtDataControlState {
- &self.niri.ext_data_control_state
+ fn data_control_state(&mut self) -> &mut ExtDataControlState {
+ &mut self.niri.ext_data_control_state
}
}