Mercurial > hg > xemacs-beta

comparison lwlib/xlwtabs.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 6aa26bef0527
children 03f6627a2e09
comparison
equal deleted inserted replaced
3684:80b10d0ec1e1 3685:382b11fa8866
151 offset(font), XtRString, (XtPointer) XtDefaultFont}, 151 offset(font), XtRString, (XtPointer) XtDefaultFont},
152 #ifdef USE_XFT_TABS 152 #ifdef USE_XFT_TABS
153 /* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here? 153 /* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here?
154 or XtDefaultFont? */ 154 or XtDefaultFont? */
155 {XtNfcFontName, XtCFcFontName, XtRString, sizeof(String), 155 {XtNfcFontName, XtCFcFontName, XtRString, sizeof(String),
156 offset(fcFontName), XtRString, (XtPointer) "AirCut-16" }, 156 offset(fcFontName), XtRString, (XtPointer) NULL },
157 /* #### This needs to be fixed to give a proper type and converter for 157 /* #### This needs to be fixed to give a proper type and converter for
158 XftFonts. See also xlwmenu.c. */ 158 XftFonts. See also xlwmenu.c. */
159 {XtNxftFont, XtCXftFont, XtRPointer, sizeof(XtPointer), 159 {XtNxftFont, XtCXftFont, XtRString, sizeof(String),
160 offset(renderFont), XtRPointer, (XtPointer) NULL }, 160 offset(xftFontName), XtRString, (XtPointer) "Helvetica-12" },
161 #endif 161 #endif
162 {XtNinternalWidth, XtCWidth, XtRDimension, sizeof(Dimension), 162 {XtNinternalWidth, XtCWidth, XtRDimension, sizeof(Dimension),
163 offset(internalWidth), XtRImmediate, (XtPointer)4 }, 163 offset(internalWidth), XtRImmediate, (XtPointer)4 },
164 {XtNinternalHeight, XtCHeight, XtRDimension, sizeof(Dimension), 164 {XtNinternalHeight, XtCHeight, XtRDimension, sizeof(Dimension),
165 offset(internalHeight), XtRImmediate, (XtPointer)4 }, 165 offset(internalHeight), XtRImmediate, (XtPointer)4 },
477 * TODO: font height + height of tallest bitmap. 477 * TODO: font height + height of tallest bitmap.
478 */ 478 */
479 newTw->tabs.tab_height = 2 * newTw->tabs.internalHeight + SHADWID ; 479 newTw->tabs.tab_height = 2 * newTw->tabs.internalHeight + SHADWID ;
480 480
481 #ifdef USE_XFT_TABS 481 #ifdef USE_XFT_TABS
482 /* #### kludge for name change */
483 if (!newTw->tabs.fcFontName)
484 newTw->tabs.fcFontName = newTw->tabs.xftFontName;
482 /* must get font here 485 /* must get font here
483 to do this right, we should add a new Xt Resource type + 486 #### to do this right, we should add a new Xt Resource type +
484 conversion function 487 conversion function */
485 */
486 newTw->tabs.renderFont = 488 newTw->tabs.renderFont =
487 xft_open_font_by_name (XtDisplay ((Widget) newTw), 489 xft_open_font_by_name (XtDisplay ((Widget) newTw),
488 newTw->tabs.fcFontName); 490 newTw->tabs.fcFontName);
489 if (newTw->tabs.renderFont != NULL) 491 if (newTw->tabs.renderFont != NULL)
490 #if XFT_USE_HEIGHT_NOT_ASCENT_DESCENT 492 #if XFT_USE_HEIGHT_NOT_ASCENT_DESCENT