Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-12-19 21:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Zengtudor:fe9a61e027a13bb803a281f81f224b8507c2650d
Branches Tags
Zengtudor:master
Zengtudor:ci
Zengtudor:latest
Zengtudor:new-cursors-on-3.3-stable
Zengtudor:3.3-stable
Zengtudor:wayland-tablet
Zengtudor:keyboard-layout-r2
Zengtudor:damage-tracking
Zengtudor:x11-inhibit-screensaver
Zengtudor:attach-win32-window
Zengtudor:context-renderer
Zengtudor:drag-window
Zengtudor:egldevice
Zengtudor:get-event-time
Zengtudor:metal-guide
Zengtudor:x11-event-time
Zengtudor:3.4
Zengtudor:3.3.10
Zengtudor:3.3.9
Zengtudor:3.3.8
Zengtudor:3.3.7
Zengtudor:3.3.6
Zengtudor:3.3.5
Zengtudor:3.3.4
Zengtudor:3.3.3
Zengtudor:3.3.2
Zengtudor:3.3.1
Zengtudor:3.3
Zengtudor:3.2.1
Zengtudor:3.2
Zengtudor:3.1.2
Zengtudor:3.1.1
Zengtudor:3.1
Zengtudor:3.0.4
Zengtudor:3.0.3
Zengtudor:3.0.2
Zengtudor:3.0.1
Zengtudor:3.0
...
compare: Zengtudor:fee8f81f48852afc97fa7ec6e944bccd7d65c188
Branches Tags
Zengtudor:ci
Zengtudor:master
Zengtudor:latest
Zengtudor:new-cursors-on-3.3-stable
Zengtudor:3.3-stable
Zengtudor:wayland-tablet
Zengtudor:keyboard-layout-r2
Zengtudor:damage-tracking
Zengtudor:x11-inhibit-screensaver
Zengtudor:attach-win32-window
Zengtudor:context-renderer
Zengtudor:drag-window
Zengtudor:egldevice
Zengtudor:get-event-time
Zengtudor:metal-guide
Zengtudor:x11-event-time
Zengtudor:3.4
Zengtudor:3.3.10
Zengtudor:3.3.9
Zengtudor:3.3.8
Zengtudor:3.3.7
Zengtudor:3.3.6
Zengtudor:3.3.5
Zengtudor:3.3.4
Zengtudor:3.3.3
Zengtudor:3.3.2
Zengtudor:3.3.1
Zengtudor:3.3
Zengtudor:3.2.1
Zengtudor:3.2
Zengtudor:3.1.2
Zengtudor:3.1.1
Zengtudor:3.1
Zengtudor:3.0.4
Zengtudor:3.0.3
Zengtudor:3.0.2
Zengtudor:3.0.1
Zengtudor:3.0

3 Commits
fe9a61e027 ... fee8f81f48

Author SHA1 Message Date
Grzesiek11
fee8f81f48
Merge 7235dddefd into feb2a6b728 2025-07-17 20:58:39 +02:00
Doug Binks
feb2a6b728 Wayland: Reset key repeat timer on window destruction 
Windows with keyboard focus may have an active key repeat timer.
This should be reset when the window is closed, or key repeat events
could be sent to a NULL window were it not for the quickfix in PR #2732.

Fixes #2741
Probably the source of #2727
 2025-07-17 17:24:19 +02:00
Grzesiek11
7235dddefd
Fix extended scancode of 0 not being processed correctly 
On Windows, keyboard events with an extended 0 Windows scancode are now
processed by mapping the virtual-key code to a Windows scancode using
the Win32 MapVirtualKey function.

Some keyboard scancodes (in particular, ones used for some non-typical
keys) are not mapped to corresponding Windows scancodes, and are instead
mapped to an extended 0 Windows scancode, with the distinction being
only in the virtual-key code.

This causes GLFW to report a 256 GLFW scancode (0x00 | 0x100, 0x100
being the extended bit bitmask) for any of those keys, which causes API
consumers to be unable to distinguish between them.

There exists, however, a Win32 function MapVirtualKey that maps those
virtual key-codes to proper Windows scancodes. GLFW even appears to use
this workaround, but after further inspection, it checks whether the
Windows scancode is 0 (0x00), and not extended 0 (0x100).

This change makes GLFW check for the extended 0 keycode instead, which
seems to work correctly. I'm not sure if checking for the non-extended 0
Windows scancode was intentional, as I never seem to have encountered
one during testing with multiple keyboards. Thus, the handling of the
non-extended 0 Windows scancode was removed, but it can be brought back
if necessary.
 2025-04-04 02:55:49 +02:00
3 changed files with 10 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
README.md
View File

@ -132,10 +132,12 @@ information on what to include when reporting a bug.
- [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
- [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
- [Wayland] Bugfix: Ignore key repeat events when no window has keyboard focus (#2727)
- [Wayland] Bugfix: Reset key repeat timer when window destroyed (#2741,#2727)
- [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
- [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
- [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`
- [EGL] Allowed native access on Wayland with `GLFW_CONTEXT_CREATION_API` set to
- [Win32] Bugfix: Extended scancode of 0 was not being processed correctly
`GLFW_NATIVE_CONTEXT_API` (#2518)

6
src/win32_window.c
View File

@ -711,11 +711,11 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM l
const int mods = getKeyMods();
scancode = (HIWORD(lParam) & (KF_EXTENDED | 0xff));
if (!scancode)
if (scancode == 0x100)
{
// NOTE: Some synthetic key messages have a scancode of zero
// NOTE: Some synthetic key messages have a scancode of extended zero
// HACK: Map the virtual key back to a usable scancode
scancode = MapVirtualKeyW((UINT) wParam, MAPVK_VK_TO_VSC);
scancode = KF_EXTENDED | MapVirtualKeyW((UINT) wParam, MAPVK_VK_TO_VSC);
}
// HACK: Alt+PrtSc has a different scancode than just PrtSc

5
src/wl_window.c
View File

@ -2187,7 +2187,12 @@ void _glfwDestroyWindowWayland(_GLFWwindow* window)
_glfw.wl.pointerFocus = NULL;
if (window == _glfw.wl.keyboardFocus)
{
struct itimerspec timer = {0};
timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
_glfw.wl.keyboardFocus = NULL;
}
if (window->wl.fractionalScale)
wp_fractional_scale_v1_destroy(window->wl.fractionalScale);