mirrors/ghostty
1
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-10-14 13:56:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtk(wayland): gtk4-layer-shell -> layer-shell

Browse Source 
It was getting a bit too unwieldy.
This commit is contained in:
Leah Amelia Chen
2025-05-30 14:50:26 +02:00
parent 6fac355363
commit 71a1ece7e9
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,8 +6,8 @@ const build_options = @import("build_options");
const gdk = @import("gdk"); const gdk = @import("gdk");
const gdk_wayland = @import("gdk_wayland"); const gdk_wayland = @import("gdk_wayland");
const gobject = @import("gobject"); const gobject = @import("gobject");
const gtk4_layer_shell = @import("gtk4-layer-shell");
const gtk = @import("gtk"); const gtk = @import("gtk");
const layer_shell = @import("gtk4-layer-shell");
const wayland = @import("wayland"); const wayland = @import("wayland");
const Config = @import("../../../config.zig").Config; const Config = @import("../../../config.zig").Config;
@@ -98,7 +98,7 @@ pub const App = struct {
} }
pub fn supportsQuickTerminal(_: App) bool { pub fn supportsQuickTerminal(_: App) bool {
if (!gtk4_layer_shell.isSupported()) { if (!layer_shell.isSupported()) {
log.warn("your compositor does not support the wlr-layer-shell protocol; disabling quick terminal", .{}); log.warn("your compositor does not support the wlr-layer-shell protocol; disabling quick terminal", .{});
return false; return false;
} }
@@ -108,8 +108,8 @@ pub const App = struct {
pub fn initQuickTerminal(_: *App, apprt_window: *ApprtWindow) !void { pub fn initQuickTerminal(_: *App, apprt_window: *ApprtWindow) !void {
const window = apprt_window.window.as(gtk.Window); const window = apprt_window.window.as(gtk.Window);
gtk4_layer_shell.initForWindow(window); layer_shell.initForWindow(window);
gtk4_layer_shell.setLayer(window, .top); layer_shell.setLayer(window, .top);
} }
fn registryListener( fn registryListener(
@@ -357,7 +357,7 @@ pub const Window = struct {
const window = self.apprt_window.window.as(gtk.Window); const window = self.apprt_window.window.as(gtk.Window);
const config = &self.apprt_window.config; const config = &self.apprt_window.config;
const anchored_edge: ?gtk4_layer_shell.ShellEdge = switch (config.quick_terminal_position) { const anchored_edge: ?layer_shell.ShellEdge = switch (config.quick_terminal_position) {
.left => .left, .left => .left,
.right => .right, .right => .right,
.top => .top, .top => .top,
@@ -365,12 +365,12 @@ pub const Window = struct {
.center => null, .center => null,
}; };
gtk4_layer_shell.setKeyboardMode( layer_shell.setKeyboardMode(
window, window,
switch (config.quick_terminal_keyboard_interactivity) { switch (config.quick_terminal_keyboard_interactivity) {
.none => .none, .none => .none,
.@"on-demand" => on_demand: { .@"on-demand" => on_demand: {
if (gtk4_layer_shell.getProtocolVersion() < 4) { if (layer_shell.getProtocolVersion() < 4) {
log.warn("your compositor does not support on-demand keyboard access; falling back to exclusive access", .{}); log.warn("your compositor does not support on-demand keyboard access; falling back to exclusive access", .{});
break :on_demand .exclusive; break :on_demand .exclusive;
} }
@@ -380,18 +380,18 @@ pub const Window = struct {
}, },
); );
for (std.meta.tags(gtk4_layer_shell.ShellEdge)) |edge| { for (std.meta.tags(layer_shell.ShellEdge)) |edge| {
if (anchored_edge) |anchored| { if (anchored_edge) |anchored| {
if (edge == anchored) { if (edge == anchored) {
gtk4_layer_shell.setMargin(window, edge, 0); layer_shell.setMargin(window, edge, 0);
gtk4_layer_shell.setAnchor(window, edge, true); layer_shell.setAnchor(window, edge, true);
continue; continue;
} }
} }
// Arbitrary margin - could be made customizable? // Arbitrary margin - could be made customizable?
gtk4_layer_shell.setMargin(window, edge, 20); layer_shell.setMargin(window, edge, 20);
gtk4_layer_shell.setAnchor(window, edge, false); layer_shell.setAnchor(window, edge, false);
} }
if (self.apprt_window.isQuickTerminal()) { if (self.apprt_window.isQuickTerminal()) {