annotate lisp/reposition.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 249a1455856a 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
74442
b2e5081b9320 Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 68651
diff changeset
3 ;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
5
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
6 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 906
diff changeset
7 ;; Created: Jan 1991
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
8 ;; Maintainer: FSF
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
9
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
15 ;; (at your option) any later version.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
16
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 93975
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
24
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
25 ;;; Commentary:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
26
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
27 ;; Reposition-window makes an entire function definition or comment visible,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
28 ;; or, if it is already visible, places it at the top of the window;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
29 ;; additional invocations toggle the visibility of comments preceding the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
30 ;; code. For the gory details, see the documentation for reposition-window;
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
31 ;; rather than reading that, you may just want to play with it.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
32
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
33 ;; This tries pretty hard to do the recentering correctly; the precise
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
34 ;; action depends on what the buffer looks like. If you find a situation
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
35 ;; where it doesn't behave well, let me know. This function is modeled
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
36 ;; after one of the same name in ZMACS, but the code is all-new and the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 7300
diff changeset
37 ;; behavior in some situations differs.
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
38
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
39 ;;; Code:
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 658
diff changeset
40
262
990d2229354c *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 197
diff changeset
41 ;;;###autoload
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
42 (defun reposition-window (&optional arg)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
43 "Make the current definition and/or comment visible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
44 Further invocations move it to the top of the window or toggle the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
45 visibility of comments that precede it.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
46 Point is left unchanged unless prefix ARG is supplied.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
47 If the definition is fully onscreen, it is moved to the top of the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
48 window. If it is partly offscreen, the window is scrolled to get the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
49 definition (or as much as will fit) onscreen, unless point is in a comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
50 which is also partly offscreen, in which case the scrolling attempts to get
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
51 as much of the comment onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
52 Initially `reposition-window' attempts to make both the definition and
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
53 preceding comments visible. Further invocations toggle the visibility of
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
54 the comment lines.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
55 If ARG is non-nil, point may move in order to make the whole defun
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
56 visible (if only part could otherwise be made so), to make the defun line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
57 visible (if point is in code and it could not be made so, or if only
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
58 comments, including the first comment line, are visible), or to make the
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
59 first comment line visible (if point is in a comment)."
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
60 (interactive "P")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
61 (let* (;; (here (save-excursion (beginning-of-line) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
62 (here (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
63 ;; change this name once I've gotten rid of references to ht.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
64 ;; this is actually the number of the last screen line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
65 (ht (- (window-height (selected-window)) 2))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
66 (line (repos-count-screen-lines (window-start) (point)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
67 (comment-height
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
68 ;; The call to max deals with the case of cursor between defuns.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
69 (max 0
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
70 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
71 ;; the beginning of the preceding comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
72 (save-excursion
4182
b85c00ac4ae3 (reposition-window): Don't forward-char if eobp.
Richard M. Stallman <rms@gnu.org>
parents: 2315
diff changeset
73 (if (not (eobp)) (forward-char 1))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
74 (end-of-defun -1)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
75 ;; Skip whitespace, newlines, and form feeds.
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
76 (if (re-search-forward "[^ \t\n\f]" nil t)
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
77 (backward-char 1))
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
78 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
79 here)))
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
80 (defun-height
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
81 (repos-count-screen-lines-signed
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
82 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
83 (end-of-defun 1) ; so comments associate with following defuns
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
84 (beginning-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
85 (point))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
86 here))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
87 ;; This must be positive, so don't use the signed version.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
88 (defun-depth (repos-count-screen-lines here
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
89 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
90 (end-of-defun 1)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
91 (point))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
92 (defun-line-onscreen-p
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
93 (and (<= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
94 (<= (- line defun-height) ht))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
95 (cond ((or (= comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
96 (and (= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
97 (> comment-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
98 ;; if defun line offscreen, we should be in case 4
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
99 defun-line-onscreen-p))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
100 ;; Either first comment line is at top of screen or (point at
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
101 ;; bottom of screen, defun line onscreen, and first comment line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
102 ;; off top of screen). That is, it looks like we just did
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
103 ;; recenter-definition, trying to fit as much of the comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
104 ;; onscreen as possible. Put defun line at top of screen; that
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
105 ;; is, show as much code, and as few comments, as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
106
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
107 (if (and arg (> defun-depth (1+ ht)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
108 ;; Can't fit whole defun onscreen without moving point.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
109 (progn (end-of-defun) (beginning-of-defun) (recenter 0))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
110 (recenter (max defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
111 ;;(repos-debug-macro "1")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
112 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
113
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
114 ((or (= defun-height line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
115 (= line 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
116 (and (< line comment-height)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
117 (< defun-height 0)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
118 ;; Defun line or cursor at top of screen, OR cursor in comment
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
119 ;; whose first line is offscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
120 ;; Avoid moving definition up even if defun runs offscreen;
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
121 ;; we care more about getting the comment onscreen.
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
122
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
123 (cond ((= line ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
124 ;; cursor on last screen line (and so in a comment)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
125 (if arg (progn (end-of-defun) (beginning-of-defun)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
126 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
127 ;;(repos-debug-macro "2a")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
128 )
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
129
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
130 ;; This condition, copied from case 4, may not be quite right
5290
fee2ab7de353 (reposition-window): Fix whitespace-skipping regexp.
Richard M. Stallman <rms@gnu.org>
parents: 4182
diff changeset
131
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
132 ((and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
133 ;; Can't get first comment line onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
134 ;; Go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
135 (forward-line (- comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
136 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
137 ;; was (reposition-window)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
138 (recenter 0)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
139 ;;(repos-debug-macro "2b")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
140 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
141 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
142 (recenter (min ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
143 ;;(repos-debug-macro "2c")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
144 ))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
145 ;; (recenter (min ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
146 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
147
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
148 ((and (> (+ line defun-depth -1) ht)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
149 defun-line-onscreen-p)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
150 ;; Defun runs off the bottom of the screen and the defun line
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
151 ;; is onscreen.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
152 ;; Move the defun up.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
153 (recenter (max 0 (1+ (- ht defun-depth)) defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
154 ;;(repos-debug-macro "3")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
155 )
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
156
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
157 (t
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
158 ;; If on the bottom line and comment start is offscreen
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
159 ;; then just move all comments offscreen, or at least as
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
160 ;; far as they'll go.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
161
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
162 ;; Try to get as much of the comments onscreen as possible.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
163 (if (and arg (< ht comment-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
164 ;; Can't get defun line onscreen; go there and try again.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
165 (progn (forward-line (- defun-height))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
166 (beginning-of-line)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
167 (reposition-window))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
168 (recenter (min ht comment-height)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
169 ;;(repos-debug-macro "4")
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
170 ))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
171
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
172 ;;; Auxiliary functions
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
173
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
174 ;; Return number of screen lines between START and END.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
175 (defun repos-count-screen-lines (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
176 (save-excursion
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
177 (save-restriction
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
178 (narrow-to-region start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
179 (goto-char (point-min))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
180 (vertical-motion (- (point-max) (point-min))))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
181
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
182 ;; Return number of screen lines between START and END; returns a negative
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
183 ;; number if END precedes START.
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
184 (defun repos-count-screen-lines-signed (start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
185 (let ((lines (repos-count-screen-lines start end)))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
186 (if (< start end)
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
187 lines
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
188 (- lines))))
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
189
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
190 ;; (defmacro repos-debug-macro (case-no)
41611
64ee9a4a698e Converted backquote to the new style (in comments).
Sam Steingold <sds@gnu.org>
parents: 18383
diff changeset
191 ;; `(message (concat "Case " ,case-no ": %s %s %s %s %s")
64ee9a4a698e Converted backquote to the new style (in comments).
Sam Steingold <sds@gnu.org>
parents: 18383
diff changeset
192 ;; ht line comment-height defun-height defun-depth))
18383
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
193
11218164bc54 Add provide call.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
194 (provide 'reposition)
196
cb231c9208d8 Initial revision
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
195
93975
1e3a407766b9 Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 79721
diff changeset
196 ;; arch-tag: 79487039-3bd7-4ab5-a3e8-ecf3b4919010
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 269
diff changeset
197 ;;; reposition.el ends here