Rémi Bernon : winex11: Set or clear XIC focus using a xim_set_focus helper.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ecd8c9310ff9e6fd15ee9e174729655766d5218a
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ecd8c9310ff9e6fd15ee9e174729655...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Tue May  9 14:04:14 2023 +0200

winex11: Set or clear XIC focus using a xim_set_focus helper.

---

 dlls/winex11.drv/event.c  |  7 +++----
 dlls/winex11.drv/x11drv.h |  1 +
 dlls/winex11.drv/xim.c    | 10 ++++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
index aea119e1ec7..701d0c1faf6 100644
--- a/dlls/winex11.drv/event.c
+++ b/dlls/winex11.drv/event.c
@@ -752,7 +752,6 @@ static const char * const focus_modes[] =
 static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev )
 {
     XFocusChangeEvent *event = &xev->xfocus;
-    XIC xic;
 
     if (!hwnd) return FALSE;
 
@@ -779,7 +778,8 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev )
         return TRUE; /* ignore wm specific NotifyUngrab / NotifyGrab events w.r.t focus */
     }
 
-    if ((xic = X11DRV_get_ic( hwnd ))) XSetICFocus( xic );
+    xim_set_focus( hwnd, TRUE );
+
     if (use_take_focus)
     {
         if (hwnd == NtUserGetForegroundWindow()) clip_fullscreen_window( hwnd, FALSE );
@@ -806,12 +806,11 @@ static void focus_out( Display *display , HWND hwnd )
     HWND hwnd_tmp;
     Window focus_win;
     int revert;
-    XIC xic;
 
     if (xim_in_compose_mode()) return;
 
     x11drv_thread_data()->last_focus = hwnd;
-    if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic );
+    xim_set_focus( hwnd, FALSE );
 
     if (is_virtual_desktop())
     {
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index acde51a104d..4b36c6096c4 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -826,6 +826,7 @@ 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;
+extern void xim_set_focus( HWND hwnd, BOOL focus ) DECLSPEC_HIDDEN;
 
 #define XEMBED_MAPPED  (1 << 0)
 
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 0d12b155da4..760bbae42d8 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -471,3 +471,13 @@ XIC X11DRV_get_ic( HWND hwnd )
 
     return ret;
 }
+
+void xim_set_focus( HWND hwnd, BOOL focus )
+{
+    XIC xic;
+
+    if (!(xic = X11DRV_get_ic( hwnd ))) return;
+
+    if (focus) XSetICFocus( xic );
+    else XUnsetICFocus( xic );
+}