Mercurial > emacs
view lisp/reveal.el @ 51209:880539128b51
Make (many) trivial substitutions for renamed and
new macros in dispextern.h, frame.h and window.h.
(window_box_width): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Note that returned
value is no longer guaranteed to be a whole multiple of the frame
column width, since per-window fringes may now be any width.
(window_box_left_offset): New function like window_box_left, but
value is relative to left border of window (rather than frame).
(window_box_right_offset): New function like window_box_right,
but value is relative to left border of window.
(window_box_left): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Simplify by using
WINDOW_LEFT_EDGE_X and window_box_left_offset.
(window_box): Allow null args for unnecessary return values;
change/simplify relevant callers.
(x_y_to_hpos_vpos): Adapt to per-window fringes and scroll bars,
and new fringe vs. display margin position. Use
window_box_left_offset and window_box_right_offset
(get_glyph_string_clip_rect): Adapt to per-window fringes and
scroll bars, and new fringe vs. display margin position. Use
WINDOW_LEFT_EDGE_X and WINDOW_TOTAL_WIDTH.
(draw_fringe_bitmap): Rework to handle per-window fringes and new
fringe vs. display margin position.
(hscroll_window_tree): Use window_box_width instead of window_box.
(redisplay_window): Adapt to per-window scroll bars.
(draw_glyphs): Rework to handle per-window fringes and scroll
bars, and new fringe vs. display margin position. Use
WINDOW_LEFT_EDGE_X, WINDOW_TOTAL_WIDTH, and window_box_left.
(x_clear_end_of_line): Adapt to per-window fringes and scroll
bars, and new fringe vs. display margin position. Fix bug which
increased total width of full_width rows by width of scroll bars
although window's total width already includes that.
(x_fix_overlapping_area): Simplify using window_box_left_offset.
(expose_area): Simplify using window_box_left_offset.
(x_draw_vertical_border): Handle per-window scroll bar settings,
mixing windows with left, right and no scroll bars.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 22:08:54 +0000 |
parents | 9582ab8af8fe |
children | 695cf19ef79e |
line wrap: on
line source
;;; reveal.el --- Automatically reveal hidden text at point ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: outlines ;; 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 2, 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., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Commentary: ;; Reveal mode is a minor mode that makes sure that text around point ;; is always visible. When point enters a region of hidden text, ;; `reveal-mode' temporarily makes it visible. ;; ;; This is normally used in conjunction with `outline-minor-mode', ;; `hs-minor-mode', `hide-ifdef-mode', ... ;; ;; It only works with packages that hide text using overlays. ;; Packages can provide special support for it by placing ;; a function in the `reveal-toggle-invisible' property on the symbol ;; used as the value of the `invisible' overlay property. ;; The function is called right after revealing (or re-hiding) the ;; text with two arguments: the overlay and a boolean that's non-nil ;; if we have just revealed the text. When revealing, that function ;; may re-hide some of the text. ;;; Todo: ;; - find other hysteresis features. ;;; Code: (require 'pcvs-util) (defgroup reveal nil "Reveal hidden text on the fly." :group 'editing) (defcustom reveal-around-mark t "Reveal text around the mark, if active." :type 'boolean) (defvar reveal-open-spots nil) (make-variable-buffer-local 'reveal-open-spots) ;; Actual code (defun reveal-post-command () ;; Refresh the spots that might have changed. ;; `Refreshing' here means to try and re-hide the corresponding text. ;; We don't refresh everything correctly: ;; - we only refresh spots in the current window. ;; FIXME: do we actually know that (current-buffer) = (window-buffer) ? (with-local-quit (condition-case err (let* ((spots (cvs-partition (lambda (x) ;; We refresh any spot in the current window as well ;; as any spots associated with a dead window or a window ;; which does not show this buffer any more. (or (eq (car x) (selected-window)) (not (window-live-p (car x))) (not (eq (window-buffer (car x)) (current-buffer))))) reveal-open-spots)) (old-ols (mapcar 'cdr (car spots))) (repeat t)) (setq reveal-open-spots (cdr spots)) ;; Open new overlays. (while repeat (setq repeat nil) (dolist (ol (nconc (when (and reveal-around-mark mark-active) (overlays-at (mark))) (overlays-at (point)))) (push (cons (selected-window) ol) reveal-open-spots) (setq old-ols (delq ol old-ols)) (let ((open (overlay-get ol 'reveal-toggle-invisible))) (when (or open (let ((inv (overlay-get ol 'invisible))) (and inv (symbolp inv) (or (setq open (or (get inv 'reveal-toggle-invisible) (overlay-get ol 'isearch-open-invisible-temporary))) (overlay-get ol 'isearch-open-invisible) (and (consp buffer-invisibility-spec) (assq inv buffer-invisibility-spec))) (overlay-put ol 'reveal-invisible inv)))) (if (null open) (overlay-put ol 'invisible nil) ;; Use the provided opening function and repeat (since the ;; opening function might have hidden a subpart around point). (setq repeat t) (condition-case err (funcall open ol nil) (error (message "!!Reveal-show: %s !!" err) ;; Let's default to a meaningful behavior to avoid ;; getting stuck in an infinite loop. (setq repeat nil) (overlay-put ol 'invisible nil)))))))) ;; Close old overlays. (dolist (ol old-ols) (when (and (eq (current-buffer) (overlay-buffer ol)) (not (rassq ol reveal-open-spots))) (if (and (>= (point) (save-excursion (goto-char (overlay-start ol)) (line-beginning-position 1))) (<= (point) (save-excursion (goto-char (overlay-end ol)) (line-beginning-position 2)))) ;; Still near the overlay: keep it open. (push (cons (selected-window) ol) reveal-open-spots) ;; Really close it. (let ((open (overlay-get ol 'reveal-toggle-invisible)) inv) (if (or open (and (setq inv (overlay-get ol 'reveal-invisible)) (setq open (or (get inv 'reveal-toggle-invisible) (overlay-get ol 'isearch-open-invisible-temporary))))) (condition-case err (funcall open ol t) (error (message "!!Reveal-hide: %s !!" err))) (overlay-put ol 'invisible inv))))))) (error (message "Reveal: %s" err))))) ;;;###autoload (define-minor-mode reveal-mode "Toggle Reveal mode on or off. Reveal mode renders invisible text around point visible again. Interactively, with no prefix argument, toggle the mode. With universal prefix ARG (or if ARG is nil) turn mode on. With zero or negative ARG turn mode off." :lighter (global-reveal-mode nil " Reveal") (if reveal-mode (progn (set (make-local-variable 'search-invisible) t) (add-hook 'post-command-hook 'reveal-post-command nil t)) (kill-local-variable 'search-invisible) (remove-hook 'post-command-hook 'reveal-post-command t))) ;;;###autoload (define-minor-mode global-reveal-mode "Toggle Reveal mode in all buffers on or off. Reveal mode renders invisible text around point visible again. Interactively, with no prefix argument, toggle the mode. With universal prefix ARG (or if ARG is nil) turn mode on. With zero or negative ARG turn mode off." :global t :group 'reveal (setq-default reveal-mode global-reveal-mode) (if global-reveal-mode (progn (setq search-invisible t) (add-hook 'post-command-hook 'reveal-post-command)) (setq search-invisible 'open) ;FIXME (remove-hook 'post-command-hook 'reveal-post-command))) (provide 'reveal) ;;; reveal.el ends here