Mercurial > emacs
view lisp/minibuf-eldef.el @ 51195:3cbf29813eea
(struct frame): Rename members height to text_lines,
width to text_cols, window_height to total_lines, window_width to
total_cols, new_height to new_text_lines, new_width to
new_text_cols. All uses changed.
(struct frame): New members which consolidate common members of
x_output, w32_output, and mac_output structures: left_pos,
top_pos, pixel_height, pixel_width, x_pixels_diff, y_pixels_diff,
win_gravity, size_hint_flags, border_width, internal_border_width,
line_height, fringe_cols, left_fringe_width, right_fringe_width,
want_fullscreen. All uses changed.
(struct frame): New member column_width contaning the canonical
column width, analogue to line_height. All uses changed.
(struct frame): Rename members scroll_bar_pixel_width to
config_scroll_bar_width, and scroll_bar_cols to
config_scroll_bar_cols. All uses changed.
(struct frame): New member scroll_bar_actual_width which
consolidates and renames the vertical_scroll_bar_extra member of
x_output, w32_output, and mac_output structures. All uses changed.
(FRAME_PIXEL_HEIGHT): Renamed from PIXEL_HEIGHT and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_height.
(FRAME_PIXEL_WIDTH): Renamed from PIXEL_WIDTH and moved
from x/w32/macterm.h files. All uses changed. Also change code
which referred to f->output_data...->pixel_width.
(FRAME_LINES): Renamed from FRAME_HEIGHT. All uses changed.
Also change code which referred to f->height.
(FRAME_COLS): Renamed from FRAME_WIDTH. All uses changed.
Also change code which referred to f->width.
(FRAME_NEW_HEIGHT, FRAME_NEW_WIDTH): Remove macros; change uses
to update new_text_lines and new_text_cols members directly.
(FRAME_CONFIG_SCROLL_BAR_WIDTH): Renamed from
FRAME_SCROLL_BAR_PIXEL_WIDTH. All uses changed.
(FRAME_CONFIG_SCROLL_BAR_COLS): Renamed from
FRAME_SCROLL_BAR_COLS. All uses changed.
(FRAME_LEFT_SCROLL_BAR_COLS, FRAME_RIGHT_SCROLL_BAR_COLS):
Renamed from FRAME_LEFT_SCROLL_BAR_WIDTH and
FRAME_RIGHT_SCROLL_BAR_WIDTH, resp. All uses changed.
(FRAME_SCROLL_BAR_AREA_WIDTH, FRAME_LEFT_SCROLL_BAR_AREA_WIDTH)
(FRAME_RIGHT_SCROLL_BAR_AREA_WIDTH): New macros.
(FRAME_TOTAL_COLS): Renamed from FRAME_WINDOW_WIDTH.
(SET_FRAME_COLS): Renamed from SET_FRAME_WIDTH.
(FRAME_TOTAL_COLS_ARG): Renamed from FRAME_WINDOW_WIDTH_ARG.
(WINDOW_VERTICAL_SCROLL_BAR_COLUMN): Remove unused macro.
(WINDOW_VERTICAL_SCROLL_BAR_HEIGHT): Remove unused macro.
(FRAME_LINE_HEIGHT): Renamed from CANON_Y_UNIT. Unconditionally
return line_height member (it now has proper value also for
non-window frames).
(FRAME_COLUMN_WIDTH): Renamed from CANON_X_UNIT. Unconditionally
return new column_width member (rather than the default font width).
(FRAME_FRINGE_COLS, FRAME_LEFT_FRINGE_WIDTH)
(FRAME_RIGHT_FRINGE_WIDTH): Renamed from FRAME_X_... and moved
from x/w32/macterm.h files. Unconditionally return corresponding
member of frame structure (they now have proper values also for
non-window frames).
(FRAME_TOTAL_FRINGE_WIDTH): Renamed from FRAME_FRINGE_WIDTH.
Calculate return value from left and right widths.
(FRAME_INTERNAL_BORDER_WIDTH): Unconditionally return
internal_border_width member (has proper value for non-window frame).
(FRAME_PIXEL_X_FROM_CANON_X): Renamed from PIXEL_X_FROM_CANON_X.
(FRAME_PIXEL_Y_FROM_CANON_Y): Renamed from PIXEL_Y_FROM_CANON_Y.
(FRAME_CANON_X_FROM_PIXEL_X): Renamed from CANON_X_FROM_PIXEL_X.
(FRAME_CANON_Y_FROM_PIXEL_Y): Renamed from CANON_Y_FROM_PIXEL_Y.
(FRAME_LINE_TO_PIXEL_Y): Renamed from CHAR_TO_PIXEL_ROW,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_COL_TO_PIXEL_X): Renamed from CHAR_TO_PIXEL_COL,
consolidated from xterm.h, macterm.h, and w32term.h.
(FRAME_TEXT_COLS_TO_PIXEL_WIDTH): Renamed from
CHAR_TO_PIXEL_WIDTH consolidated from x/mac/w32term.h.
(FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Renamed from
CHAR_TO_PIXEL_HEIGHT consolidated from x/mac/w32term.h.
(FRAME_PIXEL_Y_TO_LINE): Renamed from PIXEL_TO_CHAR_ROW
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_X_TO_COL): Renamed from PIXEL_TO_CHAR_COL
consolidated from x/mac/w32term.h.
(FRAME_PIXEL_WIDTH_TO_TEXT_COLS): Renamed from
PIXEL_TO_CHAR_WIDTH consolidated from x/mac/w32term.h.
(FRAME_PIXEL_HEIGHT_TO_TEXT_LINES): Renamed from
PIXEL_TO_CHAR_HEIGHT consolidated from x/mac/w32term.h.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sat, 24 May 2003 21:58:07 +0000 |
parents | e88404e8f2cf |
children | 695cf19ef79e d7ddb3e565de |
line wrap: on
line source
;;; minibuf-eldef.el --- Only show defaults in prompts when applicable ;; ;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. ;; ;; Author: Miles Bader <miles@gnu.org> ;; Keywords: convenience ;; 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: ;; ;; Defines the mode `minibuffer-electric-default-mode'. ;; ;; When active, minibuffer prompts that show a default value only show ;; the default when it's applicable -- that is, when hitting RET would ;; yield the default value. If the user modifies the input such that ;; hitting RET would enter a non-default value, the prompt is modified ;; to remove the default indication (which is restored if the input is ;; ever restore to the match the initial input). ;;; Code: (defvar minibuffer-default-in-prompt-regexps '(("\\( (default\\>.*)\\):? \\'" . 1)) "*A list of regexps matching the parts of minibuffer prompts showing defaults. When `minibuffer-electric-default-mode' is active, these regexps are used to identify the portions of prompts to elide. Each entry is either a string, which should be a regexp matching the default portion of the prompt, or a cons cell, who's car is a regexp matching the default part of the prompt, and who's cdr indicates the regexp subexpression that matched.") ;;; Internal variables ;; A list of minibuffers to which we've added a post-command-hook. (defvar minibuf-eldef-frobbed-minibufs nil) ;;; The following are all local variables in the minibuffer ;; Input pre-inserted into the minibuffer before the user can edit it. (defvar minibuf-eldef-initial-input) (make-variable-buffer-local 'minibuf-eldef-initial-input) ;; and the length of the buffer with it inserted. (defvar minibuf-eldef-initial-buffer-length) (make-variable-buffer-local 'minibuf-eldef-initial-buffer-length) ;; True if the current minibuffer prompt contains the default spec. (defvar minibuf-eldef-showing-default-in-prompt) (make-variable-buffer-local 'minibuf-eldef-showing-default-in-prompt) ;; An overlay covering the default portion of the prompt (defvar minibuf-eldef-overlay) (make-variable-buffer-local 'minibuf-eldef-overlay) ;;; Hook functions ;; This function goes on minibuffer-setup-hook (defun minibuf-eldef-setup-minibuffer () "Set up a minibuffer for `minibuffer-electric-default-mode'. The prompt and initial input should already have been inserted." (let ((regexps minibuffer-default-in-prompt-regexps) (match nil) (inhibit-point-motion-hooks t)) (save-excursion (save-restriction ;; Narrow to only the prompt (goto-char (point-min)) (narrow-to-region (point) (minibuffer-prompt-end)) ;; See the prompt contains a default input indicator (while regexps (setq match (pop regexps)) (if (re-search-forward (if (stringp match) match (car match)) nil t) (setq regexps nil) (setq match nil))))) (if (not match) ;; Nope, so just make sure our post-command-hook isn't left around. (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t) ;; Yup; set things up so we can frob the prompt as the state of ;; the input string changes. (setq match (if (consp match) (cdr match) 0)) (setq minibuf-eldef-overlay (make-overlay (match-beginning match) (match-end match))) (setq minibuf-eldef-showing-default-in-prompt t) (setq minibuf-eldef-initial-input (minibuffer-contents-no-properties)) (setq minibuf-eldef-initial-buffer-length (point-max)) (add-to-list 'minibuf-eldef-frobbed-minibufs (current-buffer)) (add-hook 'post-command-hook #'minibuf-eldef-update-minibuffer nil t)))) ;; post-command-hook to swap prompts when necessary (defun minibuf-eldef-update-minibuffer () "Update a minibuffer's prompt to include a default only when applicable. This is intended to be used as a minibuffer post-command-hook for `minibuffer-electric-default-mode'; the minibuffer should have already been set up by `minibuf-eldef-setup-minibuffer'." (unless (eq minibuf-eldef-showing-default-in-prompt (and (= (point-max) minibuf-eldef-initial-buffer-length) (string-equal (minibuffer-contents-no-properties) minibuf-eldef-initial-input))) ;; swap state (setq minibuf-eldef-showing-default-in-prompt (not minibuf-eldef-showing-default-in-prompt)) (cond (minibuf-eldef-showing-default-in-prompt (overlay-put minibuf-eldef-overlay 'invisible nil) (overlay-put minibuf-eldef-overlay 'intangible nil)) (t (overlay-put minibuf-eldef-overlay 'invisible t) (overlay-put minibuf-eldef-overlay 'intangible t))))) ;;; Note this definition must be at the end of the file, because ;;; `define-minor-mode' actually calls the mode-function if the ;;; associated variable is non-nil, which requires that all needed ;;; functions be already defined. [This is arguably a bug in d-m-m] ;;;###autoload (define-minor-mode minibuffer-electric-default-mode "Toggle Minibuffer Electric Default mode. When active, minibuffer prompts that show a default value only show the default when it's applicable -- that is, when hitting RET would yield the default value. If the user modifies the input such that hitting RET would enter a non-default value, the prompt is modified to remove the default indication. With prefix argument ARG, turn on if positive, otherwise off. Returns non-nil if the new state is enabled." :global t :group 'minibuffer (if minibuffer-electric-default-mode ;; Enable the mode (add-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) ;; Disable the mode (remove-hook 'minibuffer-setup-hook 'minibuf-eldef-setup-minibuffer) ;; Remove our entry from any post-command-hook variable's it's still in (dolist (minibuf minibuf-eldef-frobbed-minibufs) (with-current-buffer minibuf (remove-hook 'post-command-hook #'minibuf-eldef-update-minibuffer t))) (setq minibuf-eldef-frobbed-minibufs nil))) (provide 'minibuf-eldef) ;;; minibuf-eldef.el ends here