ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce CSD API surface

Browse source
This commit is contained in:
Kovid Goyal 2024-04-05 19:57:43 +05:30
parent 9e55951d5a
commit 9225bd772d
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
glfw/wl_client_side_decorations.c vendored
View file

@ -318,7 +318,7 @@ create_shm_buffers(_GLFWwindow* window) {
return true;
}
void
static void
free_csd_surfaces(_GLFWwindow *window) {
#define d(which) {\
if (decs.which.subsurface) wl_subsurface_destroy(decs.which.subsurface); \
@ -366,7 +366,7 @@ create_csd_surfaces(_GLFWwindow *window, _GLFWWaylandCSDEdge *s) {
wl_surface_commit(decs.which.surface); \
if (decs.which.buffer.a == (xbuffer)) { decs.which.buffer.a_needs_to_be_destroyed = false; } else { decs.which.buffer.b_needs_to_be_destroyed = false; }
bool
static bool
ensure_csd_resources(_GLFWwindow *window) {
if (!window->decorated || window->wl.decorations.serverSide) return false;
const bool is_focused = window->id == _glfw.focusedWindowId;
@ -417,6 +417,14 @@ ensure_csd_resources(_GLFWwindow *window) {
return true;
}
void
csd_set_visible(_GLFWwindow *window, bool visible) {
// When setting to visible will only take effect if window currently has
// CSD and will also ensure CSD is of correct size for current window size.
// When hiding CSD simply destroys all CSD surfaces.
if (visible) ensure_csd_resources(window); else free_csd_surfaces(window);
}
void
free_all_csd_resources(_GLFWwindow *window) {
free_csd_surfaces(window);

3
glfw/wl_client_side_decorations.h vendored
View file

@ -10,8 +10,7 @@
void initialize_csd_metrics(_GLFWwindow *window);
void free_all_csd_resources(_GLFWwindow *window);
void free_csd_surfaces(_GLFWwindow *window);
void change_csd_title(_GLFWwindow *window);
bool ensure_csd_resources(_GLFWwindow *window);
void set_csd_window_geometry(_GLFWwindow *window, int32_t *width, int32_t *height);
void set_titlebar_color(_GLFWwindow *window, uint32_t color, bool use_system_color);
void csd_set_visible(_GLFWwindow *window, bool visible);

21
glfw/wl_window.c vendored
View file

@ -393,7 +393,7 @@ apply_scale_changes(_GLFWwindow *window, bool resize_framebuffer, bool update_cs
float scale = _glfwWaylandWindowScale(window);
if (resize_framebuffer) resizeFramebuffer(window);
_glfwInputWindowContentScale(window, scale, scale);
if (update_csd) ensure_csd_resources(window);
if (update_csd) csd_set_visible(window, true); // resize the csd iff the window currently has CSD
int buffer_scale = window->wl.fractional_scale ? 1 : (int)scale;
wl_surface_set_buffer_scale(window->wl.surface, buffer_scale);
}
@ -601,13 +601,11 @@ static void setFullscreen(_GLFWwindow* window, _GLFWmonitor* monitor, bool on)
if (window->wl.xdg.toplevel)
{
if (on) {
xdg_toplevel_set_fullscreen(
window->wl.xdg.toplevel,
monitor ? monitor->wl.output : NULL);
if (!window->wl.decorations.serverSide) free_csd_surfaces(window);
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel, monitor ? monitor->wl.output : NULL);
csd_set_visible(window, false);
} else {
xdg_toplevel_unset_fullscreen(window->wl.xdg.toplevel);
ensure_csd_resources(window);
csd_set_visible(window, true);
}
}
}
@ -739,11 +737,7 @@ apply_xdg_configure_changes(_GLFWwindow *window) {
int width = window->wl.pending.width, height = window->wl.pending.height;
set_csd_window_geometry(window, &width, &height);
bool resized = dispatchChangesAfterConfigure(window, width, height);
if (window->wl.decorations.serverSide || window->monitor || window->wl.current.toplevel_states & TOPLEVEL_STATE_FULLSCREEN) {
free_csd_surfaces(window);
} else {
ensure_csd_resources(window);
}
csd_set_visible(window, !(window->wl.decorations.serverSide || window->monitor || window->wl.current.toplevel_states & TOPLEVEL_STATE_FULLSCREEN));
debug("Final window content size: %dx%d resized: %d\n", width, height, resized);
}
@ -877,13 +871,12 @@ setXdgDecorations(_GLFWwindow* window)
zxdg_toplevel_decoration_v1_set_mode(window->wl.xdg.decoration, window->decorated ? ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE: ZXDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE);
} else {
window->wl.decorations.serverSide = false;
ensure_csd_resources(window);
csd_set_visible(window, window->decorated);
}
}
void _glfwPlatformSetWindowDecorated(_GLFWwindow* window, bool enabled UNUSED) {
setXdgDecorations(window);
if (window->decorated) ensure_csd_resources(window); else free_csd_surfaces(window);
inform_compositor_of_window_geometry(window, "SetWindowDecorated");
commit_window_surface_if_safe(window);
}
@ -1416,7 +1409,7 @@ void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
set_csd_window_geometry(window, &w, &h);
window->wl.width = w; window->wl.height = h;
resizeFramebuffer(window);
ensure_csd_resources(window);
csd_set_visible(window, true); // resizes the csd iff the window currently has csd
commit_window_surface_if_safe(window);
inform_compositor_of_window_geometry(window, "SetWindowSize");
}