leyoda/cosmic-greeter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Search all XDG_DATA_DIRS and XDG_DATA_HOME for sessions

Browse source
This commit is contained in:
Lily Foster 2024-02-19 22:08:02 -05:00
parent 0d7624b76d
commit cb8762180e
No known key found for this signature in database
GPG key ID: 49340081E484C893
3 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/greeter.rs
View file

@ -25,7 +25,15 @@ use cosmic::{
};
use cosmic_greeter_daemon::{UserData, WallpaperData};
use greetd_ipc::{codec::SyncCodec, AuthMessageType, Request, Response};
use std::{collections::HashMap, env, error::Error, fs, io, path::Path, process, sync::Arc};
use std::{
collections::HashMap,
env,
error::Error,
fs, io,
path::{Path, PathBuf},
process,
sync::Arc,
};
use tokio::{net::UnixStream, time};
use wayland_client::{protocol::wl_output::WlOutput, Proxy};
use zbus::{dbus_proxy, Connection};
@ -116,14 +124,22 @@ pub fn main() -> Result<(), Box<dyn Error>> {
Wayland,
}
//TODO: allow custom directories?
let session_dirs = &[
(
Path::new("/usr/share/wayland-sessions"),
SessionType::Wayland,
),
(Path::new("/usr/share/xsessions"), SessionType::X11),
];
let session_dirs = xdg::BaseDirectories::with_prefix("wayland-sessions")
.map_or(
vec![PathBuf::from("/usr/share/wayland-sessions")],
|xdg_dirs| xdg_dirs.get_data_dirs(),
)
.into_iter()
.map(|dir| (dir, SessionType::Wayland))
.chain(
xdg::BaseDirectories::with_prefix("xsessions")
.map_or(
vec![PathBuf::from("/usr/share/xsessions")],
|xdg_dirs| xdg_dirs.get_data_dirs(),
)
.into_iter()
.map(|dir| (dir, SessionType::X11)),
);
let sessions = {
let mut sessions = HashMap::new();