Mercurial > emacs
view lisp/s-region.el @ 106768:21fd634f447a
Make line<->pixel_y conversion macros aware of native menu/tool bars.
They are placed above the internal border. This supersedes special
treatment of native tool bars in the display code.
This fixes wrong display position of native menu bars and bogus mouse
highlighting of native tool bars, both of which can be found when
internal border width is large. Also it fixes wrong flashed part on
visible bell with native menu bars.
* frame.h (FRAME_TOP_MARGIN_HEIGHT): New macro.
(FRAME_LINE_TO_PIXEL_Y, FRAME_PIXEL_Y_TO_LINE): Take account of pseudo
windows above internal border.
* window.h (WINDOW_MENU_BAR_P, WINDOW_TOOL_BAR_P): New macros.
(WINDOW_TOP_EDGE_Y, WINDOW_BOTTOM_EDGE_Y): Take account of pseudo
windows above internal border.
* xdisp.c (get_glyph_string_clip_rects, init_glyph_string): Don't treat
tool bar windows specially.
* xfns.c (x_set_tool_bar_lines): Take account of menu bar height.
* xterm.c (x_after_update_window_line): Don't treat tool bar windows
specially.
(XTflash): Take account of menu bar height.
* w32term.c (x_after_update_window_line): Don't treat tool bar windows
specially.
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
---|---|
date | Sat, 09 Jan 2010 13:16:32 +0900 |
parents | a9dc0e7c3f2b |
children | 1d1d5d9bd884 |
line wrap: on
line source
;;; s-region.el --- set region using shift key ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006, 2007, 2008, 2009 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. ;;; 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 second 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