StardustXR/server
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 5 Wiki Activity

refactor(wayland): comment out xdg activation protocol

Browse Source
This commit is contained in:
Nova
2023-01-02 03:43:50 -05:00
parent 4f057358c8
commit dd43f238ff
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wayland/mod.rs
View File

@@ -6,7 +6,7 @@ mod seat;
mod shaders; mod shaders;
mod state; mod state;
mod surface; mod surface;
mod xdg_activation; // mod xdg_activation;
mod xdg_shell; mod xdg_shell;
use self::{state::WaylandState, surface::CORE_SURFACES}; use self::{state::WaylandState, surface::CORE_SURFACES};

7
src/wayland/state.rs
View File

@@ -26,7 +26,6 @@ use smithay::{
output::OutputManagerState, output::OutputManagerState,
shell::kde::decoration::KdeDecorationState, shell::kde::decoration::KdeDecorationState,
shm::{ShmHandler, ShmState}, shm::{ShmHandler, ShmState},
xdg_activation::XdgActivationState,
}, },
}; };
use std::sync::{Arc, Weak}; use std::sync::{Arc, Weak};
@@ -53,7 +52,7 @@ pub struct WaylandState {
pub display_handle: DisplayHandle, pub display_handle: DisplayHandle,
pub compositor_state: CompositorState, pub compositor_state: CompositorState,
pub xdg_activation_state: XdgActivationState, // pub xdg_activation_state: XdgActivationState,
pub kde_decoration_state: KdeDecorationState, pub kde_decoration_state: KdeDecorationState,
pub shm_state: ShmState, pub shm_state: ShmState,
pub dmabuf_state: DmabufState, pub dmabuf_state: DmabufState,
@@ -72,7 +71,7 @@ impl WaylandState {
renderer: &Gles2Renderer, renderer: &Gles2Renderer,
) -> Arc<Mutex<Self>> { ) -> Arc<Mutex<Self>> {
let compositor_state = CompositorState::new::<Self, _>(&display_handle, log.clone()); let compositor_state = CompositorState::new::<Self, _>(&display_handle, log.clone());
let xdg_activation_state = XdgActivationState::new::<Self, _>(&display_handle, log.clone()); // let xdg_activation_state = XdgActivationState::new::<Self, _>(&display_handle, log.clone());
let kde_decoration_state = KdeDecorationState::new::<Self, _>( let kde_decoration_state = KdeDecorationState::new::<Self, _>(
&display_handle, &display_handle,
DecorationMode::Server, DecorationMode::Server,
@@ -119,7 +118,7 @@ impl WaylandState {
display_handle, display_handle,
compositor_state, compositor_state,
xdg_activation_state, // xdg_activation_state,
kde_decoration_state, kde_decoration_state,
shm_state, shm_state,
dmabuf_state, dmabuf_state,