Mercurial > hg > xemacs-beta
annotate lisp/gtk-password-dialog.el @ 5882:bbe4146603db
Reduce regexp usage, now CL-oriented non-regexp code available, core Lisp
lisp/ChangeLog addition:
2015-04-01 Aidan Kehoe <kehoea@parhasard.net>
When calling #'string-match with a REGEXP without regular
expression special characters, call #'search, #'mismatch, #'find,
etc. instead, making our code less likely to side-effect other
functions' match data and a little faster.
* apropos.el (apropos-command):
* apropos.el (apropos):
Call (position ?\n ...) rather than (string-match "\n" ...) here.
* buff-menu.el:
* buff-menu.el (buffers-menu-omit-invisible-buffers):
Don't fire up the regexp engine just to check if a string starts
with a space.
* buff-menu.el (select-buffers-tab-buffers-by-mode):
Don't fire up the regexp engine just to compare mode basenames.
* buff-menu.el (format-buffers-tab-line):
* buff-menu.el (build-buffers-tab-internal): Moved to being a
label within the following.
* buff-menu.el (buffers-tab-items): Use the label.
* bytecomp.el (byte-compile-log-1):
Don't fire up the regexp engine just to look for a newline.
* cus-edit.el (get):
Ditto.
* cus-edit.el (custom-variable-value-create):
Ditto, but for a colon.
* descr-text.el (describe-text-sexp):
Ditto.
* descr-text.el (describe-char-unicode-data):
Use #'split-string-by-char given that we're just looking for a
semicolon.
* descr-text.el (describe-char):
Don't fire up the regexp engine just to look for a newline.
* disass.el (disassemble-internal):
Ditto.
* files.el (file-name-sans-extension):
Implement this using #'position.
* files.el (file-name-extension):
Correct this function's docstring, implement it in terms of
#'position.
* files.el (insert-directory):
Don't fire up the regexp engine to split a string by space; don't
reverse the list of switches, this is actually a longstand bug as
far as I can see.
* gnuserv.el (gnuserv-process-filter):
Use #'position here, instead of consing inside #'split-string
needlessly.
* gtk-file-dialog.el (gtk-file-dialog-update-dropdown):
Use #'split-string-by-char here, don't fire up #'split-string for
directory-sep-char.
* gtk-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* hyper-apropos.el (hyper-apropos-grok-functions):
* hyper-apropos.el (hyper-apropos-grok-variables):
Look for a newline using #'position rather than #'string-match in
these functions.
* info.el (Info-insert-dir):
* info.el (Info-insert-file-contents):
* info.el (Info-follow-reference):
* info.el (Info-extract-menu-node-name):
* info.el (Info-menu):
Look for fixed strings using #'position or #'search as appropriate
in this file.
* ldap.el (ldap-decode-string):
* ldap.el (ldap-encode-string):
#'encode-coding-string, #'decode-coding-string are always
available, don't check if they're fboundp.
* ldap.el (ldap-decode-address):
* ldap.el (ldap-encode-address):
Use #'split-string-by-char in these functions.
* lisp-mnt.el (lm-creation-date):
* lisp-mnt.el (lm-last-modified-date):
Don't fire up the regexp engine just to look for spaces in this file.
* menubar-items.el (default-menubar):
Use (not (mismatch ...)) rather than #'string-match here, for
simple regexp.
Use (search "beta" ...) rather than (string-match "beta" ...)
* menubar-items.el (sort-buffers-menu-alphabetically):
* menubar-items.el (sort-buffers-menu-by-mode-then-alphabetically):
* menubar-items.el (group-buffers-menu-by-mode-then-alphabetically):
Don't fire up the regexp engine to check if a string starts with
a space or an asterisk.
Use the more fine-grained results of #'compare-strings; compare
case-insensitively for the buffer menu.
* menubar-items.el (list-all-buffers):
* menubar-items.el (tutorials-menu-filter):
Use #'equal rather than #'string-equal, which, in this context,
has the drawback of not having a bytecode, and no redeeming
features.
* minibuf.el:
* minibuf.el (un-substitute-in-file-name):
Use #'count, rather than counting the occurences of $ using the
regexp engine.
* minibuf.el (read-file-name-internal-1):
Don't fire up the regexp engine to search for ?=.
* mouse.el (mouse-eval-sexp):
Check for newline with #'find.
* msw-font-menu.el (mswindows-reset-device-font-menus):
Split a string by newline with #'split-string-by-char.
* mule/japanese.el:
* mule/japanese.el ("Japanese"):
Use #'search rather than #'string-match; canoncase before
comparing; fix a bug I had introduced where I had been making case
insensitive comparisons where the case mattered.
* mule/korea-util.el (default-korean-keyboard):
Look for ?3 using #'find, not #'string-march.
* mule/korea-util.el (quail-hangul-switch-hanja):
Search for a fixed string using #'search.
* mule/mule-cmds.el (set-locale-for-language-environment):
#'position, #'substitute rather than #'string-match,
#'replace-in-string.
* newcomment.el (comment-make-extra-lines):
Use #'search rather than #'string-match for a simple string.
* package-get.el (package-get-remote-filename):
Use #'position when looking for ?@
* process.el (setenv):
* process.el (read-envvar-name):
Use #'position when looking for ?=.
* replace.el (map-query-replace-regexp):
Use #'split-string-by-char instead of using an inline
implementation of it.
* select.el (select-convert-from-cf-text):
* select.el (select-convert-from-cf-unicodetext):
Use #'position rather than #'string-match in these functions.
* setup-paths.el (paths-emacs-data-root-p):
Use #'search when looking for simple string.
* sound.el (load-sound-file):
Use #'split-string-by-char rather than an inline reimplementation
of same.
* startup.el (splash-screen-window-body):
* startup.el (splash-screen-tty-body):
Search for simple strings using #'search.
* version.el (emacs-version):
Ditto.
* x-font-menu.el (hack-font-truename):
Implement this more cheaply in terms of #'find,
#'split-string-by-char, #'equal, rather than #'string-match,
#'split-string, #'string-equal.
* x-font-menu.el (x-reset-device-font-menus-core):
Use #'split-string-by-char here.
* x-init.el (x-initialize-keyboard):
Search for a simple string using #'search.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Wed, 01 Apr 2015 14:28:20 +0100 |
parents | 308d34e9f07d |
children |
rev | line source |
---|---|
462 | 1 ;;; gtk-password-dialog.el --- Reading passwords in a dialog |
2 | |
3 ;; Copyright (C) 2000 Free Software Foundation, Inc. | |
4 | |
5 ;; Maintainer: William M. Perry <wmperry@gnu.org> | |
6 ;; Keywords: extensions, internal | |
7 | |
8 ;; This file is part of XEmacs. | |
9 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
10 ;; XEmacs is free software: you can redistribute it and/or modify it |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
11 ;; under the terms of the GNU General Public License as published by the |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
12 ;; Free Software Foundation, either version 3 of the License, or (at your |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
13 ;; option) any later version. |
462 | 14 |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
15 ;; XEmacs is distributed in the hope that it will be useful, but WITHOUT |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
16 ;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
17 ;; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
18 ;; for more details. |
462 | 19 |
20 ;; You should have received a copy of the GNU General Public License | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
502
diff
changeset
|
21 ;; along with XEmacs. If not, see <http://www.gnu.org/licenses/>. |
462 | 22 |
23 ;;; Synched up with: Not in FSF. | |
24 | |
502 | 25 (globally-declare-fboundp |
26 '(gtk-dialog-new | |
27 gtk-dialog-vbox gtk-dialog-action-area | |
28 gtk-window-set-title gtk-button-new-with-label | |
29 gtk-container-add gtk-signal-connect gtk-entry-get-text | |
30 gtk-widget-destroy gtk-container-set-border-width gtk-label-new | |
31 gtk-misc-set-alignment gtk-entry-new gtk-widget-set-sensitive | |
32 gtk-entry-set-text gtk-entry-select-region)) | |
33 | |
462 | 34 (defun gtk-password-dialog-ok-button (dlg) |
35 (get dlg 'x-ok-button)) | |
36 | |
37 (defun gtk-password-dialog-cancel-button (dlg) | |
38 (get dlg 'x-cancel-button)) | |
39 | |
40 (defun gtk-password-dialog-entry-widget (dlg) | |
41 (get dlg 'x-initial-entry)) | |
42 | |
43 (defun gtk-password-dialog-confirmation-widget (dlg) | |
44 (get dlg 'x-verify-entry)) | |
45 | |
46 (defun gtk-password-dialog-new (&rest keywords) | |
47 ;; Format is (:keyword value ...) | |
48 ;; Allowed keywords are: | |
49 ;; | |
50 ;; :callback function | |
51 ;; :default string | |
52 ;; :title string | |
53 :; :prompt string | |
54 ;; :default string | |
55 ;; :verify boolean | |
56 ;; :verify-prompt string | |
57 (let* ((callback (plist-get keywords :callback 'ignore)) | |
58 (dialog (gtk-dialog-new)) | |
59 (vbox (gtk-dialog-vbox dialog)) | |
60 (button-area (gtk-dialog-action-area dialog)) | |
61 (default (plist-get keywords :default)) | |
62 (widget nil)) | |
63 (gtk-window-set-title dialog (plist-get keywords :title "Enter password...")) | |
64 | |
65 ;; Make us modal... | |
66 (put dialog 'type 'dialog) | |
67 | |
68 ;; Put the buttons in the bottom | |
69 (setq widget (gtk-button-new-with-label "OK")) | |
70 (gtk-container-add button-area widget) | |
71 (gtk-signal-connect widget 'clicked | |
72 (lambda (button data) | |
73 (funcall (car data) | |
74 (gtk-entry-get-text | |
75 (get (cdr data) 'x-initial-entry)))) | |
76 (cons callback dialog)) | |
77 (put dialog 'x-ok-button widget) | |
78 | |
79 (setq widget (gtk-button-new-with-label "Cancel")) | |
80 (gtk-container-add button-area widget) | |
81 (gtk-signal-connect widget 'clicked | |
82 (lambda (button dialog) | |
83 (gtk-widget-destroy dialog)) | |
84 dialog) | |
85 (put dialog 'x-cancel-button widget) | |
86 | |
87 ;; Now the entry area... | |
88 (gtk-container-set-border-width vbox 5) | |
89 (setq widget (gtk-label-new (plist-get keywords :prompt "Password:"))) | |
90 (gtk-misc-set-alignment widget 0.0 0.5) | |
91 (gtk-container-add vbox widget) | |
92 | |
93 (setq widget (gtk-entry-new)) | |
94 (put widget 'visibility nil) | |
95 (gtk-container-add vbox widget) | |
96 (put dialog 'x-initial-entry widget) | |
97 | |
98 (if (plist-get keywords :verify) | |
99 (let ((changed-cb (lambda (editable dialog) | |
100 (gtk-widget-set-sensitive | |
101 (get dialog 'x-ok-button) | |
102 (equal (gtk-entry-get-text | |
103 (get dialog 'x-initial-entry)) | |
104 (gtk-entry-get-text | |
105 (get dialog 'x-verify-entry))))))) | |
106 (gtk-container-set-border-width vbox 5) | |
107 (setq widget (gtk-label-new (plist-get keywords :verify-prompt "Verify:"))) | |
108 (gtk-misc-set-alignment widget 0.0 0.5) | |
109 (gtk-container-add vbox widget) | |
110 | |
111 (setq widget (gtk-entry-new)) | |
112 (put widget 'visibility nil) | |
113 (gtk-container-add vbox widget) | |
114 (put dialog 'x-verify-entry widget) | |
115 | |
116 (gtk-signal-connect (get dialog 'x-initial-entry) | |
117 'changed changed-cb dialog) | |
118 (gtk-signal-connect (get dialog 'x-verify-entry) | |
119 'changed changed-cb dialog) | |
120 (gtk-widget-set-sensitive (get dialog 'x-ok-button) nil))) | |
121 | |
122 (if default | |
123 (progn | |
124 (gtk-entry-set-text (get dialog 'x-initial-entry) default) | |
125 (gtk-entry-select-region (get dialog 'x-initial-entry) | |
126 0 (length default)))) | |
127 dialog)) | |
128 | |
129 (provide 'gtk-password-dialog) |