Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-20 08:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Simplify per-window ouput scales tracking

Browse Source 
This replaces (one case of) manual management of weak links between
windows and monitors, both objects with complex life times, with
wl_object pointers used as opaque key values.

(cherry picked from commit efa9297a41)
This commit is contained in:
Camilla Löwy
2022-11-08 20:33:29 +01:00
parent 5ac970120a
commit e5d19c9fac
3 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wl_window.c
+30 -28
View File
@@ -346,7 +346,7 @@ static void setContentAreaOpaque(_GLFWwindow* window)
static void resizeWindow(_GLFWwindow* window)
{
int scale = window->wl.scale;
int scale = window->wl.contentScale;
int scaledWidth = window->wl.width * scale;
int scaledHeight = window->wl.height * scale;
@@ -391,13 +391,13 @@ void _glfwUpdateContentScaleWayland(_GLFWwindow* window)
// Get the scale factor from the highest scale monitor.
int maxScale = 1;
for (int i = 0; i < window->wl.monitorsCount; i++)
maxScale = _glfw_max(window->wl.monitors[i]->wl.scale, maxScale);
for (int i = 0; i < window->wl.scaleCount; i++)
maxScale = _glfw_max(window->wl.scales[i].factor, maxScale);
// Only change the framebuffer size if the scale changed.
if (window->wl.scale != maxScale)
if (window->wl.contentScale != maxScale)
{
window->wl.scale = maxScale;
window->wl.contentScale = maxScale;
wl_surface_set_buffer_scale(window->wl.surface, maxScale);
_glfwInputWindowContentScale(window, maxScale, maxScale);
resizeWindow(window);
@@ -416,16 +416,20 @@ static void surfaceHandleEnter(void* userData,
_GLFWwindow* window = userData;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
if (!window || !monitor)
return;
if (window->wl.monitorsCount + 1 > window->wl.monitorsSize)
if (window->wl.scaleCount + 1 > window->wl.scaleSize)
{
++window->wl.monitorsSize;
window->wl.monitors =
realloc(window->wl.monitors,
window->wl.monitorsSize * sizeof(_GLFWmonitor*));
window->wl.scaleSize++;
window->wl.scales =
realloc(window->wl.scales,
window->wl.scaleSize * sizeof(_GLFWscaleWayland));
}
window->wl.monitors[window->wl.monitorsCount++] = monitor;
window->wl.scaleCount++;
window->wl.scales[window->wl.scaleCount - 1].factor = monitor->wl.contentScale;
window->wl.scales[window->wl.scaleCount - 1].output = output;
_glfwUpdateContentScaleWayland(window);
}
@@ -438,18 +442,16 @@ static void surfaceHandleLeave(void* userData,
return;
_GLFWwindow* window = userData;
_GLFWmonitor* monitor = wl_output_get_user_data(output);
GLFWbool found;
int i;
for (i = 0, found = GLFW_FALSE; i < window->wl.monitorsCount - 1; ++i)
for (int i = 0; i < window->wl.scaleCount; i++)
{
if (monitor == window->wl.monitors[i])
found = GLFW_TRUE;
if (found)
window->wl.monitors[i] = window->wl.monitors[i + 1];
if (window->wl.scales[i].output == output)
{
window->wl.scales[i] = window->wl.scales[window->wl.scaleCount - 1];
window->wl.scaleCount--;
break;
}
}
window->wl.monitors[--window->wl.monitorsCount] = NULL;
_glfwUpdateContentScaleWayland(window);
}
@@ -780,7 +782,7 @@ static GLFWbool createNativeSurface(_GLFWwindow* window,
window->wl.width = wndconfig->width;
window->wl.height = wndconfig->height;
window->wl.scale = 1;
window->wl.contentScale = 1;
window->wl.title = _glfw_strdup(wndconfig->title);
window->wl.maximized = wndconfig->maximized;
@@ -806,7 +808,7 @@ static void setCursorImage(_GLFWwindow* window,
buffer = cursorWayland->buffer;
else
{
if (window->wl.scale > 1 && cursorWayland->cursorHiDPI)
if (window->wl.contentScale > 1 && cursorWayland->cursorHiDPI)
{
wlCursor = cursorWayland->cursorHiDPI;
scale = 2;
@@ -1162,7 +1164,7 @@ static void setCursor(_GLFWwindow* window, const char* name)
struct wl_cursor_theme* theme = _glfw.wl.cursorTheme;
int scale = 1;
if (window->wl.scale > 1 && _glfw.wl.cursorThemeHiDPI)
if (window->wl.contentScale > 1 && _glfw.wl.cursorThemeHiDPI)
{
// We only support up to scale=2 for now, since libwayland-cursor
// requires us to load a different theme for each size.
@@ -1961,7 +1963,7 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
wl_surface_destroy(window->wl.surface);
free(window->wl.title);
free(window->wl.monitors);
free(window->wl.scales);
}
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
@@ -2092,9 +2094,9 @@ void _glfwPlatformGetFramebufferSize(_GLFWwindow* window,
{
_glfwPlatformGetWindowSize(window, width, height);
if (width)
*width *= window->wl.scale;
*width *= window->wl.contentScale;
if (height)
*height *= window->wl.scale;
*height *= window->wl.contentScale;
}
void _glfwPlatformGetWindowFrameSize(_GLFWwindow* window,
@@ -2118,9 +2120,9 @@ void _glfwPlatformGetWindowContentScale(_GLFWwindow* window,
float* xscale, float* yscale)
{
if (xscale)
*xscale = (float) window->wl.scale;
*xscale = (float) window->wl.contentScale;
if (yscale)
*yscale = (float) window->wl.scale;
*yscale = (float) window->wl.contentScale;
}
void _glfwPlatformIconifyWindow(_GLFWwindow* window)