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

winex11.drv: Fold X11DRV_ImmSetOpenStatus into XIMPreEditDoneCallback.

This commit is contained in:
Kusanagi Kouichi 2010-02-12 14:54:33 +09:00 committed by Alexandre Julliard
parent 3739dcd6e5
commit 30872b0ebf
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,25 +122,10 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count )
HeapFree(GetProcessHeap(), 0, wcOutput); HeapFree(GetProcessHeap(), 0, wcOutput);
} }
static void X11DRV_ImmSetOpenStatus(BOOL fOpen)
{
if (fOpen == FALSE)
{
if (dwCompStringSize)
HeapFree(GetProcessHeap(),0,CompositionString);
dwCompStringSize = 0;
dwCompStringLength = 0;
CompositionString = NULL;
}
IME_SetOpenStatus(fOpen);
}
static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data) static int XIMPreEditStartCallback(XIC ic, XPointer client_data, XPointer call_data)
{ {
TRACE("PreEditStartCallback %p\n",ic); TRACE("PreEditStartCallback %p\n",ic);
X11DRV_ImmSetOpenStatus(TRUE); IME_SetOpenStatus(TRUE);
ximInComposeMode = TRUE; ximInComposeMode = TRUE;
return -1; return -1;
} }
@ -149,7 +134,12 @@ static void XIMPreEditDoneCallback(XIC ic, XPointer client_data, XPointer call_d
{ {
TRACE("PreeditDoneCallback %p\n",ic); TRACE("PreeditDoneCallback %p\n",ic);
ximInComposeMode = FALSE; ximInComposeMode = FALSE;
X11DRV_ImmSetOpenStatus(FALSE); if (dwCompStringSize)
HeapFree(GetProcessHeap(), 0, CompositionString);
dwCompStringSize = 0;
dwCompStringLength = 0;
CompositionString = NULL;
IME_SetOpenStatus(FALSE);
} }
static void XIMPreEditDrawCallback(XIM ic, XPointer client_data, static void XIMPreEditDrawCallback(XIM ic, XPointer client_data,