Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 01:55:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Implement GLFW_RESIZABLE for XDG toplevel

Browse Source 
This implements GLFW_RESIZABLE for all paths where we manage our own
xdg_toplevel, namely XDG decorations and fallback decorations.

Fixes #2203
This commit is contained in:
Camilla Löwy 2024-02-15 19:45:59 +01:00
parent b61f3fc479
commit 690a15f929
2 changed files with 79 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -182,6 +182,7 @@ information on what to include when reporting a bug.
would abort (#1649) would abort (#1649)
- [Wayland] Added support for `glfwRequestWindowAttention` (#2287) - [Wayland] Added support for `glfwRequestWindowAttention` (#2287)
- [Wayland] Added support for `glfwFocusWindow` - [Wayland] Added support for `glfwFocusWindow`
- [Wayland] Added support for `GLFW_RESIZABLE` (#2203)
- [Wayland] Added support for fractional scaling of window contents - [Wayland] Added support for fractional scaling of window contents
- [Wayland] Added dynamic loading of all Wayland libraries - [Wayland] Added dynamic loading of all Wayland libraries
- [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled - [Wayland] Bugfix: `CLOCK_MONOTONIC` was not correctly enabled

167
src/wl_window.c
View File

@ -869,6 +869,50 @@ static GLFWbool createLibdecorFrame(_GLFWwindow* window)
return GLFW_TRUE; return GLFW_TRUE;
} }
static void updateXdgSizeLimits(_GLFWwindow* window)
{
int minwidth, minheight, maxwidth, maxheight;
if (window->resizable)
{
if (window->minwidth == GLFW_DONT_CARE || window->minheight == GLFW_DONT_CARE)
minwidth = minheight = 0;
else
{
minwidth = window->minwidth;
minheight = window->minheight;
if (window->wl.fallback.decorations)
{
minwidth += GLFW_BORDER_SIZE * 2;
minheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
}
if (window->maxwidth == GLFW_DONT_CARE || window->maxheight == GLFW_DONT_CARE)
maxwidth = maxheight = 0;
else
{
maxwidth = window->maxwidth;
maxheight = window->maxheight;
if (window->wl.fallback.decorations)
{
maxwidth += GLFW_BORDER_SIZE * 2;
maxheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
}
}
else
{
minwidth = maxwidth = window->wl.width;
minheight = maxheight = window->wl.height;
}
xdg_toplevel_set_min_size(window->wl.xdg.toplevel, minwidth, minheight);
xdg_toplevel_set_max_size(window->wl.xdg.toplevel, maxwidth, maxheight);
}
static GLFWbool createXdgShellObjects(_GLFWwindow* window) static GLFWbool createXdgShellObjects(_GLFWwindow* window)
{ {
window->wl.xdg.surface = xdg_wm_base_get_xdg_surface(_glfw.wl.wmBase, window->wl.xdg.surface = xdg_wm_base_get_xdg_surface(_glfw.wl.wmBase,
@ -935,33 +979,7 @@ static GLFWbool createXdgShellObjects(_GLFWwindow* window)
createFallbackDecorations(window); createFallbackDecorations(window);
} }
if (window->minwidth != GLFW_DONT_CARE && window->minheight != GLFW_DONT_CARE) updateXdgSizeLimits(window);
{
int minwidth = window->minwidth;
int minheight = window->minheight;
if (window->wl.fallback.decorations)
{
minwidth += GLFW_BORDER_SIZE * 2;
minheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
xdg_toplevel_set_min_size(window->wl.xdg.toplevel, minwidth, minheight);
}
if (window->maxwidth != GLFW_DONT_CARE && window->maxheight != GLFW_DONT_CARE)
{
int maxwidth = window->maxwidth;
int maxheight = window->maxheight;
if (window->wl.fallback.decorations)
{
maxwidth += GLFW_BORDER_SIZE * 2;
maxheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
xdg_toplevel_set_max_size(window->wl.xdg.toplevel, maxwidth, maxheight);
}
wl_surface_commit(window->wl.surface); wl_surface_commit(window->wl.surface);
wl_display_roundtrip(_glfw.wl.display); wl_display_roundtrip(_glfw.wl.display);
@ -1437,37 +1455,38 @@ static void pointerHandleMotion(void* userData,
if (window->wl.fallback.decorations) if (window->wl.fallback.decorations)
{ {
const char* cursorName = NULL; const char* cursorName = "left_ptr";
if (window->wl.fallback.focus == window->wl.fallback.top.surface) if (window->resizable)
{ {
if (ypos < GLFW_BORDER_SIZE) if (window->wl.fallback.focus == window->wl.fallback.top.surface)
cursorName = "n-resize"; {
else if (ypos < GLFW_BORDER_SIZE)
cursorName = "left_ptr"; cursorName = "n-resize";
} }
else if (window->wl.fallback.focus == window->wl.fallback.left.surface) else if (window->wl.fallback.focus == window->wl.fallback.left.surface)
{ {
if (ypos < GLFW_BORDER_SIZE) if (ypos < GLFW_BORDER_SIZE)
cursorName = "nw-resize"; cursorName = "nw-resize";
else else
cursorName = "w-resize"; cursorName = "w-resize";
} }
else if (window->wl.fallback.focus == window->wl.fallback.right.surface) else if (window->wl.fallback.focus == window->wl.fallback.right.surface)
{ {
if (ypos < GLFW_BORDER_SIZE) if (ypos < GLFW_BORDER_SIZE)
cursorName = "ne-resize"; cursorName = "ne-resize";
else else
cursorName = "e-resize"; cursorName = "e-resize";
} }
else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface) else if (window->wl.fallback.focus == window->wl.fallback.bottom.surface)
{ {
if (xpos < GLFW_BORDER_SIZE) if (xpos < GLFW_BORDER_SIZE)
cursorName = "sw-resize"; cursorName = "sw-resize";
else if (xpos > window->wl.width + GLFW_BORDER_SIZE) else if (xpos > window->wl.width + GLFW_BORDER_SIZE)
cursorName = "se-resize"; cursorName = "se-resize";
else else
cursorName = "s-resize"; cursorName = "s-resize";
}
} }
if (_glfw.wl.cursorPreviousName != cursorName) if (_glfw.wl.cursorPreviousName != cursorName)
@ -2287,33 +2306,7 @@ void _glfwSetWindowSizeLimitsWayland(_GLFWwindow* window,
maxwidth, maxheight); maxwidth, maxheight);
} }
else if (window->wl.xdg.toplevel) else if (window->wl.xdg.toplevel)
{ updateXdgSizeLimits(window);
if (minwidth == GLFW_DONT_CARE || minheight == GLFW_DONT_CARE)
minwidth = minheight = 0;
else
{
if (window->wl.fallback.decorations)
{
minwidth += GLFW_BORDER_SIZE * 2;
minheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
}
if (maxwidth == GLFW_DONT_CARE || maxheight == GLFW_DONT_CARE)
maxwidth = maxheight = 0;
else
{
if (window->wl.fallback.decorations)
{
maxwidth += GLFW_BORDER_SIZE * 2;
maxheight += GLFW_CAPTION_HEIGHT + GLFW_BORDER_SIZE;
}
}
xdg_toplevel_set_min_size(window->wl.xdg.toplevel, minwidth, minheight);
xdg_toplevel_set_max_size(window->wl.xdg.toplevel, maxwidth, maxheight);
wl_surface_commit(window->wl.surface);
}
} }
void _glfwSetWindowAspectRatioWayland(_GLFWwindow* window, int numer, int denom) void _glfwSetWindowAspectRatioWayland(_GLFWwindow* window, int numer, int denom)
@ -2581,12 +2574,8 @@ void _glfwSetWindowResizableWayland(_GLFWwindow* window, GLFWbool enabled)
LIBDECOR_ACTION_RESIZE); LIBDECOR_ACTION_RESIZE);
} }
} }
else else if (window->wl.xdg.toplevel)
{ updateXdgSizeLimits(window);
// TODO
_glfwInputError(GLFW_FEATURE_UNIMPLEMENTED,
"Wayland: Window attribute setting not implemented yet");
}
} }
void _glfwSetWindowDecoratedWayland(_GLFWwindow* window, GLFWbool enabled) void _glfwSetWindowDecoratedWayland(_GLFWwindow* window, GLFWbool enabled)