Mercurial > hg > xemacs-beta
view lisp/x-scrollbar.el @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Sep 2012 14:31:40 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
;;; x-scrollbar.el --- scrollbar resourcing and such. ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Sun Microsystems. ;; Copyright (C) 1995, 1996 Ben Wing. ;; Author: Ben Wing <ben@xemacs.org> ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs 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. ;; XEmacs 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 XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not synched. ;;; Commentary: ;; This file is dumped with XEmacs (when X and menubar support is compiled in). ;;; Code: (globally-declare-fboundp '(x-init-specifier-from-resources x-get-resource)) (defun x-init-scrollbar-from-resources (locale) (x-init-specifier-from-resources (specifier-fallback scrollbar-width) 'natnum locale '("scrollBarWidth" . "ScrollBarWidth") ;; The name strings are wrong, but the scrollbar name is ;; non-deterministic so it is a poor way to set a resource ;; for the scrollbar anyhow. (cond ((featurep 'athena-scrollbars) '("scrollbar.thickness" . "ScrollBar.Thickness")) ((featurep 'lucid-scrollbars) '("scrollbar.width" . "XlwScrollBar.Width")) ((featurep 'motif-scrollbars) '("scrollbar.width" . "XmScrollBar.Width")))) ;; Athena scrollbars accept either 'thickness' or 'width'. ;; If any of the previous resources succeeded, the following ;; call does nothing; so there's no harm in doing it all the ;; time. (if (featurep 'athena-scrollbars) (x-init-specifier-from-resources (specifier-fallback scrollbar-width) 'natnum locale '("scrollbar.width" . "ScrollBar.Width"))) ;; lather, rinse, repeat. (x-init-specifier-from-resources (specifier-fallback scrollbar-height) 'natnum locale '("scrollBarHeight" . "ScrollBarHeight") ;; The name strings are wrong, but the scrollbar name is ;; non-deterministic so it is a poor way to set a resource ;; for the scrollbar anyhow. (cond ((featurep 'athena-scrollbars) '("scrollbar.thickness" . "ScrollBar.Thickness")) ((featurep 'lucid-scrollbars) '("scrollbar.height" . "XlwScrollBar.Height")) ((featurep 'motif-scrollbars) '("scrollbar.height" . "XmScrollBar.Height")))) ;; Athena scrollbars accept either 'thickness' or 'height'. ;; If any of the previous resources succeeded, the following ;; call does nothing; so there's no harm in doing it all the ;; time. (if (featurep 'athena-scrollbars) (x-init-specifier-from-resources (specifier-fallback scrollbar-height) 'natnum locale '("scrollbar.height" . "ScrollBar.Height"))) ;; Now do ScrollBarPlacement.scrollBarPlacement (let ((case-fold-search t) (resval (x-get-resource "ScrollBarPlacement" "scrollBarPlacement" 'string locale nil 'warn))) (cond ((null resval)) ((string-match "^top[_-]left$" resval) (set-specifier scrollbar-on-top-p t locale) (set-specifier scrollbar-on-left-p t locale)) ((string-match "^top[_-]right$" resval) (set-specifier scrollbar-on-top-p t locale) (set-specifier scrollbar-on-left-p nil locale)) ((string-match "^bottom[_-]left$" resval) (set-specifier scrollbar-on-top-p nil locale) (set-specifier scrollbar-on-left-p t locale)) ((string-match "^bottom[_-]right$" resval) (set-specifier scrollbar-on-top-p nil locale) (set-specifier scrollbar-on-left-p nil locale)) (t (display-warning 'resource (format "Illegal value '%s' for scrollBarPlacement resource" resval))))) ) ;;; x-scrollbar.el ends here
