Mercurial > emacs
annotate lisp/reposition.el @ 1717:aa7d6d57504b
* frame.h (struct frame): New fields `can_have_scrollbars' and
`has_vertical_scrollbars'.
(FRAME_CAN_HAVE_SCROLLBARS, FRAME_HAS_VERTICAL_SCROLLBARS): New
accessors, for both the MULTI_FRAME and non-MULTI_FRAME.
(VERTICAL_SCROLLBAR_WIDTH, WINDOW_VERTICAL_SCROLLBAR,
WINDOW_VERTICAL_SCROLLBAR_COLUMN,
WINDOW_VERTICAL_SCROLLBAR_HEIGHT): New macros.
* window.h (struct window): New field `vertical_scrollbar'.
* xterm.h (struct x_display): vertical_scrollbars,
judge_timestamp, vertical_scrollbar_extra: New fields.
(struct scrollbar): New struct.
(VERTICAL_SCROLLBAR_PIXEL_WIDTH, VERTICAL_SCROLLBAR_PIXEL_HEIGHT,
VERTICAL_SCROLLBAR_LEFT_BORDER, VERTICAL_SCROLLBAR_RIGHT_BORDER,
VERTICAL_SCROLLBAR_TOP_BORDER, VERTICAL_SCROLLBAR_BOTTOM_BORDER,
CHAR_TO_PIXEL_WIDTH, CHAR_TO_PIXEL_HEIGHT, PIXEL_TO_CHAR_WIDTH,
PIXEL_TO_CHAR_HEIGHT): New accessors and macros.
* frame.c (make_frame): Initialize the `can_have_scrollbars' and
`has_vertical_scrollbars' fields of the frame.
* term.c (term_init): Note that TERMCAP terminals don't support
scrollbars.
(mouse_position_hook): Document new args.
(set_vertical_scrollbar_hook, condemn_scrollbars_hook,
redeem_scrollbar_hook, judge_scrollbars_hook): New hooks.
* termhooks.h: Declare and document them.
(enum scrollbar_part): New type.
(struct input_event): Describe the new form of the scrollbar_click
event type. Change `part' from a Lisp_Object to an enum
scrollbar_part. Add a new field `scrollbar'.
* keyboard.c (kbd_buffer_get_event): Pass appropriate new
parameters to *mouse_position_hook, and make_lispy_movement.
* xfns.c (x_set_vertical_scrollbar): New function.
(x_figure_window_size): Use new macros to calculate frame size.
(Fx_create_frame): Note that X Windows frames do support scroll
bars. Default to "yes".
* xterm.c: #include <X11/cursorfont.h> and "window.h".
(x_vertical_scrollbar_cursor): New variable.
(x_term_init): Initialize it.
(last_mouse_bar, last_mouse_bar_frame, last_mouse_part,
last_mouse_scroll_range_start, last_mouse_scroll_range_end): New
variables.
(XTmouse_position): Use them to return scrollbar movement events.
Take new arguments, for that purpose.
(x_window_to_scrollbar, x_scrollbar_create,
x_scrollbar_set_handle, x_scrollbar_remove, x_scrollbar_move,
XTset_scrollbar, XTcondemn_scrollbars, XTredeem_scrollbar,
XTjudge_scrollbars, x_scrollbar_expose,
x_scrollbar_background_expose, x_scrollbar_handle_click,
x_scrollbar_handle_motion): New functions to implement scrollbars.
(x_term_init): Set the termhooks.h hooks to point to them.
(x_set_window_size): Use new macros to calculate frame size. Set
vertical_scrollbar_extra field.
(x_make_frame_visible): Use the frame accessor
FRAME_HAS_VERTICAL_SCROLLBARS to decide if we need to map the
frame's subwindows as well.
(XTread_socket): Use new size-calculation macros from xterm.h when
processing ConfigureNotify events.
(x_wm_set_size_hint): Use PIXEL_TO_CHAR_WIDTH and
PIXEL_TO_CHAR_HEIGHT macros.
* ymakefile (xdisp.o): This now depends on termhooks.h.
(xterm.o): This now depends on window.h.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Thu, 24 Dec 1992 06:17:18 +0000 |
| parents | 97064c6420e7 |
| children | 9e7ec92a4fdf |
| rev | line source |
|---|---|
|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
1 ;;; reposition.el --- center a Lisp function or comment on the screen |
|
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
2 |
|
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
3 ;; Copyright (C) 1991 Free Software Foundation, Inc. |
|
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
4 |
|
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
5 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu> |
|
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
6 ;; Maintainer: FSF |
| 196 | 7 |
| 8 ;; This file is part of GNU Emacs. | |
| 9 | |
| 10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
|
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
| 196 | 13 ;; any later version. |
| 14 | |
| 15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
| 22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
| 23 | |
|
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
24 ;;; Commentary: |
|
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
25 |
|
197
590c27da44e4
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
196
diff
changeset
|
26 ;;; Written by Michael D. Ernst, mernst@theory.lcs.mit.edu, Jan 1991. |
| 196 | 27 |
| 28 ;;; Reposition-window makes an entire function definition or comment visible, | |
| 29 ;;; or, if it is already visible, places it at the top of the window; | |
| 30 ;;; additional invocations toggle the visibility of comments preceding the | |
| 31 ;;; code. For the gory details, see the documentation for reposition-window; | |
| 32 ;;; rather than reading that, you may just want to play with it. | |
| 33 | |
| 34 ;;; This tries pretty hard to do the recentering correctly; the precise | |
| 35 ;;; action depends on what the buffer looks like. If you find a situation | |
| 36 ;;; where it doesn't behave well, let me know. This function is modeled | |
| 37 ;;; after one of the same name in ZMACS, but the code is all-new and the | |
| 38 ;;; behavior in some situations differs. | |
| 39 | |
|
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
40 ;;; Code: |
|
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
658
diff
changeset
|
41 |
| 262 | 42 ;;;###autoload |
| 196 | 43 (defun reposition-window (&optional arg) |
| 44 "Make the current definition and/or comment visible. | |
| 45 Further invocations move it to the top of the window or toggle the | |
| 46 visibility of comments that precede it. | |
| 47 Point is left unchanged unless prefix ARG is supplied. | |
| 48 If the definition is fully onscreen, it is moved to the top of the | |
| 49 window. If it is partly offscreen, the window is scrolled to get the | |
| 50 definition (or as much as will fit) onscreen, unless point is in a comment | |
| 51 which is also partly offscreen, in which case the scrolling attempts to get | |
| 52 as much of the comment onscreen as possible. | |
| 53 Initially `reposition-window' attempts to make both the definition and | |
| 54 preceding comments visible. Further invocations toggle the visibility of | |
| 55 the comment lines. | |
| 56 If ARG is non-nil, point may move in order to make the whole defun | |
| 57 visible (if only part could otherwise be made so), to make the defun line | |
| 58 visible (if point is in code and it could not be made so, or if only | |
| 59 comments, including the first comment line, are visible), or to make the | |
| 60 first comment line visible (if point is in a comment)." | |
| 61 (interactive "P") | |
| 62 (let* (;; (here (save-excursion (beginning-of-line) (point))) | |
| 63 (here (point)) | |
| 64 ;; change this name once I've gotten rid of references to ht. | |
| 65 ;; this is actually the number of the last screen line | |
| 66 (ht (- (window-height (selected-window)) 2)) | |
| 67 (line (repos-count-screen-lines (window-start) (point))) | |
| 68 (comment-height | |
| 69 ;; The call to max deals with the case of cursor between defuns. | |
| 70 (max 0 | |
| 71 (repos-count-screen-lines-signed | |
| 72 ;; the beginning of the preceding comment | |
| 73 (save-excursion | |
| 74 (forward-char 1) (end-of-defun -1) | |
| 75 ;; Skip whitespace, newlines, and form feeds. | |
| 76 (re-search-forward "[^\\s \n\014]") | |
| 77 (backward-char 1) | |
| 78 (point)) | |
| 79 here))) | |
| 80 (defun-height | |
| 81 (repos-count-screen-lines-signed | |
| 82 (save-excursion | |
| 83 (end-of-defun 1) ; so comments associate with following defuns | |
| 84 (beginning-of-defun 1) | |
| 85 (point)) | |
| 86 here)) | |
| 87 ;; This must be positive, so don't use the signed version. | |
| 88 (defun-depth (repos-count-screen-lines here | |
| 89 (save-excursion | |
| 90 (end-of-defun 1) | |
| 91 (point)))) | |
| 92 (defun-line-onscreen-p | |
| 93 (and (<= defun-height line) | |
| 94 (<= (- line defun-height) ht)))) | |
| 95 (cond ((or (= comment-height line) | |
| 96 (and (= line ht) | |
| 97 (> comment-height line) | |
| 98 ;; if defun line offscreen, we should be in case 4 | |
| 99 defun-line-onscreen-p)) | |
| 100 ;; Either first comment line is at top of screen or (point at | |
| 101 ;; bottom of screen, defun line onscreen, and first comment line | |
| 102 ;; off top of screen). That is, it looks like we just did | |
| 103 ;; recenter-definition, trying to fit as much of the comment | |
| 104 ;; onscreen as possible. Put defun line at top of screen; that | |
| 105 ;; is, show as much code, and as few comments, as possible. | |
| 106 | |
| 107 (if (and arg (> defun-depth (1+ ht))) | |
| 108 ;; Can't fit whole defun onscreen without moving point. | |
| 109 (progn (end-of-defun) (beginning-of-defun) (recenter 0)) | |
| 110 (recenter (max defun-height 0))) | |
| 111 ;;(repos-debug-macro "1") | |
| 112 ) | |
| 113 | |
| 114 ((or (= defun-height line) | |
| 115 (= line 0) | |
| 116 (and (< line comment-height) | |
| 117 (< defun-height 0))) | |
| 118 ;; Defun line or cursor at top of screen, OR cursor in comment | |
| 119 ;; whose first line is offscreen. | |
| 120 ;; Avoid moving definition up even if defun runs offscreen; | |
| 121 ;; we care more about getting the comment onscreen. | |
| 122 | |
| 123 (cond ((= line ht) | |
| 124 ;; cursor on last screen line (and so in a comment) | |
| 125 (if arg (progn (end-of-defun) (beginning-of-defun))) | |
| 126 (recenter 0) | |
| 127 ;;(repos-debug-macro "2a") | |
| 128 ) | |
| 129 | |
| 130 ;; This condition, copied from case 4, may not be quite right | |
| 131 | |
| 132 ((and arg (< ht comment-height)) | |
| 133 ;; Can't get first comment line onscreen. | |
| 134 ;; Go there and try again. | |
| 135 (forward-line (- comment-height)) | |
| 136 (beginning-of-line) | |
| 137 ;; was (reposition-window) | |
| 138 (recenter 0) | |
| 139 ;;(repos-debug-macro "2b") | |
| 140 ) | |
| 141 (t | |
| 142 (recenter (min ht comment-height)) | |
| 143 ;;(repos-debug-macro "2c") | |
| 144 )) | |
| 145 ;; (recenter (min ht comment-height)) | |
| 146 ) | |
| 147 | |
| 148 ((and (> (+ line defun-depth -1) ht) | |
| 149 defun-line-onscreen-p) | |
| 150 ;; Defun runs off the bottom of the screen and the defun line | |
| 151 ;; is onscreen. | |
| 152 ;; Move the defun up. | |
| 153 (recenter (max 0 (1+ (- ht defun-depth)) defun-height)) | |
| 154 ;;(repos-debug-macro "3") | |
| 155 ) | |
| 156 | |
| 157 (t | |
| 158 ;; If on the bottom line and comment start is offscreen | |
| 159 ;; then just move all comments offscreen, or at least as | |
| 160 ;; far as they'll go. | |
| 161 | |
| 162 ;; Try to get as much of the comments onscreen as possible. | |
| 163 (if (and arg (< ht comment-height)) | |
| 164 ;; Can't get defun line onscreen; go there and try again. | |
| 165 (progn (forward-line (- defun-height)) | |
| 166 (beginning-of-line) | |
| 167 (reposition-window)) | |
| 168 (recenter (min ht comment-height))) | |
| 169 ;;(repos-debug-macro "4") | |
| 170 )))) | |
| 171 | |
| 269 | 172 ;;;###autoload |
| 906 | 173 (define-key esc-map "\C-l" 'reposition-window) |
| 264 | 174 |
| 196 | 175 ;;; Auxiliary functions |
| 176 | |
| 177 ;; Return number of screen lines between START and END. | |
| 178 (defun repos-count-screen-lines (start end) | |
| 179 (save-excursion | |
| 180 (save-restriction | |
| 181 (narrow-to-region start end) | |
| 182 (goto-char (point-min)) | |
| 183 (vertical-motion (- (point-max) (point-min)))))) | |
| 184 | |
| 185 ;; Return number of screen lines between START and END; returns a negative | |
| 186 ;; number if END precedes START. | |
| 187 (defun repos-count-screen-lines-signed (start end) | |
| 188 (let ((lines (repos-count-screen-lines start end))) | |
| 189 (if (< start end) | |
| 190 lines | |
| 191 (- lines)))) | |
| 192 | |
| 193 ; (defmacro repos-debug-macro (case-no) | |
| 194 ; (` (message | |
| 195 ; (concat "Case " (, case-no) ": %s %s %s %s %s") | |
| 196 ; ht line comment-height defun-height defun-depth))) | |
| 197 | |
|
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
269
diff
changeset
|
198 ;;; reposition.el ends here |
