Mercurial > emacs
annotate lisp/iimage.el @ 109067:b5f73bf59a4f
Use non-deprecated Gtk+ functions, add changes for Gtk+3 with GSEAL_ENABLE.
* configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY,
check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied
by minimum required Gtk+ 2.6). Add checks for functions introduced
in Gtk+ 2.14 or newer.
* xterm.h (gtk_widget_get_window, gtk_widget_get_mapped)
(gtk_adjustment_get_page_size, gtk_adjustment_get_upper): New
defines based on what configure finds.
* xterm.c (XTflash): Use gtk_widget_get_window.
(xg_scroll_callback): Use gtk_adjustment_get_upper and
gtk_adjustment_get_page_size.
(handle_one_xevent): Use gtk_widget_get_mapped.
(x_term_init): Remove HAVE_GTK_MULTIDISPLAY and associated error
messages.
* xmenu.c (create_and_show_popup_menu): Call gtk_widget_get_mapped.
* gtkutil.h: Replace HAVE_GTK_FILE_BOTH with
HAVE_GTK_FILE_SELECTION_NEW.
* gtkutil.c (xg_display_open, xg_display_close): Remove
HAVE_GTK_MULTIDISPLAY, it is always defined.
(xg_display_open): Return type is void.
(gtk_widget_set_has_window)
(gtk_dialog_get_action_area, gtk_dialog_get_content_area)
(gtk_widget_get_sensitive, gtk_adjustment_set_page_size)
(gtk_adjustment_set_page_increment)
(gtk_adjustment_get_step_increment): #define these if not found
by configure.
(remove_submenu): New define based on Gtk+ version.
(xg_set_cursor, xg_frame_resized, xg_event_is_for_scrollbar): Use
gtk_widget_get_window.
(xg_frame_resized, xg_update_frame_menubar): Use gtk_widget_get_mapped.
(xg_create_frame_widgets): Use gtk_widget_set_has_window.
(create_dialog): Use gtk_dialog_get_action_area and
gtk_dialog_get_content_area.
(xg_uses_old_file_dialog, xg_get_file_name): Remove HAVE_GTK_FILE_BOTH
and HAVE_GTK_FILE_CHOOSER_DIALOG_NEW. File chooser is always
available, so checking for HAVE_GTK_FILE_SELECTION_NEW is enough.
(xg_update_menubar, xg_update_submenu, xg_show_toolbar_item): Use
g_object_ref and g_object_unref.
(xg_update_menu_item, xg_tool_bar_menu_proxy): Use
gtk_widget_get_sensitive.
(xg_update_submenu): Use remove_submenu.
(xg_update_scrollbar_pos): Don't use GtkFixedChild, use child
properties instead to get old x and y position.
(xg_set_toolkit_scroll_bar_thumb): Use gtk_adjustment_get_page_size,
gtk_adjustment_get_step_increment, gtk_adjustment_set_page_size,
gtk_adjustment_set_step_increment and gtk_adjustment_set_page_increment.
(xg_get_tool_bar_widgets): New function.
(xg_tool_bar_menu_proxy, xg_show_toolbar_item)
(update_frame_tool_bar): Call xg_get_tool_bar_widgets.
(toolbar_set_orientation): New #define based on if configure
finds gtk_orientable_set_orientation.
(xg_create_tool_bar): Call toolbar_set_orientation.
(xg_make_tool_item, xg_show_toolbar_item): Call gtk_box_pack_start
instead of gtk_box_pack_start_defaults.
author | Jan D <jan.h.d@swipnet.se> |
---|---|
date | Mon, 28 Jun 2010 12:11:26 +0200 |
parents | bbdc76e1b06c |
children | 4901ee6d9e5a |
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 |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
59 (defvar iimage-mode-map |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
60 (let ((map (make-sparse-keymap))) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
61 (define-key map "\C-l" 'iimage-recenter) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
62 map)) |
55525 | 63 |
64 (defun iimage-recenter (&optional arg) | |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
65 "Re-draw images and recenter." |
55525 | 66 (interactive "P") |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
67 (iimage-mode-buffer nil) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
68 (iimage-mode-buffer t) |
55525 | 69 (recenter arg)) |
70 | |
71 (defvar iimage-mode-image-filename-regex | |
72 (concat "[-+./_0-9a-zA-Z]+\\." | |
73 (regexp-opt (nconc (mapcar #'upcase | |
74 image-file-name-extensions) | |
75 image-file-name-extensions) | |
76 t))) | |
77 | |
78 (defvar iimage-mode-image-regex-alist | |
79 `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" | |
80 "\\(" iimage-mode-image-filename-regex "\\)" | |
81 "\\(\\]\\]\\|>\\|'\\)?") . 2)) | |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
82 "*Alist of filename REGEXP vs NUM. |
55525 | 83 Each element looks like (REGEXP . NUM). |
84 NUM specifies which parenthesized expression in the regexp. | |
85 | |
74256
9b80e932389f
(iimage-mode-image-regex-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
86 Examples of image filename regexps: |
55525 | 87 file://foo.png |
88 `file://foo.png' | |
89 \\[\\[foo.gif]] | |
90 <foo.png> | |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
91 foo.JPG") |
55525 | 92 |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
93 (defvar iimage-mode-image-search-path nil |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
94 "*List of directories to search for image files for `iimage-mode'.") |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
95 |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
96 ;;;###autoload |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
97 (define-obsolete-function-alias 'turn-on-iimage-mode 'iimage-mode "24.1") |
55525 | 98 |
99 (defun turn-off-iimage-mode () | |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
100 "Unconditionally turn off iimage mode." |
55525 | 101 (interactive) |
102 (iimage-mode 0)) | |
103 | |
108903
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
104 (defun iimage-modification-hook (beg end) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
105 "Remove display property if a display region is modified." |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
106 ;;(debug-print "ii1 begin %d, end %d\n" beg end) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
107 (let ((inhibit-modification-hooks t) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
108 (beg (previous-single-property-change end 'display |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
109 nil (line-beginning-position))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
110 (end (next-single-property-change beg 'display |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
111 nil (line-end-position)))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
112 (when (and beg end (plist-get (text-properties-at beg) 'display)) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
113 ;;(debug-print "ii2 begin %d, end %d\n" beg end) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
114 (remove-text-properties beg end |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
115 '(display nil modification-hooks nil))))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
116 |
55525 | 117 (defun iimage-mode-buffer (arg) |
108488
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
118 "Display images if ARG is non-nil, undisplay them otherwise." |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
119 (let ((image-path (cons default-directory iimage-mode-image-search-path)) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
120 file) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
121 (with-silent-modifications |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
122 (save-excursion |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
123 (goto-char (point-min)) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
124 (dolist (pair iimage-mode-image-regex-alist) |
925f002ec4ab
* iimage.el: Misc cleanup.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
106815
diff
changeset
|
125 (while (re-search-forward (car pair) nil t) |
108903
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
126 (when (and (setq file (match-string (cdr pair))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
127 (setq file (locate-file file image-path))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
128 ;; FIXME: we don't mark our images, so we can't reliably |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
129 ;; remove them either (we may leave some of ours, and we |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
130 ;; may remove other packages's display properties). |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
131 (if arg |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
132 (add-text-properties (match-beginning 0) (match-end 0) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
133 `(display ,(create-image file) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
134 modification-hooks |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
135 (iimage-modification-hook))) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
136 (remove-text-properties (match-beginning 0) (match-end 0) |
bbdc76e1b06c
* lisp/iimage.el: Remove images as soon as the underlying text is modified.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
108488
diff
changeset
|
137 '(display modification-hooks)))))))))) |
55525 | 138 |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
139 ;;;###autoload |
55525 | 140 (define-minor-mode iimage-mode |
141 "Toggle inline image minor mode." | |
61272
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
142 :group 'iimage :lighter " iImg" :keymap iimage-mode-map |
55525 | 143 (iimage-mode-buffer iimage-mode)) |
144 | |
145 (provide 'iimage) | |
146 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
147 ;; arch-tag: f6f8e29a-08f6-4a12-9496-51e67441ce65 |
55525 | 148 ;;; iimage.el ends here |