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,22 +485,27 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win) ...@@ -485,22 +485,27 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
return xic; return xic;
} }
fontSet = XCreateFontSet(display,
"*", /*FIXME*/
&list, &count, NULL);
TRACE("ximFontSet = %p\n", fontSet); if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) ||
TRACE("list = %p, count = %d\n", list, count); ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0))
if (list != NULL)
{ {
int i; fontSet = XCreateFontSet(display,
"*", /*FIXME*/
&list, &count, NULL);
TRACE("ximFontSet = %p\n", fontSet);
TRACE("list = %p, count = %d\n", list, count);
for (i = 0; i < count; ++i) if (list != NULL)
{ {
TRACE("list[%d] = %s\n", i, list[i]); int i;
for (i = 0; i < count; ++i)
{
TRACE("list[%d] = %s\n", i, list[i]);
}
XFreeStringList(list);
} }
XFreeStringList(list);
} }
/* create callbacks */ /* create callbacks */
......
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