annotate lisp/org/org-install.el @ 107804:24c4451bcaf7

Lucid menus can now use Xft for fonts. * xsettings.c (current_font, SYSTEM_FONT, XSETTINGS_FONT_NAME): New. (parse_xft_settings): Also check for XSETTINGS_FONT_NAME and save that in current_font. (init_gconf): Read value of SYSTEM_FONT and save it in current_font. (Ffont_get_system_normal_font, xsettings_get_system_normal_font): New functions. (syms_of_xsettings): Initialize current_font. defsubr Sfont_get_system_normal_font. * xsettings.h (Ffont_get_system_normal_font, xsettings_get_system_normal_font): Declare. * xfns.c (extern xlwmenu_default_font): Remove. (Fx_create_frame): Remove setting of xlwmenu_default_font, moved to xlwmenu.c. * menu.c (digest_single_submenu): If USE_LUCID and HAVE_XFT, encode menu items in UTF-8. * xmenu.c: include xsettings.h and xlwmenu.h if USE_LUCID. (apply_systemfont_to_menu): New function. (set_frame_menubar, create_and_show_popup_menu): Call apply_systemfont_to_menu. * xlwmenu.c (xlwmenu_default_font): Make static. (xlwMenuResources): Add XtNfaceName and XtNdefaultFace. (string_width): Use XftTextExtentsUtf8 if HAVE_XFT. (MENU_FONT_HEIGHT, MENU_FONT_ASCENT): Add versions for HAVE_XFT. (size_menu): Set max_rest_width in window_state structure. (display_menu_item): If HAVE_XFT and xft_draw is set, use XftDrawRect and XftDrawStringUtf8 to draw text. (make_windows_if_needed): Set max_rest_width and xft_draw in windows[i]. (openXftFont): New. (XlwMenuInitialize): Call openXftFont if HAVE_XFT. If mw->menu.font is not set, load font fixed and save it in xlwmenu_default_font. (XlwMenuInitialize): Set max_rest_width and xft_draw in windows[0]. (XlwMenuClassInitialize): Initialize xlwmenu_default_font. (XlwMenuRealize): Set xft_fg, xft_bg, xft_disabled_fg and windows[0].xft_draw if xft_font is set. (XlwMenuDestroy): Destroy all xft_draw and close xft_font. (facename_changed): New. (XlwMenuSetValues): Call facename_changed. If face name did change, close old fonts and destroy xft_draw:s. Then create new ones. * xlwmenu.h (XtNfaceName, XtCFaceName, XtNdefaultFace, XtCDefaultFace): New. * xlwmenuP.h (_window_state): Add max_rest_width and xft_draw. (_XlwMenu_part): Add faceName,xft_fg, xft_bg, xft_disabled_fg and xft_font. * xresources.texi (Lucid Resources): Mention faceName to set Xft fonts.
author Jan D. <jan.h.d@swipnet.se>
date Thu, 08 Apr 2010 18:20:32 +0200
parents 1d1d5d9bd884
children 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
97046
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
1 ;;; org-install.el --- Outline-based notes management and organizer
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
2 ;; Carstens outline-mode for keeping track of everything.
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 101515
diff changeset
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
101515
64ef70f990a9 2009-01-26 Carsten Dominik <dominik@science.uva.nl>
Carsten Dominik <dominik@science.uva.nl>
parents: 100908
diff changeset
4 ;; Free Software Foundation, Inc.
97046
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
5 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
6 ;; Author: Carsten Dominik <carsten at orgmode dot org>
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
7 ;; Keywords: outlines, hypermedia, calendar, wp
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
8 ;; Homepage: http://orgmode.org
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
9 ;; Version: 6.06b
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
10 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
12 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
15 ;; the Free Software Foundation, either version 3 of the License, or
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
16 ;; (at your option) any later version.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
17
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
21 ;; GNU General Public License for more details.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
22
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
25 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
26 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
27 ;;; Commentary:
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
28 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
29 ;; When Org-mode is distributed with Emacs, this is just a dummy file.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
30 ;; In an Org-mode distribution outside Emacs, this file would provide
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
31 ;; the autoloads. We include this dummy version in Emacs, so that people
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
32 ;; can leave a (require 'org-install) in .emacs, independently of
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
33 ;; which kind of distribution they use.
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
34 ;;
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
35
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
36 (provide 'org-install)
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
37
97050
22e04d4d8347 Add arch tagline
Miles Bader <miles@gnu.org>
parents: 97046
diff changeset
38 ;; arch-tag: 0614acb4-47a3-4e7b-918a-aa3149792bcc
97046
cd3145d8768e New file org-install.el
Carsten Dominik <dominik@science.uva.nl>
parents:
diff changeset
39 ;;; org-install.el ends here