Mercurial > hg > xemacs-beta
view lisp/keymap.el @ 4981:4aebb0131297
Cleanups/renaming of EXTERNAL_TO_C_STRING and friends
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_lo_import):
* postgresql/postgresql.c (Fpq_lo_export):
* ldap/eldap.c (Fldap_open):
* ldap/eldap.c (Fldap_search_basic):
* ldap/eldap.c (Fldap_add):
* ldap/eldap.c (Fldap_modify):
* ldap/eldap.c (Fldap_delete):
* canna/canna_api.c (Fcanna_initialize):
* canna/canna_api.c (Fcanna_store_yomi):
* canna/canna_api.c (Fcanna_parse):
* canna/canna_api.c (Fcanna_henkan_begin):
EXTERNAL_TO_C_STRING returns its argument instead of storing it
in a parameter, and is renamed to EXTERNAL_TO_ITEXT. Similar
things happen to related macros. See entry in src/ChangeLog.
More Mule-izing of postgresql.c. Extract out common code
between `pq-connectdb' and `pq-connect-start'. Fix places
that signal an error string using a formatted string to instead
follow the standard and have a fixed reason followed by the
particular error message stored as one of the frobs.
src/ChangeLog addition:
2010-02-05 Ben Wing <ben@xemacs.org>
* console-msw.c (write_string_to_mswindows_debugging_output):
* console-msw.c (Fmswindows_message_box):
* console-x.c (x_perhaps_init_unseen_key_defaults):
* console.c:
* database.c (dbm_get):
* database.c (dbm_put):
* database.c (dbm_remove):
* database.c (berkdb_get):
* database.c (berkdb_put):
* database.c (berkdb_remove):
* database.c (Fopen_database):
* device-gtk.c (gtk_init_device):
* device-msw.c (msprinter_init_device_internal):
* device-msw.c (msprinter_default_printer):
* device-msw.c (msprinter_init_device):
* device-msw.c (sync_printer_with_devmode):
* device-msw.c (Fmsprinter_select_settings):
* device-x.c (sanity_check_geometry_resource):
* device-x.c (Dynarr_add_validified_lisp_string):
* device-x.c (x_init_device):
* device-x.c (Fx_put_resource):
* device-x.c (Fx_valid_keysym_name_p):
* device-x.c (Fx_set_font_path):
* dialog-msw.c (push_lisp_string_as_unicode):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-x.c (dbox_descriptor_to_widget_value):
* editfns.c (Fformat_time_string):
* editfns.c (Fencode_time):
* editfns.c (Fset_time_zone_rule):
* emacs.c (make_argc_argv):
* emacs.c (Fdump_emacs):
* emodules.c (emodules_load):
* eval.c:
* eval.c (maybe_signal_error_1):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (mswindows_wnd_proc):
* fileio.c (report_error_with_errno):
* fileio.c (Fsysnetunam):
* fileio.c (Fdo_auto_save):
* font-mgr.c (extract_fcapi_string):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_filename):
* frame-gtk.c (gtk_set_frame_text_value):
* frame-gtk.c (gtk_create_widgets):
* frame-msw.c (mswindows_init_frame_1):
* frame-msw.c (mswindows_set_title_from_ibyte):
* frame-msw.c (msprinter_init_frame_3):
* frame-x.c (x_set_frame_text_value):
* frame-x.c (x_set_frame_properties):
* frame-x.c (start_drag_internal_1):
* frame-x.c (x_cde_transfer_callback):
* frame-x.c (x_create_widgets):
* glyphs-eimage.c (my_jpeg_output_message):
* glyphs-eimage.c (jpeg_instantiate):
* glyphs-eimage.c (gif_instantiate):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (xbm_instantiate_1):
* glyphs-gtk.c (gtk_xbm_instantiate):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.c (gtk_xface_instantiate):
* glyphs-gtk.c (cursor_font_instantiate):
* glyphs-gtk.c (gtk_redisplay_widget):
* glyphs-gtk.c (gtk_widget_instantiate_1):
* glyphs-gtk.c (gtk_add_tab_item):
* glyphs-msw.c (mswindows_xpm_instantiate):
* glyphs-msw.c (bmp_instantiate):
* glyphs-msw.c (mswindows_resource_instantiate):
* glyphs-msw.c (xbm_instantiate_1):
* glyphs-msw.c (mswindows_xbm_instantiate):
* glyphs-msw.c (mswindows_xface_instantiate):
* glyphs-msw.c (mswindows_redisplay_widget):
* glyphs-msw.c (mswindows_widget_instantiate):
* glyphs-msw.c (add_tree_item):
* glyphs-msw.c (add_tab_item):
* glyphs-msw.c (mswindows_combo_box_instantiate):
* glyphs-msw.c (mswindows_widget_query_string_geometry):
* glyphs-x.c (x_locate_pixmap_file):
* glyphs-x.c (xbm_instantiate_1):
* glyphs-x.c (x_xbm_instantiate):
* glyphs-x.c (extract_xpm_color_names):
* glyphs-x.c (x_xpm_instantiate):
* glyphs-x.c (x_xface_instantiate):
* glyphs-x.c (autodetect_instantiate):
* glyphs-x.c (safe_XLoadFont):
* glyphs-x.c (cursor_font_instantiate):
* glyphs-x.c (x_redisplay_widget):
* glyphs-x.c (Fchange_subwindow_property):
* glyphs-x.c (x_widget_instantiate):
* glyphs-x.c (x_tab_control_redisplay):
* glyphs.c (pixmap_to_lisp_data):
* gui-x.c (menu_separator_style_and_to_external):
* gui-x.c (add_accel_and_to_external):
* gui-x.c (button_item_to_widget_value):
* hpplay.c (player_error_internal):
* hpplay.c (play_sound_file):
* hpplay.c (play_sound_data):
* intl.c (Fset_current_locale):
* lisp.h:
* menubar-gtk.c (gtk_xemacs_set_accel_keys):
* menubar-msw.c (populate_menu_add_item):
* menubar-msw.c (populate_or_checksum_helper):
* menubar-x.c (menu_item_descriptor_to_widget_value_1):
* nt.c (init_user_info):
* nt.c (get_long_basename):
* nt.c (nt_get_resource):
* nt.c (init_mswindows_environment):
* nt.c (get_cached_volume_information):
* nt.c (mswindows_readdir):
* nt.c (read_unc_volume):
* nt.c (mswindows_stat):
* nt.c (mswindows_getdcwd):
* nt.c (mswindows_executable_type):
* nt.c (Fmswindows_short_file_name):
* ntplay.c (nt_play_sound_file):
* objects-gtk.c:
* objects-gtk.c (gtk_valid_color_name_p):
* objects-gtk.c (gtk_initialize_font_instance):
* objects-gtk.c (gtk_font_list):
* objects-msw.c (font_enum_callback_2):
* objects-msw.c (parse_font_spec):
* objects-x.c (x_parse_nearest_color):
* objects-x.c (x_valid_color_name_p):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (x_font_list):
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_create_process):
* process-nt.c (get_internet_address):
* process-nt.c (nt_open_network_stream):
* process-unix.c:
* process-unix.c (allocate_pty):
* process-unix.c (get_internet_address):
* process-unix.c (unix_canonicalize_host_name):
* process-unix.c (unix_open_network_stream):
* realpath.c:
* select-common.h (lisp_data_to_selection_data):
* select-gtk.c (symbol_to_gtk_atom):
* select-gtk.c (atom_to_symbol):
* select-msw.c (symbol_to_ms_cf):
* select-msw.c (mswindows_register_selection_data_type):
* select-x.c (symbol_to_x_atom):
* select-x.c (x_atom_to_symbol):
* select-x.c (hack_motif_clipboard_selection):
* select-x.c (Fx_store_cutbuffer_internal):
* sound.c (Fplay_sound_file):
* sound.c (Fplay_sound):
* sound.h (sound_perror):
* sysdep.c:
* sysdep.c (qxe_allocating_getcwd):
* sysdep.c (qxe_execve):
* sysdep.c (copy_in_passwd):
* sysdep.c (qxe_getpwnam):
* sysdep.c (qxe_ctime):
* sysdll.c (dll_open):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (search_linked_libs):
* sysdll.c (dll_error):
* sysfile.h:
* sysfile.h (PATHNAME_CONVERT_OUT_TSTR):
* sysfile.h (PATHNAME_CONVERT_OUT_UTF_8):
* sysfile.h (PATHNAME_CONVERT_OUT):
* sysfile.h (LISP_PATHNAME_CONVERT_OUT):
* syswindows.h (ITEXT_TO_TSTR):
* syswindows.h (LOCAL_FILE_FORMAT_TO_TSTR):
* syswindows.h (TSTR_TO_LOCAL_FILE_FORMAT):
* syswindows.h (LOCAL_FILE_FORMAT_TO_INTERNAL_MSWIN):
* syswindows.h (LISP_LOCAL_FILE_FORMAT_MAYBE_URL_TO_TSTR):
* text.h:
* text.h (eicpy_ext_len):
* text.h (enum new_dfc_src_type):
* text.h (EXTERNAL_TO_ITEXT):
* text.h (GET_STRERROR):
* tooltalk.c (check_status):
* tooltalk.c (Fadd_tooltalk_message_arg):
* tooltalk.c (Fadd_tooltalk_pattern_attribute):
* tooltalk.c (Fadd_tooltalk_pattern_arg):
* win32.c (tstr_to_local_file_format):
* win32.c (mswindows_lisp_error_1):
* win32.c (mswindows_report_process_error):
* win32.c (Fmswindows_shell_execute):
* win32.c (mswindows_read_link_1):
Changes involving external/internal format conversion,
mostly code cleanup and renaming.
1. Eliminate the previous macros like LISP_STRING_TO_EXTERNAL
that stored its result in a parameter. The new version of
LISP_STRING_TO_EXTERNAL returns its result through the
return value, same as the previous NEW_LISP_STRING_TO_EXTERNAL.
Use the new-style macros throughout the code.
2. Rename C_STRING_TO_EXTERNAL and friends to ITEXT_TO_EXTERNAL,
in keeping with overall naming rationalization involving
Itext and related types.
Macros involved in previous two:
EXTERNAL_TO_C_STRING -> EXTERNAL_TO_ITEXT
EXTERNAL_TO_C_STRING_MALLOC -> EXTERNAL_TO_ITEXT_MALLOC
SIZED_EXTERNAL_TO_C_STRING -> SIZED_EXTERNAL_TO_ITEXT
SIZED_EXTERNAL_TO_C_STRING_MALLOC -> SIZED_EXTERNAL_TO_ITEXT_MALLOC
C_STRING_TO_EXTERNAL -> ITEXT_TO_EXTERNAL
C_STRING_TO_EXTERNAL_MALLOC -> ITEXT_TO_EXTERNAL_MALLOC
LISP_STRING_TO_EXTERNAL
LISP_STRING_TO_EXTERNAL_MALLOC
LISP_STRING_TO_TSTR
C_STRING_TO_TSTR -> ITEXT_TO_TSTR
TSTR_TO_C_STRING -> TSTR_TO_ITEXT
The following four still return their values through parameters,
since they have more than one value to return:
C_STRING_TO_SIZED_EXTERNAL -> ITEXT_TO_SIZED_EXTERNAL
LISP_STRING_TO_SIZED_EXTERNAL
C_STRING_TO_SIZED_EXTERNAL_MALLOC -> ITEXT_TO_SIZED_EXTERNAL_MALLOC
LISP_STRING_TO_SIZED_EXTERNAL_MALLOC
Sometimes additional casts had to be inserted, since the old
macros played strange games and completely defeated the type system
of the store params.
3. Rewrite many places where direct calls to TO_EXTERNAL_FORMAT
occurred with calls to one of the convenience macros listed above,
or to make_extstring().
4. Eliminate SIZED_C_STRING macros (they were hardly used, anyway)
and use a direct call to TO_EXTERNAL_FORMAT or TO_INTERNAL_FORMAT.
4. Use LISP_PATHNAME_CONVERT_OUT in many places instead of something
like LISP_STRING_TO_EXTERNAL(..., Qfile_name).
5. Eliminate some temporary variables that are no longer necessary
now that we return a value rather than storing it into a variable.
6. Some Mule-izing in database.c.
7. Error functions:
-- A bit of code cleanup in maybe_signal_error_1.
-- Eliminate report_file_type_error; it's just an alias for
signal_error_2 with params in a different order.
-- Fix some places in the hostname-handling code that directly
inserted externally-retrieved error strings into the
supposed ASCII "reason" param instead of doing the right thing
and sticking text descriptive of what was going on in "reason"
and putting the external message in a frob.
8. Use Ascbyte instead of CIbyte in process-unix.c and maybe one
or two other places.
9. Some code cleanup in copy_in_passwd() in sysdep.c.
10. Fix a real bug due to accidental variable shadowing in
tstr_to_local_file_format() in win32.c.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Fri, 05 Feb 2010 11:02:24 -0600 |
parents | a25c824ed558 |
children | 308d34e9f07d |
line wrap: on
line source
;; keymap.el --- Keymap functions for XEmacs. ;; Copyright (C) 1993-4, 1997 Free Software Foundation, Inc. ;; Copyright (C) 1995 Tinker Systems and INS Engineering Corp. ;; Copyright (C) 2003 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: internals, 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 2, 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; see the file COPYING. If not, write to the ;; Free Software Foundation, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: FSF 19.28. ;;; Commentary: ;; This file is dumped with XEmacs. ;;; Note: FSF does not have a file keymap.el. This stuff is ;;; in keymap.c. ;Prevent the \{...} documentation construct ;from mentioning keys that run this command. ;;; Code: ;; BEGIN SYNCHED WITH FSF 21.2. (defun undefined () (interactive) (ding)) ;Prevent the \{...} documentation construct ;from mentioning keys that run this command. (put 'undefined 'suppress-keymap t) (defun suppress-keymap (map &optional nodigits) "Make MAP override all normally self-inserting keys to be undefined. Normally, as an exception, digits and minus-sign are set to make prefix args, but optional second arg NODIGITS non-nil treats them like other chars." (substitute-key-definition 'self-insert-command 'undefined map global-map) (or nodigits (let ((string (make-string 1 ?0))) (define-key map "-" 'negative-argument) ;; Make plain numbers do numeric args. (while (<= (aref string 0) ?9) (define-key map string 'digit-argument) (incf (aref string 0)))))) ;Unneeded in XEmacs (defvar key-substitution-in-progress nil (defun substitute-key-definition (olddef newdef keymap &optional oldmap prefix) "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. In other words, OLDDEF is replaced with NEWDEF wherever it appears. Prefix keymaps are checked recursively. If optional fourth argument OLDMAP is specified, we redefine in KEYMAP as NEWDEF those chars which are defined as OLDDEF in OLDMAP, unless that keybinding is already present in KEYMAP. If optional fifth argument PREFIX is non-nil, then only those occurrences of OLDDEF found in keymaps accessible through the keymap bound to PREFIX in KEYMAP are redefined. See also `accessible-keymaps'." (let ((maps (accessible-keymaps (or oldmap keymap) prefix)) (shadowing (not (null oldmap))) prefix map) (while maps (setq prefix (car (car maps)) map (cdr (car maps)) maps (cdr maps)) ;; Substitute in this keymap (map-keymap #'(lambda (key binding) (if (or (eq binding olddef) ;; Compare with equal if definition is a key ;; sequence. That is useful for operating on ;; function-key-map. (and (or (stringp binding) (vectorp binding)) (equal binding olddef))) ;; The new bindings always go in KEYMAP even if we ;; found them in OLDMAP or one of its children. ;; If KEYMAP will be shadowing OLDMAP, then do not ;; redefine the key if there is another binding ;; in KEYMAP that will shadow OLDDEF. (or (and shadowing (lookup-key keymap key)) ;; define-key will give an error if a prefix ;; of the key is already defined. Otherwise ;; it will define the key in the map. ;; #### - Perhaps this should be protected? (define-key keymap (vconcat prefix (list key)) newdef)))) map) ))) ;; FSF garbage. They misguidedly tried to put menu entries into keymaps, ;; and needed stuff like the following. Eventually they admitted defeat ;; and switched to our method. ; (defun define-key-after (keymap key definition &optional after) ; "Add binding in KEYMAP for KEY => DEFINITION, right after AFTER's binding. ; This is like `define-key' except that the binding for KEY is placed ; just after the binding for the event AFTER, instead of at the beginning ; of the map. Note that AFTER must be an event type (like KEY), NOT a command ; \(like DEFINITION). ; ; If AFTER is t or omitted, the new binding goes at the end of the keymap. ; ; KEY must contain just one event type--that is to say, it must be a ; string or vector of length 1, but AFTER should be a single event ; type--a symbol or a character, not a sequence. ; ; Bindings are always added before any inherited map. ; ; The order of bindings in a keymap matters when it is used as a menu." (defmacro kbd (keys) "Convert KEYS to the internal Emacs key representation. KEYS should be a string constant in the format used for saving keyboard macros (see `insert-kbd-macro')." (if (or (stringp keys) (vectorp keys)) ;; #### need to move xemacs-base into the core!!!!!! (declare-fboundp (read-kbd-macro keys)) `(declare-fboundp (read-kbd-macro ,keys)))) ;; END SYNCHED WITH FSF 21.2. ;; This used to wrap forms into an interactive lambda. It is unclear ;; to me why this is needed in this function. Anyway, ;; `key-or-menu-binding' doesn't do it, so this function no longer ;; does it, either. (defun insert-key-binding (key) ; modeled after describe-key "Insert the command bound to KEY." (interactive "kInsert command bound to key: ") (let ((defn (key-or-menu-binding key))) (if (or (null defn) (integerp defn)) (error "%s is undefined" (key-description key)) (if (or (stringp defn) (vectorp defn)) (setq defn (key-binding defn))) ;; a keyboard macro (insert (format "%s" defn))))) (defun read-command-or-command-sexp (prompt) "Read a command symbol or command sexp. A command sexp is wrapped in an interactive lambda if needed. Prompts with PROMPT." ;; Todo: it would be better if we could reject symbols that are not ;; commandp (as does 'read-command') but that is not easy to do ;; because we must supply arg4 = require-match = nil for sexp case. (let ((result (car (read-from-string (completing-read prompt obarray 'commandp))))) (if (and (consp result) (not (eq (car result) 'lambda))) `(lambda () (interactive) ,result) result))) (defun local-key-binding (keys &optional accept-defaults) "Return the binding for command KEYS in current local keymap only. KEYS is a string, a vector of events, or a vector of key-description lists as described in the documentation for the `define-key' function. The binding is probably a symbol with a function definition; see the documentation for `lookup-key' for more information." (let ((map (current-local-map))) (if map (lookup-key map keys accept-defaults) nil))) (defun global-key-binding (keys &optional accept-defaults) "Return the binding for command KEYS in current global keymap only. KEYS is a string or vector of events, a sequence of keystrokes. The binding is probably a symbol with a function definition; see the documentation for `lookup-key' for more information." (lookup-key (current-global-map) keys accept-defaults)) (defun global-set-key (key command) "Give KEY a global binding as COMMAND. COMMAND is a symbol naming an interactively-callable function. KEY is a string, a vector of events, or a vector of key-description lists as described in the documentation for the `define-key' function. Note that if KEY has a local binding in the current buffer that local binding will continue to shadow any global binding." ;;(interactive "KSet key globally: \nCSet key %s to command: ") (interactive (list (setq key (read-key-sequence "Set key globally: ")) ;; Command sexps are allowed here so that this arg ;; may be supplied interactively via insert-key-binding. (read-command-or-command-sexp (format "Set key %s to command: " (key-description key))))) (define-key (current-global-map) key command) nil) (defun local-set-key (key command) "Give KEY a local binding as COMMAND. COMMAND is a symbol naming an interactively-callable function. KEY is a string, a vector of events, or a vector of key-description lists as described in the documentation for the `define-key' function. The binding goes in the current buffer's local map, which is shared with other buffers in the same major mode." ;;(interactive "KSet key locally: \nCSet key %s locally to command: ") (interactive (list (setq key (read-key-sequence "Set key locally: ")) ;; Command sexps are allowed here so that this arg ;; may be supplied interactively via insert-key-binding. (read-command-or-command-sexp (format "Set key %s locally to command: " (key-description key))))) (if (null (current-local-map)) (use-local-map (make-sparse-keymap))) (define-key (current-local-map) key command) nil) (defun global-unset-key (key) "Remove global binding of KEY. KEY is a string, a vector of events, or a vector of key-description lists as described in the documentation for the `define-key' function." (interactive "kUnset key globally: ") (global-set-key key nil)) (defun local-unset-key (key) "Remove local binding of KEY. KEY is a string, a vector of events, or a vector of key-description lists as described in the documentation for the `define-key' function." (interactive "kUnset key locally: ") (if (current-local-map) (define-key (current-local-map) key nil))) ;; FSF-inherited brain-death. (defun minor-mode-key-binding (key &optional accept-default) "Find the visible minor mode bindings of KEY. Return an alist of pairs (MODENAME . BINDING), where MODENAME is the symbol which names the minor mode binding KEY, and BINDING is KEY's definition in that mode. In particular, if KEY has no minor-mode bindings, return nil. If the first binding is a non-prefix, all subsequent bindings will be omitted, since they would be ignored. Similarly, the list doesn't include non-prefix bindings that come after prefix bindings. If optional argument ACCEPT-DEFAULT is non-nil, recognize default bindings; see the description of `lookup-key' for more details about this." (let ((tail minor-mode-map-alist) a s v) (while tail (setq a (car tail) tail (cdr tail)) (and (consp a) (symbolp (setq s (car a))) (boundp s) (symbol-value s) ;; indirect-function deals with autoloadable keymaps (setq v (indirect-function (cdr a))) (setq v (lookup-key v key accept-default)) ;; Terminate loop, with v set to non-nil value (setq tail nil))) v)) (defun current-minor-mode-maps () "Return a list of keymaps for the minor modes of the current buffer." (let ((l '()) (tail minor-mode-map-alist) a s v) (while tail (setq a (car tail) tail (cdr tail)) (and (consp a) (symbolp (setq s (car a))) (boundp s) (symbol-value s) ;; indirect-function deals with autoloadable keymaps (setq v (indirect-function (cdr a))) (setq l (cons v l)))) (nreverse l))) ;;#### What a crock (defun define-prefix-command (name &optional mapvar) "Define COMMAND as a prefix command. A new sparse keymap is stored as COMMAND's function definition. If second optional argument MAPVAR is not specified, COMMAND's value (as well as its function definition) is set to the keymap. If a second optional argument MAPVAR is given and is not `t', the map is stored as its value. Regardless of MAPVAR, COMMAND's function-value is always set to the keymap." (let ((map (make-sparse-keymap name))) (fset name map) (cond ((not mapvar) (set name map)) ((eq mapvar 't) ) (t (set mapvar map))) name)) ;;; Converting vectors of events to a read-equivalent form. ;;; This is used both by call-interactively (for the command history) ;;; and by macros.el (for saving keyboard macros to a file). ;; #### why does (events-to-keys [backspace]) return "\C-h"? ;; BTW, this function is a mess, and macros.el does *not* use it, in ;; spite of the above comment. `format-kbd-macro' is used to save ;; keyboard macros to a file. (defun events-to-keys (events &optional no-mice) "Given a vector of event objects, returns a vector of key descriptors, or a string (if they all fit in the ASCII range). Optional arg NO-MICE means that button events are not allowed." (if (and events (symbolp events)) (setq events (vector events))) (cond ((stringp events) events) ((not (vectorp events)) (signal 'wrong-type-argument (list 'vectorp events))) ((let* ((length (length events)) (string (make-string length 0)) c ce (i 0)) (while (< i length) (setq ce (aref events i)) (or (eventp ce) (setq ce (character-to-event ce))) ;; Normalize `c' to `?c' and `(control k)' to `?\C-k' ;; By passing t for the `allow-meta' arg we could get kbd macros ;; with meta in them to translate to the string form instead of ;; the list/symbol form; but I expect that would cause confusion, ;; so let's use the list/symbol form whenever there's ;; any ambiguity. (setq c (event-to-character ce)) (if (and c (key-press-event-p ce)) (cond ((symbolp (event-key ce)) (if (get (event-key ce) 'character-of-keysym) ;; Don't use a string for `backspace' and `tab' to ;; avoid that unpleasant little ambiguity. (setq c nil))) ((and (= (event-modifier-bits ce) 1) ;control (integerp (event-key ce))) (let* ((te (character-to-event c))) (if (and (symbolp (event-key te)) (get (event-key te) 'character-of-keysym)) ;; Don't "normalize" (control i) to tab ;; to avoid the ambiguity in the other direction (setq c nil)) (deallocate-event te))))) (if c (aset string i c) (setq i length string nil)) (setq i (1+ i))) string)) (t (let* ((length (length events)) (new (copy-sequence events)) event mods key (i 0)) (while (< i length) (setq event (aref events i)) (cond ((key-press-event-p event) (setq mods (event-modifiers event) key (event-key event)) (if (numberp key) (setq key (intern (make-string 1 key)))) (aset new i (if mods (nconc mods (cons key nil)) key))) ((misc-user-event-p event) (aset new i (list 'menu-selection (event-function event) (event-object event)))) ((or (button-press-event-p event) (button-release-event-p event)) (if no-mice (error "Mouse events can't be saved in keyboard macros.")) (setq mods (event-modifiers event) key (intern (format "button%d%s" (event-button event) (if (button-release-event-p event) "up" "")))) (aset new i (if mods (nconc mods (cons key nil)) key))) ((or (and event (symbolp event)) (and (consp event) (symbolp (car event)))) (aset new i event)) (t (signal 'wrong-type-argument (list 'eventp event)))) (setq i (1+ i))) new)))) (defun next-key-event () "Return the next available keyboard event." (let (event) (while (not (key-press-event-p (setq event (next-command-event)))) (dispatch-event event)) event)) (defun key-sequence-list-description (keys) "Convert a key sequence KEYS to the full [(modifiers... key)...] form. Argument KEYS can be in any form accepted by `define-key' function. The output is always in a canonical form, meaning you can use this function to determine if two key sequence specifications are equivalent by comparing the respective outputs of this function using `equal'." (let ((vec (cond ((vectorp keys) keys) ((stringp keys) (vconcat keys)) (t (vector keys))))) (flet ((event-to-list (ev) (append (event-modifiers ev) (list (event-key ev))))) (mapvector #'(lambda (key) (let* ((full-key (cond ((key-press-event-p key) (event-to-list key)) ((characterp key) (event-to-list (character-to-event key))) ((listp key) (copy-sequence key)) (t (list key)))) (keysym (car (last full-key)))) (if (characterp keysym) (setcar (last full-key) (intern (char-to-string keysym)))) full-key)) vec)))) ;;; Support keyboard commands to turn on various modifiers. ;;; These functions -- which are not commands -- each add one modifier ;;; to the following event. (defun event-apply-alt-modifier (ignore-prompt) (event-apply-modifier 'alt)) (defun event-apply-super-modifier (ignore-prompt) (event-apply-modifier 'super)) (defun event-apply-hyper-modifier (ignore-prompt) (event-apply-modifier 'hyper)) (defun event-apply-shift-modifier (ignore-prompt) (event-apply-modifier 'shift)) (defun event-apply-control-modifier (ignore-prompt) (event-apply-modifier 'control)) (defun event-apply-meta-modifier (ignore-prompt) (event-apply-modifier 'meta)) ;;; #### `key-translate-map' is ignored for now. (defun event-apply-modifier (symbol) "Return the next key event, with a modifier flag applied. SYMBOL is the name of this modifier, as a symbol. `function-key-map' is scanned for prefix bindings." (let (events binding) ;; read keystrokes scanning `function-key-map' (while (keymapp (setq binding (lookup-key function-key-map (vconcat (setq events (append events (list (next-key-event))))))))) (if binding ; found a binding (progn ;; allow for several modifiers (if (and (symbolp binding) (fboundp binding)) (setq binding (funcall binding nil))) (setq events (append binding nil)) ;; put remaining keystrokes back into input queue (setq unread-command-events (mapcar 'character-to-event (cdr events)))) (setq unread-command-events (cdr events))) ;; add a modifier SYMBOL to the first keystroke or event (vector (append (list symbol) (delq symbol (aref (key-sequence-list-description (car events)) 0)))))) (defun synthesize-keysym (ignore-prompt) "Read a sequence of keys, and returned the corresponding key symbol. The characters must be from the [-_a-zA-Z0-9]. Reading is terminated by RET (which is discarded)." (let ((continuep t) event char list) (while continuep (setq event (next-key-event)) (cond ((and (setq char (event-to-character event)) (or (memq char '(?- ?_)) (eq ?w (char-syntax char (standard-syntax-table))))) ;; Advance a character. (push char list)) ((or (memq char '(?\r ?\n)) (memq (event-key event) '(return newline))) ;; Legal termination. (setq continuep nil)) (char ;; Illegal character. (error "Illegal character in keysym: %c" char)) (t ;; Illegal event. (error "Event has no character equivalent: %s" event)))) (vector (intern (concat "" (nreverse list)))))) ;; This looks dirty. The following code should maybe go to another ;; file, and `create-console-hook' should maybe default to nil. (add-hook 'create-console-hook #'(lambda (console) (letf (((selected-console) console)) (define-key function-key-map [?\C-x ?@ ?h] 'event-apply-hyper-modifier) (define-key function-key-map [?\C-x ?@ ?s] 'event-apply-super-modifier) (define-key function-key-map [?\C-x ?@ ?m] 'event-apply-meta-modifier) (define-key function-key-map [?\C-x ?@ ?S] 'event-apply-shift-modifier) (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier) (define-key function-key-map [?\C-x ?@ ?a] 'event-apply-alt-modifier) (define-key function-key-map [?\C-x ?@ ?k] 'synthesize-keysym)))) ;;; keymap.el ends here