Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-08-24 17:55:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crash on X servers without UTF-8 support.

Browse Source
This commit is contained in:
Ryan C. Gordon
2011-10-31 23:37:57 -04:00
parent 6371c44a9e
commit dd3d93c50f
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/video/x11/SDL_x11window.c
View File

@@ -265,6 +265,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
Atom _NET_WM_WINDOW_TYPE_NORMAL;
int wmstate_count;
Atom wmstate_atoms[3];
Uint32 fevent = 0;
#if SDL_VIDEO_DRIVER_X11_XINERAMA
/* FIXME
@@ -554,28 +555,19 @@ X11_CreateWindow(_THIS, SDL_Window * window)
}
#ifdef X_HAVE_UTF8_STRING
{
Uint32 fevent = 0;
if (SDL_X11_HAVE_UTF8) {
pXGetICValues(((SDL_WindowData *) window->driverdata)->ic,
XNFilterEvents, &fevent, NULL);
XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask |
KeymapStateMask | fevent));
}
#else
{
XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask |
KeymapStateMask));
}
#endif
XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask |
KeymapStateMask | fevent));
XFlush(display);
return 0;