Mercurial > emacs
view lisp/iimage.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 | 925f002ec4ab 376148b31b5e |
line wrap: on
line source
;;; iimage.el --- Inline image minor mode. ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: KOSEKI Yoshinori <kose@meadowy.org> ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> ;; Keywords: multimedia ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Iimage is a minor mode that displays images, when image-filename ;; exists in the buffer. ;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html ;; ;; Add to your `~/.emacs': ;; (autoload 'iimage-mode "iimage" "Support Inline image minor mode." t) ;; (autoload 'turn-on-iimage-mode "iimage" "Turn on Inline image minor mode." t) ;; ;; ** Display images in *Info* buffer. ;; ;; (add-hook 'info-mode-hook 'turn-on-iimage-mode) ;; ;; .texinfo: @file{file://foo.png} ;; .info: `file://foo.png' ;; ;; ** Display images in Wiki buffer. ;; ;; (add-hook 'wiki-mode-hook 'turn-on-iimage-mode) ;; ;; wiki-file: [[foo.png]] ;;; Code: (eval-when-compile (require 'image-file)) (defgroup iimage nil "Support for inline images." :version "22.1" :group 'image) (defconst iimage-version "1.1") (defvar iimage-mode nil) (defvar iimage-mode-map nil) ;; Set up key map. (unless iimage-mode-map (setq iimage-mode-map (make-sparse-keymap)) (define-key iimage-mode-map "\C-l" 'iimage-recenter)) (defun iimage-recenter (&optional arg) "Re-draw images and recenter." (interactive "P") (iimage-mode-buffer 0) (iimage-mode-buffer 1) (recenter arg)) (defvar iimage-mode-image-filename-regex (concat "[-+./_0-9a-zA-Z]+\\." (regexp-opt (nconc (mapcar #'upcase image-file-name-extensions) image-file-name-extensions) t))) (defvar iimage-mode-image-regex-alist `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" "\\(" iimage-mode-image-filename-regex "\\)" "\\(\\]\\]\\|>\\|'\\)?") . 2)) "*Alist of filename REGEXP vs NUM. Each element looks like (REGEXP . NUM). NUM specifies which parenthesized expression in the regexp. Examples of image filename regexps: file://foo.png `file://foo.png' \\[\\[foo.gif]] <foo.png> foo.JPG ") (defvar iimage-mode-image-search-path nil "*List of directories to search for image files for iimage-mode.") ;;;###autoload (defun turn-on-iimage-mode () "Unconditionally turn on iimage mode." (interactive) (iimage-mode 1)) (defun turn-off-iimage-mode () "Unconditionally turn off iimage mode." (interactive) (iimage-mode 0)) (defalias 'iimage-locate-file 'locate-file) (defun iimage-mode-buffer (arg) "Display/undisplay images. With numeric ARG, display the images if and only if ARG is positive." (interactive) (let ((ing (if (numberp arg) (> arg 0) iimage-mode)) (modp (buffer-modified-p (current-buffer))) file buffer-read-only) (save-excursion (goto-char (point-min)) (dolist (pair iimage-mode-image-regex-alist) (while (re-search-forward (car pair) nil t) (if (and (setq file (match-string (cdr pair))) (setq file (iimage-locate-file file (cons default-directory iimage-mode-image-search-path)))) (if ing (add-text-properties (match-beginning 0) (match-end 0) (list 'display (create-image file))) (remove-text-properties (match-beginning 0) (match-end 0) '(display))))))) (set-buffer-modified-p modp))) ;;;###autoload (define-minor-mode iimage-mode "Toggle inline image minor mode." :group 'iimage :lighter " iImg" :keymap iimage-mode-map (run-hooks 'iimage-mode-hook) (iimage-mode-buffer iimage-mode)) (provide 'iimage) ;; arch-tag: f6f8e29a-08f6-4a12-9496-51e67441ce65 ;;; iimage.el ends here