Mercurial > emacs
view lisp/erc/erc-ring.el @ 111413:d53ee71e7e89
Unify mouse-highlight code for all GUI and TTY sessions.
term.c: Remove static mouse_face_* variables. All users
changed.
(term_show_mouse_face, term_clear_mouse_face)
(fast_find_position, term_mouse_highlight): Functions deleted.
(tty_draw_row_with_mouse_face): New function.
(term_mouse_movement): Call note_mouse_highlight instead of
term_mouse_highlight.
nsterm.m (ns_update_window_begin, ns_update_window_end)
(ns_update_end, x_destroy_window, ns_frame_up_to_date)
(ns_dumpglyphs_box_or_relief, ns_maybe_dumpglyphs_background)
(ns_dumpglyphs_image, ns_dumpglyphs_stretch)
(ns_initialize_display_info, keyDown, mouseMoved, mouseExited):
Replace Display_Info with Mouse_HLInfo everywhere where
mouse_face_* members were accessed for mouse highlight purposes.
xterm.c (x_update_window_begin, x_update_window_end)
(x_update_end, XTframe_up_to_date, x_set_mouse_face_gc)
(handle_one_xevent, x_free_frame_resources, x_term_init): Replace
Display_Info with Mouse_HLInfo everywhere where mouse_face_*
members were accessed for mouse highlight purposes.
w32term.c (x_update_window_begin, x_update_window_end)
(x_update_end, w32_read_socket, x_free_frame_resources)
(w32_initialize_display_info): Replace Display_Info with
Mouse_HLInfo everywhere where mouse_face_* members were accessed
for mouse highlight purposes.
xdisp.c (show_mouse_face, note_mode_line_or_margin_highlight)
(note_mouse_highlight) [HAVE_WINDOW_SYSTEM]: Don't run GUI code
unless the frame is on a window-system.
(get_tool_bar_item, handle_tool_bar_click)
(note_tool_bar_highlight, draw_glyphs, erase_phys_cursor)
(show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face, expose_frame):
Replace Display_Info with Mouse_HLInfo everywhere where
mouse_face_* members were accessed for mouse highlight purposes.
(coords_in_mouse_face_p): Move prototype out of the
HAVE_WINDOW_SYSTEM conditional.
(x_y_to_hpos_vpos, frame_to_window_pixel_xy): Move out of the
HAVE_WINDOW_SYSTEM block.
(try_window_id) [HAVE_GPM || MSDOS]: Call
x_clear_window_mouse_face.
(draw_row_with_mouse_face): Implementation for HAVE_WINDOW_SYSTEM
systems. Call tty_draw_row_with_mouse_face for TTY systems.
(show_mouse_face): Call draw_row_with_mouse_face, instead of
calling draw_glyphs directly.
(show_mouse_face, clear_mouse_face, coords_in_mouse_face_p)
(cursor_in_mouse_face_p, rows_from_pos_range)
(mouse_face_from_buffer_pos, mouse_face_from_string_pos)
(note_mode_line_or_margin_highlight, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face): Move out of the
HAVE_WINDOW_SYSTEM block. Ifdef away window-system specific
fragments.
(note_mouse_highlight): Call popup_activated for MSDOS as well.
Clear mouse highlight if pointer is over glyphs whose OBJECT is an
integer.
(mouse_face_from_buffer_pos): Add parentheses around && within ||.
(x_consider_frame_title, tool_bar_lines_needed): Move
prototypes to HAVE_WINDOW_SYSTEM-only part.
(get_window_cursor_type): Move inside a HAVE_WINDOW_SYSTEM-only
part. Remove "#ifdef HAVE_WINDOW_SYSTEM" from body of function.
(null_glyph_slice): Move declaration into HAVE_WINDOW_SYSTEM-only
part.
dispnew.c (mirror_make_current): Set Y coordinate of the
mode-line and header-line rows.
(init_display): Setup initial frame's output_data for text
terminal frames.
xmenu.c (popup_activated): Don't define on MSDOS, which now has
its own definition on msdos.c.
msdos.c (show_mouse_face, clear_mouse_face)
(fast_find_position, IT_note_mode_line_highlight)
(IT_note_mouse_highlight): Functions deleted.
(IT_frame_up_to_date, dos_rawgetc): Call note_mouse_highlight
instead of IT_note_mouse_highlight.
(draw_row_with_mouse_face, popup_activated): New functions.
(dos_set_window_size, draw_row_with_mouse_face, IT_update_begin)
(IT_update_end, IT_frame_up_to_date, internal_terminal_init)
(dos_rawgetc): Replace Display_Info with Mouse_HLInfo everywhere
where mouse_face_* members were accessed for mouse highlight
purposes.
msdos.h (initialize_msdos_display): Add prototype.
frame.h (MOUSE_HL_INFO): New macro.
lisp.h (Mouse_HLInfo): New data type.
xterm.h (struct x_display_info):
w32term.h (struct w32_display_info):
nsterm.h (struct ns_display_info):
termchar.h (struct tty_display_info): Use it instead of
mouse_face_* members.
dispextern.h (show_mouse_face, clear_mouse_face): Update type of
1st argument.
(frame_to_window_pixel_xy, note_mouse_highlight)
(x_clear_window_mouse_face, cancel_mouse_face, clear_mouse_face)
(show_mouse_face, cursor_in_mouse_face_p): Move prototypes out of
HAVE_WINDOW_SYSTEM conditional.
(draw_row_with_mouse_face): Declare prototype.
(tty_draw_row_with_mouse_face): Declare prototype.
author | Eli Zaretskii <eliz@gnu.org> |
---|---|
date | Sat, 06 Nov 2010 10:28:31 +0200 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
line wrap: on
line source
;; erc-ring.el -- Command history handling for erc using ring.el ;; Copyright (C) 2001, 2002, 2003, 2004, 2006, ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex@gnu.org> ;; Keywords: comm ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcHistory ;; 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: ;; This file implements an input ring -- a history of the stuff you ;; wrote. To activate: ;; ;; (require 'erc-auto) or (require 'erc-ring) ;; (erc-ring-mode 1) ;; ;; Use M-n and M-p to navigate the ring ;;; Code: (require 'erc) (require 'comint) (require 'ring) ;;;###autoload (autoload 'erc-ring-mode "erc-ring" nil t) (define-erc-module ring nil "Stores input in a ring so that previous commands and messages can be recalled using M-p and M-n." ((add-hook 'erc-send-pre-hook 'erc-add-to-input-ring) (define-key erc-mode-map "\M-p" 'erc-previous-command) (define-key erc-mode-map "\M-n" 'erc-next-command)) ((remove-hook 'erc-send-pre-hook 'erc-add-to-input-ring) (define-key erc-mode-map "\M-p" 'undefined) (define-key erc-mode-map "\M-n" 'undefined))) (defvar erc-input-ring nil "Input ring for erc.") (make-variable-buffer-local 'erc-input-ring) (defvar erc-input-ring-index nil "Position in the input ring for erc. If nil, the input line is blank and the user is conceptually 'after' the most recently added item in the ring. If an integer, the input line is non-blank and displays the item from the ring indexed by this variable.") (make-variable-buffer-local 'erc-input-ring-index) (defun erc-input-ring-setup () "Do the setup required so that we can use comint style input rings. Call this function when setting up the mode." (setq erc-input-ring (make-ring comint-input-ring-size)) (setq erc-input-ring-index nil)) (defun erc-add-to-input-ring (s) "Add string S to the input ring and reset history position." (unless erc-input-ring (erc-input-ring-setup)) (ring-insert erc-input-ring s) (setq erc-input-ring-index nil)) (defun erc-clear-input-ring () "Remove all entries from the input ring, then call garbage-collect. You might use this for security purposes if you have typed a command containing a password." (interactive) (setq erc-input-ring (make-ring comint-input-ring-size) erc-input-ring-index nil) (garbage-collect) (message "ERC input ring cleared.")) (defun erc-previous-command () "Replace current command with the previous one from the history." (interactive) (unless erc-input-ring (erc-input-ring-setup)) ;; if the ring isn't empty (when (> (ring-length erc-input-ring) 0) (if (and erc-input-ring-index (= (ring-length erc-input-ring) (1+ erc-input-ring-index))) (progn (erc-replace-current-command "") (setq erc-input-ring-index nil)) ;; If we are not viewing old input and there's text in the input ;; area, push it on the history ring before moving back through ;; the input history, so it will be there when we return to the ;; front. (if (null erc-input-ring-index) (when (> (point-max) erc-input-marker) (erc-add-to-input-ring (buffer-substring erc-input-marker (point-max))) (setq erc-input-ring-index 0))) (setq erc-input-ring-index (if erc-input-ring-index (ring-plus1 erc-input-ring-index (ring-length erc-input-ring)) 0)) (erc-replace-current-command (ring-ref erc-input-ring erc-input-ring-index))))) (defun erc-next-command () "Replace current command with the next one from the history." (interactive) (unless erc-input-ring (erc-input-ring-setup)) ;; if the ring isn't empty (when (> (ring-length erc-input-ring) 0) (if (and erc-input-ring-index (= 0 erc-input-ring-index)) (progn (erc-replace-current-command "") (setq erc-input-ring-index nil)) (setq erc-input-ring-index (ring-minus1 (or erc-input-ring-index 0) (ring-length erc-input-ring))) (erc-replace-current-command (ring-ref erc-input-ring erc-input-ring-index))))) (defun erc-replace-current-command (s) "Replace current command with string S." ;; delete line (let ((inhibit-read-only t)) (delete-region (progn (goto-char erc-insert-marker) (erc-bol)) (goto-char (point-max))) (insert s))) (provide 'erc-ring) ;;; erc-ring.el ends here ;; Local Variables: ;; indent-tabs-mode: nil ;; End: ;; arch-tag: b77924a8-a80e-489d-84cd-b351761ea5c8