.zed/settings.json

@@ -0,0 +1,15 @@
+{
+  "format_on_save": "on",
+  "lsp": {
+    "rust-analyzer": {
+      "initialization_options": {
+        "check": {
+          "command": "clippy",
+        },
+        "rustfmt": {
+          "extraArgs": ["+nightly"],
+        },
+      },
+    },
+  },
+}

Cargo.toml

@@ -18,7 +18,6 @@ cosmic-comp-config.workspace = true
 cosmic-config = { workspace = true, features = ["calloop", "macro"] }
 cosmic-greeter-config.workspace = true
 cosmic-greeter-daemon = { path = "daemon" }
-cosmic-osk-config = { git = "https://github.com/pop-os/cosmic-osk" }
 dirs = "6"
 cosmic = { package = "libcosmic-yoda", path = "../libcosmic", default-features = false, features = [
     "advanced-shaping",
@@ -90,7 +89,6 @@ image = { version = "0.25", default-features = false, features = [
 ] }
 # JPEG-XL support
 jxl-oxide = { version = "0.12.6", features = ["image"] }
-enumflags2 = "0.7.12"
 
 [dependencies.greetd_ipc]
 version = "0.10.3"
@@ -173,8 +171,8 @@ iced_widget = { path = "../libcosmic/iced/widget" }
 iced_winit = { path = "../libcosmic/iced/winit" }
 
 [patch."https://github.com/pop-os/cosmic-protocols"]
-cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
 cosmic-protocols = { path = "../cosmic-protocols" }
+cosmic-client-toolkit = { path = "../cosmic-protocols/client-toolkit" }
 
 [patch."https://github.com/pop-os/cosmic-settings-daemon"]
 cosmic-settings-config = { path = "../cosmic-settings-daemon/config" }
@@ -189,7 +187,3 @@ dnd = { path = "../window_clipboard/dnd" }
 mime = { path = "../window_clipboard/mime" }
 clipboard_wayland = { path = "../window_clipboard/wayland" }
 clipboard_macos = { path = "../window_clipboard/macos" }
-
-# Yoda: cosmic-osk-config depuis le checkout local (meme source que le paquet cosmic-osk).
-[patch."https://github.com/pop-os/cosmic-osk"]
-cosmic-osk-config = { path = "../cosmic-osk/config" }

daemon/Cargo.toml

@@ -28,8 +28,7 @@ whitespace-conf = "1"
 #TODO: reduce features
 tokio = { workspace = true, features = ["full"] }
 xdg = "3.0"
-zbus_systemd = { version = "0.26000.0", features = ["home1"], optional = true }
 
 [features]
 default = ["systemd"]
-systemd = ["tracing-journald", "zbus_systemd"]
+systemd = ["tracing-journald"]

daemon/src/lib.rs

@@ -1,12 +1,11 @@
 use cosmic_comp_config::output::randr;
 use cosmic_config::CosmicConfigEntry;
 use kdl::KdlDocument;
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;
 use std::fs;
 use std::io::Read;
 use std::os::unix::fs::OpenOptionsExt;
 use std::path::{Path, PathBuf};
-use zbus::Connection;
 
 pub use cosmic_applets_config::time::TimeAppletConfig;
 pub use cosmic_bg_config::state::State as BgState;
@@ -17,41 +16,12 @@ pub use cosmic_theme::{Theme, ThemeBuilder};
 pub struct UserFilter {
     uid_min: u32,
     uid_max: u32,
-    homed_uids: BTreeSet<u32>,
 }
 
-impl UserFilter {
+impl Default for UserFilter {
-    #[cfg(feature = "systemd")]
+    fn default() -> Self {
-    async fn get_homed_uids() -> Result<BTreeSet<u32>, zbus::Error> {
-        use zbus_systemd::home1;
-
-        let connection = Connection::system().await?;
-        let homed = home1::ManagerProxy::new(&connection).await?;
-
-        let homed_uids = homed
-            .list_homes()
-            .await?
-            .iter()
-            .map(|(_, uid, ..)| *uid)
-            .collect();
-
-        Ok(homed_uids)
-    }
-
-    pub async fn new() -> Self {
         let login_defs_data = fs::read_to_string("/etc/login.defs").unwrap_or_default();
         let login_defs = whitespace_conf::parse(&login_defs_data);
-
-        #[cfg(feature = "systemd")]
-        let homed_uids = Self::get_homed_uids()
-            .await
-            .inspect_err(|e| {
-                tracing::warn!("failed to list dynamic UIDs from systemd-homed: {e:?}")
-            })
-            .unwrap_or_default();
-        #[cfg(not(feature = "systemd"))]
-        let homed_uids = BTreeSet::new();
-
         Self {
             uid_min: login_defs
                 .get("UID_MIN")
@@ -61,14 +31,17 @@ impl UserFilter {
                 .get("UID_MAX")
                 .and_then(|x| x.parse::<u32>().ok())
                 .unwrap_or(65000),
-            homed_uids,
         }
     }
+}
+
+impl UserFilter {
+    pub fn new() -> Self {
+        Self::default()
+    }
 
     pub fn filter(&self, user: &pwd::Passwd) -> bool {
-        if (user.uid < self.uid_min || user.uid > self.uid_max)
+        if user.uid < self.uid_min || user.uid > self.uid_max {
-            && !self.homed_uids.contains(&user.uid)
-        {
             // Skip system accounts
             return false;
         }
@@ -128,48 +101,6 @@ impl UserData {
         }
     }
 
-    fn load_icon_as_user(&mut self) {
-        //TODO: use accountsservice?
-        let icon_paths = [
-            //IMPORTANT: This file is owned by root and safe to read (it won't be a link to /etc/shadow for example)
-            // It may not exist if the user uses one of the system icons. In that case, we should read the
-            // information in /var/lib/AccountsService/users, and then read the icon path as the user
-            Path::new("/var/lib/AccountsService/icons").join(&self.name),
-            // systemd-homed cache
-            Path::new("/var/cache/systemd/home")
-                .join(&self.name)
-                .join("avatar"),
-        ];
-
-        for icon_path in icon_paths {
-            match fs::OpenOptions::new()
-                .read(true)
-                // Do not follow symlinks
-                .custom_flags(libc::O_NOFOLLOW)
-                .open(&icon_path)
-            {
-                Ok(mut icon_file) => {
-                    let mut icon_data = Vec::new();
-                    match icon_file.read_to_end(&mut icon_data) {
-                        Ok(count) => {
-                            icon_data.truncate(count);
-                            self.icon_opt = Some(icon_data);
-                            return;
-                        }
-                        Err(err) => {
-                            tracing::error!("failed to read icon data {:?}: {:?}", icon_path, err);
-                        }
-                    }
-                }
-                Err(err) => {
-                    tracing::warn!("failed to open icon {:?}: {:?}", icon_path, err);
-                }
-            }
-        }
-
-        tracing::error!("failed to load icon for user {:?}", self.name)
-    }
-
     pub fn load_config_as_user(&mut self) {
         self.icon_opt = None;
         self.theme_opt = None;
@@ -178,7 +109,33 @@ impl UserData {
         self.xkb_config_opt = None;
         self.time_applet_config = Default::default();
 
-        self.load_icon_as_user();
+        //TODO: use accountsservice?
+        //IMPORTANT: This file is owned by root and safe to read (it won't be a link to /etc/shadow for example)
+        // It may not exist if the user uses one of the system icons. In that case, we should read the
+        // information in /var/lib/AccountsService/users, and then read the icon path as the user
+        let icon_path = Path::new("/var/lib/AccountsService/icons").join(&self.name);
+        match fs::OpenOptions::new()
+            .read(true)
+            // Do not follow symlinks
+            .custom_flags(libc::O_NOFOLLOW)
+            .open(&icon_path)
+        {
+            Ok(mut icon_file) => {
+                let mut icon_data = Vec::new();
+                match icon_file.read_to_end(&mut icon_data) {
+                    Ok(count) => {
+                        icon_data.truncate(count);
+                        self.icon_opt = Some(icon_data);
+                    }
+                    Err(err) => {
+                        tracing::error!("failed to read icon data {:?}: {:?}", icon_path, err);
+                    }
+                }
+            }
+            Err(err) => {
+                tracing::error!("failed to open icon {:?}: {:?}", icon_path, err);
+            }
+        }
 
         let mut is_dark = true;
         match cosmic_theme::ThemeMode::config() {
@@ -252,16 +209,6 @@ impl UserData {
                 tracing::error!("failed to create cosmic-bg state helper: {:?}", err);
             }
         }
-        if self.bg_state.wallpapers.is_empty() {
-            self.bg_state.wallpapers.push((
-                String::new(),
-                BgSource::Path(
-                    Path::new("/var/cache/systemd/home")
-                        .join(&self.name)
-                        .join("login-background"),
-                ),
-            ));
-        }
         self.load_wallpapers_as_user();
 
         match cosmic_config::Config::new("com.system76.CosmicComp", CosmicCompConfig::VERSION) {

daemon/src/main.rs

@@ -70,8 +70,8 @@ struct GreeterProxy;
 
 #[zbus::interface(name = "com.system76.CosmicGreeter")]
 impl GreeterProxy {
-    async fn get_user_data(&mut self) -> Result<String, GreeterError> {
+    fn get_user_data(&mut self) -> Result<String, GreeterError> {
-        let user_filter = UserFilter::new().await;
+        let user_filter = UserFilter::new();
 
         // The pwd::Passwd method is unsafe (but not labelled as such) due to using global state (libc pwent functions).
         // To prevent issues, this should only be called once in the entire process space at a time

i18n/en/cosmic_greeter.ftl

@@ -9,7 +9,6 @@ caps-lock = Caps Lock is active.
 enter-user = Enter name manually...
 type-username = Username:
 keyboard-layout = Keyboard layout
-on-screen-keyboard = On-screen keyboard
 restart = Restart
 restart-now = Restart now?
 restart-timeout = The system will restart automatically

i18n/kab/cosmic_greeter.ftl

@@ -1,4 +1,4 @@
-cancel = Semmet
+cancel = Sefsex
 restart-timeout =
     Anagraw ad yales tanekra s wudem awurman
     { $seconds ->

i18n/oc/cosmic_greeter.ftl

@@ -13,5 +13,3 @@ shutdown-timeout =
         [1] d’aquí 1 segondas.
        *[other] d’aquí { $seconds } segondas.
     }
-cancel = Anullar
-user = Utilizaire

i18n/th/cosmic_greeter.ftl

@@ -2,10 +2,10 @@ cancel = ยกเลิก
 keyboard-layout = ผังคีย์บอร์ด
 restart = รีสตาร์ท
 restart-now = รีสตาร์ทตอนนี้เลยหรือไม่
-restart-timeout = ระบบจะรีสตาร์ทโดยอัตโนมัติภายใน { $seconds } วินาที
+restart-timeout = ระบบจะรีสตาร์ทโดยอัตโนมัติภายใน {$seconds} วินาที
 session = เซสชั่น
 shutdown = ปิดระบบ
 shutdown-now = ปิดระบบตอนนี้เลยหรือไม่
-shutdown-timeout = ระบบจะปิดลงโดยอัตโนมัติภายใน { $seconds } วินาที
+shutdown-timeout = ระบบจะปิดลงโดยอัตโนมัติภายใน {$seconds} วินาที
 suspend = ระงับ
 user = ผู้ใช้

rustfmt.toml

@@ -0,0 +1 @@
+imports_granularity = "Module"

src/common.rs

@@ -10,7 +10,6 @@ use cosmic::iced::{self, Rectangle, Size, Subscription};
 use cosmic::surface::corner_radius::rounded_rect_strips;
 use cosmic::widget::rectangle_tracker::{RectangleUpdate, rectangle_tracker_subscription};
 use cosmic::widget::{self, RectangleTracker};
-use cosmic_config::CosmicConfigEntry;
 use cosmic_greeter_daemon::{BgSource, UserData};
 use cosmic_protocols::keyboard_layout::v1::client::zcosmic_keyboard_layout_v1::ZcosmicKeyboardLayoutV1;
 use std::collections::{HashMap, HashSet};
@@ -20,7 +19,6 @@ use wayland_client::{Connection, Proxy};
 
 use crate::keyboard_layout_wayland;
 
-pub const MAX_WIDTH: f32 = 866.;
 pub const DEFAULT_MENU_ITEM_HEIGHT: f32 = 36.;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
@@ -30,18 +28,6 @@ pub struct ActiveLayout {
     pub variant: String,
 }
 
-impl ActiveLayout {
-    pub fn name(&self) -> String {
-        let mut name = self.layout.clone();
-        if !self.variant.is_empty() {
-            name.push_str(" (");
-            name.push_str(&self.variant);
-            name.push_str(")");
-        }
-        name
-    }
-}
-
 pub struct Common<M> {
     pub wayland_connection: Option<Connection>,
     pub keyboard_layout: Option<ZcosmicKeyboardLayoutV1>,
@@ -81,7 +67,6 @@ pub enum Message {
     Focus(SurfaceId),
     Key(Modifiers, Key, Option<SmolStr>),
     NetworkIcon(Option<&'static str>),
-    OnScreenKeyboard,
     SubsurfaceOpened(SurfaceId),
     OutputEvent(OutputEvent, WlOutput),
     PowerInfo(Option<(f64, bool, bool)>),
@@ -291,26 +276,6 @@ impl<M: From<Message> + Send + 'static> Common<M> {
                 self.network_icon_opt =
                     network_icon_opt.map(|name| widget::icon::from_name(name).into());
             }
-            Message::OnScreenKeyboard => {
-                use cosmic_osk_config::Config;
-                match Config::handler() {
-                    Ok(handler) => {
-                        let mut config = match Config::get_entry(&handler) {
-                            Ok(config) => config,
-                            Err((errs, config)) => {
-                                tracing::warn!("failed to parse OSK config: {:?}", errs);
-                                config
-                            }
-                        };
-                        if let Err(err) = config.set_always_shown(&handler, !config.always_shown) {
-                            tracing::error!("failed to set OSK always_shown config: {}", err);
-                        }
-                    }
-                    Err(err) => {
-                        tracing::error!("failed to create OSK config handler: {}", err);
-                    }
-                }
-            }
             Message::OutputEvent(output_event, output) => {
                 if self.wayland_connection.is_none() {
                     if let Some(backend) = output.backend().upgrade() {

src/greeter.rs

@@ -11,7 +11,6 @@ use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::Gravity
 use cosmic::cosmic_config::{self, ConfigSet};
 use cosmic::cosmic_theme::{self, CosmicPalette};
 use cosmic::desktop::fde::{DesktopEntry, get_languages_from_env};
-use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit};
 use cosmic::iced::event::listen_with;
 use cosmic::iced::event::wayland::OutputEvent;
 use cosmic::iced::futures::SinkExt;
@@ -19,7 +18,7 @@ use cosmic::iced::platform_specific::runtime::wayland::layer_surface::{
     IcedMargin, IcedOutput, SctkLayerSurfaceSettings,
 };
 use cosmic::iced::platform_specific::shell::wayland::commands::layer_surface::{
-    Anchor, KeyboardInteractivity, Layer, destroy_layer_surface,
+    Anchor, KeyboardInteractivity, Layer, destroy_layer_surface, get_layer_surface,
 };
 use cosmic::iced::platform_specific::shell::wayland::commands::subsurface::reposition_subsurface;
 use cosmic::iced::runtime::core::window::Id as SurfaceId;
@@ -27,7 +26,6 @@ use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfac
 use cosmic::iced::{
     self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription, window,
 };
-use cosmic::surface::action::{LiveSettings, app_layer_shell};
 use cosmic::widget::{id_container, text};
 use cosmic::{Element, executor, surface, theme, widget};
 use cosmic_greeter_config::Config as CosmicGreeterConfig;
@@ -42,7 +40,7 @@ use std::num::NonZeroU32;
 use std::process::Stdio;
 use std::sync::{Arc, LazyLock};
 use std::time::{Duration, Instant};
-use std::{fs, io, process, thread};
+use std::{fs, io, process};
 use tokio::process::Child;
 use tokio::time;
 use tracing::metadata::LevelFilter;
@@ -53,7 +51,7 @@ use wayland_client::Proxy;
 use wayland_client::protocol::wl_output::WlOutput;
 use zbus::{Connection, proxy};
 
-use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT, MAX_WIDTH};
+use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT};
 use crate::fl;
 
 static USERNAME_ID: LazyLock<iced::id::Id> = LazyLock::new(|| iced::id::Id::new("username-id"));
@@ -78,8 +76,8 @@ async fn user_data_dbus() -> Result<Vec<UserData>, Box<dyn Error>> {
     Ok(user_datas)
 }
 
-async fn user_data_fallback() -> Vec<UserData> {
+fn user_data_fallback() -> Vec<UserData> {
-    let user_filter = UserFilter::new().await;
+    let user_filter = UserFilter::new();
 
     // The pwd::Passwd method is unsafe (but not labelled as such) due to using global state (libc pwent functions).
     /* unsafe */
@@ -131,7 +129,7 @@ pub fn main() -> Result<(), Box<dyn Error>> {
         Ok(ok) => ok,
         Err(err) => {
             tracing::error!("failed to load user data from daemon: {}", err);
-            runtime.block_on(user_data_fallback())
+            user_data_fallback()
         }
     };
 
@@ -281,22 +279,6 @@ pub fn main() -> Result<(), Box<dyn Error>> {
         sessions
     };
 
-    match process::Command::new("cosmic-osk")
-        .arg("overlay")
-        .env("RUST_LOG", "cosmic_osk=info")
-        .spawn()
-    {
-        Ok(mut child) => {
-            thread::spawn(move || match child.wait() {
-                Ok(status) => tracing::warn!("cosmic-osk exited: {}", status),
-                Err(err) => tracing::error!("failed to wait on cosmic-osk: {}", err),
-            });
-        }
-        Err(err) => {
-            tracing::error!("failed to spawn cosmic-osk: {}", err);
-        }
-    }
-
     let flags = Flags {
         user_icons: user_datas
             .iter_mut()
@@ -407,7 +389,7 @@ pub enum Message {
     Session(String),
     Shutdown,
     Socket(SocketState),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
     Suspend,
     Username(String),
     EnterUser(bool, String),
@@ -499,9 +481,9 @@ impl App {
             .window_size
             .get(&id)
             .map(|s| s.width)
-            .unwrap_or(MAX_WIDTH);
+            .unwrap_or(800.);
-        let menu_width = if window_width > MAX_WIDTH {
+        let menu_width = if window_width > 800. {
-            MAX_WIDTH
+            800.
         } else {
             window_width
         };
@@ -601,19 +583,9 @@ impl App {
             };
 
             let mut input_button = widget::popover(
-                widget::container(
+                widget::button::custom(widget::icon::from_name("input-keyboard-symbolic"))
-                    widget::button::custom(
-                        widget::text(
-                            self.common.active_layouts[self.common.current_keyboard_layout].name(),
-                        )
-                        .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
-                        .height(16)
-                        .center(),
-                    )
                     .padding(12.0)
                     .on_press(Message::DropdownToggle(Dropdown::Keyboard)),
-                )
-                .max_width(80),
             )
             .position(widget::popover::Position::Bottom);
             if matches!(self.dropdown_opt, Some(Dropdown::Keyboard)) {
@@ -729,13 +701,6 @@ impl App {
                     text(fl!("accessibility")),
                     widget::tooltip::Position::Top
                 ),
-                widget::tooltip(
-                    widget::button::custom(widget::icon::from_name("input-keyboard-symbolic"))
-                        .padding(12.0)
-                        .on_press(Message::Common(common::Message::OnScreenKeyboard)),
-                    text(fl!("on-screen-keyboard")),
-                    widget::tooltip::Position::Top,
-                ),
                 widget::tooltip(
                     input_button,
                     text(fl!("keyboard-layout")),
@@ -999,7 +964,7 @@ impl App {
                 appearance
             },
         )))
-        .width(Length::Fixed(MAX_WIDTH));
+        .width(Length::Fixed(800.0));
         let menu = if let Some(t) = self.common.rectangle_tracker.as_ref() {
             Element::from(t.container((id, false), menu))
         } else {
@@ -1287,10 +1252,10 @@ impl cosmic::Application for App {
                         let unwrapped_size = size
                             .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080)))
                             .unwrap_or((1920, 1080));
-                        let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH {
+                        let (loc, sub_size) = if unwrapped_size.0 > 800 {
                             (
-                                Point::new((unwrapped_size.0 as f32 - MAX_WIDTH) / 2., 32.),
+                                Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.),
-                                Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.),
+                                Size::new(800., unwrapped_size.1 as f32 - 32.),
                             )
                         } else {
                             (
@@ -1326,41 +1291,27 @@ impl cosmic::Application for App {
                         );
                         return Task::batch([
                             self.update_user_data(),
-                            cosmic::surface::surface_task(app_layer_shell(
+                            get_layer_surface(SctkLayerSurfaceSettings {
-                                |_: &App| LiveSettings {
+                                id: surface_id,
-                                    padding: None,
+                                layer: Layer::Overlay,
-                                    corners: None,
+                                keyboard_interactivity: KeyboardInteractivity::Exclusive,
-                                    blur: Some(false),
+                                input_zone: None,
+                                anchor: Anchor::TOP | Anchor::LEFT | Anchor::BOTTOM | Anchor::RIGHT,
+                                output: IcedOutput::Output(output),
+                                namespace: "cosmic-locker".into(),
+                                size: Some((None, None)),
+                                margin: IcedMargin {
+                                    top: 0,
+                                    bottom: 0,
+                                    left: 0,
+                                    right: 0,
                                 },
-                                move |_: &mut App| {
+                                exclusive_zone: -1,
-                                    let output = output.clone();
+                                size_limits: iced::Limits::NONE.min_width(1.0).min_height(1.0),
-                                    SctkLayerSurfaceSettings {
+                            }),
-                                        id: surface_id,
+                            cosmic::task::message(cosmic::Action::Cosmic(
-                                        layer: Layer::Top,
+                                cosmic::app::Action::Surface(msg),
-                                        keyboard_interactivity: KeyboardInteractivity::Exclusive,
-                                        input_zone: None,
-                                        anchor: Anchor::TOP
-                                            | Anchor::LEFT
-                                            | Anchor::BOTTOM
-                                            | Anchor::RIGHT,
-                                        output: IcedOutput::Output(output),
-                                        namespace: "cosmic-greeter".into(),
-                                        size: Some((None, None)),
-                                        margin: IcedMargin {
-                                            top: 0,
-                                            bottom: 0,
-                                            left: 0,
-                                            right: 0,
-                                        },
-                                        exclusive_zone: -1,
-                                        size_limits: iced::Limits::NONE
-                                            .min_width(1.0)
-                                            .min_height(1.0),
-                                    }
-                                },
-                                None,
                             )),
-                            cosmic::task::message(cosmic::Action::Surface(msg)),
                         ]);
                     }
                     OutputEvent::Removed => {
@@ -1708,7 +1659,9 @@ impl cosmic::Application for App {
                 self.greetd_sender = Some(sender);
             }
             Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
             }
             Message::ScreenReader(enabled) => {
                 if enabled
@@ -1906,8 +1859,8 @@ impl cosmic::Application for App {
                     tracing::error!("Failed to find subsurface menu id");
                     return Task::none();
                 };
-                let loc = if size.width > MAX_WIDTH {
+                let loc = if size.width > 800. {
-                    Point::new((size.width - MAX_WIDTH) / 2., 32.)
+                    Point::new(size.width / 2. - 400., 32.)
                 } else {
                     Point::new(0., 32.)
                 };

src/locker.rs

@@ -4,18 +4,16 @@
 use color_eyre::eyre::WrapErr;
 use cosmic::app::{Core, Settings, Task};
 use cosmic::cctk::wayland_protocols::xdg::shell::client::xdg_positioner::Gravity;
-use cosmic::iced::core::text::{Ellipsize, EllipsizeHeightLimit};
 use cosmic::iced::event::wayland::{OutputEvent, SessionLockEvent};
 use cosmic::iced::futures::{self, SinkExt};
 use cosmic::iced::platform_specific::shell::wayland::commands::session_lock::{
-    destroy_lock_surface, lock, unlock,
+    destroy_lock_surface, get_lock_surface, lock, unlock,
 };
 use cosmic::iced::runtime::core::window::Id as SurfaceId;
 use cosmic::iced::runtime::platform_specific::wayland::subsurface::SctkSubsurfaceSettings;
 use cosmic::iced::{
     self, Alignment, Background, Border, Length, Point, Rectangle, Size, Subscription,
 };
-use cosmic::surface::action::LiveSettings;
 use cosmic::{Element, executor, surface, theme, widget};
 use cosmic_config::CosmicConfigEntry;
 use cosmic_greeter_daemon::{TimeAppletConfig, UserData};
@@ -35,7 +33,7 @@ use tracing_subscriber::{EnvFilter, fmt};
 use wayland_client::Proxy;
 use wayland_client::protocol::wl_output::WlOutput;
 
-use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT, MAX_WIDTH};
+use crate::common::{self, Common, DEFAULT_MENU_ITEM_HEIGHT};
 use crate::fl;
 
 fn lockfile_opt() -> Option<PathBuf> {
@@ -275,7 +273,7 @@ pub enum Message {
     KeyboardLayout(usize),
     Inhibit(Arc<OwnedFd>),
     Submit(String),
-    Surface(surface::Action<Message>),
+    Surface(surface::Action),
     Suspend,
     TimeAppletConfig(TimeAppletConfig),
     Error(String),
@@ -327,9 +325,9 @@ impl App {
             .window_size
             .get(&surface_id)
             .map(|s| s.width)
-            .unwrap_or(MAX_WIDTH);
+            .unwrap_or(800.);
-        let menu_width = if window_width > MAX_WIDTH {
+        let menu_width = if window_width > 800. {
-            MAX_WIDTH
+            800.
         } else {
             window_width
         };
@@ -418,19 +416,9 @@ impl App {
             };
 
             let mut input_button = widget::popover(
-                widget::container(
+                widget::button::custom(widget::icon::from_name("input-keyboard-symbolic"))
-                    widget::button::custom(
-                        widget::text(
-                            self.common.active_layouts[self.common.current_keyboard_layout].name(),
-                        )
-                        .ellipsize(Ellipsize::End(EllipsizeHeightLimit::Lines(1)))
-                        .height(16)
-                        .center(),
-                    )
                     .padding(12.0)
                     .on_press(Message::DropdownToggle(Dropdown::Keyboard)),
-                )
-                .max_width(80),
             )
             .position(widget::popover::Position::Bottom);
             if matches!(self.dropdown_opt, Some(Dropdown::Keyboard)) {
@@ -454,13 +442,6 @@ impl App {
                 .padding(12.0)
                 .on_press(Message::None),
                 */
-                widget::tooltip(
-                    widget::button::custom(widget::icon::from_name("input-keyboard-symbolic"))
-                        .padding(12.0)
-                        .on_press(Message::Common(common::Message::OnScreenKeyboard)),
-                    widget::text(fl!("on-screen-keyboard")),
-                    widget::tooltip::Position::Top,
-                ),
                 widget::tooltip(
                     input_button,
                     widget::text(fl!("keyboard-layout")),
@@ -682,7 +663,6 @@ impl cosmic::Application for App {
     /// Creates the application, and optionally emits command on initialize.
     fn init(mut core: Core, flags: Self::Flags) -> (Self, Task<Self::Message>) {
         core.set_app_type(cosmic::core::AppType::System);
-
         let (mut common, common_task) = Common::init(core);
         common.on_output_event = Some(Box::new(|output_event, output| {
             Message::OutputEvent(output_event, output)
@@ -801,10 +781,10 @@ impl cosmic::Application for App {
                         let unwrapped_size = size
                             .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080)))
                             .unwrap_or((1920, 1080));
-                        let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH {
+                        let (loc, sub_size) = if unwrapped_size.0 > 800 {
                             (
                                 Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.),
-                                Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.),
+                                Size::new(800., unwrapped_size.1 as f32 - 32.),
                             )
                         } else {
                             (
@@ -839,19 +819,11 @@ impl cosmic::Application for App {
                         );
 
                         if matches!(self.state, State::Locked { .. }) {
-                            return cosmic::task::message(cosmic::Action::Surface(
+                            return get_lock_surface(surface_id, output).chain({
-                                cosmic::surface::action::lock(
+                                cosmic::task::message(cosmic::Action::Cosmic(
-                                    || LiveSettings {
+                                    cosmic::app::Action::Surface(msg),
-                                        padding: None,
+                                ))
-                                        corners: None,
+                            });
-                                        blur: Some(false),
-                                    },
-                                    surface_id,
-                                    output,
-                                    None::<fn() -> cosmic::Element<'static, cosmic::Action<Message>>>,
-                                ),
-                            ))
-                            .chain(cosmic::task::message(cosmic::Action::Surface(msg)));
                         }
                     }
                     OutputEvent::Removed => {
@@ -882,10 +854,10 @@ impl cosmic::Application for App {
                         let unwrapped_size = size
                             .map(|s| (s.0.unwrap_or(1920), s.1.unwrap_or(1080)))
                             .unwrap_or((1920, 1080));
-                        let (loc, sub_size) = if unwrapped_size.0 as f32 > MAX_WIDTH {
+                        let (loc, sub_size) = if unwrapped_size.0 > 800 {
                             (
                                 Point::new(unwrapped_size.0 as f32 / 2. - 400., 32.),
-                                Size::new(MAX_WIDTH, unwrapped_size.1 as f32 - 32.),
+                                Size::new(800., unwrapped_size.1 as f32 - 32.),
                             )
                         } else {
                             (Point::ORIGIN, Size::new(1920., 1080.))
@@ -991,18 +963,7 @@ impl cosmic::Application for App {
 
                     // Create lock surfaces
                     for (output, surface_id) in self.common.surface_ids.iter() {
-                        commands.push(cosmic::task::message(cosmic::Action::Surface(
+                        commands.push(get_lock_surface(*surface_id, output.clone()));
-                            cosmic::surface::action::lock(
-                                || LiveSettings {
-                                    padding: None,
-                                    corners: None,
-                                    blur: Some(false),
-                                },
-                                *surface_id,
-                                output.clone(),
-                                None::<fn() -> cosmic::Element<'static, cosmic::Action<Message>>>,
-                            ),
-                        )));
 
                         if let Some((rect, name)) = self
                             .common
@@ -1037,7 +998,9 @@ impl cosmic::Application for App {
                                     app.menu(subsurface_id).map(cosmic::Action::App)
                                 })),
                             );
-                            commands.push(cosmic::task::message(cosmic::Action::Surface(msg)));
+                            commands.push(cosmic::task::message(cosmic::Action::Cosmic(
+                                cosmic::app::Action::Surface(msg),
+                            )));
                         } else {
                             tracing::error!("no rectangle for subsurface creation...");
                         }
@@ -1202,7 +1165,9 @@ impl cosmic::Application for App {
                 }
             }
             Message::Surface(a) => {
-                return cosmic::task::message(cosmic::Action::Surface(a));
+                return cosmic::task::message(cosmic::Action::Cosmic(
+                    cosmic::app::Action::Surface(a),
+                ));
             }
         }
         Task::none()
@@ -1214,8 +1179,17 @@ impl cosmic::Application for App {
     }
 
     /// Creates a view after each update.
-    fn view_window(&self, _surface_id: SurfaceId) -> Element<'_, Self::Message> {
+    fn view_window(&self, surface_id: SurfaceId) -> Element<'_, Self::Message> {
-        widget::space::horizontal().into()
+        let img = self
+            .common
+            .surface_images
+            .get(&surface_id)
+            .unwrap_or(&self.common.fallback_background);
+        widget::image(img)
+            .content_fit(iced::ContentFit::Cover)
+            .width(Length::Fill)
+            .height(Length::Fill)
+            .into()
     }
 
     fn subscription(&self) -> Subscription<Self::Message> {