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

chore: Update smithay with Dispatch2

Browse source
This commit is contained in:
Ian Douglas Scott 2026-04-28 16:58:33 -07:00 • committed by Victoria Brekenfeld
parent b5186ef21a
commit 4106904a7e
46 changed files with 59 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Cargo.lock generated
View file

@ -1230,7 +1230,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -1540,7 +1540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -2710,7 +2710,7 @@ dependencies = [
"portable-atomic",
"portable-atomic-util",
"serde_core",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -2823,7 +2823,7 @@ version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "770919970f7d2f74fea948900d35e2ef64f44129e8ae4015f59de1f0aca7c2a5"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -3433,7 +3433,7 @@ version = "0.50.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -4629,7 +4629,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.12.1",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -4924,7 +4924,7 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
[[package]]
name = "smithay"
version = "0.7.0"
source = "git+https://github.com/smithay/smithay.git?rev=211c19d#211c19d712dc5f1b78eb879f1c195715801e37ff"
source = "git+https://github.com/smithay/smithay.git?rev=0d14cd6#0d14cd655f6e905ad5110ff0384400da223f2cab"
dependencies = [
"aliasable",
"appendlist",
@ -5254,7 +5254,7 @@ dependencies = [
"getrandom 0.4.1",
"once_cell",
"rustix 1.1.4",
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]
@ -6273,7 +6273,7 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
dependencies = [
"windows-sys 0.59.0",
"windows-sys 0.61.2",
]
[[package]]

2
Cargo.toml
View file

@ -143,4 +143,4 @@ cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", branch
cosmic-client-toolkit = { git = "https://github.com/pop-os//cosmic-protocols", branch = "main" }
[patch.crates-io]
smithay = { git = "https://github.com/smithay/smithay.git", rev = "211c19d" }
smithay = { git = "https://github.com/smithay/smithay.git", rev = "0d14cd6" }

1
src/state.rs
View file

@ -224,6 +224,7 @@ pub struct State {
pub ready: Once,
pub last_refresh: LastRefresh,
}
smithay::delegate_dispatch2!(State);
#[derive(Debug)]
pub struct Common {

6
src/wayland/handlers/alpha_modifier.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_alpha_modifier;
delegate_alpha_modifier!(State);

3
src/wayland/handlers/compositor.rs
View file

@ -7,7 +7,6 @@ use smithay::{
element::{Kind, surface::KindEvaluation},
utils::{on_commit_buffer_handler, with_renderer_surface_state},
},
delegate_compositor,
desktop::{LayerSurface, PopupKind, WindowSurfaceType, layer_map_for_output},
reexports::wayland_server::{Client, Resource, protocol::wl_surface::WlSurface},
utils::{Clock, Logical, Monotonic, SERIAL_COUNTER, Size, Time},
@ -434,5 +433,3 @@ impl State {
false
}
}
delegate_compositor!(State);

7
src/wayland/handlers/data_control/ext.rs
View file

@ -1,13 +1,8 @@
use crate::state::State;
use smithay::{
delegate_ext_data_control,
wayland::selection::ext_data_control::{DataControlHandler, DataControlState},
};
use smithay::wayland::selection::ext_data_control::{DataControlHandler, DataControlState};
impl DataControlHandler for State {
fn data_control_state(&mut self) -> &mut DataControlState {
&mut self.common.ext_data_control_state
}
}
delegate_ext_data_control!(State);

7
src/wayland/handlers/data_control/wlr.rs
View file

@ -1,15 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_data_control,
wayland::selection::wlr_data_control::{DataControlHandler, DataControlState},
};
use smithay::wayland::selection::wlr_data_control::{DataControlHandler, DataControlState};
impl DataControlHandler for State {
fn data_control_state(&mut self) -> &mut DataControlState {
&mut self.common.wlr_data_control_state
}
}
delegate_data_control!(State);

3
src/wayland/handlers/data_device.rs
View file

@ -2,7 +2,6 @@
use crate::{state::State, utils::prelude::SeatExt};
use smithay::{
delegate_data_device,
input::{
Seat,
dnd::{DnDGrab, DndGrabHandler, DndTarget, GrabType},
@ -135,5 +134,3 @@ impl DataDeviceHandler for State {
&mut self.common.data_device_state
}
}
delegate_data_device!(State);

4
src/wayland/handlers/decoration.rs
View file

@ -1,7 +1,6 @@
use std::{cell::RefCell, sync::Mutex};
use smithay::{
delegate_kde_decoration, delegate_xdg_decoration,
desktop::Window,
reexports::{
wayland_protocols::xdg::decoration::zv1::server::zxdg_toplevel_decoration_v1::Mode as XdgMode,
@ -186,6 +185,3 @@ impl KdeDecorationHandler for State {
});
}
}
delegate_xdg_decoration!(State);
delegate_kde_decoration!(State);

3
src/wayland/handlers/dmabuf.rs
View file

@ -6,7 +6,6 @@ use crate::{
};
use smithay::{
backend::{allocator::dmabuf::Dmabuf, renderer::element::Kind},
delegate_dmabuf,
desktop::WindowSurfaceType,
reexports::wayland_server::protocol::wl_surface::WlSurface,
wayland::{
@ -89,5 +88,3 @@ impl DmabufHandler for State {
}))
}
}
delegate_dmabuf!(State);

3
src/wayland/handlers/drm_lease.rs
View file

@ -3,7 +3,6 @@
use crate::state::State;
use smithay::{
backend::drm::DrmNode,
delegate_drm_lease,
wayland::drm_lease::{
DrmLease, DrmLeaseBuilder, DrmLeaseHandler, DrmLeaseRequest, DrmLeaseState, LeaseRejected,
},
@ -134,5 +133,3 @@ impl DrmLeaseHandler for State {
}
}
}
delegate_drm_lease!(State);

7
src/wayland/handlers/drm_syncobj.rs
View file

@ -1,10 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::{BackendData, State};
use smithay::{
delegate_drm_syncobj,
wayland::drm_syncobj::{DrmSyncobjHandler, DrmSyncobjState},
};
use smithay::wayland::drm_syncobj::{DrmSyncobjHandler, DrmSyncobjState};
impl DrmSyncobjHandler for State {
fn drm_syncobj_state(&mut self) -> Option<&mut DrmSyncobjState> {
@ -15,5 +12,3 @@ impl DrmSyncobjHandler for State {
kms.syncobj_state.as_mut()
}
}
delegate_drm_syncobj!(State);

6
src/wayland/handlers/fixes.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_fixes;
delegate_fixes!(State);

2
src/wayland/handlers/foreign_toplevel_list.rs
View file

@ -10,5 +10,3 @@ impl ForeignToplevelListHandler for State {
&mut self.toplevel_info_state_mut().foreign_toplevel_list
}
}
smithay::delegate_foreign_toplevel_list!(State);

3
src/wayland/handlers/fractional_scale.rs
View file

@ -1,6 +1,5 @@
use crate::{state::State, utils::prelude::SeatExt};
use smithay::{
delegate_fractional_scale,
desktop::utils::surface_primary_scanout_output,
reexports::wayland_server::protocol::wl_surface::WlSurface,
wayland::{
@ -55,5 +54,3 @@ impl FractionalScaleHandler for State {
});
}
}
delegate_fractional_scale!(State);

3
src/wayland/handlers/idle_inhibit.rs
View file

@ -1,5 +1,5 @@
use smithay::{
delegate_idle_inhibit, reexports::wayland_server::protocol::wl_surface::WlSurface,
reexports::wayland_server::protocol::wl_surface::WlSurface,
wayland::idle_inhibit::IdleInhibitHandler,
};
@ -16,4 +16,3 @@ impl IdleInhibitHandler for State {
self.common.refresh_idle_inhibit();
}
}
delegate_idle_inhibit!(State);

3
src/wayland/handlers/idle_notify.rs
View file

@ -1,4 +1,4 @@
use smithay::{delegate_idle_notify, wayland::idle_notify::IdleNotifierHandler};
use smithay::wayland::idle_notify::IdleNotifierHandler;
use crate::state::State;
@ -9,4 +9,3 @@ impl IdleNotifierHandler for State {
&mut self.common.idle_notifier_state
}
}
delegate_idle_notify!(State);

9
src/wayland/handlers/image_capture_source.rs
View file

@ -3,8 +3,7 @@
use crate::{
state::State,
wayland::protocols::{
image_capture_source::{ImageCaptureSourceKind, delegate_cosmic_image_capture_source},
toplevel_info::window_from_ext,
image_capture_source::ImageCaptureSourceKind, toplevel_info::window_from_ext,
},
};
use smithay::{
@ -51,9 +50,3 @@ impl ToplevelCaptureSourceHandler for State {
source.user_data().insert_if_missing(|| data);
}
}
smithay::delegate_image_capture_source!(State);
smithay::delegate_output_capture_source!(State);
smithay::delegate_toplevel_capture_source!(State);
delegate_cosmic_image_capture_source!(State);

2
src/wayland/handlers/image_copy_capture/mod.rs
View file

@ -449,5 +449,3 @@ fn constraints_for_renderer(
constraints
}
smithay::delegate_image_copy_capture!(State);

3
src/wayland/handlers/input_method.rs
View file

@ -2,7 +2,6 @@
use crate::state::State;
use smithay::{
delegate_input_method_manager,
desktop::{PopupKind, PopupManager, space::SpaceElement},
reexports::wayland_server::protocol::wl_surface::WlSurface,
utils::Rectangle,
@ -41,5 +40,3 @@ impl InputMethodHandler for State {
self.common.shell.read().unconstrain_popup(&popup.into());
}
}
delegate_input_method_manager!(State);

9
src/wayland/handlers/keyboard_shortcuts_inhibit.rs
View file

@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_keyboard_shortcuts_inhibit,
wayland::keyboard_shortcuts_inhibit::{
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, KeyboardShortcutsInhibitor,
},
use smithay::wayland::keyboard_shortcuts_inhibit::{
KeyboardShortcutsInhibitHandler, KeyboardShortcutsInhibitState, KeyboardShortcutsInhibitor,
};
impl KeyboardShortcutsInhibitHandler for State {
@ -18,5 +15,3 @@ impl KeyboardShortcutsInhibitHandler for State {
inhibitor.activate();
}
}
delegate_keyboard_shortcuts_inhibit!(State);

3
src/wayland/handlers/layer_shell.rs
View file

@ -2,7 +2,6 @@
use crate::{shell::PendingLayer, utils::prelude::*};
use smithay::{
delegate_layer_shell,
desktop::{LayerSurface, PopupKind, WindowSurfaceType, layer_map_for_output},
output::Output,
reexports::wayland_server::protocol::wl_output::WlOutput,
@ -82,5 +81,3 @@ impl WlrLayerShellHandler for State {
}
}
}
delegate_layer_shell!(State);

9
src/wayland/handlers/mod.rs
View file

@ -1,7 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
pub mod a11y;
pub mod alpha_modifier;
pub mod buffer;
pub mod compositor;
pub mod corner_radius;
@ -12,7 +11,6 @@ pub mod dmabuf;
pub mod drm;
pub mod drm_lease;
pub mod drm_syncobj;
pub mod fixes;
pub mod foreign_toplevel_list;
pub mod fractional_scale;
pub mod idle_inhibit;
@ -27,22 +25,15 @@ pub mod output_configuration;
pub mod output_power;
pub mod overlap_notify;
pub mod pointer_constraints;
pub mod pointer_gestures;
pub mod presentation;
pub mod primary_selection;
pub mod relative_pointer;
pub mod seat;
pub mod security_context;
pub mod selection;
pub mod session_lock;
pub mod shm;
pub mod single_pixel_buffer;
pub mod tablet_manager;
pub mod text_input;
pub mod toplevel_info;
pub mod toplevel_management;
pub mod viewporter;
pub mod virtual_keyboard;
pub mod workspace;
pub mod xdg_activation;
pub mod xdg_foreign;

4
src/wayland/handlers/output.rs
View file

@ -1,8 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{delegate_output, wayland::output::OutputHandler};
use smithay::wayland::output::OutputHandler;
impl OutputHandler for State {}
delegate_output!(State);

2
src/wayland/handlers/pointer_constraints.rs
View file

@ -2,7 +2,6 @@
use crate::state::State;
use smithay::{
delegate_pointer_constraints,
input::pointer::PointerHandle,
reexports::wayland_server::protocol::wl_surface::WlSurface,
utils::{Logical, Point},
@ -34,4 +33,3 @@ impl PointerConstraintsHandler for State {
// TODO
}
}
delegate_pointer_constraints!(State);

6
src/wayland/handlers/pointer_gestures.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_pointer_gestures;
delegate_pointer_gestures!(State);

6
src/wayland/handlers/presentation.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_presentation;
delegate_presentation!(State);

7
src/wayland/handlers/primary_selection.rs
View file

@ -1,9 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_primary_selection,
wayland::selection::primary_selection::{PrimarySelectionHandler, PrimarySelectionState},
use smithay::wayland::selection::primary_selection::{
PrimarySelectionHandler, PrimarySelectionState,
};
impl PrimarySelectionHandler for State {
@ -11,5 +10,3 @@ impl PrimarySelectionHandler for State {
&mut self.common.primary_selection_state
}
}
delegate_primary_selection!(State);

6
src/wayland/handlers/relative_pointer.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_relative_pointer;
delegate_relative_pointer!(State);

8
src/wayland/handlers/seat.rs
View file

@ -6,10 +6,7 @@ use crate::{
state::State,
utils::prelude::SeatExt,
};
use smithay::{
delegate_cursor_shape, delegate_seat,
input::{SeatHandler, SeatState, keyboard::LedState, pointer::CursorImageStatus},
};
use smithay::input::{SeatHandler, SeatState, keyboard::LedState, pointer::CursorImageStatus};
impl SeatHandler for State {
type KeyboardFocus = KeyboardFocusTarget;
@ -37,6 +34,3 @@ impl SeatHandler for State {
devices.update_led_state(led_state);
}
}
delegate_seat!(State);
delegate_cursor_shape!(State);

2
src/wayland/handlers/security_context.rs
View file

@ -1,7 +1,6 @@
use crate::state::{ClientState, State};
use smithay::{
backend::drm::DrmNode,
delegate_security_context,
wayland::security_context::{
SecurityContext, SecurityContextHandler, SecurityContextListenerSource,
},
@ -54,4 +53,3 @@ impl SecurityContextHandler for State {
.expect("Failed to init the wayland socket source.");
}
}
delegate_security_context!(State);

3
src/wayland/handlers/session_lock.rs
View file

@ -2,7 +2,6 @@
use crate::{shell::SessionLock, state::State, utils::prelude::*};
use smithay::{
delegate_session_lock,
output::Output,
reexports::wayland_server::{Resource, protocol::wl_output::WlOutput},
utils::Size,
@ -68,5 +67,3 @@ impl SessionLockHandler for State {
}
}
}
delegate_session_lock!(State);

7
src/wayland/handlers/shm.rs
View file

@ -1,15 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_shm,
wayland::shm::{ShmHandler, ShmState},
};
use smithay::wayland::shm::{ShmHandler, ShmState};
impl ShmHandler for State {
fn shm_state(&self) -> &ShmState {
&self.common.shm_state
}
}
delegate_shm!(State);

6
src/wayland/handlers/single_pixel_buffer.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_single_pixel_buffer;
delegate_single_pixel_buffer!(State);

6
src/wayland/handlers/tablet_manager.rs
View file

@ -2,8 +2,8 @@
use crate::state::State;
use smithay::{
backend::input::TabletToolDescriptor, delegate_tablet_manager,
input::pointer::CursorImageStatus, wayland::tablet_manager::TabletSeatHandler,
backend::input::TabletToolDescriptor, input::pointer::CursorImageStatus,
wayland::tablet_manager::TabletSeatHandler,
};
impl TabletSeatHandler for State {
@ -11,5 +11,3 @@ impl TabletSeatHandler for State {
// TODO display cursor for each tablet tool
}
}
delegate_tablet_manager!(State);

6
src/wayland/handlers/text_input.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_text_input_manager;
delegate_text_input_manager!(State);

6
src/wayland/handlers/viewporter.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_viewporter;
delegate_viewporter!(State);

6
src/wayland/handlers/virtual_keyboard.rs
View file

@ -1,6 +0,0 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::delegate_virtual_keyboard_manager;
delegate_virtual_keyboard_manager!(State);

3
src/wayland/handlers/xdg_activation.rs
View file

@ -6,7 +6,6 @@ use crate::{
wayland::protocols::workspace::{State as WState, WorkspaceHandle},
};
use smithay::{
delegate_xdg_activation,
input::Seat,
reexports::wayland_server::protocol::wl_surface::WlSurface,
wayland::xdg_activation::{
@ -246,5 +245,3 @@ impl State {
};
}
}
delegate_xdg_activation!(State);

7
src/wayland/handlers/xdg_foreign.rs
View file

@ -1,15 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_xdg_foreign,
wayland::xdg_foreign::{XdgForeignHandler, XdgForeignState},
};
use smithay::wayland::xdg_foreign::{XdgForeignHandler, XdgForeignState};
impl XdgForeignHandler for State {
fn xdg_foreign_state(&mut self) -> &mut XdgForeignState {
&mut self.common.xdg_foreign_state
}
}
delegate_xdg_foreign!(State);

3
src/wayland/handlers/xdg_shell/mod.rs
View file

@ -6,7 +6,6 @@ use crate::{
};
use smithay::desktop::layer_map_for_output;
use smithay::{
delegate_xdg_shell,
desktop::{
PopupGrab, PopupKeyboardGrab, PopupKind, PopupPointerGrab, PopupUngrabStrategy,
WindowSurfaceType, find_popup_root_surface,
@ -391,5 +390,3 @@ impl XdgShellHandler for State {
}
}
}
delegate_xdg_shell!(State);

3
src/wayland/handlers/xwayland_keyboard_grab.rs
View file

@ -2,7 +2,6 @@
use crate::{shell::focus::target::KeyboardFocusTarget, state::State};
use smithay::{
delegate_xwayland_keyboard_grab,
input::Seat,
reexports::wayland_server::{Resource, protocol::wl_surface::WlSurface},
wayland::xwayland_keyboard_grab::{XWaylandKeyboardGrab, XWaylandKeyboardGrabHandler},
@ -49,5 +48,3 @@ impl XWaylandGrabSeat for Seat<State> {
.is_some_and(|(s, g)| g.grab().is_alive() && s == surface)
}
}
delegate_xwayland_keyboard_grab!(State);

7
src/wayland/handlers/xwayland_shell.rs
View file

@ -1,15 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
use crate::state::State;
use smithay::{
delegate_xwayland_shell,
wayland::xwayland_shell::{XWaylandShellHandler, XWaylandShellState},
};
use smithay::wayland::xwayland_shell::{XWaylandShellHandler, XWaylandShellState};
impl XWaylandShellHandler for State {
fn xwayland_shell_state(&mut self) -> &mut XWaylandShellState {
&mut self.common.xwayland_shell_state
}
}
delegate_xwayland_shell!(State);

52
src/wayland/protocols/image_capture_source.rs
View file

@ -15,7 +15,7 @@ use smithay::{
reexports::wayland_server::{
Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource,
},
wayland::image_capture_source::{ImageCaptureSource, ImageCaptureSourceData},
wayland::{image_capture_source::{ImageCaptureSource, ImageCaptureSourceData}, Dispatch2, GlobalDispatch2},
};
use wayland_backend::server::GlobalId;
@ -53,7 +53,7 @@ impl CosmicImageCaptureSourceState {
D: GlobalDispatch<
ZcosmicWorkspaceImageCaptureSourceManagerV1,
WorkspaceImageCaptureSourceManagerGlobalData,
> + Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, ()>
> + Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, CaptureSourceManagerData>
+ Dispatch<ExtImageCaptureSourceV1, ImageCaptureSourceData>
+ WorkspaceHandler
+ 'static,
@ -75,53 +75,41 @@ impl CosmicImageCaptureSourceState {
}
}
impl<D>
GlobalDispatch<
ZcosmicWorkspaceImageCaptureSourceManagerV1,
WorkspaceImageCaptureSourceManagerGlobalData,
D,
> for CosmicImageCaptureSourceState
pub struct CaptureSourceManagerData;
impl<D> GlobalDispatch2<ZcosmicWorkspaceImageCaptureSourceManagerV1, D>
for WorkspaceImageCaptureSourceManagerGlobalData
where
D: GlobalDispatch<
ZcosmicWorkspaceImageCaptureSourceManagerV1,
WorkspaceImageCaptureSourceManagerGlobalData,
> + Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, ()>
D: Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, CaptureSourceManagerData>
+ Dispatch<ExtImageCaptureSourceV1, ImageCaptureSourceData>
+ 'static,
{
fn bind(
&self,
_state: &mut D,
_handle: &DisplayHandle,
_client: &Client,
resource: New<ZcosmicWorkspaceImageCaptureSourceManagerV1>,
_global_data: &WorkspaceImageCaptureSourceManagerGlobalData,
data_init: &mut DataInit<'_, D>,
) {
data_init.init(resource, ());
data_init.init(resource, CaptureSourceManagerData);
}
fn can_view(
client: Client,
global_data: &WorkspaceImageCaptureSourceManagerGlobalData,
) -> bool {
(global_data.filter)(&client)
fn can_view(&self, client: &Client) -> bool {
(self.filter)(client)
}
}
impl<D> Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, (), D>
for CosmicImageCaptureSourceState
impl<D> Dispatch2<ZcosmicWorkspaceImageCaptureSourceManagerV1, D> for CaptureSourceManagerData
where
D: Dispatch<ZcosmicWorkspaceImageCaptureSourceManagerV1, ()>
+ Dispatch<ExtImageCaptureSourceV1, ImageCaptureSourceData>
+ WorkspaceHandler
+ 'static,
D: Dispatch<ExtImageCaptureSourceV1, ImageCaptureSourceData> + WorkspaceHandler + 'static,
{
fn request(
&self,
state: &mut D,
_client: &Client,
_resource: &ZcosmicWorkspaceImageCaptureSourceManagerV1,
request: <ZcosmicWorkspaceImageCaptureSourceManagerV1 as Resource>::Request,
_data: &(),
_dhandle: &DisplayHandle,
data_init: &mut DataInit<'_, D>,
) {
@ -146,15 +134,3 @@ where
}
}
}
macro_rules! delegate_cosmic_image_capture_source {
($(@<$( $lt:tt $( : $clt:tt $(+ $dlt:tt )* )? ),+>)? $ty: ty) => {
smithay::reexports::wayland_server::delegate_global_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
cosmic_protocols::image_capture_source::v1::server::zcosmic_workspace_image_capture_source_manager_v1::ZcosmicWorkspaceImageCaptureSourceManagerV1: $crate::wayland::protocols::image_capture_source::WorkspaceImageCaptureSourceManagerGlobalData
] => $crate::wayland::protocols::image_capture_source::CosmicImageCaptureSourceState);
smithay::reexports::wayland_server::delegate_dispatch!($(@< $( $lt $( : $clt $(+ $dlt )* )? ),+ >)? $ty: [
cosmic_protocols::image_capture_source::v1::server::zcosmic_workspace_image_capture_source_manager_v1::ZcosmicWorkspaceImageCaptureSourceManagerV1: ()
] => $crate::wayland::protocols::image_capture_source::CosmicImageCaptureSourceState);
};
}
pub(crate) use delegate_cosmic_image_capture_source;

11
src/wayland/protocols/overlap_notify.rs
View file

@ -16,7 +16,10 @@ use smithay::{
desktop::{LayerSurface, layer_map_for_output},
output::Output,
reexports::{
wayland_protocols::ext::foreign_toplevel_list::v1::server::ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
wayland_protocols::ext::foreign_toplevel_list::v1::server::{
ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1,
},
wayland_protocols_wlr::layer_shell::v1::server::{
zwlr_layer_shell_v1::Layer as WlrLayer, zwlr_layer_surface_v1::ZwlrLayerSurfaceV1,
},
@ -24,7 +27,9 @@ use smithay::{
},
utils::{Logical, Rectangle},
wayland::{
foreign_toplevel_list::ForeignToplevelListHandler,
foreign_toplevel_list::{
ForeignToplevelHandle, ForeignToplevelListGlobalData, ForeignToplevelListHandler,
},
shell::wlr_layer::{ExclusiveZone, Layer},
},
};
@ -75,6 +80,8 @@ impl OverlapNotifyState {
pub fn refresh<D, W>(state: &mut D)
where
D: GlobalDispatch<ZcosmicOverlapNotifyV1, OverlapNotifyGlobalData>
+ GlobalDispatch<ExtForeignToplevelListV1, ForeignToplevelListGlobalData>
+ Dispatch<ExtForeignToplevelHandleV1, ForeignToplevelHandle>
+ Dispatch<ZcosmicOverlapNotifyV1, ()>
+ Dispatch<ZcosmicOverlapNotificationV1, ()>
+ OverlapNotifyHandler

10
src/wayland/protocols/toplevel_info.rs
View file

@ -5,7 +5,10 @@ use std::{collections::HashSet, sync::Mutex};
use smithay::{
output::Output,
reexports::{
wayland_protocols::ext::foreign_toplevel_list::v1::server::ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
wayland_protocols::ext::foreign_toplevel_list::v1::server::{
ext_foreign_toplevel_handle_v1::ExtForeignToplevelHandleV1,
ext_foreign_toplevel_list_v1::ExtForeignToplevelListV1,
},
wayland_server::{
Client, DataInit, Dispatch, DisplayHandle, GlobalDispatch, New, Resource, Weak,
backend::{ClientId, GlobalId},
@ -14,7 +17,8 @@ use smithay::{
},
utils::{IsAlive, Logical, Rectangle, user_data::UserDataMap},
wayland::foreign_toplevel_list::{
ForeignToplevelHandle, ForeignToplevelListHandler, ForeignToplevelListState,
ForeignToplevelHandle, ForeignToplevelListGlobalData, ForeignToplevelListHandler,
ForeignToplevelListState,
},
};
@ -300,6 +304,8 @@ pub fn toplevel_leave_workspace(toplevel: &impl Window, workspace: &WorkspaceHan
impl<D, W> ToplevelInfoState<D, W>
where
D: GlobalDispatch<ZcosmicToplevelInfoV1, ToplevelInfoGlobalData>
+ GlobalDispatch<ExtForeignToplevelListV1, ForeignToplevelListGlobalData>
+ Dispatch<ExtForeignToplevelHandleV1, ForeignToplevelHandle>
+ Dispatch<ZcosmicToplevelInfoV1, ()>
+ Dispatch<ZcosmicToplevelHandleV1, ToplevelHandleState<W>>
+ ForeignToplevelListHandler