Mercurial > hg > xemacs-beta
view lisp/gtk-password-dialog.el @ 5576:071b810ceb18
Declare labels as line where appropriate; use #'labels, not #'flet, tests.
lisp/ChangeLog addition:
2011-10-03 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (handle-pre-motion-command-current-command-is-motion):
Implement #'keysyms-equal with #'labels + (declare (inline ...)),
instead of abusing macrolet to the same end.
* specifier.el (let-specifier):
* mule/mule-cmds.el (describe-language-environment):
* mule/mule-cmds.el (set-language-environment-coding-systems):
* mule/mule-x-init.el (x-use-halfwidth-roman-font):
* faces.el (Face-frob-property):
* keymap.el (key-sequence-list-description):
* lisp-mode.el (construct-lisp-mode-menu):
* loadhist.el (unload-feature):
* mouse.el (default-mouse-track-check-for-activation):
Declare various labels inline in dumped files when that reduces
the size of the dumped image. Declaring labels inline is normally
only worthwhile for inner loops and so on, but it's reasonable
exercise of the related code to have these changes in core.
tests/ChangeLog addition:
2011-10-03 Aidan Kehoe <kehoea@parhasard.net>
* automated/case-tests.el (uni-mappings):
* automated/database-tests.el (delete-database-files):
* automated/hash-table-tests.el (iterations):
* automated/lisp-tests.el (test1):
* automated/lisp-tests.el (a):
* automated/lisp-tests.el (cl-floor):
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (list-nreverse):
* automated/lisp-tests.el (needs-lexical-context):
* automated/mule-tests.el (featurep):
* automated/os-tests.el (original-string):
* automated/os-tests.el (with):
* automated/symbol-tests.el (check-weak-list-unique):
Replace #'flet with #'labels where appropriate in these tests,
following my own advice on style in the docstrings of those
functions.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 03 Oct 2011 20:16:14 +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)
