Mercurial > emacs
view lisp/s-region.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 | 6fb026ad601f 375f2633d815 |
line wrap: on
line source
;;; s-region.el --- set region using shift key ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: terminals ;; Favourite-brand-of-beer: None, I hate beer. ;; 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: ;; Having loaded this code you can set the region by holding down the ;; shift key and move the cursor to the other end of the region. The ;; functionality provided by this code is similar to that provided by ;; the editors of Borland International's compilers for ms-dos. ;; Currently, s-region-move may be bound only to events that are vectors ;; of length one and whose last element is a symbol. Also, the functions ;; that are given this kind of overlay should be (interactive "p") ;; functions. ;; If the following keys are not already bound then... ;; C-insert is bound to copy-region-as-kill ;; S-delete is bound to kill-region ;; S-insert is bound to yank ;;; Code: (defvar s-region-overlay (make-overlay 1 1)) (overlay-put s-region-overlay 'face 'region) (overlay-put s-region-overlay 'priority 1000000) ; for hilit19 (defun s-region-unshift (key) "Remove shift modifier from last keypress KEY and return that as a key." (if (vectorp key) (let ((last (aref key (1- (length key))))) (if (symbolp last) (let* ((keyname (symbol-name last)) (pos (string-match "S-" keyname))) (if pos ;; We skip all initial parts of the event assuming that ;; those are setting up the prefix argument to the command. (vector (intern (concat (substring keyname 0 pos) (substring keyname (+ 2 pos))))) (error "Non-shifted key: %S" key))) (error "Key does not end in a symbol: %S" key))) (error "Non-vector key: %S" key))) (defun s-region-move-p1 (&rest arg) "This is an overlay function to point-moving keys that are interactive \"p\"" (interactive "p") (apply (function s-region-move) arg)) (defun s-region-move-p2 (&rest arg) "This is an overlay function to point-moving keys that are interactive \"P\"" (interactive "P") (apply (function s-region-move) arg)) (defun s-region-move (&rest arg) (if (if mark-active (not (equal last-command 's-region-move)) t) (set-mark-command nil) (message "")) ; delete the "Mark set" message (setq this-command 's-region-move) (apply (key-binding (s-region-unshift (this-command-keys))) arg) (move-overlay s-region-overlay (mark) (point) (current-buffer)) (sit-for 1) (delete-overlay s-region-overlay)) (defun s-region-bind (keylist &optional map) "Bind shifted keys in KEYLIST to s-region-move-p1 or s-region-move-p2. Each key in KEYLIST is shifted and bound to one of the s-region-move functions provided it is already bound to some command or other. Optional third argument MAP specifies keymap to add binding to, defaulting to global keymap." (let ((p2 (list 'scroll-up 'scroll-down 'beginning-of-buffer 'end-of-buffer))) (or map (setq map global-map)) (while keylist (let* ((key (car keylist)) (binding (key-binding key))) (if (commandp binding) (define-key map (vector (intern (concat "S-" (symbol-name (aref key 0))))) (cond ((memq binding p2) 's-region-move-p2) (t 's-region-move-p1))))) (setq keylist (cdr keylist))))) ;; Single keys (plus modifiers) only! (s-region-bind (list [right] [left] [up] [down] [C-left] [C-right] [C-up] [C-down] [M-left] [M-right] [M-up] [M-down] [next] [previous] [home] [end] [C-next] [C-previous] [C-home] [C-end] [M-next] [M-previous] [M-home] [M-end])) (or (global-key-binding [C-insert]) (global-set-key [C-insert] 'copy-region-as-kill)) (or (global-key-binding [S-delete]) (global-set-key [S-delete] 'kill-region)) (or (global-key-binding [S-insert]) (global-set-key [S-insert] 'yank)) (provide 's-region) ;;; arch-tag: a471e912-18d7-4247-a29b-2100bca180ff ;;; s-region.el ends here