Merge branch 'fix/x11-focus-and-os-window-target' of https://github.com/jquast/kitty
Some checks are pending
CI / Linux (python=3.14 cc=clang sanitize=1) (push) Waiting to run
CI / Linux (python=3.12 cc=gcc sanitize=0) (push) Waiting to run
CI / Linux (python=3.13 cc=gcc sanitize=1) (push) Waiting to run
CI / Linux package (push) Waiting to run
CI / Bundle test (macos-latest) (push) Waiting to run
CI / Bundle test (ubuntu-latest) (push) Waiting to run
CI / macOS Brew (push) Waiting to run
CI / Test ./dev.sh and benchmark (push) Waiting to run
CodeQL / CodeQL-Build (actions, ubuntu-latest) (push) Waiting to run
CodeQL / CodeQL-Build (c, macos-latest) (push) Waiting to run
CodeQL / CodeQL-Build (c, ubuntu-latest) (push) Waiting to run
CodeQL / CodeQL-Build (go, ubuntu-latest) (push) Waiting to run
CodeQL / CodeQL-Build (python, ubuntu-latest) (push) Waiting to run
Depscan / Scan dependencies for vulnerabilities (push) Waiting to run

This commit is contained in:
Kovid Goyal 2026-09-25 20:58:01 +05:30
commit 1e1486ebba
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 13 additions and 0 deletions

View file

@ -215,6 +215,9 @@ Detailed list of changes
- Graphics: Fix images briefly disappearing for one frame the first time an image is replaced during a synchronized update (:iss:`10538`)
- X11: Fix copy and paste targeting the wrong OS window when the keyboard focus
is set to PointerRoot or None
0.49.1 [2026-09-24]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

10
glfw/x11_window.c vendored
View file

@ -2135,6 +2135,11 @@ processEvent(XEvent *event) {
// key chords and window dragging
return;
}
if (event->xfocus.detail == NotifyPointer) {
// Ignore focus events for the window under the pointer when the
// focus is set to PointerRoot or None
return;
}
if (window->cursorMode == GLFW_CURSOR_DISABLED) disableCursor(window);
@ -2148,6 +2153,11 @@ processEvent(XEvent *event) {
// key chords and window dragging
return;
}
if (event->xfocus.detail == NotifyPointer) {
// Ignore focus events for the window under the pointer when the
// focus is set to PointerRoot or None
return;
}
if (window->cursorMode == GLFW_CURSOR_DISABLED) enableCursor(window);