Mercurial > hg > xemacs-beta

comparison lwlib/xlwmenu.c @ 3397:6aa26bef0527

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-05-12 19:25:28 by stephent] Stop trashing xftFont resources. <87mzdnxd1j.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Fri, 12 May 2006 19:25:29 +0000
parents 174eb4da74fb
children 6c7605dfcf07
comparison
equal deleted inserted replaced
3396:af3bfea5c60e 3397:6aa26bef0527
91 XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"}, 91 XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"},
92 #else 92 #else
93 {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), 93 {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *),
94 offset(menu.font), XtRString, (XtPointer) "XtDefaultFont"}, 94 offset(menu.font), XtRString, (XtPointer) "XtDefaultFont"},
95 #ifdef USE_XFT_MENUBARS 95 #ifdef USE_XFT_MENUBARS
96 {XtNxftFont, XtCXftFont, XtRString, sizeof (String), 96 {XtNfcFontName, XtCFcFontName, XtRString, sizeof (String),
97 offset(menu.renderFontSpec), 97 offset(menu.fcFontName),
98 XtRString, (XtPointer) "Helvetica-12:bold"}, 98 XtRString, (XtPointer) "Helvetica-12:bold"},
99 /* #### This needs to be fixed to give a proper type and converter for
100 XftFonts. See also xlwtabs.c. */
101 {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer),
102 offset(menu.renderFont), XtRPointer, (XtPointer) NULL },
99 #endif 103 #endif
100 # ifdef USE_XFONTSET 104 # ifdef USE_XFONTSET
101 /* #### Consider using the same method as for Motif; see the comment in 105 /* #### Consider using the same method as for Motif; see the comment in
102 XlwMenuInitialize(). */ 106 XlwMenuInitialize(). */
103 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet), 107 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet),
3239 #ifdef USE_XFT_MENUBARS 3243 #ifdef USE_XFT_MENUBARS
3240 /* to do this right, we should add a new Xt Resource type + 3244 /* to do this right, we should add a new Xt Resource type +
3241 conversion function 3245 conversion function
3242 */ 3246 */
3243 mw->menu.renderFont = 3247 mw->menu.renderFont =
3244 xft_open_font_by_name (XtDisplay (mw), mw->menu.renderFontSpec); 3248 xft_open_font_by_name (XtDisplay (mw), mw->menu.fcFontName);
3245 #endif 3249 #endif
3246 3250
3247 make_drawing_gcs (mw); 3251 make_drawing_gcs (mw);
3248 make_shadow_gcs (mw); 3252 make_shadow_gcs (mw);
3249 extract_font_extents (mw); 3253 extract_font_extents (mw);