mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2026-04-06 07:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk: simplify Wayland output-order state handling

Browse Source
This commit is contained in:
Jake Guthmiller
2026-03-01 17:50:57 -06:00
parent c982253543
commit 18fa161222
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/apprt/gtk/winproto/wayland.zig
View File

@@ -54,10 +54,6 @@ pub const App = struct {
/// Initialized to true so the first event after binding is captured.
output_order_done: bool = true,
/// True if we've received an `output` event in the current cycle.
/// This lets us detect empty cycles and clear stale cached state.
output_order_seen_output: bool = false,
default_deco_mode: ?org.KdeKwinServerDecorationManager.Mode = null,
xdg_activation: ?*xdg.ActivationV1 = null,
@@ -243,6 +239,13 @@ pub const App = struct {
return null;
}
/// Reset cached state derived from kde_output_order_v1.
fn resetOutputOrderState(context: *Context) void {
context.primary_output_name = null;
context.primary_output_match_failed_logged = false;
context.output_order_done = true;
}
fn registryListener(
registry: *wl.Registry,
event: wl.Registry.Event,
@@ -315,6 +318,12 @@ pub const App = struct {
.{ v.interface, existing_global_name orelse 0, v.name },
);
old.destroy();
if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
// Replacement means the previous primary may be stale
// until the new object sends a fresh cycle.
resetOutputOrderState(context);
}
}
@field(context, field.name) = global;
@@ -352,10 +361,7 @@ pub const App = struct {
@field(context, name_field) = null;
if (comptime std.mem.eql(u8, field.name, "kde_output_order")) {
context.primary_output_name = null;
context.primary_output_match_failed_logged = false;
context.output_order_done = true;
context.output_order_seen_output = false;
resetOutputOrderState(context);
}
break :remove;
}
@@ -396,7 +402,6 @@ pub const App = struct {
// Only the first output event after a `done` is the new primary.
if (!context.output_order_done) return;
context.output_order_done = false;
context.output_order_seen_output = true;
// A new primary invalidates any cached match-failure state.
context.primary_output_match_failed_logged = false;
@@ -415,14 +420,13 @@ pub const App = struct {
}
},
.done => {
// An empty update means the compositor currently reports no
// outputs in priority order, so drop any stale cached primary.
if (!context.output_order_seen_output) {
context.primary_output_name = null;
context.primary_output_match_failed_logged = false;
if (context.output_order_done) {
// No output arrived since the previous done. Treat this as
// an empty update and drop any stale cached primary.
resetOutputOrderState(context);
return;
}
context.output_order_done = true;
context.output_order_seen_output = false;
},
}
}

12
src/build/SharedDeps.zig
View File

@@ -661,14 +661,10 @@ fn addGtkNg(
.optimize = optimize,
})) |gtk4_layer_shell| {
const layer_shell_module = gtk4_layer_shell.module("gtk4-layer-shell");
if (gobject_) |gobject| layer_shell_module.addImport(
"gtk",
gobject.module("gtk4"),
);
if (gobject_) |gobject| layer_shell_module.addImport(
"gdk",
gobject.module("gdk4"),
);
if (gobject_) |gobject| {
layer_shell_module.addImport("gtk", gobject.module("gtk4"));
layer_shell_module.addImport("gdk", gobject.module("gdk4"));
}
step.root_module.addImport(
"gtk4-layer-shell",
layer_shell_module,