Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Fix crash on X servers without UTF-8 support.

  • Loading branch information
icculus committed Nov 1, 2011
1 parent 43ced8f commit ee9413e744bc7b435d36cdf5ff01efa75a185654
Showing with 9 additions and 17 deletions.
  1. +9 −17 src/video/x11/SDL_x11window.c
@@ -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;

0 comments on commit ee9413e

Please sign in to comment.