winex11: Get rid of the XKB initialisation workaround now that we no longer use XInitThreads.
This commit is contained in:
parent
7e8ecd2d64
commit
5998bd59d7
|
@ -637,18 +637,8 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
|
||||||
fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */
|
fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */
|
||||||
|
|
||||||
#ifdef HAVE_XKB
|
#ifdef HAVE_XKB
|
||||||
if (use_xkb)
|
if (use_xkb && XkbUseExtension( data->display, NULL, NULL ))
|
||||||
{
|
XkbSetDetectableAutoRepeat( data->display, True, NULL );
|
||||||
use_xkb = XkbUseExtension( data->display, NULL, NULL );
|
|
||||||
if (use_xkb)
|
|
||||||
{
|
|
||||||
/* Hack: dummy call to XkbKeysymToModifiers to force initialisation of Xkb internals */
|
|
||||||
/* This works around an Xlib bug where it tries to get the display lock */
|
|
||||||
/* twice during XFilterEvents if Xkb hasn't been initialised yet. */
|
|
||||||
XkbKeysymToModifiers( data->display, 'A' );
|
|
||||||
XkbSetDetectableAutoRepeat( data->display, True, NULL );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (TRACE_ON(synchronous)) XSynchronize( data->display, True );
|
if (TRACE_ON(synchronous)) XSynchronize( data->display, True );
|
||||||
|
|
Loading…
Reference in New Issue