Commit 0bcc941f authored by Aric Stewart's avatar Aric Stewart Committed by Alexandre Julliard

winex11.drv: Only create a fontSet if we are going to be using it in the XIC.

parent 530abd2e
...@@ -456,7 +456,7 @@ err: ...@@ -456,7 +456,7 @@ err:
XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
{ {
XFontSet fontSet; XFontSet fontSet = NULL;
char **list; char **list;
int count; int count;
XPoint spot = {0}; XPoint spot = {0};
...@@ -485,6 +485,10 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) ...@@ -485,6 +485,10 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
return xic; return xic;
} }
if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) ||
((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0))
{
fontSet = XCreateFontSet(display, fontSet = XCreateFontSet(display,
"*", /*FIXME*/ "*", /*FIXME*/
&list, &count, NULL); &list, &count, NULL);
...@@ -502,6 +506,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) ...@@ -502,6 +506,7 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
} }
XFreeStringList(list); XFreeStringList(list);
} }
}
/* create callbacks */ /* create callbacks */
P_StartCB.client_data = NULL; P_StartCB.client_data = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment