Mercurial > hg > xemacs-beta

comparison lwlib/xlwmenu.c @ 3685:382b11fa8866

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-11-17 02:50:22 by stephent] Fix breakage in xftFont resource for tabs and menubar. <877ixuiy0n.fsf@uwakimon.sk.tsukuba.ac.jp>
author stephent
date Fri, 17 Nov 2006 02:50:32 +0000
parents 6c7605dfcf07
children 03f6627a2e09
comparison
equal deleted inserted replaced
3684:80b10d0ec1e1 3685:382b11fa8866
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 {XtNfcFontName, XtCFcFontName, XtRString, sizeof (String), 96 {XtNfcFontName, XtCFcFontName, XtRString, sizeof (String),
97 offset(menu.fcFontName), 97 offset(menu.fcFontName),
98 XtRString, (XtPointer) "Helvetica-12:bold"}, 98 XtRString, (XtPointer) NULL},
99 /* #### This needs to be fixed to give a proper type and converter for 99 /* #### This needs to be fixed to give a proper type and converter for
100 XftFonts. See also xlwtabs.c. */ 100 XftFonts. See also xlwtabs.c. */
101 {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer), 101 {XtNxftFont, XtCXftFont, XtRString, sizeof(XtPointer),
102 offset(menu.renderFont), XtRPointer, (XtPointer) NULL }, 102 offset(menu.xftFontName), XtRString, (XtPointer) "Helvetica-12:bold" },
103 #endif 103 #endif
104 # ifdef USE_XFONTSET 104 # ifdef USE_XFONTSET
105 /* #### 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
106 XlwMenuInitialize(). */ 106 XlwMenuInitialize(). */
107 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet), 107 {XtNfontSet, XtCFontSet, XtRFontSet, sizeof(XFontSet),
3239 else /* otherwise use default */ 3239 else /* otherwise use default */
3240 mw->menu.font_list = mw->menu.fallback_font_list; 3240 mw->menu.font_list = mw->menu.fallback_font_list;
3241 #endif 3241 #endif
3242 3242
3243 #ifdef USE_XFT_MENUBARS 3243 #ifdef USE_XFT_MENUBARS
3244 /* #### kludge for name change */
3245 if (!mw->menu.fcFontName)
3246 mw->menu.fcFontName = mw->menu.xftFontName;
3244 /* to do this right, we should add a new Xt Resource type + 3247 /* to do this right, we should add a new Xt Resource type +
3245 conversion function 3248 conversion function
3246 */ 3249 */
3247 mw->menu.renderFont = 3250 mw->menu.renderFont =
3248 xft_open_font_by_name (XtDisplay (mw), mw->menu.fcFontName); 3251 xft_open_font_by_name (XtDisplay (mw), mw->menu.fcFontName);