Rémi Bernon : winex11: Create the thread XFontSet on thread attach.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4390b0117633716b6e5477a35c13f6eb0fd52eff
URL:    https://gitlab.winehq.org/wine/wine/-/commit/4390b0117633716b6e5477a35c13f6e...

Author: Rémi Bernon 
Date:   Sun Apr  2 13:58:58 2023 +0200

winex11: Create the thread XFontSet on thread attach.

---

dlls/winex11.drv/x11drv.h      |  4 ++--
 dlls/winex11.drv/x11drv_main.c |  4 ++--
 dlls/winex11.drv/xim.c         | 38 +++++++++++---------------------------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index e6def396c45..a41eac928ad 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -820,9 +820,9 @@ extern BOOL X11DRV_DisplayDevices_SupportEventHandlers(void) DECLSPEC_HIDDEN;
 extern struct x11drv_display_device_handler desktop_handler DECLSPEC_HIDDEN;

/* XIM support */
-extern BOOL X11DRV_InitXIM( const WCHAR *input_style ) DECLSPEC_HIDDEN;
+extern BOOL xim_init( const WCHAR *input_style ) DECLSPEC_HIDDEN;
 extern XIC X11DRV_CreateIC( XIM xim, HWND hwnd, struct x11drv_win_data *data ) DECLSPEC_HIDDEN;
-extern void X11DRV_SetupXIM(void) DECLSPEC_HIDDEN;
+extern void xim_thread_attach( struct x11drv_thread_data *data ) DECLSPEC_HIDDEN;
 extern void X11DRV_XIMLookupChars( const char *str, UINT count ) DECLSPEC_HIDDEN;

#define XEMBED_MAPPED  (1 << 0)
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 46f99e9b83b..aa39ecf2228 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -707,7 +707,7 @@ static NTSTATUS x11drv_init( void *arg )

XkbUseExtension( gdi_display, NULL, NULL );
     X11DRV_InitKeyboard( gdi_display );
-    if (use_xim) use_xim = X11DRV_InitXIM( input_style );
+    if (use_xim) use_xim = xim_init( input_style );

init_user_driver();
     X11DRV_DisplayDevices_Init(FALSE);
@@ -791,7 +791,7 @@ struct x11drv_thread_data *x11drv_init_thread_data(void)
     set_queue_display_fd( data->display );
     NtUserGetThreadInfo()->driver_data = (UINT_PTR)data;

-    if (use_xim) X11DRV_SetupXIM();
+    if (use_xim) xim_thread_attach( data );

return data;
 }
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index dda412e5eaf..0ab97edf5ba 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -288,13 +288,10 @@ NTSTATUS x11drv_xim_preedit_state( void *arg )
     return 0;
 }

-
 /***********************************************************************
- *           X11DRV_InitXIM
- *
- * Process-wide XIM initialization.
+ *           xim_init
  */
-BOOL X11DRV_InitXIM( const WCHAR *input_style )
+BOOL xim_init( const WCHAR *input_style )
 {
     static const WCHAR offthespotW[] = {'o','f','f','t','h','e','s','p','o','t',0};
     static const WCHAR overthespotW[] = {'o','v','e','r','t','h','e','s','p','o','t',0};
@@ -416,26 +413,6 @@ static BOOL open_xim( Display *display )

thread_data->xim = xim;

-    if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0 ||
-        (ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0)
-    {
-        char **list;
-        int count;
-        thread_data->font_set = XCreateFontSet(display, "fixed",
-                          &list, &count, NULL);
-        TRACE("ximFontSet = %p\n", thread_data->font_set);
-        TRACE("list = %p, count = %d\n", list, count);
-        if (list != NULL)
-        {
-            int i;
-            for (i = 0; i < count; ++i)
-                TRACE("list[%d] = %s\n", i, list[i]);
-            XFreeStringList(list);
-        }
-    }
-    else
-        thread_data->font_set = NULL;
-
     x11drv_client_call( client_ime_update_association, 0 );
     return TRUE;
 }
@@ -446,9 +423,16 @@ static void open_xim_callback( Display *display, XPointer ptr, XPointer data )
         XUnregisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL);
 }

-void X11DRV_SetupXIM(void)
+void xim_thread_attach( struct x11drv_thread_data *data )
 {
-    Display *display = thread_display();
+    Display *display = data->display;
+    int i, count;
+    char **list;
+
+    data->font_set = XCreateFontSet( display, "fixed", &list, &count, NULL );
+    TRACE( "created XFontSet %p, list %p, count %d\n", data->font_set, list, count );
+    for (i = 0; list && i < count; ++i) TRACE( "  %d: %s\n", i, list[i] );
+    if (list) XFreeStringList( list );

if (!open_xim( display ))
         XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, open_xim_callback, NULL );