Commit 9f84d0e0 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Fix crash on X servers without UTF-8 support.

parent ad2a21d4
...@@ -265,6 +265,7 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -265,6 +265,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
Atom _NET_WM_WINDOW_TYPE_NORMAL; Atom _NET_WM_WINDOW_TYPE_NORMAL;
int wmstate_count; int wmstate_count;
Atom wmstate_atoms[3]; Atom wmstate_atoms[3];
Uint32 fevent = 0;
#if SDL_VIDEO_DRIVER_X11_XINERAMA #if SDL_VIDEO_DRIVER_X11_XINERAMA
/* FIXME /* FIXME
...@@ -554,27 +555,18 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -554,27 +555,18 @@ X11_CreateWindow(_THIS, SDL_Window * window)
} }
#ifdef X_HAVE_UTF8_STRING #ifdef X_HAVE_UTF8_STRING
{ if (SDL_X11_HAVE_UTF8) {
Uint32 fevent = 0;
pXGetICValues(((SDL_WindowData *) window->driverdata)->ic, pXGetICValues(((SDL_WindowData *) window->driverdata)->ic,
XNFilterEvents, &fevent, NULL); XNFilterEvents, &fevent, NULL);
XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask |
KeymapStateMask | fevent));
} }
#else #endif
{
XSelectInput(display, w, XSelectInput(display, w,
(FocusChangeMask | EnterWindowMask | LeaveWindowMask | (FocusChangeMask | EnterWindowMask | LeaveWindowMask |
ExposureMask | ButtonPressMask | ButtonReleaseMask | ExposureMask | ButtonPressMask | ButtonReleaseMask |
PointerMotionMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | KeyPressMask | KeyReleaseMask |
PropertyChangeMask | StructureNotifyMask | PropertyChangeMask | StructureNotifyMask |
KeymapStateMask)); KeymapStateMask | fevent));
}
#endif
XFlush(display); XFlush(display);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment