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

Update dependencies

Browse source
This commit is contained in:
Ian Douglas Scott 2023-03-16 14:08:20 -07:00
parent e781ea0d34
commit 69a877894a
4 changed files with 339 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

768
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -5,7 +5,7 @@ edition = "2021"
[dependencies] [dependencies]
calloop = "0.10.5" calloop = "0.10.5"
cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os/cosmic-protocols" } cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os/cosmic-protocols", rev = "e491d91" }
futures-channel = "0.3.25" futures-channel = "0.3.25"
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"] }
tokio = "1.23.0" tokio = "1.23.0"

2
src/main.rs
View file

@ -6,7 +6,7 @@ use cctk::{
toplevel_management::v1::client::zcosmic_toplevel_manager_v1, toplevel_management::v1::client::zcosmic_toplevel_manager_v1,
workspace::v1::client::{zcosmic_workspace_handle_v1, zcosmic_workspace_manager_v1}, workspace::v1::client::{zcosmic_workspace_handle_v1, zcosmic_workspace_manager_v1},
}, },
sctk::shell::layer::{KeyboardInteractivity, Layer}, sctk::shell::wlr_layer::{KeyboardInteractivity, Layer},
toplevel_info::ToplevelInfo, toplevel_info::ToplevelInfo,
wayland_client::{ wayland_client::{
protocol::{wl_output, wl_seat}, protocol::{wl_output, wl_seat},

11
src/wayland/mod.rs
View file

@ -15,11 +15,10 @@ use cctk::{
screencopy::ScreencopyState, screencopy::ScreencopyState,
sctk::{ sctk::{
self, self,
event_loop::WaylandSource,
output::{OutputHandler, OutputState}, output::{OutputHandler, OutputState},
registry::{ProvidesRegistryState, RegistryState}, registry::{ProvidesRegistryState, RegistryState},
seat::{SeatHandler, SeatState}, seat::{SeatHandler, SeatState},
shm::{ShmHandler, ShmState}, shm::{Shm, ShmHandler},
}, },
toplevel_info::{ToplevelInfo, ToplevelInfoState}, toplevel_info::{ToplevelInfo, ToplevelInfoState},
toplevel_management::ToplevelManagerState, toplevel_management::ToplevelManagerState,
@ -27,7 +26,7 @@ use cctk::{
backend::ObjectId, backend::ObjectId,
globals::registry_queue_init, globals::registry_queue_init,
protocol::{wl_output, wl_seat}, protocol::{wl_output, wl_seat},
Connection, Proxy, QueueHandle, Connection, Proxy, QueueHandle, WaylandSource,
}, },
workspace::WorkspaceState, workspace::WorkspaceState,
}; };
@ -96,7 +95,7 @@ pub struct AppData {
workspace_state: WorkspaceState, workspace_state: WorkspaceState,
screencopy_state: ScreencopyState, screencopy_state: ScreencopyState,
seat_state: SeatState, seat_state: SeatState,
shm_state: ShmState, shm_state: Shm,
toplevel_manager_state: ToplevelManagerState, toplevel_manager_state: ToplevelManagerState,
sender: mpsc::Sender<Event>, sender: mpsc::Sender<Event>,
output_names: HashMap<ObjectId, Option<String>>, output_names: HashMap<ObjectId, Option<String>>,
@ -219,7 +218,7 @@ impl SeatHandler for AppData {
} }
impl ShmHandler for AppData { impl ShmHandler for AppData {
fn shm_state(&mut self) -> &mut ShmState { fn shm_state(&mut self) -> &mut Shm {
&mut self.shm_state &mut self.shm_state
} }
} }
@ -276,7 +275,7 @@ fn start() -> mpsc::Receiver<Event> {
screencopy_state: ScreencopyState::new(&globals, &qh), screencopy_state: ScreencopyState::new(&globals, &qh),
registry_state, registry_state,
seat_state: SeatState::new(&globals, &qh), seat_state: SeatState::new(&globals, &qh),
shm_state: ShmState::bind(&globals, &qh).unwrap(), shm_state: Shm::bind(&globals, &qh).unwrap(),
sender, sender,
output_names: HashMap::new(), output_names: HashMap::new(),
seats: Vec::new(), seats: Vec::new(),