Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: Fix resize events before ack_configure

Browse Source 
The surface was resized and the size event was emitted before we had
sent xdg_surface::ack_configure.  If user code then called some GLFW
function that commited the surface, those changes would all get applied
to the wrong configure event.

This postpones size changes until after the ack.

(cherry picked from commit e33db6d7aa)
This commit is contained in:
Camilla Löwy 2022-06-10 18:38:06 +02:00
parent ebe2b648ea
commit e894bf71a2
2 changed files with 42 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wl_platform.h
View File

@ -189,6 +189,10 @@ typedef struct _GLFWwindowWayland
struct wl_egl_window* native; struct wl_egl_window* native;
struct wl_callback* callback; struct wl_callback* callback;
struct {
int width, height;
} pending;
struct { struct {
struct xdg_surface* surface; struct xdg_surface* surface;
struct xdg_toplevel* toplevel; struct xdg_toplevel* toplevel;

62
src/wl_window.c
View File

@ -506,8 +506,6 @@ static void xdgToplevelHandleConfigure(void* userData,
struct wl_array* states) struct wl_array* states)
{ {
_GLFWwindow* window = userData; _GLFWwindow* window = userData;
float aspectRatio;
float targetRatio;
uint32_t* state; uint32_t* state;
GLFWbool maximized = GLFW_FALSE; GLFWbool maximized = GLFW_FALSE;
GLFWbool fullscreen = GLFW_FALSE; GLFWbool fullscreen = GLFW_FALSE;
@ -531,28 +529,6 @@ static void xdgToplevelHandleConfigure(void* userData,
} }
} }
if (width != 0 && height != 0)
{
if (!maximized && !fullscreen)
{
if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE)
{
aspectRatio = (float)width / (float)height;
targetRatio = (float)window->numer / (float)window->denom;
if (aspectRatio < targetRatio)
height = width / targetRatio;
else if (aspectRatio > targetRatio)
width = height * targetRatio;
}
}
_glfwInputWindowSize(window, width, height);
window->wl.width = width;
window->wl.height = height;
resizeWindow(window);
_glfwInputWindowDamage(window);
}
if (window->wl.activated && !activated) if (window->wl.activated && !activated)
{ {
if (window->monitor && window->autoIconify) if (window->monitor && window->autoIconify)
@ -567,6 +543,17 @@ static void xdgToplevelHandleConfigure(void* userData,
window->wl.activated = activated; window->wl.activated = activated;
window->wl.maximized = maximized; window->wl.maximized = maximized;
window->wl.fullscreen = fullscreen; window->wl.fullscreen = fullscreen;
if (width && height)
{
window->wl.pending.width = width;
window->wl.pending.height = height;
}
else
{
window->wl.pending.width = window->wl.width;
window->wl.pending.height = window->wl.height;
}
} }
static void xdgToplevelHandleClose(void* userData, static void xdgToplevelHandleClose(void* userData,
@ -586,7 +573,34 @@ static void xdgSurfaceHandleConfigure(void* userData,
struct xdg_surface* surface, struct xdg_surface* surface,
uint32_t serial) uint32_t serial)
{ {
_GLFWwindow* window = userData;
int width = window->wl.pending.width;
int height = window->wl.pending.height;
xdg_surface_ack_configure(surface, serial); xdg_surface_ack_configure(surface, serial);
if (!window->wl.maximized && !window->wl.fullscreen)
{
if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE)
{
const float aspectRatio = (float) width / (float) height;
const float targetRatio = (float) window->numer / (float) window->denom;
if (aspectRatio < targetRatio)
height = width / targetRatio;
else if (aspectRatio > targetRatio)
width = height * targetRatio;
}
}
if (width != window->wl.width || height != window->wl.height)
{
window->wl.width = width;
window->wl.height = height;
resizeWindow(window);
_glfwInputWindowSize(window, width, height);
_glfwInputWindowDamage(window);
}
} }
static const struct xdg_surface_listener xdgSurfaceListener = { static const struct xdg_surface_listener xdgSurfaceListener = {