andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-23 02:05:33 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Add a way to override the element ID for primary output check

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-02-07 11:30:52 +04:00
parent 0761401650
commit 026ad8f377
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/niri.rs
+28 -9
View File
@@ -20,7 +20,8 @@ use smithay::backend::renderer::element::surface::{
}; };
use smithay::backend::renderer::element::utils::{select_dmabuf_feedback, RelocateRenderElement}; use smithay::backend::renderer::element::utils::{select_dmabuf_feedback, RelocateRenderElement};
use smithay::backend::renderer::element::{ use smithay::backend::renderer::element::{
default_primary_scanout_output_compare, AsRenderElements, Kind, RenderElementStates, default_primary_scanout_output_compare, AsRenderElements, Id, Kind, PrimaryScanoutOutput,
RenderElementStates,
}; };
use smithay::backend::renderer::gles::GlesRenderer; use smithay::backend::renderer::gles::GlesRenderer;
use smithay::desktop::utils::{ use smithay::desktop::utils::{
@@ -274,6 +275,9 @@ struct SurfaceFrameThrottlingState {
last_sent_at: RefCell<Option<(Output, u32)>>, last_sent_at: RefCell<Option<(Output, u32)>>,
} }
#[derive(Default)]
pub struct WindowOffscreenId(pub RefCell<Option<Id>>);
impl Default for SurfaceFrameThrottlingState { impl Default for SurfaceFrameThrottlingState {
fn default() -> Self { fn default() -> Self {
Self { Self {
@@ -2156,15 +2160,30 @@ impl Niri {
// not in a unified way with the pointer surfaces, which makes the logic elsewhere simpler. // not in a unified way with the pointer surfaces, which makes the logic elsewhere simpler.
for win in self.layout.windows_for_output(output) { for win in self.layout.windows_for_output(output) {
let offscreen_id = win
.user_data()
.get_or_insert(WindowOffscreenId::default)
.0
.borrow();
let offscreen_id = offscreen_id.as_ref();
win.with_surfaces(|surface, states| { win.with_surfaces(|surface, states| {
update_surface_primary_scanout_output( states
surface, .data_map
output, .insert_if_missing_threadsafe(Mutex::<PrimaryScanoutOutput>::default);
states, let surface_primary_scanout_output = states
render_element_states, .data_map
// Windows are shown only on one output at a time. .get::<Mutex<PrimaryScanoutOutput>>()
|_, _, output, _| output, .unwrap();
); surface_primary_scanout_output
.lock()
.unwrap()
.update_from_render_element_states(
offscreen_id.cloned().unwrap_or_else(|| surface.into()),
output,
render_element_states,
|_, _, output, _| output,
);
}); });
} }