[PATCH v7 03/12] winex11: Use ime_comp_buf != NULL instead of ximInComposeMode.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/winex11.drv/event.c  |  4 +---
 dlls/winex11.drv/x11drv.h |  2 +-
 dlls/winex11.drv/xim.c    | 12 ++++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index 1ae39eb9edf..aea119e1ec7 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -49,8 +49,6 @@
 WINE_DEFAULT_DEBUG_CHANNEL(event);
 WINE_DECLARE_DEBUG_CHANNEL(xdnd);

-extern BOOL ximInComposeMode;
-
 #define DndNotDnd       -1    /* OffiX drag&drop */
 #define DndUnknown      0
 #define DndRawData      1
@@ -810,7 +808,7 @@ static void focus_out( Display *display , HWND hwnd )
     int revert;
     XIC xic;

-    if (ximInComposeMode) return;
+    if (xim_in_compose_mode()) return;

x11drv_thread_data()->last_focus = hwnd;
     if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic );
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 9efaae3465b..05f576b8fb5 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -435,7 +435,6 @@ extern BOOL keyboard_grabbed DECLSPEC_HIDDEN;
 extern unsigned int screen_bpp DECLSPEC_HIDDEN;
 extern BOOL usexrandr DECLSPEC_HIDDEN;
 extern BOOL usexvidmode DECLSPEC_HIDDEN;
-extern BOOL ximInComposeMode DECLSPEC_HIDDEN;
 extern BOOL use_take_focus DECLSPEC_HIDDEN;
 extern BOOL use_primary_selection DECLSPEC_HIDDEN;
 extern BOOL use_system_cursors DECLSPEC_HIDDEN;
@@ -823,6 +822,7 @@ extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN;
 /* XIM support */
 extern BOOL xim_init( const WCHAR *input_style ) DECLSPEC_HIDDEN;
 extern void xim_thread_attach( struct x11drv_thread_data *data ) DECLSPEC_HIDDEN;
+extern BOOL xim_in_compose_mode(void) DECLSPEC_HIDDEN;
 extern void X11DRV_XIMLookupChars( const char *str, UINT count ) DECLSPEC_HIDDEN;
 extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN;

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 4ac7f72ce67..5e5cac0026d 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(xim);
 #define XICProc XIMProc
 #endif

-BOOL ximInComposeMode=FALSE;
-
 static WCHAR *ime_comp_buf;

static XIMStyle input_style = 0;
@@ -69,6 +67,11 @@ static const char *debugstr_xim_style( XIMStyle style )
     return wine_dbg_sprintf( "%s", buffer );
 }

+BOOL xim_in_compose_mode(void)
+{
+    return !!ime_comp_buf;
+}
+
 static void xim_update_comp_string( UINT offset, UINT old_len, const WCHAR *text, UINT new_len )
 {
     UINT len = ime_comp_buf ? wcslen( ime_comp_buf ) : 0;
@@ -136,7 +139,9 @@ static int xic_preedit_start( XIC xic, XPointer user, XPointer arg )
     TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg );

x11drv_client_call( client_ime_set_composition_status, TRUE );
-    ximInComposeMode = TRUE;
+    if ((ime_comp_buf = realloc( ime_comp_buf, sizeof(WCHAR) ))) *ime_comp_buf = 0;
+    else ERR( "Failed to allocate preedit buffer\n" );
+
     return -1;
 }

@@ -146,7 +151,6 @@ static int xic_preedit_done( XIC xic, XPointer user, XPointer arg )

TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg );

-    ximInComposeMode = FALSE;
     free( ime_comp_buf );
     ime_comp_buf = NULL;