Mercurial > hg > xemacs-beta
annotate lisp/keymap.el @ 5908:6174848f3e6c
Use parse_integer() in read_atom(); support bases with ratios like integers
src/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* data.c (init_errors_once_early):
Move the Qunsupported_type here from numbers.c, so it's available
when the majority of our types are not supported.
* general-slots.h: Add it here, too.
* number.c: Remove the definition of Qunsupported_type from here.
* lread.c (read_atom):
Check if the first character could reflect a rational, if so, call
parse_integer(), don't check the syntax of the other
characters. This allows us to accept the non-ASCII digit
characters too.
If that worked partially, but not completely, and the next char is
a slash, try to parse as a ratio.
If that fails, try isfloat_string(), but only if the first
character could plausibly be part of a float.
Otherwise, treat as a symbol.
* lread.c (read_rational):
Rename from read_integer. Handle ratios with the same radix
specification as was used for integers.
* lread.c (read1):
Rename read_integer in this function. Support the Common Lisp
#NNNrMMM syntax for parsing a number MMM of arbitrary radix NNN.
man/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* lispref/numbers.texi (Numbers):
Describe the newly-supported arbitrary-base syntax for rationals
(integers and ratios). Describe that ratios can take the same base
specification as integers, something also new.
tests/ChangeLog addition:
2015-05-08 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-reader-tests.el:
Check the arbitrary-base integer reader syntax support, just
added. Check the reader base support for ratios, just added.
Check the non-ASCII-digit support in the reader, just added.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sat, 09 May 2015 00:40:57 +0100 |
| parents | c87b776ab0e1 |
| children |
| rev | line source |
|---|---|
| 428 | 1 ;; keymap.el --- Keymap functions for XEmacs. |
| 2 | |
| 3 ;; Copyright (C) 1993-4, 1997 Free Software Foundation, Inc. | |
| 4 ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. | |
| 1333 | 5 ;; Copyright (C) 2003 Ben Wing. |
| 428 | 6 |
| 7 ;; Maintainer: XEmacs Development Team | |
| 8 ;; Keywords: internals, dumped | |
| 9 | |
| 10 ;; This file is part of XEmacs. | |
| 11 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
12 ;; XEmacs is free software: you can redistribute it and/or modify it |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
13 ;; under the terms of the GNU General Public License as published by the |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
14 ;; Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
15 ;; option) any later version. |
| 428 | 16 |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
17 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
18 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
19 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
20 ;; for more details. |
| 428 | 21 |
| 22 ;; You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
2828
diff
changeset
|
23 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
| 428 | 24 |
| 25 ;;; Synched up with: FSF 19.28. | |
| 26 | |
| 27 ;;; Commentary: | |
| 28 | |
| 29 ;; This file is dumped with XEmacs. | |
| 30 | |
| 31 ;;; Note: FSF does not have a file keymap.el. This stuff is | |
| 32 ;;; in keymap.c. | |
| 33 | |
| 34 ;Prevent the \{...} documentation construct | |
| 35 ;from mentioning keys that run this command. | |
| 36 | |
| 37 ;;; Code: | |
| 38 | |
| 1333 | 39 ;; BEGIN SYNCHED WITH FSF 21.2. |
| 428 | 40 |
| 41 (defun undefined () | |
| 42 (interactive) | |
| 43 (ding)) | |
| 44 | |
| 1333 | 45 ;Prevent the \{...} documentation construct |
| 46 ;from mentioning keys that run this command. | |
| 47 (put 'undefined 'suppress-keymap t) | |
| 428 | 48 |
| 49 (defun suppress-keymap (map &optional nodigits) | |
| 50 "Make MAP override all normally self-inserting keys to be undefined. | |
| 51 Normally, as an exception, digits and minus-sign are set to make prefix args, | |
| 52 but optional second arg NODIGITS non-nil treats them like other chars." | |
| 53 (substitute-key-definition 'self-insert-command 'undefined map global-map) | |
| 54 (or nodigits | |
| 55 (let ((string (make-string 1 ?0))) | |
| 56 (define-key map "-" 'negative-argument) | |
| 57 ;; Make plain numbers do numeric args. | |
| 58 (while (<= (aref string 0) ?9) | |
| 59 (define-key map string 'digit-argument) | |
| 60 (incf (aref string 0)))))) | |
| 61 | |
| 1333 | 62 ;Unneeded in XEmacs (defvar key-substitution-in-progress nil |
| 63 | |
| 428 | 64 (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) |
| 65 "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. | |
| 66 In other words, OLDDEF is replaced with NEWDEF wherever it appears. | |
| 67 Prefix keymaps are checked recursively. If optional fourth argument OLDMAP | |
| 68 is specified, we redefine in KEYMAP as NEWDEF those chars which are defined | |
| 444 | 69 as OLDDEF in OLDMAP, unless that keybinding is already present in KEYMAP. |
| 70 If optional fifth argument PREFIX is non-nil, then only those occurrences of | |
| 428 | 71 OLDDEF found in keymaps accessible through the keymap bound to PREFIX in |
| 72 KEYMAP are redefined. See also `accessible-keymaps'." | |
| 73 (let ((maps (accessible-keymaps (or oldmap keymap) prefix)) | |
| 74 (shadowing (not (null oldmap))) | |
| 75 prefix map) | |
| 76 (while maps | |
| 77 (setq prefix (car (car maps)) | |
| 78 map (cdr (car maps)) | |
| 79 maps (cdr maps)) | |
| 80 ;; Substitute in this keymap | |
| 81 (map-keymap #'(lambda (key binding) | |
| 1333 | 82 (if (or (eq binding olddef) |
| 83 ;; Compare with equal if definition is a key | |
| 84 ;; sequence. That is useful for operating on | |
| 85 ;; function-key-map. | |
| 86 (and (or (stringp binding) (vectorp binding)) | |
| 87 (equal binding olddef))) | |
| 428 | 88 ;; The new bindings always go in KEYMAP even if we |
| 89 ;; found them in OLDMAP or one of its children. | |
| 90 ;; If KEYMAP will be shadowing OLDMAP, then do not | |
| 91 ;; redefine the key if there is another binding | |
| 92 ;; in KEYMAP that will shadow OLDDEF. | |
| 93 (or (and shadowing | |
| 94 (lookup-key keymap key)) | |
| 95 ;; define-key will give an error if a prefix | |
| 96 ;; of the key is already defined. Otherwise | |
| 97 ;; it will define the key in the map. | |
| 98 ;; #### - Perhaps this should be protected? | |
| 99 (define-key | |
| 100 keymap | |
| 101 (vconcat prefix (list key)) | |
| 102 newdef)))) | |
| 103 map) | |
| 104 ))) | |
| 105 | |
| 1333 | 106 ;; FSF garbage. They misguidedly tried to put menu entries into keymaps, |
| 107 ;; and needed stuff like the following. Eventually they admitted defeat | |
| 108 ;; and switched to our method. | |
| 109 | |
| 110 ; (defun define-key-after (keymap key definition &optional after) | |
| 111 ; "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding. | |
| 112 ; This is like `define-key' except that the binding for KEY is placed | |
| 113 ; just after the binding for the event AFTER, instead of at the beginning | |
| 114 ; of the map. Note that AFTER must be an event type (like KEY), NOT a command | |
| 115 ; \(like DEFINITION). | |
| 116 ; | |
| 117 ; If AFTER is t or omitted, the new binding goes at the end of the keymap. | |
| 118 ; | |
| 119 ; KEY must contain just one event type--that is to say, it must be a | |
| 120 ; string or vector of length 1, but AFTER should be a single event | |
| 121 ; type--a symbol or a character, not a sequence. | |
| 122 ; | |
| 123 ; Bindings are always added before any inherited map. | |
| 124 ; | |
| 125 ; The order of bindings in a keymap matters when it is used as a menu." | |
| 126 | |
| 127 (defmacro kbd (keys) | |
| 128 "Convert KEYS to the internal Emacs key representation. | |
| 129 KEYS should be a string constant in the format used for | |
| 130 saving keyboard macros (see `insert-kbd-macro')." | |
| 131 (if (or (stringp keys) | |
| 132 (vectorp keys)) | |
| 133 ;; #### need to move xemacs-base into the core!!!!!! | |
| 134 (declare-fboundp (read-kbd-macro keys)) | |
| 135 `(declare-fboundp (read-kbd-macro ,keys)))) | |
| 136 | |
| 137 ;; END SYNCHED WITH FSF 21.2. | |
| 428 | 138 |
| 139 ;; This used to wrap forms into an interactive lambda. It is unclear | |
| 140 ;; to me why this is needed in this function. Anyway, | |
| 141 ;; `key-or-menu-binding' doesn't do it, so this function no longer | |
| 142 ;; does it, either. | |
| 143 (defun insert-key-binding (key) ; modeled after describe-key | |
| 144 "Insert the command bound to KEY." | |
| 145 (interactive "kInsert command bound to key: ") | |
| 146 (let ((defn (key-or-menu-binding key))) | |
| 147 (if (or (null defn) (integerp defn)) | |
| 148 (error "%s is undefined" (key-description key)) | |
| 149 (if (or (stringp defn) (vectorp defn)) | |
| 150 (setq defn (key-binding defn))) ;; a keyboard macro | |
| 151 (insert (format "%s" defn))))) | |
| 152 | |
| 153 (defun read-command-or-command-sexp (prompt) | |
| 154 "Read a command symbol or command sexp. | |
| 155 A command sexp is wrapped in an interactive lambda if needed. | |
| 156 Prompts with PROMPT." | |
| 157 ;; Todo: it would be better if we could reject symbols that are not | |
| 158 ;; commandp (as does 'read-command') but that is not easy to do | |
| 159 ;; because we must supply arg4 = require-match = nil for sexp case. | |
| 160 (let ((result (car (read-from-string | |
| 161 (completing-read prompt obarray 'commandp))))) | |
| 162 (if (and (consp result) | |
| 163 (not (eq (car result) 'lambda))) | |
| 164 `(lambda () | |
| 165 (interactive) | |
| 166 ,result) | |
| 167 result))) | |
| 168 | |
| 444 | 169 (defun local-key-binding (keys &optional accept-defaults) |
| 428 | 170 "Return the binding for command KEYS in current local keymap only. |
| 171 KEYS is a string, a vector of events, or a vector of key-description lists | |
| 172 as described in the documentation for the `define-key' function. | |
| 173 The binding is probably a symbol with a function definition; see | |
| 174 the documentation for `lookup-key' for more information." | |
| 175 (let ((map (current-local-map))) | |
| 176 (if map | |
| 444 | 177 (lookup-key map keys accept-defaults) |
| 428 | 178 nil))) |
| 179 | |
| 444 | 180 (defun global-key-binding (keys &optional accept-defaults) |
| 428 | 181 "Return the binding for command KEYS in current global keymap only. |
| 182 KEYS is a string or vector of events, a sequence of keystrokes. | |
| 183 The binding is probably a symbol with a function definition; see | |
| 184 the documentation for `lookup-key' for more information." | |
| 444 | 185 (lookup-key (current-global-map) keys accept-defaults)) |
| 428 | 186 |
| 187 (defun global-set-key (key command) | |
| 188 "Give KEY a global binding as COMMAND. | |
| 189 COMMAND is a symbol naming an interactively-callable function. | |
| 190 KEY is a string, a vector of events, or a vector of key-description lists | |
| 191 as described in the documentation for the `define-key' function. | |
| 192 Note that if KEY has a local binding in the current buffer | |
| 193 that local binding will continue to shadow any global binding." | |
| 194 ;;(interactive "KSet key globally: \nCSet key %s to command: ") | |
| 195 (interactive (list (setq key (read-key-sequence "Set key globally: ")) | |
| 196 ;; Command sexps are allowed here so that this arg | |
| 197 ;; may be supplied interactively via insert-key-binding. | |
| 198 (read-command-or-command-sexp | |
| 199 (format "Set key %s to command: " | |
| 200 (key-description key))))) | |
| 201 (define-key (current-global-map) key command) | |
| 202 nil) | |
| 203 | |
| 204 (defun local-set-key (key command) | |
| 205 "Give KEY a local binding as COMMAND. | |
| 206 COMMAND is a symbol naming an interactively-callable function. | |
| 207 KEY is a string, a vector of events, or a vector of key-description lists | |
| 208 as described in the documentation for the `define-key' function. | |
| 209 The binding goes in the current buffer's local map, | |
| 210 which is shared with other buffers in the same major mode." | |
| 211 ;;(interactive "KSet key locally: \nCSet key %s locally to command: ") | |
| 212 (interactive (list (setq key (read-key-sequence "Set key locally: ")) | |
| 213 ;; Command sexps are allowed here so that this arg | |
| 214 ;; may be supplied interactively via insert-key-binding. | |
| 215 (read-command-or-command-sexp | |
| 216 (format "Set key %s locally to command: " | |
| 217 (key-description key))))) | |
| 218 (if (null (current-local-map)) | |
| 219 (use-local-map (make-sparse-keymap))) | |
| 220 (define-key (current-local-map) key command) | |
| 221 nil) | |
| 222 | |
| 223 (defun global-unset-key (key) | |
| 224 "Remove global binding of KEY. | |
| 225 KEY is a string, a vector of events, or a vector of key-description lists | |
| 226 as described in the documentation for the `define-key' function." | |
| 227 (interactive "kUnset key globally: ") | |
| 228 (global-set-key key nil)) | |
| 229 | |
| 230 (defun local-unset-key (key) | |
| 231 "Remove local binding of KEY. | |
| 232 KEY is a string, a vector of events, or a vector of key-description lists | |
| 233 as described in the documentation for the `define-key' function." | |
| 234 (interactive "kUnset key locally: ") | |
| 235 (if (current-local-map) | |
| 236 (define-key (current-local-map) key nil))) | |
| 237 | |
| 238 | |
| 239 ;; FSF-inherited brain-death. | |
| 240 (defun minor-mode-key-binding (key &optional accept-default) | |
| 241 "Find the visible minor mode bindings of KEY. | |
| 242 Return an alist of pairs (MODENAME . BINDING), where MODENAME is | |
| 243 the symbol which names the minor mode binding KEY, and BINDING is | |
| 244 KEY's definition in that mode. In particular, if KEY has no | |
| 245 minor-mode bindings, return nil. If the first binding is a | |
| 246 non-prefix, all subsequent bindings will be omitted, since they would | |
| 247 be ignored. Similarly, the list doesn't include non-prefix bindings | |
| 248 that come after prefix bindings. | |
| 249 | |
| 250 If optional argument ACCEPT-DEFAULT is non-nil, recognize default | |
| 251 bindings; see the description of `lookup-key' for more details about this." | |
| 252 (let ((tail minor-mode-map-alist) | |
| 253 a s v) | |
| 254 (while tail | |
| 255 (setq a (car tail) | |
| 256 tail (cdr tail)) | |
| 257 (and (consp a) | |
| 258 (symbolp (setq s (car a))) | |
| 259 (boundp s) | |
| 260 (symbol-value s) | |
| 261 ;; indirect-function deals with autoloadable keymaps | |
| 262 (setq v (indirect-function (cdr a))) | |
| 263 (setq v (lookup-key v key accept-default)) | |
| 264 ;; Terminate loop, with v set to non-nil value | |
| 265 (setq tail nil))) | |
| 266 v)) | |
| 267 | |
| 268 | |
| 269 (defun current-minor-mode-maps () | |
| 270 "Return a list of keymaps for the minor modes of the current buffer." | |
| 271 (let ((l '()) | |
| 272 (tail minor-mode-map-alist) | |
| 273 a s v) | |
| 274 (while tail | |
| 275 (setq a (car tail) | |
| 276 tail (cdr tail)) | |
| 277 (and (consp a) | |
| 278 (symbolp (setq s (car a))) | |
| 279 (boundp s) | |
| 280 (symbol-value s) | |
| 281 ;; indirect-function deals with autoloadable keymaps | |
| 282 (setq v (indirect-function (cdr a))) | |
| 283 (setq l (cons v l)))) | |
| 284 (nreverse l))) | |
| 285 | |
| 286 | |
| 287 ;;#### What a crock | |
| 288 (defun define-prefix-command (name &optional mapvar) | |
| 289 "Define COMMAND as a prefix command. | |
| 290 A new sparse keymap is stored as COMMAND's function definition. | |
| 291 If second optional argument MAPVAR is not specified, | |
| 292 COMMAND's value (as well as its function definition) is set to the keymap. | |
| 293 If a second optional argument MAPVAR is given and is not `t', | |
| 294 the map is stored as its value. | |
| 295 Regardless of MAPVAR, COMMAND's function-value is always set to the keymap." | |
| 296 (let ((map (make-sparse-keymap name))) | |
| 297 (fset name map) | |
| 298 (cond ((not mapvar) | |
| 299 (set name map)) | |
| 300 ((eq mapvar 't) | |
| 301 ) | |
| 302 (t | |
| 303 (set mapvar map))) | |
| 304 name)) | |
| 305 | |
| 306 | |
| 307 ;;; Converting vectors of events to a read-equivalent form. | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
308 (defun events-to-keys (events &optional no-mice) |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
309 "Given a vector of event objects, return a vector of key descriptors. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
310 |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
311 If all events can be represented unambiguously as characters, return a |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
312 string. Both the string and the vector will be equivalent to the events, if |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
313 the elements are passed to `character-to-event'. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
314 |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
315 If an event represents a key press of a printable ASCII character between ?@ |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
316 and ?_, with the control modifier and only the control modifier, it is |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
317 returned as a character between ?\x00 and ?\x1f, inclusive. ?\\C-i, ?\\C-j, |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
318 ?\\C-m are returned as the symbols `tab', `linefeed' and `return', |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
319 respectively. |
| 428 | 320 |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
321 There is a similar equivalence between ASCII characters with the meta |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
322 modifier and Latin 1 characters, but this function does not use that |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
323 equivalence. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
324 |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
325 Obsolete optional argument NO-MICE means that mouse events are not allowed. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
326 These are actually never allowed, since `character-to-event' never accepts |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
327 them. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
328 |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
329 EVENTS can be a string, and will be treated as a vector of the events |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
330 corresponding to those characters." |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
331 ;; This is only used in packages. There were some contexts where it was |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
332 ;; used in core, but those dated from before #'lookup-key accepted events |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
333 ;; in KEYS; it conses less and is more accurate to use the events directly, |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
334 ;; rather than calling this function. It'd be nice to move this to |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
335 ;; xemacs-base and add an autoload, there's no need for it to be dumped. |
| 428 | 336 (if (and events (symbolp events)) (setq events (vector events))) |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
337 (check-type events array) |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
338 (cond ((let* ((length (length events)) |
| 428 | 339 (string (make-string length 0)) |
| 340 c ce | |
| 341 (i 0)) | |
| 342 (while (< i length) | |
| 343 (setq ce (aref events i)) | |
| 344 (or (eventp ce) (setq ce (character-to-event ce))) | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
345 ;; Normalize `c' to `?c' and `(control k)' to `?\C-k' We don't |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
346 ;; "normalize" Latin 1 to the corresponding meta characters, or |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
347 ;; vice-versa. |
| 428 | 348 (setq c (event-to-character ce)) |
| 349 (if (and c | |
| 350 (key-press-event-p ce)) | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
351 (if (symbolp (event-key ce)) |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
352 (if (get (event-key ce) 'character-of-keysym) |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
353 ;; Don't use a string `tab' to avoid that unpleasant |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
354 ;; little ambiguity. |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
355 (setq c nil)))) |
| 428 | 356 (if c |
| 357 (aset string i c) | |
| 358 (setq i length string nil)) | |
| 359 (setq i (1+ i))) | |
| 360 string)) | |
| 361 (t | |
| 362 (let* ((length (length events)) | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
363 (new (vconcat events nil)) |
| 428 | 364 event mods key |
| 365 (i 0)) | |
| 366 (while (< i length) | |
| 367 (setq event (aref events i)) | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
368 (or (eventp event) (setq event (character-to-event event))) |
| 428 | 369 (cond ((key-press-event-p event) |
| 370 (setq mods (event-modifiers event) | |
| 371 key (event-key event)) | |
| 372 (aset new i (if mods | |
| 373 (nconc mods (cons key nil)) | |
| 374 key))) | |
| 375 ((or (and event (symbolp event)) | |
| 376 (and (consp event) (symbolp (car event)))) | |
| 377 (aset new i event)) | |
| 378 (t | |
|
5745
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
379 (signal 'wrong-type-argument |
|
f9e4d44504a4
Document #'events-to-keys some more, use it less.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5576
diff
changeset
|
380 (list 'key-press-event-p event)))) |
| 428 | 381 (setq i (1+ i))) |
| 382 new)))) | |
| 383 | |
|
5801
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
384 (defun next-key-event (&optional event prompt) |
| 428 | 385 "Return the next available keyboard event." |
|
5801
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
386 (while (not (key-press-event-p |
|
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
387 (setq event (next-command-event event prompt)))) |
|
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
388 (dispatch-event event)) |
|
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
389 event) |
| 428 | 390 |
| 391 (defun key-sequence-list-description (keys) | |
| 392 "Convert a key sequence KEYS to the full [(modifiers... key)...] form. | |
| 502 | 393 Argument KEYS can be in any form accepted by `define-key' function. |
| 394 The output is always in a canonical form, meaning you can use this | |
| 395 function to determine if two key sequence specifications are equivalent | |
| 396 by comparing the respective outputs of this function using `equal'." | |
| 428 | 397 (let ((vec |
| 502 | 398 (cond ((vectorp keys) |
| 399 keys) | |
| 400 ((stringp keys) | |
| 401 (vconcat keys)) | |
| 402 (t | |
| 403 (vector keys))))) | |
|
5567
3bc58dc9d688
Replace #'flet by #'labels where appropriate, core code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5549
diff
changeset
|
404 (labels ((event-to-list (ev) |
|
3bc58dc9d688
Replace #'flet by #'labels where appropriate, core code.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5549
diff
changeset
|
405 (append (event-modifiers ev) (list (event-key ev))))) |
|
5576
071b810ceb18
Declare labels as line where appropriate; use #'labels, not #'flet, tests.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5567
diff
changeset
|
406 (declare (inline event-to-list)) |
| 502 | 407 (mapvector |
| 408 #'(lambda (key) | |
| 409 (let* ((full-key | |
| 410 (cond ((key-press-event-p key) | |
| 411 (event-to-list key)) | |
| 412 ((characterp key) | |
| 413 (event-to-list (character-to-event key))) | |
| 414 ((listp key) | |
| 415 (copy-sequence key)) | |
| 416 (t | |
| 417 (list key)))) | |
| 418 (keysym (car (last full-key)))) | |
| 419 (if (characterp keysym) | |
| 420 (setcar (last full-key) (intern (char-to-string keysym)))) | |
| 421 full-key)) | |
| 422 vec)))) | |
| 428 | 423 |
| 424 | |
| 425 ;;; Support keyboard commands to turn on various modifiers. | |
| 426 | |
| 427 ;;; These functions -- which are not commands -- each add one modifier | |
| 428 ;;; to the following event. | |
| 429 | |
| 430 (defun event-apply-alt-modifier (ignore-prompt) | |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
431 (event-apply-modifiers '(alt))) |
| 428 | 432 (defun event-apply-super-modifier (ignore-prompt) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
433 (event-apply-modifiers '(super))) |
| 428 | 434 (defun event-apply-hyper-modifier (ignore-prompt) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
435 (event-apply-modifiers '(hyper))) |
| 428 | 436 (defun event-apply-shift-modifier (ignore-prompt) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
437 (event-apply-modifiers '(shift))) |
| 428 | 438 (defun event-apply-control-modifier (ignore-prompt) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
439 (event-apply-modifiers '(control))) |
| 428 | 440 (defun event-apply-meta-modifier (ignore-prompt) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
441 (event-apply-modifiers '(meta))) |
| 428 | 442 |
| 443 ;;; #### `key-translate-map' is ignored for now. | |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
444 (defun event-apply-modifiers (list) |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
445 "Return the next key event, with a list of modifiers applied. |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
446 LIST describes the names of these modifier, a list of symbols. |
| 428 | 447 `function-key-map' is scanned for prefix bindings." |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
448 (let (events binding key-sequence-list-description symbol-name) |
| 428 | 449 ;; read keystrokes scanning `function-key-map' |
| 450 (while (keymapp | |
| 451 (setq binding | |
| 452 (lookup-key | |
| 453 function-key-map | |
| 454 (vconcat | |
| 455 (setq events | |
| 456 (append events (list (next-key-event))))))))) | |
| 457 (if binding ; found a binding | |
| 458 (progn | |
| 459 ;; allow for several modifiers | |
|
5801
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
460 (if (functionp binding) |
| 428 | 461 (setq binding (funcall binding nil))) |
| 462 (setq events (append binding nil)) | |
| 463 ;; put remaining keystrokes back into input queue | |
| 464 (setq unread-command-events | |
| 465 (mapcar 'character-to-event (cdr events)))) | |
| 466 (setq unread-command-events (cdr events))) | |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
467 ;; add modifiers LIST to the first keystroke or event |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
468 (setf key-sequence-list-description |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
469 (aref (key-sequence-list-description (car events)) 0)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
470 (if (and (member 'shift list) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
471 (symbolp (car (last key-sequence-list-description))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
472 (eql 1 (length |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
473 (setq symbol-name |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
474 (symbol-name |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
475 (car (last key-sequence-list-description)))))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
476 (not (eql (aref symbol-name 0) (upcase (aref symbol-name 0))))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
477 (setf (car (last key-sequence-list-description)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
478 (intern (upcase symbol-name)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
479 list (remove* 'shift list))) |
| 428 | 480 (vector |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
481 (append list |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
482 (set-difference key-sequence-list-description list :stable t))))) |
|
5549
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
483 |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
484 (defun event-apply-modifier (symbol) |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
485 "Return the next key event, with a single modifier applied. |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
486 See `event-apply-modifiers'." |
|
493c487cbc3f
Add #'event-apply-modifiers, implement #'event-apply-modifiers in terms of it.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5529
diff
changeset
|
487 (event-apply-modifiers (list symbol))) |
| 428 | 488 |
| 489 (defun synthesize-keysym (ignore-prompt) | |
|
5801
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
490 "Read a sequence of characters, and return the corresponding keysym. |
|
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
491 The characters must be ?-, or ?_, or have word syntax. Reading is |
|
0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
Aidan Kehoe <kehoea@parhasard.net>
parents:
5745
diff
changeset
|
492 terminated by RET (which is discarded)." |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
493 ;; This has the disadvantage that only X11 keysyms (and space, backspace |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
494 ;; and friends, together with the trivial one-character keysyms) are |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
495 ;; recognised, and then only on a build with X11 support which has had an |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
496 ;; X11 frame open at some point. |
| 428 | 497 (let ((continuep t) |
| 498 event char list) | |
| 499 (while continuep | |
| 500 (setq event (next-key-event)) | |
| 501 (cond ((and (setq char (event-to-character event)) | |
| 502 (or (memq char '(?- ?_)) | |
| 503 (eq ?w (char-syntax char (standard-syntax-table))))) | |
| 504 ;; Advance a character. | |
| 505 (push char list)) | |
| 506 ((or (memq char '(?\r ?\n)) | |
| 507 (memq (event-key event) '(return newline))) | |
| 508 ;; Legal termination. | |
| 509 (setq continuep nil)) | |
| 510 (char | |
| 511 ;; Illegal character. | |
| 512 (error "Illegal character in keysym: %c" char)) | |
| 513 (t | |
| 514 ;; Illegal event. | |
|
5861
c87b776ab0e1
Create a new error for when a char is needed but event-to-character gives nil
Aidan Kehoe <kehoea@parhasard.net>
parents:
5808
diff
changeset
|
515 (error 'no-character-typed event)))) |
| 428 | 516 (vector (intern (concat "" (nreverse list)))))) |
| 517 | |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
518 (defun synthesize-unicode-codepoint (ignore-prompt) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
519 "Read a sequence of hexadecimal digits and return a one-char keyboard macro. |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
520 |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
521 The character has the Unicode code point corresponding to those hexadecimal |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
522 digits." |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
523 (symbol-macrolet ((first-prompt "Unicode hex input: u")) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
524 (let* ((prompt first-prompt) (integer 0) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
525 (extent (make-extent (1- (length first-prompt)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
526 (length first-prompt) prompt)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
527 character digit-char-p) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
528 (setf (extent-face extent) 'underline |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
529 (extent-property extent 'duplicable) t) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
530 (while (not (member (setq character |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
531 ;; Discard non-enter non-hex-digit characters, |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
532 ;; as GTK does. |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
533 (read-char-exclusive prompt)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
534 '(?\r ?\n))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
535 (when (setq digit-char-p (digit-char-p character 16)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
536 (setq integer (logior (lsh integer 4) digit-char-p) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
537 prompt (concat prompt (list character))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
538 (if (>= integer #x110000) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
539 (error 'args-out-of-range "Not a Unicode code point" integer)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
540 (set-extent-endpoints extent (1- (length first-prompt)) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
541 (length prompt) prompt))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
542 (vector (list (decode-char 'ucs integer)))))) |
|
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
543 |
|
5529
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
544 (define-key function-key-map-parent [?\C-x ?@ ?h] 'event-apply-hyper-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
545 (define-key function-key-map-parent [?\C-x ?@ ?s] 'event-apply-super-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
546 (define-key function-key-map-parent [?\C-x ?@ ?m] 'event-apply-meta-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
547 (define-key function-key-map-parent [?\C-x ?@ ?S] 'event-apply-shift-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
548 (define-key function-key-map-parent [?\C-x ?@ ?c] 'event-apply-control-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
549 (define-key function-key-map-parent [?\C-x ?@ ?a] 'event-apply-alt-modifier) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
550 (define-key function-key-map-parent [?\C-x ?@ ?k] 'synthesize-keysym) |
|
5808
1b984807a299
Support control shift u for Unicode input as does GTK.
Aidan Kehoe <kehoea@parhasard.net>
parents:
5801
diff
changeset
|
551 (define-key function-key-map-parent [(control U)] 'synthesize-unicode-codepoint) |
|
5529
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
552 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
553 ;; The autoloads for the compose map, and their bindings in |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
554 ;; function-key-map-parent are used by GTK as well as X11. And Julian |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
555 ;; Bradfield, at least, uses x-compose on the TTY, it's reasonable to make |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
556 ;; them generally available. |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
557 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
558 (loop for map in '(compose-acute-map compose-breve-map compose-caron-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
559 compose-cedilla-map compose-circumflex-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
560 compose-diaeresis-map compose-dot-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
561 compose-doubleacute-map compose-grave-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
562 compose-hook-map compose-horn-map compose-macron-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
563 compose-map compose-ogonek-map compose-ring-map |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
564 compose-stroke-map compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
565 do (autoload map "x-compose" nil t 'keymap)) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
566 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
567 (loop |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
568 for (key map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
569 ;; The dead keys might really be called just about anything, depending |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
570 ;; on the vendor. MIT thinks that the prefixes are "SunFA_", "D", and |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
571 ;; "hpmute_" for Sun, DEC, and HP respectively. However, OpenWindows 3 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
572 ;; thinks that the prefixes are "SunXK_FA_", "DXK_", and "hpXK_mute_". |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
573 ;; And HP (who don't mention Sun and DEC at all) use "XK_mute_". Go |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
574 ;; figure. |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
575 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
576 ;; Presumably if someone is running OpenWindows, they won't be using the |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
577 ;; DEC or HP keysyms, but if they are defined then that is possible, so |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
578 ;; in that case we accept them all. |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
579 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
580 ;; If things seem not to be working, you might want to check your |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
581 ;; /usr/lib/X11/XKeysymDB file to see if your vendor has an equally |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
582 ;; mixed up view of what these keys should be called. |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
583 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
584 ;; Canonical names: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
585 in '((acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
586 (grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
587 (cedilla compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
588 (diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
589 (circumflex compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
590 (tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
591 (degree compose-ring-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
592 (multi-key compose-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
593 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
594 ;; Sun according to MIT: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
595 (SunFA_Acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
596 (SunFA_Grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
597 (SunFA_Cedilla compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
598 (SunFA_Diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
599 (SunFA_Circum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
600 (SunFA_Tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
601 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
602 ;; Sun according to OpenWindows 2: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
603 (Dead_Grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
604 (Dead_Circum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
605 (Dead_Tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
606 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
607 ;; Sun according to OpenWindows 3: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
608 (SunXK_FA_Acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
609 (SunXK_FA_Grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
610 (SunXK_FA_Cedilla compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
611 (SunXK_FA_Diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
612 (SunXK_FA_Circum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
613 (SunXK_FA_Tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
614 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
615 ;; DEC according to MIT: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
616 (Dacute_accent compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
617 (Dgrave_accent compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
618 (Dcedilla_accent compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
619 (Dcircumflex_accent compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
620 (Dtilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
621 (Dring_accent compose-ring-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
622 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
623 ;; DEC according to OpenWindows 3: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
624 (DXK_acute_accent compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
625 (DXK_grave_accent compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
626 (DXK_cedilla_accent compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
627 (DXK_circumflex_accent compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
628 (DXK_tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
629 (DXK_ring_accent compose-ring-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
630 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
631 ;; HP according to MIT: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
632 (hpmute_acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
633 (hpmute_grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
634 (hpmute_diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
635 (hpmute_asciicircum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
636 (hpmute_asciitilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
637 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
638 ;; Empirically discovered on Linux XFree86 MetroX: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
639 (usldead_acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
640 (usldead_grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
641 (usldead_diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
642 (usldead_asciicircum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
643 (usldead_asciitilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
644 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
645 ;; HP according to OpenWindows 3: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
646 (hpXK_mute_acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
647 (hpXK_mute_grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
648 (hpXK_mute_diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
649 (hpXK_mute_asciicircum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
650 (hpXK_mute_asciitilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
651 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
652 ;; HP according to HP-UX 8.0: |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
653 (XK_mute_acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
654 (XK_mute_grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
655 (XK_mute_diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
656 (XK_mute_asciicircum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
657 (XK_mute_asciitilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
658 |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
659 ;; XFree86 uses lower case and an underscore. XEmacs converts the |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
660 ;; underscore to a hyphen in x_keysym_to_emacs_keysym because the |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
661 ;; keysym is in the "Keyboard" character set, which seems a very |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
662 ;; arbitrary approach. |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
663 (dead-acute compose-acute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
664 (dead-grave compose-grave-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
665 (dead-cedilla compose-cedilla-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
666 (dead-diaeresis compose-diaeresis-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
667 (dead-circum compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
668 (dead-circumflex compose-circumflex-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
669 (dead-tilde compose-tilde-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
670 (dead-abovering compose-ring-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
671 (dead-caron compose-caron-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
672 (dead-macron compose-macron-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
673 (dead-breve compose-breve-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
674 (dead-abovedot compose-dot-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
675 (dead-doubleacute compose-doubleacute-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
676 (dead-ogonek compose-ogonek-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
677 (dead-hook compose-hook-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
678 (dead-horn compose-horn-map) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
679 (dead-stroke compose-stroke-map)) |
|
3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
Aidan Kehoe <kehoea@parhasard.net>
parents:
5402
diff
changeset
|
680 do (define-key function-key-map-parent (vector key) map)) |
| 428 | 681 |
| 682 ;;; keymap.el ends here |