Mercurial > emacs
annotate 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 |
rev | line source |
---|---|
55525 | 1 ;;; iimage.el --- Inline image minor mode. |
2 | |
106815 | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
55525 | 4 |
5 ;; Author: KOSEKI Yoshinori <kose@meadowy.org> | |
6 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org> | |
7 ;; Keywords: multimedia | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
55525 | 12 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
55525 | 15 |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
55525 | 23 |
24 ;;; Commentary: | |
25 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
26 ;; Iimage is a minor mode that displays images, when image-filename |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
27 ;; exists in the buffer. |
55525 | 28 ;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html |
29 ;; | |
30 ;; Add to your `~/.emacs': | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
31 ;; (autoload 'iimage-mode "iimage" "Support Inline image minor mode." t) |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
32 ;; (autoload 'turn-on-iimage-mode "iimage" "Turn on Inline image minor mode." t) |
55525 | 33 ;; |
34 ;; ** Display images in *Info* buffer. | |
35 ;; | |
36 ;; (add-hook 'info-mode-hook 'turn-on-iimage-mode) | |
37 ;; | |
38 ;; .texinfo: @file{file://foo.png} | |
39 ;; .info: `file://foo.png' | |
40 ;; | |
41 ;; ** Display images in Wiki buffer. | |
42 ;; | |
43 ;; (add-hook 'wiki-mode-hook 'turn-on-iimage-mode) | |
44 ;; | |
45 ;; wiki-file: [[foo.png]] | |
46 | |
47 ;;; Code: | |
48 | |
49 (eval-when-compile | |
50 (require 'image-file)) | |
51 | |
61272
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
52 (defgroup iimage nil |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
53 "Support for inline images." |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
54 :version "22.1" |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
55 :group 'image) |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
56 |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
57 (defconst iimage-version "1.1") |
55525 | 58 (defvar iimage-mode nil) |
59 (defvar iimage-mode-map nil) | |
60 | |
61 ;; Set up key map. | |
62 (unless iimage-mode-map | |
63 (setq iimage-mode-map (make-sparse-keymap)) | |
64 (define-key iimage-mode-map "\C-l" 'iimage-recenter)) | |
65 | |
66 (defun iimage-recenter (&optional arg) | |
67 "Re-draw images and recenter." | |
68 (interactive "P") | |
69 (iimage-mode-buffer 0) | |
70 (iimage-mode-buffer 1) | |
71 (recenter arg)) | |
72 | |
73 (defvar iimage-mode-image-filename-regex | |
74 (concat "[-+./_0-9a-zA-Z]+\\." | |
75 (regexp-opt (nconc (mapcar #'upcase | |
76 image-file-name-extensions) | |
77 image-file-name-extensions) | |
78 t))) | |
79 | |
80 (defvar iimage-mode-image-regex-alist | |
81 `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" | |
82 "\\(" iimage-mode-image-filename-regex "\\)" | |
83 "\\(\\]\\]\\|>\\|'\\)?") . 2)) | |
84 "*Alist of filename REGEXP vs NUM. | |
85 Each element looks like (REGEXP . NUM). | |
86 NUM specifies which parenthesized expression in the regexp. | |
87 | |
74256
9b80e932389f
(iimage-mode-image-regex-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
88 Examples of image filename regexps: |
55525 | 89 file://foo.png |
90 `file://foo.png' | |
91 \\[\\[foo.gif]] | |
92 <foo.png> | |
93 foo.JPG | |
94 ") | |
95 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
96 (defvar iimage-mode-image-search-path nil |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
97 "*List of directories to search for image files for iimage-mode.") |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
98 |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
99 ;;;###autoload |
55525 | 100 (defun turn-on-iimage-mode () |
101 "Unconditionally turn on iimage mode." | |
102 (interactive) | |
103 (iimage-mode 1)) | |
104 | |
105 (defun turn-off-iimage-mode () | |
106 "Unconditionally turn off iimage mode." | |
107 (interactive) | |
108 (iimage-mode 0)) | |
109 | |
85825
13163bbed0bf
* progmodes/mixal-mode.el (mixal-run, mixal-debug): Call mixvm
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
110 (defalias 'iimage-locate-file 'locate-file) |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
111 |
55525 | 112 (defun iimage-mode-buffer (arg) |
74256
9b80e932389f
(iimage-mode-image-regex-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
113 "Display/undisplay images. |
55525 | 114 With numeric ARG, display the images if and only if ARG is positive." |
115 (interactive) | |
116 (let ((ing (if (numberp arg) | |
117 (> arg 0) | |
118 iimage-mode)) | |
119 (modp (buffer-modified-p (current-buffer))) | |
120 file buffer-read-only) | |
121 (save-excursion | |
122 (goto-char (point-min)) | |
123 (dolist (pair iimage-mode-image-regex-alist) | |
124 (while (re-search-forward (car pair) nil t) | |
125 (if (and (setq file (match-string (cdr pair))) | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
126 (setq file (iimage-locate-file file |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
127 (cons default-directory |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
128 iimage-mode-image-search-path)))) |
55525 | 129 (if ing |
130 (add-text-properties (match-beginning 0) (match-end 0) | |
131 (list 'display (create-image file))) | |
132 (remove-text-properties (match-beginning 0) (match-end 0) | |
133 '(display))))))) | |
134 (set-buffer-modified-p modp))) | |
135 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
136 ;;;###autoload |
55525 | 137 (define-minor-mode iimage-mode |
138 "Toggle inline image minor mode." | |
61272
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
139 :group 'iimage :lighter " iImg" :keymap iimage-mode-map |
55525 | 140 (run-hooks 'iimage-mode-hook) |
141 (iimage-mode-buffer iimage-mode)) | |
142 | |
143 (provide 'iimage) | |
144 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
145 ;; arch-tag: f6f8e29a-08f6-4a12-9496-51e67441ce65 |
55525 | 146 ;;; iimage.el ends here |