andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Allow replacement of screencast and displayconfig dbus

Browse Source 
This way the session can start with those dbus services registered, but
then for debugging they can be subsequently replaced anyway.
This commit is contained in:
Ivan Molodetskikh
2023-09-19 16:46:13 +04:00
parent 361b34f460
commit 99b945c385
1 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+40 -25
View File
@@ -57,6 +57,7 @@ use smithay::wayland::shm::ShmState;
use smithay::wayland::socket::ListeningSocketSource;
use smithay::wayland::tablet_manager::TabletManagerState;
use time::OffsetDateTime;
use zbus::fdo::RequestNameFlags;
use crate::backend::{Backend, Tty, Winit};
use crate::config::Config;
@@ -384,7 +385,7 @@ impl Niri {
}
// Set up zbus, make sure it happens before anything might want it.
let mut conn = zbus::blocking::ConnectionBuilder::session()
let conn = zbus::blocking::ConnectionBuilder::session()
.unwrap()
.name("org.gnome.Mutter.ServiceChannel")
.unwrap()
@@ -392,24 +393,31 @@ impl Niri {
"/org/gnome/Mutter/ServiceChannel",
ServiceChannel::new(display_handle.clone()),
)
.unwrap()
.build()
.unwrap();
if pipewire.is_some() && !config_.debug.screen_cast_in_non_session_instances {
conn = conn
.name("org.gnome.Mutter.ScreenCast")
.unwrap()
.serve_at("/org/gnome/Mutter/ScreenCast", screen_cast.clone())
.unwrap()
.name("org.gnome.Mutter.DisplayConfig")
.unwrap()
.serve_at(
if pipewire.is_some() {
let server = conn.object_server();
server
.at("/org/gnome/Mutter/ScreenCast", screen_cast.clone())
.unwrap();
server
.at(
"/org/gnome/Mutter/DisplayConfig",
DisplayConfig::new(backend.connectors()),
)
.unwrap();
let flags = RequestNameFlags::AllowReplacement
| RequestNameFlags::ReplaceExisting
| RequestNameFlags::DoNotQueue;
conn.request_name_with_flags("org.gnome.Mutter.ScreenCast", flags)
.unwrap();
conn.request_name_with_flags("org.gnome.Mutter.DisplayConfig", flags)
.unwrap();
}
let conn = conn.build().unwrap();
zbus_conn = Some(conn);
// Notify systemd we're ready.
@@ -443,21 +451,28 @@ impl Niri {
}
}
} else if pipewire.is_some() && config_.debug.screen_cast_in_non_session_instances {
let conn = zbus::blocking::ConnectionBuilder::session()
.unwrap()
.name("org.gnome.Mutter.ScreenCast")
.unwrap()
.serve_at("/org/gnome/Mutter/ScreenCast", screen_cast.clone())
.unwrap()
.name("org.gnome.Mutter.DisplayConfig")
.unwrap()
.serve_at(
"/org/gnome/Mutter/DisplayConfig",
DisplayConfig::new(backend.connectors()),
)
.unwrap()
.build()
let conn = zbus::blocking::Connection::session().unwrap();
{
let server = conn.object_server();
server
.at("/org/gnome/Mutter/ScreenCast", screen_cast.clone())
.unwrap();
server
.at(
"/org/gnome/Mutter/DisplayConfig",
DisplayConfig::new(backend.connectors()),
)
.unwrap();
}
let flags = RequestNameFlags::AllowReplacement
| RequestNameFlags::ReplaceExisting
| RequestNameFlags::DoNotQueue;
conn.request_name_with_flags("org.gnome.Mutter.ScreenCast", flags)
.unwrap();
conn.request_name_with_flags("org.gnome.Mutter.DisplayConfig", flags)
.unwrap();
zbus_conn = Some(conn);
}