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

fix: keep Xwayland frame callbacks progressing

Browse source
This commit is contained in:
Frederic Laing 2026-08-31 20:23:45 +02:00 • committed by Victoria Brekenfeld
parent 8691956644
commit e62e35e5cc
1 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/state.rs
View file

@ -139,6 +139,14 @@ struct Localizations;
pub static LANG_LOADER: LazyLock<FluentLanguageLoader> = pub static LANG_LOADER: LazyLock<FluentLanguageLoader> =
LazyLock::new(|| fluent_language_loader!()); LazyLock::new(|| fluent_language_loader!());
fn xwayland_frame_throttle(throttle: Option<Duration>, is_xwayland: bool) -> Option<Duration> {
if is_xwayland {
Some(Duration::ZERO)
} else {
throttle
}
}
#[macro_export] #[macro_export]
macro_rules! fl { macro_rules! fl {
($message_id:literal) => {{ ($message_id:literal) => {{
@ -1365,7 +1373,9 @@ impl Common {
&& let Some(grab_state) = move_grab.lock().unwrap().as_ref() && let Some(grab_state) = move_grab.lock().unwrap().as_ref()
{ {
for (window, _) in grab_state.element().windows() { for (window, _) in grab_state.element().windows() {
window.send_frame(output, time, throttle(&window), should_send); let throttle =
xwayland_frame_throttle(throttle(&window), window.x11_surface().is_some());
window.send_frame(output, time, throttle, should_send);
} }
} }
@ -1389,25 +1399,34 @@ impl Common {
.mapped() .mapped()
.for_each(|mapped| { .for_each(|mapped| {
for (window, _) in mapped.windows() { for (window, _) in mapped.windows() {
window.send_frame(output, time, throttle(&window), should_send); let throttle =
xwayland_frame_throttle(throttle(&window), window.x11_surface().is_some());
window.send_frame(output, time, throttle, should_send);
} }
}); });
if let Some(active) = shell.active_space(output) { if let Some(active) = shell.active_space(output) {
if let Some(fs) = active.get_fullscreen(shell.seats.last_active()) { if let Some(fs) = active.get_fullscreen(shell.seats.last_active()) {
fs.surface let throttle = xwayland_frame_throttle(
.send_frame(output, time, throttle(&fs.surface), should_send); throttle(&fs.surface),
fs.surface.x11_surface().is_some(),
);
fs.surface.send_frame(output, time, throttle, should_send);
} }
active.mapped().for_each(|mapped| { active.mapped().for_each(|mapped| {
for (window, _) in mapped.windows() { for (window, _) in mapped.windows() {
window.send_frame(output, time, throttle(&window), should_send); let throttle =
xwayland_frame_throttle(throttle(&window), window.x11_surface().is_some());
window.send_frame(output, time, throttle, should_send);
} }
}); });
// other (throttled) windows // other (throttled) windows
active.minimized_windows.iter().for_each(|m| { active.minimized_windows.iter().for_each(|m| {
for window in m.windows() { for window in m.windows() {
window.send_frame(output, time, throttle(&window), |_, _| None); let throttle =
xwayland_frame_throttle(throttle(&window), window.x11_surface().is_some());
window.send_frame(output, time, throttle, |_, _| None);
} }
}); });
@ -1418,17 +1437,25 @@ impl Common {
{ {
if let Some(fs) = space.get_fullscreen(shell.seats.last_active()) { if let Some(fs) = space.get_fullscreen(shell.seats.last_active()) {
let throttle = min(throttle(space), throttle(&fs.surface)); let throttle = min(throttle(space), throttle(&fs.surface));
let throttle =
xwayland_frame_throttle(throttle, fs.surface.x11_surface().is_some());
fs.surface.send_frame(output, time, throttle, |_, _| None); fs.surface.send_frame(output, time, throttle, |_, _| None);
} }
space.mapped().for_each(|mapped| { space.mapped().for_each(|mapped| {
for (window, _) in mapped.windows() { for (window, _) in mapped.windows() {
let throttle = min(throttle(space), throttle(&window)); let throttle = min(throttle(space), throttle(&window));
let throttle =
xwayland_frame_throttle(throttle, window.x11_surface().is_some());
window.send_frame(output, time, throttle, |_, _| None); window.send_frame(output, time, throttle, |_, _| None);
} }
}); });
space.minimized_windows.iter().for_each(|m| { space.minimized_windows.iter().for_each(|m| {
for window in m.windows() { for window in m.windows() {
window.send_frame(output, time, throttle(&window), |_, _| None); let throttle = xwayland_frame_throttle(
throttle(&window),
window.x11_surface().is_some(),
);
window.send_frame(output, time, throttle, |_, _| None);
} }
}) })
} }