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

Wayland: Fix events emitted before ack_configure

Browse Source 
Window iconfication and maximization events were being emitted before
xdg_surface::configure, making it possible for user code to indirectly
commit surface changes from those event callbacks before
xdg_surface::ack_configure.

This postpones those events until after the ack has been sent.

(cherry picked from commit 85f5a51912)
This commit is contained in:
Camilla Löwy 2022-06-15 17:57:54 +02:00
parent 498a4d0635
commit e79d6fe40a
2 changed files with 32 additions and 23 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 { struct {
int width, height; int width, height;
GLFWbool maximized;
GLFWbool iconified;
GLFWbool activated;
GLFWbool fullscreen;
} pending; } pending;
struct { struct {

51
src/wl_window.c
View File

@ -499,43 +499,29 @@ static void xdgToplevelHandleConfigure(void* userData,
{ {
_GLFWwindow* window = userData; _GLFWwindow* window = userData;
uint32_t* state; uint32_t* state;
GLFWbool maximized = GLFW_FALSE;
GLFWbool fullscreen = GLFW_FALSE; window->wl.pending.activated = GLFW_FALSE;
GLFWbool activated = GLFW_FALSE; window->wl.pending.maximized = GLFW_FALSE;
window->wl.pending.fullscreen = GLFW_FALSE;
wl_array_for_each(state, states) wl_array_for_each(state, states)
{ {
switch (*state) switch (*state)
{ {
case XDG_TOPLEVEL_STATE_MAXIMIZED: case XDG_TOPLEVEL_STATE_MAXIMIZED:
maximized = GLFW_TRUE; window->wl.pending.maximized = GLFW_TRUE;
break; break;
case XDG_TOPLEVEL_STATE_FULLSCREEN: case XDG_TOPLEVEL_STATE_FULLSCREEN:
fullscreen = GLFW_TRUE; window->wl.pending.fullscreen = GLFW_TRUE;
break; break;
case XDG_TOPLEVEL_STATE_RESIZING: case XDG_TOPLEVEL_STATE_RESIZING:
break; break;
case XDG_TOPLEVEL_STATE_ACTIVATED: case XDG_TOPLEVEL_STATE_ACTIVATED:
activated = GLFW_TRUE; window->wl.pending.activated = GLFW_TRUE;
break; break;
} }
} }
if (window->wl.activated && !activated)
{
if (window->monitor && window->autoIconify)
_glfwPlatformIconifyWindow(window);
}
if (window->wl.maximized && !maximized)
_glfwInputWindowMaximize(window, GLFW_FALSE);
else if (maximized && !window->wl.maximized)
_glfwInputWindowMaximize(window, GLFW_TRUE);
window->wl.activated = activated;
window->wl.maximized = maximized;
window->wl.fullscreen = fullscreen;
if (width && height) if (width && height)
{ {
if (window->wl.decorations.top.surface) if (window->wl.decorations.top.surface)
@ -575,11 +561,30 @@ static void xdgSurfaceHandleConfigure(void* userData,
uint32_t serial) uint32_t serial)
{ {
_GLFWwindow* window = userData; _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.activated != window->wl.pending.activated)
{
window->wl.activated = window->wl.pending.activated;
if (!window->wl.activated)
{
if (window->monitor && window->autoIconify)
xdg_toplevel_set_minimized(window->wl.xdg.toplevel);
}
}
if (window->wl.maximized != window->wl.pending.maximized)
{
window->wl.maximized = window->wl.pending.maximized;
_glfwInputWindowMaximize(window, window->wl.maximized);
}
window->wl.fullscreen = window->wl.pending.fullscreen;
int width = window->wl.pending.width;
int height = window->wl.pending.height;
if (!window->wl.maximized && !window->wl.fullscreen) if (!window->wl.maximized && !window->wl.fullscreen)
{ {
if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE) if (window->numer != GLFW_DONT_CARE && window->denom != GLFW_DONT_CARE)