Alexandre Julliard : winex11: Get rid of the XKB initialisation workaround now that we no longer use XInitThreads .
Alexandre Julliard
julliard at winehq.org
Wed Jul 2 06:03:34 CDT 2008
Module: wine
Branch: master
Commit: 5998bd59d7033b1c1623017839508413514949f2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5998bd59d7033b1c1623017839508413514949f2
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jul 2 12:03:26 2008 +0200
winex11: Get rid of the XKB initialisation workaround now that we no longer use XInitThreads.
---
dlls/winex11.drv/x11drv_main.c | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 434778a..e2375b2 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -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 */
#ifdef HAVE_XKB
- if (use_xkb)
- {
- 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 );
- }
- }
+ if (use_xkb && XkbUseExtension( data->display, NULL, NULL ))
+ XkbSetDetectableAutoRepeat( data->display, True, NULL );
#endif
if (TRACE_ON(synchronous)) XSynchronize( data->display, True );
More information about the wine-cvs
mailing list