Mercurial > hg > xemacs-beta
view lisp/gtk-password-dialog.el @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Sep 2012 14:31:40 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
;;; gtk-password-dialog.el --- Reading passwords in a dialog ;; Copyright (C) 2000 Free Software Foundation, Inc. ;; Maintainer: William M. Perry <wmperry@gnu.org> ;; Keywords: extensions, internal ;; 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. (globally-declare-fboundp '(gtk-dialog-new gtk-dialog-vbox gtk-dialog-action-area gtk-window-set-title gtk-button-new-with-label gtk-container-add gtk-signal-connect gtk-entry-get-text gtk-widget-destroy gtk-container-set-border-width gtk-label-new gtk-misc-set-alignment gtk-entry-new gtk-widget-set-sensitive gtk-entry-set-text gtk-entry-select-region)) (defun gtk-password-dialog-ok-button (dlg) (get dlg 'x-ok-button)) (defun gtk-password-dialog-cancel-button (dlg) (get dlg 'x-cancel-button)) (defun gtk-password-dialog-entry-widget (dlg) (get dlg 'x-initial-entry)) (defun gtk-password-dialog-confirmation-widget (dlg) (get dlg 'x-verify-entry)) (defun gtk-password-dialog-new (&rest keywords) ;; Format is (:keyword value ...) ;; Allowed keywords are: ;; ;; :callback function ;; :default string ;; :title string :; :prompt string ;; :default string ;; :verify boolean ;; :verify-prompt string (let* ((callback (plist-get keywords :callback 'ignore)) (dialog (gtk-dialog-new)) (vbox (gtk-dialog-vbox dialog)) (button-area (gtk-dialog-action-area dialog)) (default (plist-get keywords :default)) (widget nil)) (gtk-window-set-title dialog (plist-get keywords :title "Enter password...")) ;; Make us modal... (put dialog 'type 'dialog) ;; Put the buttons in the bottom (setq widget (gtk-button-new-with-label "OK")) (gtk-container-add button-area widget) (gtk-signal-connect widget 'clicked (lambda (button data) (funcall (car data) (gtk-entry-get-text (get (cdr data) 'x-initial-entry)))) (cons callback dialog)) (put dialog 'x-ok-button widget) (setq widget (gtk-button-new-with-label "Cancel")) (gtk-container-add button-area widget) (gtk-signal-connect widget 'clicked (lambda (button dialog) (gtk-widget-destroy dialog)) dialog) (put dialog 'x-cancel-button widget) ;; Now the entry area... (gtk-container-set-border-width vbox 5) (setq widget (gtk-label-new (plist-get keywords :prompt "Password:"))) (gtk-misc-set-alignment widget 0.0 0.5) (gtk-container-add vbox widget) (setq widget (gtk-entry-new)) (put widget 'visibility nil) (gtk-container-add vbox widget) (put dialog 'x-initial-entry widget) (if (plist-get keywords :verify) (let ((changed-cb (lambda (editable dialog) (gtk-widget-set-sensitive (get dialog 'x-ok-button) (equal (gtk-entry-get-text (get dialog 'x-initial-entry)) (gtk-entry-get-text (get dialog 'x-verify-entry))))))) (gtk-container-set-border-width vbox 5) (setq widget (gtk-label-new (plist-get keywords :verify-prompt "Verify:"))) (gtk-misc-set-alignment widget 0.0 0.5) (gtk-container-add vbox widget) (setq widget (gtk-entry-new)) (put widget 'visibility nil) (gtk-container-add vbox widget) (put dialog 'x-verify-entry widget) (gtk-signal-connect (get dialog 'x-initial-entry) 'changed changed-cb dialog) (gtk-signal-connect (get dialog 'x-verify-entry) 'changed changed-cb dialog) (gtk-widget-set-sensitive (get dialog 'x-ok-button) nil))) (if default (progn (gtk-entry-set-text (get dialog 'x-initial-entry) default) (gtk-entry-select-region (get dialog 'x-initial-entry) 0 (length default)))) dialog)) (provide 'gtk-password-dialog)
