ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11: Only register an XIM callback if we can't open the XIM right away.

This commit is contained in:
Alexandre Julliard 2008-06-21 11:18:07 +02:00
parent bc0acd1ac2
commit 5b7bec34c1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/winex11.drv/xim.c
View File

@ -359,7 +359,7 @@ BOOL X11DRV_InitXIM( const char *input_style )
} }
static void X11DRV_OpenIM(Display *display, XPointer p, XPointer data); static void open_xim_callback( Display *display, XPointer ptr, XPointer data );
static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data) static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data)
{ {
@ -369,7 +369,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data)
thread_data->xim = NULL; thread_data->xim = NULL;
ximStyle = 0; ximStyle = 0;
wine_tsx11_lock(); wine_tsx11_lock();
XRegisterIMInstantiateCallback( thread_data->display, NULL, NULL, NULL, X11DRV_OpenIM, NULL ); XRegisterIMInstantiateCallback( thread_data->display, NULL, NULL, NULL, open_xim_callback, NULL );
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
@ -378,7 +378,7 @@ static void X11DRV_DestroyIM(XIM xim, XPointer p, XPointer data)
* *
* Should always be called with the x11 lock held * Should always be called with the x11 lock held
*/ */
static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data) static BOOL open_xim( Display *display )
{ {
struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_thread_data *thread_data = x11drv_thread_data();
XIMStyle ximStyleCallback, ximStyleNone; XIMStyle ximStyleCallback, ximStyleNone;
@ -391,7 +391,7 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data)
if (xim == NULL) if (xim == NULL)
{ {
WARN("Could not open input method.\n"); WARN("Could not open input method.\n");
return; return FALSE;
} }
destroy.client_data = NULL; destroy.client_data = NULL;
@ -410,7 +410,7 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data)
{ {
WARN("Could not find supported input style.\n"); WARN("Could not find supported input style.\n");
XCloseIM(xim); XCloseIM(xim);
return; return FALSE;
} }
else else
{ {
@ -471,18 +471,26 @@ static void X11DRV_OpenIM(Display *display, XPointer ptr, XPointer data)
} }
thread_data->xim = xim; thread_data->xim = xim;
XUnregisterIMInstantiateCallback(display, NULL, NULL, NULL, X11DRV_OpenIM, NULL);
wine_tsx11_unlock(); wine_tsx11_unlock();
IME_UpdateAssociation(NULL); IME_UpdateAssociation(NULL);
wine_tsx11_lock(); wine_tsx11_lock();
return TRUE;
} }
static void open_xim_callback( Display *display, XPointer ptr, XPointer data )
{
if (open_xim( display ))
XUnregisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL);
}
void X11DRV_SetupXIM(void) void X11DRV_SetupXIM(void)
{ {
Display *display = thread_display();
wine_tsx11_lock(); wine_tsx11_lock();
XRegisterIMInstantiateCallback(thread_display(), NULL, NULL, NULL, X11DRV_OpenIM, NULL); if (!open_xim( display ))
XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL );
wine_tsx11_unlock(); wine_tsx11_unlock();
} }