Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-06-07 16:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 40df42381f into 1fe98a0d53

Browse Source
This commit is contained in:
Mariusz Białończyk 2024-02-10 23:45:39 +01:00 committed by GitHub
commit a56441b837
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/wl_init.c
View File

@ -376,6 +376,15 @@ static void createKeyTables(void)
} }
} }
static GLFWbool getScaleSetting(void)
{
const char* scaleEnvString = getenv("GLFW_SCALE_TO_MONITOR");
if (scaleEnvString)
return GLFW_TRUE;
else
return GLFW_FALSE;
}
static GLFWbool loadCursorTheme(void) static GLFWbool loadCursorTheme(void)
{ {
int cursorSize = 16; int cursorSize = 16;
@ -838,6 +847,8 @@ int _glfwInitWayland(void)
if (!loadCursorTheme()) if (!loadCursorTheme())
return GLFW_FALSE; return GLFW_FALSE;
_glfw.wl.scaleToMonitor = getScaleSetting();
if (_glfw.wl.seat && _glfw.wl.dataDeviceManager) if (_glfw.wl.seat && _glfw.wl.dataDeviceManager)
{ {
_glfw.wl.dataDevice = _glfw.wl.dataDevice =

1
src/wl_platform.h
View File

@ -458,6 +458,7 @@ typedef struct _GLFWlibraryWayland
int cursorTimerfd; int cursorTimerfd;
uint32_t serial; uint32_t serial;
uint32_t pointerEnterSerial; uint32_t pointerEnterSerial;
GLFWbool scaleToMonitor;
int keyRepeatTimerfd; int keyRepeatTimerfd;
int32_t keyRepeatRate; int32_t keyRepeatRate;

13
src/wl_window.c
View File

@ -1331,6 +1331,7 @@ static void pointerHandleMotion(void* userData,
const double ypos = wl_fixed_to_double(sy); const double ypos = wl_fixed_to_double(sy);
window->wl.cursorPosX = xpos; window->wl.cursorPosX = xpos;
window->wl.cursorPosY = ypos; window->wl.cursorPosY = ypos;
int scale = _glfw.wl.scaleToMonitor ? window->wl.contentScale : 1;
const char* cursorName = NULL; const char* cursorName = NULL;
@ -1338,7 +1339,7 @@ static void pointerHandleMotion(void* userData,
{ {
case GLFW_MAIN_WINDOW: case GLFW_MAIN_WINDOW:
_glfw.wl.cursorPreviousName = NULL; _glfw.wl.cursorPreviousName = NULL;
_glfwInputCursorPos(window, xpos, ypos); _glfwInputCursorPos(window, xpos * scale, ypos * scale);
return; return;
case GLFW_TOP_DECORATION: case GLFW_TOP_DECORATION:
if (ypos < GLFW_BORDER_SIZE) if (ypos < GLFW_BORDER_SIZE)
@ -2146,10 +2147,11 @@ void _glfwSetWindowPosWayland(_GLFWwindow* window, int xpos, int ypos)
void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height) void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height)
{ {
int scale = _glfw.wl.scaleToMonitor ? window->wl.contentScale : 1;
if (width) if (width)
*width = window->wl.width; *width = window->wl.width * scale;
if (height) if (height)
*height = window->wl.height; *height = window->wl.height * scale;
} }
void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height) void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height)
@ -2263,10 +2265,11 @@ void _glfwSetWindowAspectRatioWayland(_GLFWwindow* window, int numer, int denom)
void _glfwGetFramebufferSizeWayland(_GLFWwindow* window, int* width, int* height) void _glfwGetFramebufferSizeWayland(_GLFWwindow* window, int* width, int* height)
{ {
_glfwGetWindowSizeWayland(window, width, height); _glfwGetWindowSizeWayland(window, width, height);
int scale = _glfw.wl.scaleToMonitor ? 1 : window->wl.contentScale;
if (width) if (width)
*width *= window->wl.contentScale; *width *= scale;
if (height) if (height)
*height *= window->wl.contentScale; *height *= scale;
} }
void _glfwGetWindowFrameSizeWayland(_GLFWwindow* window, void _glfwGetWindowFrameSizeWayland(_GLFWwindow* window,