Use *font for Xft font names for Lucid menus and dialogs.

* doc/emacs/xresources.texi (X Resources): Remove *faceName and replace it with
*font for Lucid.

* lwlib/lwlib-Xaw.c (make_dialog): Use *font even for Xft fonts.  Try
XLoadQueryFont first and then Xft fonts.

* lwlib/xlwmenu.c (xlwmenu_default_font): Remove, does not work for
multi-display.
(xlwMenuResources): Remove XtNfaceName and XtNdefaultFace.
Make XtNFont a String resource.
(make_windows_if_needed): Call XFlush so later changes are seen by the
X server.
(remap_menubar): Use XtMoveWidget and then
XtResizeWidget/XtResizeWindow after XtPopup.  Works better with
Compiz.
(make_drawing_gcs): Check if mw->menu.font is set.
(getDefaultXftFont): New function.
(openXftFont): faceName is now fontName.  Try XLoadQueryFont first
and then XftFontOpenName.
(XlwMenuInitialize): Initialize mw->menu.font with XLoadQueryFont.
(XlwMenuClassInitialize): Remove initialization of
xlwmenu_default_font.
(fontname_changed): Renamed from facename_changed.
(XlwMenuSetValues): Use facename_changed.

* lwlib/xlwmenu.h: Remove Xt[CN]faceName and Xt[NC]defaultFace.

* lwlib/xlwmenuP.h (_XlwMenu_part): Remove faceName.  Add fontName.

* src/xmenu.c (apply_systemfont_to_dialog): Apply to *dialog.font.
(apply_systemfont_to_menu): Set resources *menubar*font and
*popup*font.  Remove defflt.
(set_frame_menubar, create_and_show_popup_menu): Call
apply_systemfont_to_menu before lw_create_widget.

* src/xrdb.c (x_load_resources): For LUCID and XFT, don't put a
resource that specifies helvetica for menus and dialogs.

2 files changed, 12 insertions, 18 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index d04c0322862..ec57887a154 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-14  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xresources.texi (X Resources): Remove *faceName and replace it with
+	*font for Lucid.
+
 2011-02-05  Chong Yidong  <cyd@stupidchicken.com>
 
 	* rmail.texi (Rmail Display): Document Rmail MIME support more
diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index 1482bbd0469..41a09a5f713 100644
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -428,29 +428,20 @@ and has its own resources.  The resource specifications start with
 @end iftex
 
 @example
-Emacs.pane.menubar.faceName:  Courier-12
+Emacs.pane.menubar.font:  Courier-12
 @end example
 
 @noindent
-To specify a font, use fontconfig font names as values to the @code{faceName}
-resource.
-
-If Emacs is not built with the Xft library, Lucid menus and dialogs
-can only display old style fonts.  If Emacs is built with Xft and you
-prefer the old fonts, you have to specify @samp{none} to
-@code{faceName}:
+To specify a font, use fontconfig font names as values to the @code{font}
+resource, or old style names:
 
 @example
-Emacs.pane.menubar.faceName:    none
-Emacs.pane.dialog.faceName:     none
+Emacs.pane.menubar.font: lucidasanstypewriter-10
 @end example
 
 @noindent
-To specify a non-Xft font, use @code{font}.  For example:
-
-@example
-Emacs.pane.menubar.font: lucidasanstypewriter-10
-@end example
+Emacs first tries to open the font as an old style font, and if that fails
+as an fontconfig font.  In rare cases, Emacs might do the wrong thing.
 
 @noindent
 The Lucid menus can display multilingual text in your locale with old style
@@ -480,7 +471,7 @@ Emacs.menu*.font:       8x16
 For dialog boxes, use @samp{dialog*}:
 
 @example
-Emacs.dialog*.faceName: Sans-12
+Emacs.dialog*.font: Sans-12
 @end example
 
 @noindent
@@ -495,8 +486,6 @@ approach should work on both kinds of systems.
   Here is a list of the specific resources for menu bars and pop-up menus:
 
 @table @code
-@item faceName
-Xft font for menu item text.
 @item font
 Font for menu item text.
 @item fontSet