Nigel Liang : winex11.drv: Remove call to XCreateFontSet.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jun 22 07:35:42 CDT 2007
Module: wine
Branch: master
Commit: 2f3a02ea2fd66514c59edd7ed95bb2e0df581350
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f3a02ea2fd66514c59edd7ed95bb2e0df581350
Author: Nigel Liang <ncliang at gmail.com>
Date: Thu Jun 21 13:29:13 2007 -0700
winex11.drv: Remove call to XCreateFontSet.
---
dlls/winex11.drv/xim.c | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 2be9dd2..7b31986 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -456,9 +456,6 @@ err:
XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
{
- XFontSet fontSet = NULL;
- char **list;
- int count;
XPoint spot = {0};
XVaNestedList preedit = NULL;
XVaNestedList status = NULL;
@@ -485,29 +482,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
return xic;
}
-
- if (((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0) ||
- ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0))
- {
- fontSet = XCreateFontSet(display,
- "*", /*FIXME*/
- &list, &count, NULL);
-
- TRACE("ximFontSet = %p\n", fontSet);
- 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);
- }
- }
-
/* create callbacks */
P_StartCB.client_data = NULL;
P_StartCB.callback = (XIMProc)XIMPreEditStartCallback;
@@ -521,7 +495,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
if ((ximStyle & (XIMPreeditNothing | XIMPreeditNone)) == 0)
{
preedit = XVaCreateNestedList(0,
- XNFontSet, fontSet,
XNSpotLocation, &spot,
XNPreeditStartCallback, &P_StartCB,
XNPreeditDoneCallback, &P_DoneCB,
@@ -545,7 +518,6 @@ XIC X11DRV_CreateIC(XIM xim, Display *display, Window win)
if ((ximStyle & (XIMStatusNothing | XIMStatusNone)) == 0)
{
status = XVaCreateNestedList(0,
- XNFontSet, fontSet,
NULL);
TRACE("status = %p\n", status);
}
More information about the wine-cvs
mailing list