Mercurial > emacs
view lisp/s-region.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
;;; 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) ;;; s-region.el ends here