Mercurial > hg > xemacs-beta
view lisp/gtk-password-dialog.el @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 08 Feb 2010 16:51:25 -0600 |
parents | 7039e6323819 |
children | 308d34e9f07d |
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 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: 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)