ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Aric Stewart 2006-10-24 12:17:40 -05:00 committed by Alexandre Julliard
parent 530abd2e25
commit 0bcc941f96
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/winex11.drv/xim.c
View File

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