Mercurial > emacs
view lisp/isearchb.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 | 1e3a407766b9 |
line wrap: on
line source
;;; isearchb --- a marriage between iswitchb and isearch ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org> ;; Maintainer: FSF ;; Created: 16 Apr 2004 ;; Version: 1.5 ;; Keywords: lisp ;; X-URL: http://www.newartisans.com/johnw/emacs.html ;; 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, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Commentary: ;; This module allows you to switch to buffers even faster than with ;; iswitchb! It is not intended to replace it, however, as it works ;; well only with buffers whose names don't typically overlap. You'll ;; have to try it first, and see how your mileage varies. ;; ;; The first way to use isearchb is by holding down a modifier key, in ;; which case every letter you type while holding it searches for any ;; buffer matching what you're typing (using the same ordering scheme ;; employed by iswitchb). To use it this way, add to your .emacs: ;; ;; (isearchb-set-keybindings 'super) ; s-x s-y s-z now finds "xyz" ;; ;; The other way is by using a command that puts you into "search" ;; mode, just like with isearch. I use C-z for this. The binding in ;; my .emacs looks like: ;; ;; (define-key global-map [(control ?z)] 'isearchb-activate) ;; ;; Now, after pressing C-z (for example), each self-inserting ;; character thereafter will search for a buffer containing those ;; characters. For instance, typing "C-z xyz" will switch to the ;; first buffer containing "xyz". Once you press a non-self-inserting ;; character (such as any control key sequence), the search will end. ;; ;; C-z after C-z toggles between the previously selected buffer and ;; the current one. ;; ;; C-g aborts the search and returns you to your original buffer. ;; ;; TAB, after typing in a few characters (after C-z), will jump into ;; iswitchb, using the prefix you've typed so far. This is handy when ;; you realize that isearchb is not powerful enough to find the buffer ;; you're looking for. ;; ;; C-s and C-r move forward and backward in the buffer list. If ;; `isearchb-show-completions' is non-nil (the default), the list of ;; possible completions is shown in the minibuffer. ;; ;; If `isearchb-idle-timeout' is set to a number, isearchb will quit ;; after that many seconds of idle time. I recommend trying it set to ;; one or two seconds. Then, if you switch to a buffer and wait for ;; that amount of time, you can start typing without manually exiting ;; isearchb. ;; TODO: ;; C-z C-z is broken ;; killing iswitchb.el and then trying to switch back is broken ;; make sure TAB isn't broken (require 'iswitchb) (defgroup isearchb nil "Switch between buffers using a mechanism like isearch." :group 'iswitchb) (defcustom isearchb-idle-timeout nil "*Number of idle seconds before isearchb turns itself off. If nil, don't use a timeout." :type '(choice (integer :tag "Seconds") (const :tag "Disable" nil)) :group 'isearchb) (defcustom isearchb-show-completions t "*If non-nil, show possible completions in the minibuffer." :type 'boolean :group 'isearchb) (defvar isearchb-start-buffer nil) (defvar isearchb-last-buffer nil) (defvar isearchb-idle-timer nil) (defun isearchb-stop (&optional return-to-buffer ignore-command) "Called by isearchb to terminate a search in progress." (remove-hook 'pre-command-hook 'isearchb-follow-char) (if return-to-buffer (switch-to-buffer isearchb-start-buffer) (setq isearchb-last-buffer isearchb-start-buffer)) (when isearchb-idle-timer (cancel-timer isearchb-idle-timer) (setq isearchb-idle-timer nil)) (if ignore-command (setq this-command 'ignore last-command 'ignore)) (message nil)) (defun isearchb-iswitchb () "isearchb's custom version of the `iswitchb' command. Its purpose is to pass different call arguments to `iswitchb-read-buffer'." (interactive) (let* ((prompt "iswitch ") (iswitchb-method 'samewindow) (buf (iswitchb-read-buffer prompt nil nil iswitchb-text t))) (if (eq iswitchb-exit 'findfile) (call-interactively 'find-file) (when buf (if (get-buffer buf) ;; buffer exists, so view it and then exit (iswitchb-visit-buffer buf) ;; else buffer doesn't exist (iswitchb-possible-new-buffer buf)))))) (defun isearchb () "Switch to buffer matching a substring, based on chars typed." (interactive) (unless (eq last-command 'isearchb) (setq iswitchb-text nil)) (unless iswitchb-text (setq iswitchb-text "") (iswitchb-make-buflist nil)) (if last-command-char (setq iswitchb-rescan t iswitchb-text (concat iswitchb-text (char-to-string last-command-char)))) (iswitchb-set-matches) (let* ((match (car iswitchb-matches)) (buf (and match (get-buffer match)))) (if (null buf) (progn (isearchb-stop t) (isearchb-iswitchb)) (switch-to-buffer buf) (if isearchb-show-completions (message "isearchb: %s%s" iswitchb-text (iswitchb-completions iswitchb-text)) (if (= 1 (length iswitchb-matches)) (message "isearchb: %s (only match)" iswitchb-text) (message "isearchb: %s" iswitchb-text)))))) (defun isearchb-set-keybindings (modifier) "Setup isearchb on the given MODIFIER." (dotimes (i 128) (if (eq 'self-insert-command (lookup-key global-map (vector i))) (define-key global-map (vector (list modifier i)) 'isearchb)))) (defun isearchb-follow-char () "Function added to `post-command-hook' to handle the isearchb \"mode\"." (let (keys) (if (not (and (memq last-command '(isearchb isearchb-activate)) (setq keys (this-command-keys)) (= 1 (length keys)))) (isearchb-stop) (cond ((or (equal keys "\C-h") (equal keys "\C-?") (equal keys [backspace]) (equal keys [delete])) (setq iswitchb-text (substring iswitchb-text 0 (1- (length iswitchb-text)))) (if (= 0 (length iswitchb-text)) (isearchb-stop t t) (setq last-command-char nil) (setq this-command 'isearchb))) ((or (equal keys "\C-i") (equal keys [tab])) (setq this-command 'isearchb-iswitchb)) ((equal keys "\C-s") (iswitchb-next-match) (setq last-command-char nil) (setq this-command 'isearchb)) ((equal keys "\C-r") (iswitchb-prev-match) (setq last-command-char nil) (setq this-command 'isearchb)) ((equal keys "\C-g") (ding) (isearchb-stop t t)) ((eq (lookup-key global-map keys) 'self-insert-command) (setq this-command 'isearchb))) (if (and isearchb-idle-timeout (null isearchb-idle-timer)) (setq isearchb-idle-timer (run-with-idle-timer isearchb-idle-timeout nil 'isearchb-stop)))))) ;;;###autoload (defun isearchb-activate () "Active isearchb mode for subsequent alphanumeric keystrokes. Executing this command again will terminate the search; or, if the search has not yet begun, will toggle to the last buffer accessed via isearchb." (interactive) (cond ((eq last-command 'isearchb) (isearchb-stop nil t)) ((eq last-command 'isearchb-activate) (if isearchb-last-buffer (switch-to-buffer isearchb-last-buffer) (error "isearchb: There is no previous buffer to toggle to")) (isearchb-stop nil t)) (t (message "isearchb: ") (setq iswitchb-text nil isearchb-start-buffer (current-buffer)) (add-hook 'pre-command-hook 'isearchb-follow-char)))) (provide 'isearchb) ;;; arch-tag: 9277523f-a624-4aa0-ba10-b89eeb7b6e99 ;;; isearchb.el ends here