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

fix build

Browse source
This commit is contained in:
Ashley Wulber 2023-07-25 14:13:05 -04:00 • committed by Ashley Wulber
parent c77265eaed
commit 6726873761
10 changed files with 43 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Cargo.lock generated
View file

@ -655,7 +655,6 @@ name = "cosmic-app-list"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"calloop",
"cosmic-applet", "cosmic-applet",
"cosmic-client-toolkit", "cosmic-client-toolkit",
"cosmic-protocols", "cosmic-protocols",
@ -850,7 +849,6 @@ name = "cosmic-applet-workspaces"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"calloop",
"cosmic-applet", "cosmic-applet",
"cosmic-client-toolkit", "cosmic-client-toolkit",
"cosmic-protocols", "cosmic-protocols",
@ -863,25 +861,23 @@ dependencies = [
"once_cell", "once_cell",
"pretty_env_logger 0.5.0", "pretty_env_logger 0.5.0",
"rust-embed", "rust-embed",
"wayland-backend",
"wayland-client 0.30.2",
"xdg", "xdg",
] ]
[[package]] [[package]]
name = "cosmic-client-toolkit" name = "cosmic-client-toolkit"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=f0cfe09#f0cfe0973376b31fba4a726a35633a8e39e9319e" source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
dependencies = [ dependencies = [
"cosmic-protocols", "cosmic-protocols",
"smithay-client-toolkit 0.17.0 (git+https://github.com/pop-os/client-toolkit?tag=themed-pointer)", "smithay-client-toolkit 0.17.0",
"wayland-client 0.30.2", "wayland-client 0.30.2",
] ]
[[package]] [[package]]
name = "cosmic-config" name = "cosmic-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"atomicwrites", "atomicwrites",
"cosmic-config-derive", "cosmic-config-derive",
@ -895,7 +891,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-config-derive" name = "cosmic-config-derive"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"quote", "quote",
"syn 1.0.109", "syn 1.0.109",
@ -962,7 +958,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-protocols" name = "cosmic-protocols"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-protocols?rev=f0cfe09#f0cfe0973376b31fba4a726a35633a8e39e9319e" source = "git+https://github.com/pop-os/cosmic-protocols?rev=e39748e#e39748e1312d74ab8b4c26f4813b858413500b59"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"wayland-backend", "wayland-backend",
@ -994,7 +990,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-theme" name = "cosmic-theme"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"cosmic-config", "cosmic-config",
@ -1009,7 +1005,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-time" name = "cosmic-time"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/pop-os/cosmic-time?branch=libcosmic#c39e737fc55f6c3cbb03a309627da5c525bddd6d" source = "git+https://github.com/pop-os/cosmic-time?rev=c39e737#c39e737fc55f6c3cbb03a309627da5c525bddd6d"
dependencies = [ dependencies = [
"float-cmp", "float-cmp",
"libcosmic", "libcosmic",
@ -2297,7 +2293,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
@ -2312,7 +2308,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_accessibility" name = "iced_accessibility"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"accesskit", "accesskit",
"accesskit_unix", "accesskit_unix",
@ -2321,14 +2317,14 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.9.0" version = "0.9.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"iced_accessibility", "iced_accessibility",
"instant", "instant",
"log", "log",
"palette", "palette",
"smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)", "smithay-client-toolkit 0.17.0",
"thiserror", "thiserror",
"twox-hash", "twox-hash",
] ]
@ -2336,7 +2332,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"futures", "futures",
"iced_core", "iced_core",
@ -2349,7 +2345,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2366,7 +2362,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_renderer" name = "iced_renderer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"iced_graphics", "iced_graphics",
"iced_tiny_skia", "iced_tiny_skia",
@ -2378,19 +2374,19 @@ dependencies = [
[[package]] [[package]]
name = "iced_runtime" name = "iced_runtime"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"iced_accessibility", "iced_accessibility",
"iced_core", "iced_core",
"iced_futures", "iced_futures",
"smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)", "smithay-client-toolkit 0.17.0",
"thiserror", "thiserror",
] ]
[[package]] [[package]]
name = "iced_sctk" name = "iced_sctk"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"enum-repr", "enum-repr",
"float-cmp", "float-cmp",
@ -2401,7 +2397,7 @@ dependencies = [
"iced_style", "iced_style",
"itertools 0.10.5", "itertools 0.10.5",
"raw-window-handle", "raw-window-handle",
"smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)", "smithay-client-toolkit 0.17.0",
"smithay-clipboard", "smithay-clipboard",
"thiserror", "thiserror",
"tracing", "tracing",
@ -2412,7 +2408,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.8.0" version = "0.8.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2422,7 +2418,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_tiny_skia" name = "iced_tiny_skia"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"cosmic-text", "cosmic-text",
@ -2440,7 +2436,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.10.0" version = "0.10.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"bytemuck", "bytemuck",
@ -2461,14 +2457,14 @@ dependencies = [
[[package]] [[package]]
name = "iced_widget" name = "iced_widget"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"iced_renderer", "iced_renderer",
"iced_runtime", "iced_runtime",
"iced_style", "iced_style",
"num-traits", "num-traits",
"ouroboros 0.13.0", "ouroboros 0.13.0",
"smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)", "smithay-client-toolkit 0.17.0",
"thiserror", "thiserror",
"unicode-segmentation", "unicode-segmentation",
] ]
@ -2727,7 +2723,7 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983" source = "git+https://github.com/pop-os/libcosmic#f77bd443d7f4c074040b3b8cc09ed35bd1ca3983"
dependencies = [ dependencies = [
"apply", "apply",
"cosmic-config", "cosmic-config",
@ -2747,7 +2743,7 @@ dependencies = [
"lazy_static", "lazy_static",
"palette", "palette",
"slotmap", "slotmap",
"smithay-client-toolkit 0.17.0 (git+https://github.com/smithay/client-toolkit?rev=c9940f4)", "smithay-client-toolkit 0.17.0",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -4206,30 +4202,6 @@ dependencies = [
"wayland-protocols 0.29.5", "wayland-protocols 0.29.5",
] ]
[[package]]
name = "smithay-client-toolkit"
version = "0.17.0"
source = "git+https://github.com/pop-os/client-toolkit?tag=themed-pointer#fd15dd954bc5f0c78d079aeda7b11194a682bbff"
dependencies = [
"bitflags 1.3.2",
"calloop",
"cursor-icon",
"dlib",
"lazy_static",
"log",
"memmap2 0.5.10",
"nix 0.26.2",
"pkg-config",
"thiserror",
"wayland-backend",
"wayland-client 0.30.2",
"wayland-cursor 0.30.0",
"wayland-protocols 0.30.1",
"wayland-protocols-wlr",
"wayland-scanner 0.30.1",
"xkbcommon",
]
[[package]] [[package]]
name = "smithay-client-toolkit" name = "smithay-client-toolkit"
version = "0.17.0" version = "0.17.0"

2
Cargo.toml
View file

@ -20,7 +20,7 @@ resolver="2"
[workspace.dependencies] [workspace.dependencies]
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" } cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit", rev = "e39748e" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "e39748e" } cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = ["client"], rev = "e39748e" }
cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "39c96ac", default-features = false, features = ["libcosmic", "once_cell"] } cosmic-time = { git = "https://github.com/pop-os/cosmic-time", rev = "c39e737", default-features = false, features = ["libcosmic", "once_cell"] }
libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] } libcosmic = { git = "https://github.com/pop-os/libcosmic", default-features = false, features = ["tokio", "wayland"] }
[profile.release] [profile.release]

1
cosmic-app-list/Cargo.toml
View file

@ -16,7 +16,6 @@ futures-util = "0.3"
once_cell = "1.9" once_cell = "1.9"
xdg = "2.4" xdg = "2.4"
pretty_env_logger = "0.5" pretty_env_logger = "0.5"
calloop = "0.10"
nix = "0.26" nix = "0.26"
shlex = "1.1.0" shlex = "1.1.0"
anyhow = "1.0" anyhow = "1.0"

2
cosmic-app-list/src/app.rs
View file

@ -5,7 +5,7 @@ use crate::fl;
use crate::toplevel_subscription::toplevel_subscription; use crate::toplevel_subscription::toplevel_subscription;
use crate::toplevel_subscription::ToplevelRequest; use crate::toplevel_subscription::ToplevelRequest;
use crate::toplevel_subscription::ToplevelUpdate; use crate::toplevel_subscription::ToplevelUpdate;
use calloop::channel::Sender; use cctk::sctk::reexports::calloop::channel::Sender;
use cctk::toplevel_info::ToplevelInfo; use cctk::toplevel_info::ToplevelInfo;
use cctk::wayland_client::protocol::wl_data_device_manager::DndAction; use cctk::wayland_client::protocol::wl_data_device_manager::DndAction;
use cctk::wayland_client::protocol::wl_seat::WlSeat; use cctk::wayland_client::protocol::wl_seat::WlSeat;

15
cosmic-app-list/src/toplevel_handler.rs
View file

@ -2,7 +2,10 @@ use crate::toplevel_subscription::{ToplevelRequest, ToplevelUpdate};
use cctk::{ use cctk::{
sctk::{ sctk::{
self, self,
reexports::client::{protocol::wl_seat::WlSeat, WaylandSource}, reexports::{
calloop,
client::{protocol::wl_seat::WlSeat, WaylandSource},
},
seat::{SeatHandler, SeatState}, seat::{SeatHandler, SeatState},
}, },
toplevel_info::{ToplevelInfoHandler, ToplevelInfoState}, toplevel_info::{ToplevelInfoHandler, ToplevelInfoState},
@ -131,13 +134,9 @@ pub(crate) fn toplevel_handler(
let qh = event_queue.handle(); let qh = event_queue.handle();
let wayland_source = WaylandSource::new(event_queue).unwrap(); let wayland_source = WaylandSource::new(event_queue).unwrap();
let handle = event_loop.handle(); let handle = event_loop.handle();
wayland_source
if handle .insert(handle.clone())
.insert_source(wayland_source, |_, q, state| q.dispatch_pending(state)) .expect("Failed to insert wayland source.");
.is_err()
{
return;
};
if handle if handle
.insert_source(rx, |event, _, state| match event { .insert_source(rx, |event, _, state| match event {

2
cosmic-app-list/src/toplevel_subscription.rs
View file

@ -2,7 +2,7 @@
//! //!
//! This code was generated by `zbus-xmlgen` `2.0.1` from DBus introspection data. //! This code was generated by `zbus-xmlgen` `2.0.1` from DBus introspection data.
//! Source: `Interface '/org/freedesktop/UPower/KbdBacklight' from service 'org.freedesktop.UPower' on system bus`. //! Source: `Interface '/org/freedesktop/UPower/KbdBacklight' from service 'org.freedesktop.UPower' on system bus`.
use cctk::sctk::reexports::client::protocol::wl_seat::WlSeat; use cctk::sctk::reexports::{calloop, client::protocol::wl_seat::WlSeat};
use cctk::toplevel_info::ToplevelInfo; use cctk::toplevel_info::ToplevelInfo;
use cosmic::iced; use cosmic::iced;
use cosmic::iced::subscription; use cosmic::iced::subscription;

3
cosmic-applet-workspaces/Cargo.toml
View file

@ -9,9 +9,6 @@ libcosmic.workspace = true
cosmic-applet = { path = "../applet" } cosmic-applet = { path = "../applet" }
cctk.workspace = true cctk.workspace = true
cosmic-protocols.workspace = true cosmic-protocols.workspace = true
wayland-backend = {version = "0.1.0", features = ["client_system"]}
wayland-client = {version = "0.30.0"}
calloop = "0.10.1"
nix = "0.26.1" nix = "0.26.1"
log = "0.4" log = "0.4"
pretty_env_logger = "0.5" pretty_env_logger = "0.5"

3
cosmic-applet-workspaces/src/components/app.rs
View file

@ -1,4 +1,4 @@
use calloop::channel::SyncSender; use cctk::sctk::reexports::{calloop::channel::SyncSender, client::backend::ObjectId};
use cosmic::iced::alignment::{Horizontal, Vertical}; use cosmic::iced::alignment::{Horizontal, Vertical};
use cosmic::iced::mouse::{self, ScrollDelta}; use cosmic::iced::mouse::{self, ScrollDelta};
use cosmic::iced::wayland::actions::window::SctkWindowSettings; use cosmic::iced::wayland::actions::window::SctkWindowSettings;
@ -16,7 +16,6 @@ use cosmic_applet::cosmic_panel_config::PanelAnchor;
use cosmic_applet::CosmicAppletHelper; use cosmic_applet::CosmicAppletHelper;
use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1; use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
use std::cmp::Ordering; use std::cmp::Ordering;
use wayland_backend::client::ObjectId;
use crate::config; use crate::config;
use crate::wayland::{WorkspaceEvent, WorkspaceList}; use crate::wayland::{WorkspaceEvent, WorkspaceList};

9
cosmic-applet-workspaces/src/wayland.rs
View file

@ -3,7 +3,10 @@ use cctk::{
sctk::{ sctk::{
self, self,
output::{OutputHandler, OutputState}, output::{OutputHandler, OutputState},
reexports::client::WaylandSource, reexports::{
calloop,
client::{self as wayland_client},
},
registry::{ProvidesRegistryState, RegistryState}, registry::{ProvidesRegistryState, RegistryState},
}, },
workspace::{WorkspaceHandler, WorkspaceState}, workspace::{WorkspaceHandler, WorkspaceState},
@ -11,11 +14,11 @@ use cctk::{
use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1; use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
use futures::{channel::mpsc, executor::block_on, SinkExt}; use futures::{channel::mpsc, executor::block_on, SinkExt};
use std::{env, os::unix::net::UnixStream, path::PathBuf, time::Duration}; use std::{env, os::unix::net::UnixStream, path::PathBuf, time::Duration};
use wayland_backend::client::ObjectId; use wayland_client::backend::ObjectId;
use wayland_client::{ use wayland_client::{
globals::registry_queue_init, globals::registry_queue_init,
protocol::wl_output::{self, WlOutput}, protocol::wl_output::{self, WlOutput},
ConnectError, Proxy, ConnectError, Proxy, WaylandSource,
}; };
use wayland_client::{Connection, QueueHandle, WEnum}; use wayland_client::{Connection, QueueHandle, WEnum};

2
cosmic-applet-workspaces/src/wayland_subscription.rs
View file

@ -1,5 +1,5 @@
use crate::wayland::{self, WorkspaceEvent, WorkspaceList}; use crate::wayland::{self, WorkspaceEvent, WorkspaceList};
use calloop::channel::SyncSender; use cctk::sctk::reexports::calloop::channel::SyncSender;
use cosmic::iced::{ use cosmic::iced::{
self, self,
futures::{channel::mpsc, SinkExt, StreamExt}, futures::{channel::mpsc, SinkExt, StreamExt},