Mercurial > emacs
annotate lisp/iimage.el @ 80455:4b3759b14cc7
(mac_end_cg_clip): Add argument F. All uses changed.
(mac_begin_cg_clip, mac_end_cg_clip): Allow null GC.
(mac_invert_rectangle, mac_compute_glyph_string_overhangs)
(mac_load_query_font): Use them instead of SetPortWindowPort.
(mac_clear_window) [!USE_CG_DRAWING]: Likewise.
(mac_draw_image_string_cg): Call CGContextSetTextMatrix.
(x_update_begin, x_update_end): Call mac_update_begin and
mac_update_end.
(XTframe_up_to_date): Call mac_frame_up_to_date.
(XTring_bell): Use mac_alert_sound_play.
(note_mouse_movement): Use mac_get_frame_bounds.
(XTmouse_position): Use mac_get_frame_mouse.
(x_scroll_bar_create): Use mac_create_scroll_bar.
(x_scroll_bar_remove): Use mac_dispose_scroll_bar.
(XTset_vertical_scroll_bar): Use mac_set_scroll_bar_bounds and
mac_redraw_scroll_bar.
(mac_move_window_with_gravity) [USE_MAC_TOOLBAR]: Use mac_move_window
instead of MoveWindow.
(mac_handle_size_change) [TARGET_API_MAC_CARBON]:
Use mac_reposition_hourglass.
(x_set_offset): Use mac_move_window_structure instead of
MoveWindowStructure.
(x_set_window_size): Use mac_size_window instead of SizeWindow.
(x_set_mouse_pixel_position) [MAC_OSX]:
Use mac_convert_frame_point_to_global.
(x_raise_frame): Use mac_bring_window_to_front instead of BringToFront.
(x_lower_frame): Use mac_send_window_behind instead of SendBehind.
(mac_handle_visibility_change): Use Window instead of WindowRef.
Use mac_is_window_visible/mac_is_window_collapsed instead of
IsWindowVisible/IsWindowCollapsed, respectively.
Use mac_collapse_window/mac_show_window instead of
CollapseWindow/ShowWindow, respectively.
(x_make_frame_invisible): Use mac_hide_window instead of HideWindow.
(x_iconify_frame): Use mac_show_window instead of ShowWindow.
Use mac_collapse_window instead of CollapseWindow.
(x_free_frame_resources): Use Window instead of WindowRef.
Use mac_dispose_frame_window. Clean up focus-related variables before
calling mac_dispose_frame_window.
(do_zoom_window) [MAC_OS8]: Use mac_clear_area instead of
mac_clear_window.
(mac_initialize): Use mac_toolbox_initialize instead of
initializing any_help_event_p and calling init_apple_event_handler,
init_tsm, and init_menu_bar.
(any_help_event_p, last_window, save_port_clip_region)
(read_socket_inev, saved_menu_event_location): Move variables to
mactoolbox.c.
(last_scroll_bar_part, scroll_bar_timer)
(scroll_bar_timer_event_posted_p) [USE_TOOLKIT_SCROLL_BARS]: Likewise.
(font_panel_shown_p) [USE_MAC_FONT_PANEL]: Likewise.
(tsm_document_id) [USE_MAC_TSM]: Likewise.
(mouse_region) [!TARGET_API_MAC_CARBON]: Likewise.
(mac_window_to_frame, DEFAULT_NUM_COLS, MIN_DOC_SIZE, MAX_DOC_SIZE):
Move defines to mactoolbox.c.
(FRAME_CG_CONTEXT) [USE_CG_DRAWING]: Likewise.
(SCROLL_BAR_FIRST_DELAY, SCROLL_BAR_CONTINUOUS_DELAY)
[USE_TOOLKIT_SCROLL_BARS]: Likewise.
(TOOLBAR_IDENTIFIER, TOOLBAR_ICON_ITEM_IDENTIFIER)
(TOOLBAR_ITEM_COMMAND_ID_OFFSET, TOOLBAR_ITEM_COMMAND_ID_P)
(TOOLBAR_ITEM_COMMAND_ID_VALUE, TOOLBAR_ITEM_MAKE_COMMAND_ID)
[USE_MAC_TOOLBAR]: Likewise.
(M_APPLE, I_ABOUT, EXTRA_STACK_ALLOC, ARGV_STRING_LIST_ID)
(RAM_TOO_LARGE_ALERT_ID, ABOUT_ALERT_ID): Move defines to macgui.h
(x_flush, is_emacs_window, mac_begin_clip, mac_end_clip)
(x_scroll_bar_handle_click, x_scroll_bar_report_motion)
(mac_get_window_bounds, do_window_update, is_emacs_window)
(do_grow_window, do_zoom_window, install_window_handler)
(remove_window_handler, XTread_socket, init_menu_bar): Move functions
to mactoolbox.c.
(mac_flush_display_optional, mac_begin_cg_clip, mac_end_cg_clip)
(mac_prepare_for_quickdraw) [USE_CG_DRAWING]: Likewise.
(mac_scroll_area, mac_event_to_emacs_modifiers, mac_get_mouse_btn)
(mac_convert_event_ref, mac_get_ideal_size, mac_store_drag_event)
(mac_handle_window_event, mac_handle_keyboard_event)
(mac_handle_command_event, mac_handle_mouse_event)
(install_application_handler, mac_post_mouse_moved_event)
[TARGET_API_MAC_CARBON]: Likewise.
(scroll_bar_timer_callback, install_scroll_bar_timer)
(set_scroll_bar_timer, control_part_code_to_scroll_bar_part)
(construct_scroll_bar_click, get_control_part_bounds)
(x_scroll_bar_handle_press, x_scroll_bar_handle_release)
(x_scroll_bar_handle_drag, x_set_toolkit_scroll_bar_thumb)
[USE_TOOLKIT_SCROLL_BARS]: Likewise.
(x_scroll_bar_set_handle, x_scroll_bar_note_movement)
[!USE_TOOLKIT_SCROLL_BARS]: Likewise.
(mac_handle_toolbar_event, mac_create_frame_tool_bar)
(update_frame_tool_bar, free_frame_tool_bar)
(mac_tool_bar_note_mouse_movement, mac_handle_toolbar_command_event)
[USE_MAC_TOOLBAR]: Likewise.
(mac_font_panel_visible_p, mac_handle_font_event)
(mac_show_hide_font_panel, mac_set_font_info_for_selection)
[USE_MAC_FONT_PANEL]: Likewise.
(mac_handle_text_input_event, init_tsm) [USE_MAC_TSM]: Likewise.
(do_apple_menu, mac_wait_next_event) [!TARGET_API_MAC_CARBON]: Likewise.
(mac_store_service_event) [MAC_OSX]: Likewise.
(last_mouse_glyph, last_mouse_glyph_frame, last_mouse_scroll_bar)
(last_mouse_movement_time, input_signal_count)
(mac_screen_config_changed, Qhi_command, Qtoolbar_switch_mode)
(Qservice, Qpaste, Qperform, keycode_to_xkeysym_table): Make variables
non-static.
(Qpanel_closed, Qselection) [USE_MAC_FONT_PANEL]: Likewise.
(Qtext_input, Vmac_ts_active_input_overlay, Qupdate_active_input_area)
(Qunicode_for_key_event, Vmac_ts_script_language_on_focus)
(saved_ts_script_language_on_focus) [USE_MAC_TSM]: Likewise.
(mac_focus_changed, note_mouse_movement, mac_focus_frame)
(mac_handle_origin_change, mac_handle_size_change)
(mac_handle_visibility_change, mac_to_emacs_modifiers)
(mac_mapped_modifiers, mac_get_emulated_btn, do_keystroke)
(mac_get_screen_info): Make functions non-static.
(mac_move_window_with_gravity, mac_get_window_origin_with_gravity)
(mac_image_spec_to_cg_image) [USE_MAC_TOOLBAR]: Likewise.
(mac_store_event_ref_as_apple_event) [TARGET_API_MAC_CARBON]: Likewise.
(Qwindow, mac_ready_for_apple_events): Move externs to mactoolbox.c.
(Qbefore_string) [USE_MAC_TSM]: Likewise.
(mac_toolbox_initialize, x_scroll_bar_report_motion, XTread_socket):
Add externs.
(mac_flush_display_optional) [USE_CG_DRAWING]: Likewise.
(install_drag_handler, remove_drag_handler, install_service_handler)
(install_menu_target_item_handler): Remove externs.
(XSetWindowBackground): Rename to mac_set_frame_window_background.
Take frame as argument instead of display and window.
Move to mactoolbox.c.
(mac_restore_keyboard_input_source, mac_save_keyboard_input_source)
[USE_MAC_TSM]: New functions created from mac_tsm_resume and
mac_tsm_suspend, respectively.
(mac_tsm_resume, mac_tsm_suspend) [USE_MAC_TSM]: Use them.
Move to mactoolbox.c.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Sun, 06 Apr 2008 01:58:59 +0000 |
parents | 73661ddc7ac7 |
children | 107ccd98fa12 |
rev | line source |
---|---|
55525 | 1 ;;; iimage.el --- Inline image minor mode. |
2 | |
79721 | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 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 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
75347
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
55525 | 14 ;; any later version. |
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 | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
55525 | 25 |
26 ;;; Commentary: | |
27 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
28 ;; 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
|
29 ;; exists in the buffer. |
55525 | 30 ;; http://www.netlaputa.ne.jp/~kose/Emacs/iimage.html |
31 ;; | |
32 ;; Add to your `~/.emacs': | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
33 ;; (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
|
34 ;; (autoload 'turn-on-iimage-mode "iimage" "Turn on Inline image minor mode." t) |
55525 | 35 ;; |
36 ;; ** Display images in *Info* buffer. | |
37 ;; | |
38 ;; (add-hook 'info-mode-hook 'turn-on-iimage-mode) | |
39 ;; | |
40 ;; .texinfo: @file{file://foo.png} | |
41 ;; .info: `file://foo.png' | |
42 ;; | |
43 ;; ** Display images in Wiki buffer. | |
44 ;; | |
45 ;; (add-hook 'wiki-mode-hook 'turn-on-iimage-mode) | |
46 ;; | |
47 ;; wiki-file: [[foo.png]] | |
48 | |
49 ;;; Code: | |
50 | |
51 (eval-when-compile | |
52 (require 'image-file)) | |
53 | |
61272
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
54 (defgroup iimage nil |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
55 "Support for inline images." |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
56 :version "22.1" |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
57 :group 'image) |
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
58 |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
59 (defconst iimage-version "1.1") |
55525 | 60 (defvar iimage-mode nil) |
61 (defvar iimage-mode-map nil) | |
62 | |
63 ;; Set up key map. | |
64 (unless iimage-mode-map | |
65 (setq iimage-mode-map (make-sparse-keymap)) | |
66 (define-key iimage-mode-map "\C-l" 'iimage-recenter)) | |
67 | |
68 (defun iimage-recenter (&optional arg) | |
69 "Re-draw images and recenter." | |
70 (interactive "P") | |
71 (iimage-mode-buffer 0) | |
72 (iimage-mode-buffer 1) | |
73 (recenter arg)) | |
74 | |
75 (defvar iimage-mode-image-filename-regex | |
76 (concat "[-+./_0-9a-zA-Z]+\\." | |
77 (regexp-opt (nconc (mapcar #'upcase | |
78 image-file-name-extensions) | |
79 image-file-name-extensions) | |
80 t))) | |
81 | |
82 (defvar iimage-mode-image-regex-alist | |
83 `((,(concat "\\(`?file://\\|\\[\\[\\|<\\|`\\)?" | |
84 "\\(" iimage-mode-image-filename-regex "\\)" | |
85 "\\(\\]\\]\\|>\\|'\\)?") . 2)) | |
86 "*Alist of filename REGEXP vs NUM. | |
87 Each element looks like (REGEXP . NUM). | |
88 NUM specifies which parenthesized expression in the regexp. | |
89 | |
74256
9b80e932389f
(iimage-mode-image-regex-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
90 Examples of image filename regexps: |
55525 | 91 file://foo.png |
92 `file://foo.png' | |
93 \\[\\[foo.gif]] | |
94 <foo.png> | |
95 foo.JPG | |
96 ") | |
97 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
98 (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
|
99 "*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
|
100 |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
101 ;;;###autoload |
55525 | 102 (defun turn-on-iimage-mode () |
103 "Unconditionally turn on iimage mode." | |
104 (interactive) | |
105 (iimage-mode 1)) | |
106 | |
107 (defun turn-off-iimage-mode () | |
108 "Unconditionally turn off iimage mode." | |
109 (interactive) | |
110 (iimage-mode 0)) | |
111 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
112 ;; Emacs21.3 or earlier does not heve locate-file. |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
113 (if (fboundp 'locate-file) |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
114 (defalias 'iimage-locate-file 'locate-file) |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
115 (defun iimage-locate-file (filename path) |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
116 (locate-library filename t path))) |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
117 |
55525 | 118 (defun iimage-mode-buffer (arg) |
74256
9b80e932389f
(iimage-mode-image-regex-alist): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
68651
diff
changeset
|
119 "Display/undisplay images. |
55525 | 120 With numeric ARG, display the images if and only if ARG is positive." |
121 (interactive) | |
122 (let ((ing (if (numberp arg) | |
123 (> arg 0) | |
124 iimage-mode)) | |
125 (modp (buffer-modified-p (current-buffer))) | |
126 file buffer-read-only) | |
127 (save-excursion | |
128 (goto-char (point-min)) | |
129 (dolist (pair iimage-mode-image-regex-alist) | |
130 (while (re-search-forward (car pair) nil t) | |
131 (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
|
132 (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
|
133 (cons default-directory |
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
134 iimage-mode-image-search-path)))) |
55525 | 135 (if ing |
136 (add-text-properties (match-beginning 0) (match-end 0) | |
137 (list 'display (create-image file))) | |
138 (remove-text-properties (match-beginning 0) (match-end 0) | |
139 '(display))))))) | |
140 (set-buffer-modified-p modp))) | |
141 | |
56331
401149ed59c0
(turn-on-iimage-mode, iimage-mode): Add autoload cookies.
Eli Zaretskii <eliz@gnu.org>
parents:
55532
diff
changeset
|
142 ;;;###autoload |
55525 | 143 (define-minor-mode iimage-mode |
144 "Toggle inline image minor mode." | |
61272
3933597e185e
(iimage): New customization group.
Lute Kamstra <lute@gnu.org>
parents:
56331
diff
changeset
|
145 :group 'iimage :lighter " iImg" :keymap iimage-mode-map |
55525 | 146 (run-hooks 'iimage-mode-hook) |
147 (iimage-mode-buffer iimage-mode)) | |
148 | |
149 (provide 'iimage) | |
150 | |
55532
c9cc17f13ff4
Changes from arch/CVS synchronization
Miles Bader <miles@gnu.org>
parents:
55525
diff
changeset
|
151 ;;; arch-tag: f6f8e29a-08f6-4a12-9496-51e67441ce65 |
55525 | 152 ;;; iimage.el ends here |