Mercurial > emacs
annotate lisp/emacs-lisp/helper.el @ 83004:7900111db01c
Converted display hooks to be display-local. Plus many bugfixes.
lib-src/emacsclient.c (window_change_signal): Renamed to pass_signal_to_emacs.
(init_signal): Pass SIGINT and SIGQUIT to the emacs process.
lisp/faces.el (face-valid-attribute-values): Use the window-system
function, not the variable.
(read-face-attribute, face-spec-set-match-display, frame-set-background-mode)
(face-set-after-frame-default): Ditto.
lisp/frame.el (make-frame-on-tty): Added interactive declaration
(suggested by Robert J. Chassell). Use tty-create-frame-with-faces,
not make-terminal-frame.
src/termhooks.h (struct display_method): Renamed to display for brevity.
(struct display): Added all display hook variables as members of this structure.
Added next_display, reference_count, type and display_info components.
(FRAME_MUST_WRITE_SPACES, FRAME_FAST_CLEAR_END_OF_LINE, FRAME_LINE_INS_DEL_OK)
(FRAME_CHAR_INS_DEL_OK, FRAME_SCROLL_REGION_OK, FRAME_SCROLL_REGION_COST)
(FRAME_MEMORY_BELOW_FRAME, FRAME_RIF): Updated for struct display.
(FRAME_DISPLAY): New macro.
(create_display, delete_display): New prototypes.
src/frame.h (struct frame): Added `display' member, removed display_method.
(FRAME_LIVE_P): Look at f->display, not f->output_data.
src/termchar.h (struct tty_display_info): Removed display_method component.
(FRAME_TTY): Use the display structure, not output_data.
src/term.c (display_list): New variable.
(cursor_to_hook, raw_cursor_to_hook, clear_to_end_hook, clear_frame_hook)
(clear_end_of_line_hook, ins_del_lines_hook, delete_glyphs_hook)
(ring_bell_hook, reset_terminal_modes_hook, set_terminal_modes_hook)
(update_begin_hook, update_end_hook, set_terminal_window_hook)
(insert_glyphs_hook, write_glyphs_hook, delete_glyphs_hoo, read_socket_hook)
(frame_up_to_date_hook, mouse_position_hook, frame_rehighlight_hook)
(frame_raise_lower_hook, set_vertical_scroll_bar_hook, condemn_scroll_bars_hook)
(redeem_scroll_bar_hook, judge_scroll_bars_hook): Moved to struct display.
(tty_display_method_template): Removed.
(syms_of_term): Don't initialize tty_display_method_template.
(ring_bell, set_terminal_modes, reset_terminal_modes, update_begin)
(update_end, set_terminal_window, cursor_to, raw_cursor_to, clear_to_end)
(clear_frame, clear_end_of_line, write_glyphs, insert_glyphs)
(delete_glyphs, ins_del_lines): Access display hooks through the frame pointer.
(Ftty_display_color_p): Use the frame given as a parameter, or else return nil.
(Ftty_display_color_cells): Ditto.
(get_named_tty): Renamed to get_named_tty_display, changed return type to struct display.
(term_dummy_init): Renamed to initial_term_init. Create and return an initial display.
(term_init): Initialize a new struct display and return a pointer to
it instead of tty_display_info. Removed frame initialization kludge.
(Fdelete_tty): Updated for struct display.
(delete_tty): The parameter type is now struct display, not tty_display_info.
Delete the display, too.
(create_tty_output): New function for creating tty_output structures.
(delete_tty_output): New function for deleting tty_output structures.
(create_display): New function for creating and registering display structures.
(delete_display): New function for deleting and unregistering display structures.
src/dispextern.h: Updated prototypes.
src/dispnew.c: Include frame.h before termhooks.h.
(init_display): Updated term_init call to new signature.
src/emacs.c: Include frame.h (for termhooks.h).
src/keymap.c: Ditto.
src/lread.c: Ditto.
src/xsmfns.c: Ditto.
src/process.c: Include frame.h before termhooks.h.
src/frame.c (Fwindow_system): New function.
(syms_of_frame): Initialize it.
(make_terminal_frame): Open the terminal device before creating the new frame.
Disable scrollbars here, term_init cannot do that anymore.
(Fdelete_frame): Use the new delete_frame_hook, don't do display-specific
frame deletion here. Ditto for delete_display_hook.
(Fmouse_position, Fmouse_pixel_position, Fraise_frame, Flower_frame)
(Fredirect_frame_focus): Access display hooks through the frame pointer.
src/keyboard.c: Include frame.h before termhooks.h.
(start_polling, input_polling_used, stop_polling, gobble_input): Ignore read_socket_hook.
(kbd_buffer_get_event, Fset_input_mode): Access display hooks through the frame pointer.
(read_avail_input): Loop through all display devices for and call all read_socket_hook functions. Check ttys even if read_socket_hook returned an error.
src/sysdep.c (discard_tty_input): Ignore read_socket_hook.
(stuff_char): Don't do anything if the current frame is not on a termcap display.
(request_sigio, unrequest_sigio): Ignore read_socket_hook.
(init_sys_modes): Always call narrow_foreground_group. Set up terminal modes and sigio even under X.
src/xdisp.c (message2_nolog, message3_nolog, redisplay_internal)
(set_vertical_scroll_bar, redisplay_window): Access display hooks through the frame pointer.
(echo_area_display): Don't be afraid of termcap frames during an X+tty combo session.
src/xfaces.c: Include termhooks.h.
(Ftty_supports_face_attributes_p): Use the given frame, not selected_frame.
src/xfns.c (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Access display hooks through the frame pointer.
(Fx_create_frame, x_create_tip_frame): Initialize the frame's display structure.
src/xmenu.c: Include termhooks.h after frame.h.
src/xselect.c (x_own_selection, some_frame_on_display, x_get_foreign_selection)
(Fx_disown_selection_internal, Fx_get_cut_buffer_internal)
(Fx_store_cut_buffer_internal, Fx_rotate_cut_buffers_internal): Don't do anything
if the selected frame is not an X frame.
src/xterm.c (x_display_method): Removed.
(x_create_frame_display, x_delete_frame_display): New functions for handling struct display objects.
(x_term_init): Set up a new struct display object, too.
(x_delete_display): Delete the struct display corresponding to the X display.
(x_initialize): Moved hook initialization to x_create_frame_display.
src/xterm.h (x_display_method): Removed.
(struct x_display_info): Added frame_display component.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-44
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 05 Jan 2004 05:54:35 +0000 |
parents | 695cf19ef79e |
children | 18a818a2ee7c 375f2633d815 |
rev | line source |
---|---|
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
1 ;;; helper.el --- utility help package supporting help in electric modes |
36 | 2 |
845 | 3 ;; Copyright (C) 1985 Free Software Foundation, Inc. |
4 | |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
660
diff
changeset
|
5 ;; Author: K. Shane Hartman |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
660
diff
changeset
|
6 ;; Maintainer: FSF |
811
e694e0879463
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
7 ;; Keywords: help |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
660
diff
changeset
|
8 |
36 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; 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:
660
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
36 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
36 | 25 |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
27854
diff
changeset
|
26 ;;; Commentary: |
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
27854
diff
changeset
|
27 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
660
diff
changeset
|
28 ;;; Code: |
36 | 29 |
14169 | 30 ;; hey, here's a helping hand. |
36 | 31 |
32 ;; Bind this to a string for <blank> in "... Other keys <blank>". | |
33 ;; Helper-help uses this to construct help string when scrolling. | |
34 ;; Defaults to "return" | |
35 (defvar Helper-return-blurb nil) | |
36 | |
37 ;; Keymap implementation doesn't work too well for non-standard loops. | |
38 ;; But define it anyway for those who can use it. Non-standard loops | |
39 ;; will probably have to use Helper-help. You can't autoload the | |
40 ;; keymap either. | |
41 | |
42 | |
43 (defvar Helper-help-map nil) | |
44 (if Helper-help-map | |
45 nil | |
46 (setq Helper-help-map (make-keymap)) | |
47 ;(fillarray Helper-help-map 'undefined) | |
48 (define-key Helper-help-map "m" 'Helper-describe-mode) | |
49 (define-key Helper-help-map "b" 'Helper-describe-bindings) | |
50 (define-key Helper-help-map "c" 'Helper-describe-key-briefly) | |
51 (define-key Helper-help-map "k" 'Helper-describe-key) | |
52 ;(define-key Helper-help-map "f" 'Helper-describe-function) | |
53 ;(define-key Helper-help-map "v" 'Helper-describe-variable) | |
54 (define-key Helper-help-map "?" 'Helper-help-options) | |
55 (define-key Helper-help-map (char-to-string help-char) 'Helper-help-options) | |
56 (fset 'Helper-help-map Helper-help-map)) | |
57 | |
58 (defun Helper-help-scroller () | |
59 (let ((blurb (or (and (boundp 'Helper-return-blurb) | |
60 Helper-return-blurb) | |
61 "return"))) | |
62 (save-window-excursion | |
63 (goto-char (window-start (selected-window))) | |
64 (if (get-buffer-window "*Help*") | |
65 (pop-to-buffer "*Help*") | |
66 (switch-to-buffer "*Help*")) | |
67 (goto-char (point-min)) | |
68 (let ((continue t) state) | |
69 (while continue | |
70 (setq state (+ (* 2 (if (pos-visible-in-window-p (point-max)) 1 0)) | |
71 (if (pos-visible-in-window-p (point-min)) 1 0))) | |
72 (message | |
73 (nth state | |
74 '("Space forward, Delete back. Other keys %s" | |
75 "Space scrolls forward. Other keys %s" | |
76 "Delete scrolls back. Other keys %s" | |
77 "Type anything to %s")) | |
78 blurb) | |
79 (setq continue (read-char)) | |
49843
e77b1b1735f4
(Helper-help-scroller): Fix character constant.
Juanma Barranquero <lekktu@gmail.com>
parents:
38412
diff
changeset
|
80 (cond ((and (memq continue '(?\s ?\C-v)) (< state 2)) |
36 | 81 (scroll-up)) |
82 ((= continue ?\C-l) | |
83 (recenter)) | |
84 ((and (= continue ?\177) (zerop (% state 2))) | |
85 (scroll-down)) | |
86 (t (setq continue nil)))))))) | |
87 | |
88 (defun Helper-help-options () | |
89 "Describe help options." | |
90 (interactive) | |
91 (message "c (key briefly), m (mode), k (key), b (bindings)") | |
92 ;(message "c (key briefly), m (mode), k (key), v (variable), f (function)") | |
93 (sit-for 4)) | |
94 | |
95 (defun Helper-describe-key-briefly (key) | |
208 | 96 "Briefly describe binding of KEY." |
36 | 97 (interactive "kDescribe key briefly: ") |
98 (describe-key-briefly key) | |
99 (sit-for 4)) | |
100 | |
101 (defun Helper-describe-key (key) | |
208 | 102 "Describe binding of KEY." |
36 | 103 (interactive "kDescribe key: ") |
104 (save-window-excursion (describe-key key)) | |
105 (Helper-help-scroller)) | |
106 | |
107 (defun Helper-describe-function () | |
108 "Describe a function. Name read interactively." | |
109 (interactive) | |
110 (save-window-excursion (call-interactively 'describe-function)) | |
111 (Helper-help-scroller)) | |
112 | |
113 (defun Helper-describe-variable () | |
114 "Describe a variable. Name read interactively." | |
115 (interactive) | |
116 (save-window-excursion (call-interactively 'describe-variable)) | |
117 (Helper-help-scroller)) | |
118 | |
119 (defun Helper-describe-mode () | |
120 "Describe the current mode." | |
121 (interactive) | |
122 (let ((name mode-name) | |
123 (documentation (documentation major-mode))) | |
124 (save-excursion | |
125 (set-buffer (get-buffer-create "*Help*")) | |
27854
cc746270613e
(Helper-describe-mode): Make buffer writable.
Gerd Moellmann <gerd@gnu.org>
parents:
14169
diff
changeset
|
126 (setq buffer-read-only nil) |
36 | 127 (erase-buffer) |
9853
2018a5a1da69
(Helper-describe-mode): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
845
diff
changeset
|
128 (insert name " Mode\n" documentation) |
2018a5a1da69
(Helper-describe-mode): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents:
845
diff
changeset
|
129 (help-mode))) |
36 | 130 (Helper-help-scroller)) |
131 | |
258 | 132 ;;;###autoload |
36 | 133 (defun Helper-describe-bindings () |
134 "Describe local key bindings of current mode." | |
135 (interactive) | |
136 (message "Making binding list...") | |
137 (save-window-excursion (describe-bindings)) | |
138 (Helper-help-scroller)) | |
139 | |
258 | 140 ;;;###autoload |
36 | 141 (defun Helper-help () |
142 "Provide help for current mode." | |
143 (interactive) | |
144 (let ((continue t) c) | |
145 (while continue | |
146 (message "Help (Type ? for further options)") | |
11758
eb208ec6d216
(Helper-help): Use read-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents:
9853
diff
changeset
|
147 (setq c (read-key-sequence nil)) |
36 | 148 (setq c (lookup-key Helper-help-map c)) |
149 (cond ((eq c 'Helper-help-options) | |
150 (Helper-help-options)) | |
151 ((commandp c) | |
152 (call-interactively c) | |
153 (setq continue nil)) | |
154 (t | |
155 (ding) | |
156 (setq continue nil)))))) | |
157 | |
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
158 (provide 'helper) |
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
159 |
52401 | 160 ;;; arch-tag: a0984577-d3e9-4124-ae0d-c46fe740f6a9 |
660
08eb386dd0f3
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
161 ;;; helper.el ends here |