Miroirs/pinnacle
1
0
Fork 0
mirror of https://github.com/pinnacle-comp/pinnacle.git synced 2025-01-15 15:42:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Clean up stuff

Browse source
This commit is contained in:
Ottatop 2023-09-08 22:26:43 -05:00
parent 430fb76fc8
commit 29c48bdfcd
2 changed files with 1 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/layout.rs
View file

@ -1,21 +1,17 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
use std::time::Duration;
use itertools::{Either, Itertools}; use itertools::{Either, Itertools};
use smithay::{ use smithay::{
desktop::layer_map_for_output, desktop::layer_map_for_output,
output::Output, output::Output,
reexports::wayland_server::Resource,
utils::{IsAlive, Logical, Point, Rectangle, Size}, utils::{IsAlive, Logical, Point, Rectangle, Size},
wayland::compositor::{self, CompositorHandler},
}; };
use crate::{ use crate::{
state::{State, WithState}, state::{State, WithState},
window::{ window::{
window_state::{FloatingOrTiled, FullscreenOrMaximized, LocationRequestState}, window_state::{FloatingOrTiled, FullscreenOrMaximized, LocationRequestState},
WindowElement, BLOCKER_COUNTER, WindowElement,
}, },
}; };
@ -161,12 +157,6 @@ impl State {
}); });
} }
// BLOCKER_COUNTER.store(1, std::sync::atomic::Ordering::SeqCst);
// tracing::debug!(
// "blocker {}",
// BLOCKER_COUNTER.load(std::sync::atomic::Ordering::SeqCst)
// );
// Pause rendering. Here we'll wait until all windows have ack'ed and committed, // Pause rendering. Here we'll wait until all windows have ack'ed and committed,
// then resume rendering. This prevents flickering because some windows will commit before // then resume rendering. This prevents flickering because some windows will commit before
// others. // others.
@ -175,15 +165,6 @@ impl State {
// anything meaningfully. // anything meaningfully.
self.pause_rendering = true; self.pause_rendering = true;
// for (_loc, win) in pending_wins.iter() {
// if let Some(surf) = win.wl_surface() {
// tracing::debug!("adding blocker");
// compositor::add_blocker(&surf, crate::window::WindowBlocker);
// }
// }
let pending_wins_clone = pending_wins.clone();
// schedule on all idle // schedule on all idle
self.schedule( self.schedule(
move |_dt| { move |_dt| {
@ -199,62 +180,9 @@ impl State {
for (loc, win) in non_pending_wins { for (loc, win) in non_pending_wins {
dt.state.space.map_element(win, loc, false); dt.state.space.map_element(win, loc, false);
} }
for win in windows_not_on_foc_tags {
dt.state.space.unmap_elem(&win);
}
dt.state.pause_rendering = false; dt.state.pause_rendering = false;
}, },
); );
// self.schedule(
// move |_data| {
// // tracing::debug!("Waiting for all to ack");
// pending_wins_clone.iter().all(|(_, win)| {
// win.with_state(|state| state.loc_request_state.is_acknowledged())
// })
// },
// move |data| {
// // remove and trigger blockers
// BLOCKER_COUNTER.store(0, std::sync::atomic::Ordering::SeqCst);
// tracing::debug!(
// "blocker {}",
// BLOCKER_COUNTER.load(std::sync::atomic::Ordering::SeqCst)
// );
// for client in pending_wins
// .iter()
// .filter_map(|(_, win)| win.wl_surface()?.client())
// {
// data.state
// .client_compositor_state(&client)
// .blocker_cleared(&mut data.state, &data.display.handle())
// }
//
// // schedule on all idle
// data.state.schedule(
// move |_dt| {
// // tracing::debug!("Waiting for all to be idle");
// let all_idle =
// pending_wins
// .iter()
// .filter(|(_, win)| win.alive())
// .all(|(_, win)| {
// win.with_state(|state| state.loc_request_state.is_idle())
// });
//
// all_idle
// },
// move |dt| {
// for (loc, win) in non_pending_wins {
// dt.state.space.map_element(win, loc, false);
// }
// for win in windows_not_on_foc_tags {
// dt.state.space.unmap_elem(&win);
// }
// dt.state.pause_rendering = false;
// },
// );
// },
// );
} }
} }

8
src/window/window_state.rs
View file

@ -122,14 +122,6 @@ impl LocationRequestState {
pub fn is_idle(&self) -> bool { pub fn is_idle(&self) -> bool {
matches!(self, Self::Idle) matches!(self, Self::Idle)
} }
/// Returns `true` if the location request state is [`Acknowledged`].
///
/// [`Acknowledged`]: LocationRequestState::Acknowledged
#[must_use]
pub fn is_acknowledged(&self) -> bool {
matches!(self, Self::Acknowledged(..))
}
} }
impl WindowElement { impl WindowElement {