Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-14 06:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved X11 focus event filtering.

Browse Source 
Some focus events need to be ignored to allow functionality like
Alt+Tab and volume indicators to not affect application-visible window
focus.  However, the previous filtering was too broad and missed virtual
desktop switching, Alt+Tab and programmatic iconification.

Fixes #405.
This commit is contained in:
Camilla Berglund 2015-06-15 15:11:29 +02:00
parent 56122cbe2f
commit dba59cf903
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -76,6 +76,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
- [X11] Bugfix: The response to `_NET_WM_PING` was sent to the wrong window - [X11] Bugfix: The response to `_NET_WM_PING` was sent to the wrong window
- [X11] Bugfix: Character input via XIM did not work in many cases - [X11] Bugfix: Character input via XIM did not work in many cases
- [X11] Bugfix: No fallback existed for missing `_NET_ACTIVE_WINDOW` support - [X11] Bugfix: No fallback existed for missing `_NET_ACTIVE_WINDOW` support
- [X11] Bugfix: Some significant window focus events were ignored
- [WGL] Removed `GLFW_USE_DWM_SWAP_INTERVAL` compile-time option - [WGL] Removed `GLFW_USE_DWM_SWAP_INTERVAL` compile-time option
- [WGL] Bugfix: Swap interval was ignored when DWM was enabled - [WGL] Bugfix: Swap interval was ignored when DWM was enabled
- [GLX] Added dependency on `libdl` on systems where it provides `dlopen` - [GLX] Added dependency on `libdl` on systems where it provides `dlopen`

42
src/x11_window.c
View File

@ -1220,33 +1220,43 @@ static void processEvent(XEvent *event)
case FocusIn: case FocusIn:
{ {
if (event->xfocus.mode == NotifyNormal) if (event->xfocus.mode == NotifyGrab ||
event->xfocus.mode == NotifyUngrab)
{ {
if (window->x11.ic) // Ignore focus events from popup indicator windows, window menu
XSetICFocus(window->x11.ic); // key chords and window dragging
return;
_glfwInputWindowFocus(window, GL_TRUE);
if (window->cursorMode == GLFW_CURSOR_DISABLED)
disableCursor(window);
} }
if (window->x11.ic)
XSetICFocus(window->x11.ic);
_glfwInputWindowFocus(window, GL_TRUE);
if (window->cursorMode == GLFW_CURSOR_DISABLED)
disableCursor(window);
return; return;
} }
case FocusOut: case FocusOut:
{ {
if (event->xfocus.mode == NotifyNormal) if (event->xfocus.mode == NotifyGrab ||
event->xfocus.mode == NotifyUngrab)
{ {
if (window->x11.ic) // Ignore focus events from popup indicator windows, window menu
XUnsetICFocus(window->x11.ic); // key chords and window dragging
return;
_glfwInputWindowFocus(window, GL_FALSE);
if (window->cursorMode == GLFW_CURSOR_DISABLED)
restoreCursor(window);
} }
if (window->x11.ic)
XUnsetICFocus(window->x11.ic);
_glfwInputWindowFocus(window, GL_FALSE);
if (window->cursorMode == GLFW_CURSOR_DISABLED)
restoreCursor(window);
return; return;
} }