mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-25 01:38:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make block on xdg output information more robust

Browse Source 
Now does not block forever if output has zero size
This commit is contained in:
Kovid Goyal
2026-07-24 10:08:59 +05:30
parent cff2ecedfb
commit 43478ffed9
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
glfw/wl_monitor.c vendored
View File

@@ -135,6 +135,7 @@ static void xdgOutputHandleLogicalPosition(void *data,
struct _GLFWmonitor *monitor = data;
monitor->wl.x = x;
monitor->wl.y = y;
monitor->wl.xdg_position_received = true;
}
static void xdgOutputHandleLogicalSize(void *data,
@@ -145,6 +146,7 @@ static void xdgOutputHandleLogicalSize(void *data,
struct _GLFWmonitor *monitor = data;
monitor->wl.xdg_logical_width = width;
monitor->wl.xdg_logical_height = height;
monitor->wl.xdg_size_received = true;
}
static void computeXdgFractionalScale(struct _GLFWmonitor *monitor)
@@ -364,13 +366,15 @@ GLFWAPI double glfwGetWaylandCurrentMonitorFractionalScale(void)
// spuriously match (0, 0)).
for (int i = 0; i < _glfw.monitorCount; i++) {
_GLFWmonitor *m = _glfw.monitors[i];
while (m->wl.xdg_output && m->wl.xdg_logical_width <= 0) {
while (m->wl.xdg_output &&
!(m->wl.xdg_size_received && m->wl.xdg_position_received)) {
if (wl_display_roundtrip(_glfw.wl.display) < 0) break;
}
}
for (int i = 0; i < _glfw.monitorCount; i++) {
_GLFWmonitor *m = _glfw.monitors[i];
if (m->wl.xdg_output && m->wl.xdg_logical_width > 0 &&
if (m->wl.xdg_output && m->wl.xdg_size_received &&
m->wl.xdg_position_received &&
m->wl.x == 0 && m->wl.y == 0) { monitor = m; break; }
}
if (!monitor)
@@ -380,8 +384,8 @@ GLFWAPI double glfwGetWaylandCurrentMonitorFractionalScale(void)
if (!monitor->wl.xdg_output)
return monitor->wl.scale > 0 ? (double)monitor->wl.scale : 1.0;
// Block until the compositor has delivered xdg_output logical_size.
while (monitor->wl.xdg_logical_width <= 0 || monitor->wl.xdg_logical_height <= 0)
// Block until the compositor has delivered xdg_output logical size and position.
while (!(monitor->wl.xdg_size_received && monitor->wl.xdg_position_received))
{
if (wl_display_roundtrip(_glfw.wl.display) < 0) break;
}

2
glfw/wl_platform.h vendored
View File

@@ -485,6 +485,8 @@ typedef struct _GLFWmonitorWayland
int32_t xdg_logical_width;
int32_t xdg_logical_height;
double fractional_scale;
bool xdg_size_received;
bool xdg_position_received;
} _GLFWmonitorWayland;