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

X11: Filter out Xlib errors from other connections

Browse Source 
(cherry picked from commit 2c8e0512dd)
This commit is contained in:
Camilla Löwy 2020-03-16 17:13:59 +01:00
parent aee62d3c16
commit 2d4c4b7949
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -119,6 +119,8 @@ information on what to include when reporting a bug.
## Changelog ## Changelog
- [X11] Bugfix: IME input of CJK was broken for "C" locale (#1587,#1636) - [X11] Bugfix: IME input of CJK was broken for "C" locale (#1587,#1636)
- [X11] Bugfix: Xlib errors caused by other parts of the application could be
reported as GLFW errors
## Contact ## Contact

3
src/x11_init.c
View File

@ -851,6 +851,9 @@ static Window createHelperWindow(void)
// //
static int errorHandler(Display *display, XErrorEvent* event) static int errorHandler(Display *display, XErrorEvent* event)
{ {
if (_glfw.x11.display != display)
return 0;
_glfw.x11.errorCode = event->error_code; _glfw.x11.errorCode = event->error_code;
return 0; return 0;
} }