Mercurial > hg > xemacs-beta
view lisp/toolbar.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 |
line wrap: on
line source
;;; toolbar.el --- Toolbar support for XEmacs ;; Copyright (C) 1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, 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 (when toolbar support is compiled in). ;;; Code: (defcustom toolbar-visible-p ;; added for the options menu - dverna apr. 98 (specifier-instance default-toolbar-visible-p) "*Whether the default toolbar is globally visible. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (set-specifier default-toolbar-visible-p val) (setq toolbar-visible-p val)) ) (defcustom toolbar-captioned-p ;; added for the options menu - dverna apr. 98 (specifier-instance toolbar-buttons-captioned-p) "*Whether the toolbars buttons are globally captioned. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (set-specifier toolbar-buttons-captioned-p val) (setq toolbar-captioned-p val)) ) (defcustom default-toolbar-position ;; added for the options menu - dverna (default-toolbar-position) "*The location of the default toolbar: 'top, 'bottom, 'left or 'right. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type '(choice (const :tag "top" top) (const :tag "bottom" bottom) (const :tag "left" left) (const :tag "right" right)) :set #'(lambda (var val) (let* ((height (window-height)) (hdiff (- (frame-height) height)) (width (window-width))) (set-default-toolbar-position val) (setq default-toolbar-position val) ;; needed or dimensions don't update? (redisplay-frame) ;; This probably only works correctly if there is only one ;; Emacs window. If windows are split, it probably results in ;; small adjustments in their sizes. (set-frame-size (selected-frame) width (+ height hdiff)) ))) (defvar toolbar-help-enabled t "If non-nil help is echoed for toolbar buttons.") (defvar toolbar-icon-directory nil "Location of standard toolbar icon bitmaps.") (defun toolbar-make-button-list (up &optional down disabled cap-up cap-down cap-disabled) "Call make-glyph on each arg and return a list of the results." (let ((up-glyph (make-glyph up)) (down-glyph (and down (make-glyph down))) (disabled-glyph (and disabled (make-glyph disabled))) (cap-up-glyph (and cap-up (make-glyph cap-up))) (cap-down-glyph (and cap-down (make-glyph cap-down))) (cap-disabled-glyph (and cap-disabled (make-glyph cap-disabled)))) (if cap-disabled (list up-glyph down-glyph disabled-glyph cap-up-glyph cap-down-glyph cap-disabled-glyph) (if cap-down (list up-glyph down-glyph disabled-glyph cap-up-glyph cap-down-glyph) (if cap-up (list up-glyph down-glyph disabled-glyph cap-up-glyph) (if disabled-glyph (list up-glyph down-glyph disabled-glyph) (if down-glyph (list up-glyph down-glyph) (list up-glyph)))))))) (defun init-toolbar-location () (if (not toolbar-icon-directory) (let ((name (locate-data-directory "toolbar"))) (if name (setq toolbar-icon-directory (file-name-as-directory name)))))) ;; called from toolbar.c during device and frame initialization (defun init-toolbar-from-resources (locale) (if (and (featurep 'x) (or (eq locale 'global) (eq 'x (device-or-frame-type locale)))) (declare-fboundp (x-init-toolbar-from-resources locale)))) ;; #### Is this actually needed or will the code in ;; default-mouse-motion-handler suffice? (define-key global-map 'button1up 'release-toolbar-button) (defvar toolbar-map (let ((m (make-sparse-keymap))) (set-keymap-name m 'toolbar-map) m) "Keymap consulted for mouse-clicks over a toolbar.") (define-key toolbar-map 'button1 'press-toolbar-button) (define-key toolbar-map 'button1up 'release-and-activate-toolbar-button) (defvar last-pressed-toolbar-button nil) (defvar toolbar-active nil) (defvar toolbar-blank-press-function nil "Function to call if a blank area of the toolbar is pressed.") ;; ;; It really sucks that we also have to tie onto ;; default-mouse-motion-handler to make sliding buttons work right. ;; (defun press-toolbar-button (event) "Press a toolbar button. This only changes its appearance. Call function stored in `toolbar-blank-press-function', if any, with EVENT as an argument if press is over a blank area of the toolbar." (interactive "_e") (setq this-command last-command) (let ((button (event-toolbar-button event))) ;; We silently ignore non-buttons. This most likely means we are ;; over a blank part of the toolbar. (setq toolbar-active t) (if (toolbar-button-p button) (progn (set-toolbar-button-down-flag button t) (setq last-pressed-toolbar-button button)) ;; Added by Bob Weiner, Motorola Inc., 10/6/95, to handle ;; presses on blank portions of toolbars. (when (functionp toolbar-blank-press-function) (funcall toolbar-blank-press-function event))))) (defun release-and-activate-toolbar-button (event) "Release a toolbar button and activate its callback. Call function stored in `toolbar-blank-release-function', if any, with EVENT as an argument if release is over a blank area of the toolbar." (interactive "_e") (or (button-release-event-p event) (error "%s must be invoked by a mouse-release" this-command)) (release-toolbar-button event) (let ((button (event-toolbar-button event))) (if (and (toolbar-button-p button) (toolbar-button-enabled-p button) (toolbar-button-callback button)) (let ((callback (toolbar-button-callback button))) (setq this-command callback) ;; Handle arbitrary functions. (if (functionp callback) (if (commandp callback) (call-interactively callback) (funcall callback)) (eval callback)))))) ;; If current is not t, then only release the toolbar button stored in ;; last-pressed-toolbar-button (defun release-toolbar-button-internal (event current) (let ((button (event-toolbar-button event))) (setq zmacs-region-stays t) (if (and last-pressed-toolbar-button (not (eq last-pressed-toolbar-button button)) (toolbar-button-p last-pressed-toolbar-button)) (progn (set-toolbar-button-down-flag last-pressed-toolbar-button nil) (setq last-pressed-toolbar-button nil))) (if (and current (toolbar-button-p button)) (set-toolbar-button-down-flag button nil)))) (defun release-toolbar-button (event) "Release all pressed toolbar buttons." (interactive "_e") (or (button-release-event-p event) (error "%s must be invoked by a mouse-release" this-command)) (release-toolbar-button-internal event t) ;; Don't set this-command if we're being called ;; from release-and-activate-toolbar-button. (if (interactive-p) (setq this-command last-command)) (setq toolbar-active nil)) (defun release-previous-toolbar-button (event) (setq zmacs-region-stays t) (release-toolbar-button-internal event nil)) (defun make-toolbar-specifier (spec-list) "Return a new `toolbar' specifier object with the given specification list. SPEC-LIST can be a list of specifications (each of which is a cons of a locale and a list of instantiators), a single instantiator, or a list of instantiators. See `make-specifier' for more information about specifiers. Toolbar specifiers are used to specify the format of a toolbar. The values of the variables `default-toolbar', `top-toolbar', `left-toolbar', `right-toolbar', and `bottom-toolbar' are always toolbar specifiers. Valid toolbar instantiators are called \"toolbar descriptors\" and are lists of vectors. See `default-toolbar' for a description of the exact format." (make-specifier-and-init 'toolbar spec-list)) ;;; toolbar.el ends here