Mercurial > hg > xemacs-beta
view lisp/gtk-ffi.el @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Sep 2012 14:31:40 +0100 |
| parents | 4dee0387b9de |
| children |
line wrap: on
line source
;;; gtk-ffi.el --- Foreign function interface for the GTK object system ;; Copyright (C) 2000 Free Software Foundation ;; Maintainer: William Perry <wmperry@gnu.org> ;; Keywords: extensions, dumped ;; This file is part of XEmacs. ;; XEmacs is free software: you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by the ;; Free Software Foundation, either version 3 of the License, or (at your ;; option) any later version. ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ;; for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. ;;; Synched up with: Not in FSF ;;; Commentary: ;; This file is dumped with XEmacs. (defvar gtk-type-aliases '((GtkType . guint) (GdkAtom . gulong) (GdkBitmap . GdkWindow) (time_t . guint) (none . void) (GdkDrawable . GdkWindow) (GdkBitmap . GdkWindow) (GdkPixmap . GdkWindow)) "An assoc list of aliases for commonly used GTK types that are not really part of the object system.") (defvar gtk-ffi-debug nil "If non-nil, all functions defined with `gtk-import-function' will be checked for missing marshallers.") (defun gtk-ffi-check-function (func) ;; We don't call gtk-main or gtk-main-quit because it thoroughly ;; hoses us (locks up xemacs handling events, but no lisp). (if (not (memq func '(gtk-main gtk-main-quit))) (condition-case err (funcall func) (error (case (car err) (wrong-number-of-arguments nil) (error (if (string= "Could not locate marshaller function" (nth 1 err)) (progn (set-buffer (get-buffer-create "needed marshallers")) (display-buffer (current-buffer)) (goto-char (point-max)) (insert (format "%S\n" (split-string (substring (nth 2 err) (length "emacs_gtk_marshal_")) "_+"))))))))))) (defmacro gtk-import-function (retval name &rest args) (if (symbolp name) (setq name (symbol-name name))) (let ((lisp-name (intern (replace-in-string name "_" "-"))) (doc-string nil)) (setq retval (or (cdr-safe (assoc retval gtk-type-aliases)) retval) doc-string (concat "The lisp version of " name ".\n" (if args (concat "Prototype: " (prin1-to-string args))))) ;; Drop off any naming of arguments, etc. (if (and args (consp (car args))) (setq args (mapcar 'car args))) ;; Get rid of any type aliases. (setq args (mapcar (lambda (x) (or (cdr-safe (assoc x gtk-type-aliases)) x)) args)) `(progn (defun ,lisp-name (&rest args) ,doc-string (if (not (get (quote ,lisp-name) 'gtk-ffi nil)) (put (quote ,lisp-name) 'gtk-ffi (gtk-import-function-internal (quote ,retval) ,name (quote ,args)))) (gtk-call-function (get (quote ,lisp-name) 'gtk-ffi 'ignore) args)) (and gtk-ffi-debug (gtk-ffi-check-function (quote ,lisp-name)))))) (defmacro gtk-import-variable (type name) (if (symbolp name) (setq name (symbol-name name))) (let ((lisp-name (intern (replace-in-string name "_" "-"))) (doc-string nil)) (setq type (or (cdr-safe (assoc type gtk-type-aliases)) type) doc-string (concat "Retrieve the variable " name " (type: " (symbol-name type) ").\n")) `(defun ,lisp-name () ,doc-string (gtk-import-variable-internal (quote ,type) ,name)))) (provide 'gtk-ffi)
